window: Update drag hotspot as new touches approach

Any number of touches >= 3 starts a drag operation, but the
window jumped around as new touches joined. So recalculate
the touch drag area/hotspot and tiling mode as expected
as soon as touches enter/leave the drag op.

.gitignore

@@ -19,8 +19,6 @@ libtool
 ltmain.sh
 missing
 .deps
-src/50-mutter-navigation.xml
-src/50-mutter-system.xml
 src/50-mutter-windows.xml
 src/mutter-wm.desktop
 src/mutter.desktop

NEWS

@@ -1,21 +1,3 @@
-3.7.2
-=====
-* Fix spurious focus changes when showing desktop [Florian; #686928]
-* MetaPluginManager: don't send events to Clutter twice [Owen; #686406]
-* Add the ability to add shader hooks to MetaBackgroundActor [Giovanni; #669798]
-* Only process keyboard mapping events for the core X keyboard [Rui; #674859]
-* Import keybinding files from Metacity [Florian; #687672]
-* Add compositor hook to process keybindings selectively [Florian; #688202]
-* MetaBackgroundActor: add a setter for GLSL uniforms [Giovanni; #682536]
-* Misc. fixes and cleanups [Jasper, Rui, Florian, Rico; #688182]
-
-Contributors:
-  Giovanni Campagna, Rui Matos, Florian Müllner, Jasper St. Pierre,
-  Owen Taylor, Rico Tzschichholz
-
-Translations:
-  Rafael Ferreira [pt_BR], Tobias Endrigkeit [de], Yaron Shahrabani [he]
-
 3.7.1
 =====
 * screen: Ignore num-workspaces when using dynamic workspaces [Florian; #685439]

configure.in

@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
 
 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [7])
-m4_define([mutter_micro_version], [2])
+m4_define([mutter_micro_version], [1])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -199,6 +199,33 @@ if test x$have_xcursor = xyes; then
   AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support])
 fi
 
+XINPUT2_VERSION=1.4.0
+
+AC_ARG_ENABLE(xinput2,
+  AC_HELP_STRING([--disable-xinput2],
+                 [disable XInput2 usage]),,
+  enable_xinput2=yes)
+
+if test x$enable_xinput2 = xyes; then
+  AC_MSG_CHECKING([XInput2])
+  if $PKG_CONFIG --atleast-version $XINPUT2_VERSION xi; then
+    have_xinput2=yes
+  else
+    have_xinput2=no
+  fi
+  AC_MSG_RESULT($have_xinput2)
+else
+  have_xinput2=no
+fi
+
+if test x$have_xinput2 = xyes; then
+  echo "Building with XInput2"
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES xi"
+  AC_DEFINE(HAVE_XINPUT2, , [Building with XInput2 support])
+fi
+
+AM_CONDITIONAL(HAVE_XINPUT2, test "$have_xinput2" = "yes")
+
 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)
 
 # This is used for plugins
@@ -468,6 +495,7 @@ mutter-$VERSION
 	Shape extension:          ${found_shape}
 	Xsync:                    ${found_xsync}
 	Xcursor:                  ${have_xcursor}
+	XInput2:                  ${have_xinput2}
 "
 
 

po/POTFILES.in

@@ -1,7 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-src/50-mutter-navigation.xml.in
-src/50-mutter-system.xml.in
 src/50-mutter-windows.xml.in
 src/compositor/compositor.c
 src/core/bell.c

po/ar.po

@@ -22,7 +22,7 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.7.0\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "النوافذ"
 
@@ -1507,224 +1507,21 @@ msgstr "قيمة ص كانت %d، تُرُقَِب %d"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "حُلِّلت %d تعابير الإحداثيات في %g ثواني (بمعدّل %g ثوان)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "انتقل إلى مساحة العمل 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "انتقل إلى مساحة العمل 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "انتقل إلى مساحة العمل 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "انتقل إلى مساحة العمل 4"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "فعّل قائمة النافذة"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "بدّل نمط ملء الشاشة"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "بدّل حالة التكبير"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "كبّر النّافذة"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "استعد النّافذة"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "بدّل حالة الإخفاء"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "صغّر النّافذة"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "أغلق النّافذة"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "انقل النّافذة"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "حجّم النّافذة"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "انقل النافذة إلى مساحة العمل 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "انقل النافذة إلى مساحة العمل 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "انقل النافذة إلى مساحة العمل 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "انقل النافذة إلى مساحة العمل 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "انقل النافذة مساحة عمل واحدة إلى اليسار"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "انقل النافذة مساحة عمل واحدة إلى اليمين"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "انقل النافذة مساحة عمل واحدة إلى الأعلى"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "انقل النافذة مساحة عمل واحدة إلى الأسفل"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "ارفع النافذة فوق النوافذ الأخرى"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "اخفض النافذة تحت النوافذ الأخرى"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "كبّر النافذة عموديا"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "كبّر النافذة أفقيا"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "أخفِ كل النوافذ العادية"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "انقل لمساحة العمل أعلى"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "انقل لمساحة العمل أسفل"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "انقل لمساحة العمل على اليسار"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "انقل لمساحة العمل على اليمين"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "الإبحار"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "تنقل بين التطبيقات"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "تنقل بين تحكمات النظام"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "تنقل بين تحكمات النظام مباشرة"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "تنقل بين النوافذ مباشرة"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "تنقل بين نوافذ التطبيق مباشرة"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "تنقل بين نوافذ التطبيق"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "أظهر نظرة عمة على الأنشطة"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "أظهر محث تشغيل أمر"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "النظام"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "ارفع النافذة إذا كانت أخرى تغطيها، أو أخفضها في ما عدا ذلك"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "بدّل حالة ظهور النافذة على جميع مساحات العمل أو واحدة منها"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "قائمة بملحقات المزج مفصولة بفاصلة"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "انتقل إلى مساحة العمل 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "انتقل إلى مساحة العمل 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "انتقل إلى مساحة العمل 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "انتقل إلى مساحة العمل 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "انتقل إلى مساحة العمل 5"
 
@@ -1819,12 +1616,54 @@ msgstr "بدّل حالة ظهور النافذة على جميع مساحات
 #~ msgid "Run a terminal"
 #~ msgstr "شغّل طرفية"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "فعّل قائمة النافذة"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "بدّل نمط ملء الشاشة"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "بدّل حالة التكبير"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "بدّل حالة ظهور النافذة فوق النوافذ الأخرى"
 
+#~ msgid "Maximize window"
+#~ msgstr "كبّر النّافذة"
+
+#~ msgid "Restore window"
+#~ msgstr "استعد النّافذة"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "بدّل حالة الإخفاء"
+
+#~ msgid "Minimize window"
+#~ msgstr "صغّر النّافذة"
+
+#~ msgid "Close window"
+#~ msgstr "أغلق النّافذة"
+
+#~ msgid "Move window"
+#~ msgstr "انقل النّافذة"
+
+#~ msgid "Resize window"
+#~ msgstr "حجّم النّافذة"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "بدّل حالة ظهور النافذة على جميع مساحات العمل"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "انقل النافذة إلى مساحة العمل 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "انقل النافذة إلى مساحة العمل 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "انقل النافذة إلى مساحة العمل 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "انقل النافذة إلى مساحة العمل 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "انقل النافذة إلى مساحة العمل 5"
 
@@ -1849,9 +1688,33 @@ msgstr "بدّل حالة ظهور النافذة على جميع مساحات
 #~ msgid "Move window to workspace 12"
 #~ msgstr "انقل النافذة إلى مساحة العمل 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "انقل النافذة مساحة عمل واحدة إلى اليسار"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "انقل النافذة مساحة عمل واحدة إلى اليمين"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "انقل النافذة مساحة عمل واحدة إلى الأعلى"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "انقل النافذة مساحة عمل واحدة إلى الأسفل"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "ارفع النافذة إذا كانت أخرى تغطيها، أو أخفضها في ما عدا ذلك"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "ارفع النافذة فوق النوافذ الأخرى"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "اخفض النافذة تحت النوافذ الأخرى"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "كبّر النافذة عموديا"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "كبّر النافذة أفقيا"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "انقل النافذة للزاوية شمال-غربي الشاشة (أعلى اليسار)"
 

po/as.po

@@ -21,7 +21,7 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "উইন্ডোসমূহ"
 
@@ -1524,301 +1524,6 @@ msgstr "y ৰ মান %d, %d প্ৰত্যাশিত"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d অক্ষ অভিব্যক্তিসমূহ %g ছেকেণ্ডত বিশ্লেষণ কৰা হৈছে (গড় %g ছেকেণ্ড)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মস্থান ১লে পৰিবৰ্তন কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মক্ষেত্ৰ ১ লে পৰিবৰ্তন কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মস্থান ২লে পৰিবৰ্তন কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মক্ষেত্ৰ ১৩ লে পৰিবৰ্তন কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মস্থান ৩লে পৰিবৰ্তন কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মক্ষেত্ৰ ৩ লে পৰিবৰ্তন কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মস্থান ৪লে পৰিবৰ্তন কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মক্ষেত্ৰ ৪ লে পৰিবৰ্তন কৰক"
-
-# #-#-#-#-#  as.po (as)  #-#-#-#-#
-#
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "উইন্ডো মেনু সক্ৰিয় কৰক"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"সম্পূৰ্ণপৰ্দা অৱস্থা অদল-বদল কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"পূৰ্ণপৰ্দা অৱস্থা অদল বদল কৰক"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"সৰ্বোচ্চ অবস্থা অদল-বদল কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"ডাঙৰ কৰা অৱস্থা অদল বদল কৰক"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "উইন্ডো ডাঙৰ কৰক"
-
-# #-#-#-#-#  as.po (as)  #-#-#-#-#
-#
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো পুনৰ সংৰক্ষণ কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো পুনৰস্থাপন কৰক"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"ছায়াবৃত অবস্থা অদল-বদল কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"ছায়াবৃত অৱস্থা অদল-বদল কৰা হ'ব"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো লুকাওক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো সৰু কৰক"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "উইন্ডো বন্ধ কৰক"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "উইন্ডো স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডোৰ আকাৰ পৰিবৰ্তন কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডোক পুনৰ আকাৰ দিয়ক"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডোক কৰ্মস্থান ১লে স্থানান্তৰ কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মক্ষেত্ৰ ১ লে স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডোক কৰ্মস্থান ২লে স্থানান্তৰ কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মক্ষেত্ৰ ২ লে স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডোক কৰ্মস্থান ৩লে স্থানান্তৰ কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মক্ষেত্ৰ ৩ লে স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডোক কৰ্মস্থান ৪লে স্থানান্তৰ কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"কৰ্মক্ষেত্ৰ ৪ লে স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডোক বাওঁফালে এটা কৰ্মস্থানলে স্থানান্তৰ কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো বাওঁফালৰ পাৰ্শ্ববৰ্তী কৰ্মক্ষেত্ৰত স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো সোঁফালে এটা কৰ্মস্থানলে স্থানান্তৰ কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো সোঁফালৰ পাৰ্শ্ববৰ্তী কৰ্মক্ষেত্ৰত স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো এটা কৰ্মস্থান উপৰত স্থানান্তৰ কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো এটা কৰ্মক্ষেত্ৰ ওপৰত স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো এটা কৰ্মস্থান তলত স্থানান্তৰ কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"উইন্ডো এটা কৰ্মক্ষেত্ৰ তলত স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr ""
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"অন্যান্য উইন্ডোৰ উপৰত উইন্ডো উত্থাপন কৰক\n"
-"#-#-#-#-#  as.po (as)  #-#-#-#-#\n"
-"অন্যান্য উইন্ডোৰ ওপৰত উইন্ডো উত্থাপন কৰক"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "উইন্ডোটোক অন্য উইন্ডোৰ তলত নমাওক"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "উইন্ডো উলম্ব দিশত ডাঙৰ কৰক"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "উইন্ডো আনুভূমিক দিশত ডাঙৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "সকলো স্বাভাৱিক উইন্ডো লুকাওক"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "ওপৰৰ কৰ্মক্ষেত্ৰলে স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "তলৰ কৰ্মক্ষেত্ৰলে স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "বাওঁফালৰ কৰ্মক্ষেত্ৰলে স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "সোঁফালৰ কৰ্মক্ষেত্ৰলে স্থানান্তৰ কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "দিশনিৰ্ণয়"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "এপ্লিকেচনসমুহ অদল বদল কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "চিস্টেম নিয়ন্ত্ৰণসমূহ অদল বদল কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "চিস্টেম নিয়ন্ত্ৰণসমূহ প্ৰত্যক্ষভাৱে অদল বদল কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "উইন্ডোসমূহ প্ৰত্যক্ষভাৱে অদল বদল কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "এটা এপ্লিকেচনৰ উইন্ডোসমূহ তৎক্ষনাৎ প্ৰত্যক্ষভাৱে অদল বদল কৰক"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "এটা এপ্লিকেচনৰ উইন্ডোসমূহ অদল বদল কৰক"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "কাৰ্য্যসমূহৰ অভাৰভিউ দেখুৱাওক"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "ৰান কমান্ড প্ৰম্পট দেখুৱাওক"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "চিস্টেম"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "যদি উইন্ডো ঢকা থাকে তাক উত্থাপন কৰক, নহলে তলত নমাওক"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "সকলো কৰ্মস্থানত অথবা এটাত থকা উইন্ডো অদল বদল কৰক"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "মিশ্ৰক প্লাগিনসমূহৰ কমা-পৃথকিত তালিকা"
 
@@ -1866,6 +1571,18 @@ msgstr "সকলো কৰ্মস্থানত অথবা এটাত
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "উইন্ডোক কেৱল এটা কৰ্মস্থানত ৰাখক"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "কৰ্মস্থান ১লে পৰিবৰ্তন কৰক"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "কৰ্মস্থান ২লে পৰিবৰ্তন কৰক"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "কৰ্মস্থান ৩লে পৰিবৰ্তন কৰক"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "কৰ্মস্থান ৪লে পৰিবৰ্তন কৰক"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "কৰ্মস্থান ৫লে পৰিবৰ্তন কৰক"
 
@@ -1914,8 +1631,7 @@ msgstr "সকলো কৰ্মস্থানত অথবা এটাত
 #~ msgid ""
 #~ "Move backward between windows of an application, using a popup window"
 #~ msgstr ""
-#~ "এটা এপ্লিকেচনৰ উইন্ডোসমূহৰ মাজত পপ-আপ উইন্ডো প্ৰয়োগ কৰি পিছফালে স্থান পৰিবৰ্তন "
-#~ "কৰক"
+#~ "এটা এপ্লিকেচনৰ উইন্ডোসমূহৰ মাজত পপ-আপ উইন্ডো প্ৰয়োগ কৰি পিছফালে স্থান পৰিবৰ্তন কৰক"
 
 #
 #~ msgid "Move between windows, using a popup window"
@@ -1978,14 +1694,58 @@ msgstr "সকলো কৰ্মস্থানত অথবা এটাত
 #~ msgid "Run a terminal"
 #~ msgstr "টাৰ্মিনেল আৰম্ভ কৰক"
 
+#
+#~ msgid "Activate the window menu"
+#~ msgstr "উইন্ডো মেনু সক্ৰিয় কৰক"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "সম্পূৰ্ণপৰ্দা অৱস্থা অদল-বদল কৰক"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "সৰ্বোচ্চ অবস্থা অদল-বদল কৰক"
+
 #
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "উইন্ডোটো সদায় অন্য সকল উইন্ডোৰ উপৰ প্ৰদৰ্শিত হ'ব নে সেয়া অদল বদল কৰক"
 
+#~ msgid "Maximize window"
+#~ msgstr "উইন্ডো ডাঙৰ কৰক"
+
+#
+#~ msgid "Restore window"
+#~ msgstr "উইন্ডো পুনৰ সংৰক্ষণ কৰক"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "ছায়াবৃত অবস্থা অদল-বদল কৰক"
+
+#~ msgid "Minimize window"
+#~ msgstr "উইন্ডো লুকাওক"
+
+#~ msgid "Close window"
+#~ msgstr "উইন্ডো বন্ধ কৰক"
+
+#~ msgid "Move window"
+#~ msgstr "উইন্ডো স্থানান্তৰ কৰক"
+
+#~ msgid "Resize window"
+#~ msgstr "উইন্ডোৰ আকাৰ পৰিবৰ্তন কৰক"
+
 #
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "উইন্ডো সকলো কৰ্মস্থানত আছে নে এটাত সেয়া অদল বদল কৰক"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "উইন্ডোক কৰ্মস্থান ১লে স্থানান্তৰ কৰক"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "উইন্ডোক কৰ্মস্থান ২লে স্থানান্তৰ কৰক"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "উইন্ডোক কৰ্মস্থান ৩লে স্থানান্তৰ কৰক"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "উইন্ডোক কৰ্মস্থান ৪লে স্থানান্তৰ কৰক"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "উইন্ডোক কৰ্মস্থান ৫লে স্থানান্তৰ কৰক"
 
@@ -2010,12 +1770,36 @@ msgstr "সকলো কৰ্মস্থানত অথবা এটাত
 #~ msgid "Move window to workspace 12"
 #~ msgstr "উইন্ডোক কৰ্মস্থান ১২লে স্থানান্তৰ কৰক"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "উইন্ডোক বাওঁফালে এটা কৰ্মস্থানলে স্থানান্তৰ কৰক"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "উইন্ডো সোঁফালে এটা কৰ্মস্থানলে স্থানান্তৰ কৰক"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "উইন্ডো এটা কৰ্মস্থান উপৰত স্থানান্তৰ কৰক"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "উইন্ডো এটা কৰ্মস্থান তলত স্থানান্তৰ কৰক"
+
 #
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr ""
 #~ "অন্য উইন্ডো দ্বাৰা ঢাকা থাকলে উইন্ডোটি উপৰত উইন্ডো উত্থাপন কৰক, অন্যথা সেটি তলত "
 #~ "নমাওক"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "অন্যান্য উইন্ডোৰ উপৰত উইন্ডো উত্থাপন কৰক"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "উইন্ডোটোক অন্য উইন্ডোৰ তলত নমাওক"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "উইন্ডো উলম্ব দিশত ডাঙৰ কৰক"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "উইন্ডো আনুভূমিক দিশত ডাঙৰ কৰক"
+
 #
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "উইন্ডোক উত্তৰ-পশ্চিম (উপৰত বাওঁফালে) চুকত স্থানান্তৰ কৰক"

po/ast.po

@@ -37,6 +37,7 @@ msgstr "Petición d'información ventana desconocida: %d"
 #. Translators: %s is a window title
 #: ../src/core/delete.c:95
 #, c-format
+#, c-format
 msgid "<tt>%s</tt> is not responding."
 msgstr "<tt>%s</tt> nun ta respondiendo."
 
@@ -121,6 +122,7 @@ msgstr "Comandu de terminal nun definíu.\n"
 
 #: ../src/core/main.c:130
 #, c-format
+#, c-format
 msgid ""
 "mutter %s\n"
 "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
@@ -259,6 +261,7 @@ msgstr "Error axustando númberu d'arees de trabayu a %d: %s\n"
 
 #: ../src/core/prefs.c:2028 ../src/core/prefs.c:2531
 #, c-format
+#, c-format
 msgid "Workspace %d"
 msgstr "Espaciu de Trabayu %d"
 
@@ -272,6 +275,7 @@ msgstr "\"%s\" atopau na base de datos de configuración nun ye un valor válidu
 
 #: ../src/core/prefs.c:2612
 #, c-format
+#, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Fallu al afitar nome pal espaciu de trabayu %d a \"%s\": %s\n"
 
@@ -282,16 +286,19 @@ msgstr "Fallu al afitar l'estáu del compositor: %s\n"
 
 #: ../src/core/prefs.c:2845
 #, c-format
+#, c-format
 msgid "Error setting clutter plugin list: %s\n"
 msgstr "Fallu al afitar la llista desordenada de plugin: %s\n"
 
 #: ../src/core/prefs.c:2889
 #, c-format
+#, c-format
 msgid "Error setting live hidden windows status status: %s\n"
 msgstr "Fallu al afitar l'estáu de les ventanes anubríes: %s\n"
 
 #: ../src/core/prefs.c:2917
 #, c-format
+#, c-format
 msgid "Error setting no tab popup status: %s\n"
 msgstr "Fallu al afitar l'estáu de les llingüetes emerxentes: %s\n"
 
@@ -351,6 +358,7 @@ msgstr "Falló analizar ficheru de sesión guardáu: %s\n"
 
 #: ../src/core/session.c:1198
 #, c-format
+#, c-format
 msgid "<mutter_session> attribute seen but we already have the session ID"
 msgstr "Vióse l'atributu <mutter_session> pero yá tenemos la ID de sesión"
 
@@ -396,6 +404,7 @@ msgstr "Abiertu archivu log %s\n"
 
 #: ../src/core/util.c:139 ../src/tools/mutter-message.c:176
 #, c-format
+#, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter compilose ensin sofitu pal mou testu\n"
 
@@ -490,19 +499,19 @@ msgid ""
 msgstr "La propiedá %s del ventanu 0x%lx contien un códigu UTF-8 non válidu pal "
 "elementu %d na llista\n"
 
-#: ../src/include/all-keybindings.h:88 ../src/50-mutter-navigation.xml.in.h:18
+#: ../src/include/all-keybindings.h:88
 msgid "Switch to workspace 1"
 msgstr "Cambiar a espaciu de trabayu 1"
 
-#: ../src/include/all-keybindings.h:90 ../src/50-mutter-navigation.xml.in.h:19
+#: ../src/include/all-keybindings.h:90
 msgid "Switch to workspace 2"
 msgstr "Cambiar a espaciu de trabayu 2"
 
-#: ../src/include/all-keybindings.h:92 ../src/50-mutter-navigation.xml.in.h:20
+#: ../src/include/all-keybindings.h:92
 msgid "Switch to workspace 3"
 msgstr "Cambiar a espaciu de trabayu 3"
 
-#: ../src/include/all-keybindings.h:94 ../src/50-mutter-navigation.xml.in.h:21
+#: ../src/include/all-keybindings.h:94
 msgid "Switch to workspace 4"
 msgstr "Cambiar a espaciu de trabayu 4"
 
@@ -631,57 +640,47 @@ msgstr "Saca una semeya d'una ventana"
 msgid "Run a terminal"
 msgstr "Executar una terminal"
 
-#: ../src/include/all-keybindings.h:271 ../src/50-mutter-windows.xml.in.h:1
+#: ../src/include/all-keybindings.h:271
 msgid "Activate the window menu"
 msgstr "Activar el menú de la ventana"
 
-#: ../src/include/all-keybindings.h:274 ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
+#: ../src/include/all-keybindings.h:274
 msgid "Toggle fullscreen mode"
-msgstr ""
-"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
-"Camudar a modu pantalla completa\n"
-"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
-"Camudar a mou pantalla completa"
+msgstr "Camudar a modu pantalla completa"
 
-#: ../src/include/all-keybindings.h:276 ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
+#: ../src/include/all-keybindings.h:276
 msgid "Toggle maximization state"
-msgstr ""
-"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
-"Camudar a estáu maximizáu\n"
-"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
-"Conmutar l'estáu maximizáu"
+msgstr "Camudar a estáu maximizáu"
 
 #: ../src/include/all-keybindings.h:278
 msgid "Toggle whether a window will always be visible over other windows"
 msgstr "Conmutar si una ventana siempres se verá encima d'otres ventanes"
 
-#: ../src/include/all-keybindings.h:280 ../src/50-mutter-windows.xml.in.h:4
+#: ../src/include/all-keybindings.h:280
 msgid "Maximize window"
 msgstr "Maximizar ventana"
 
-#: ../src/include/all-keybindings.h:282 ../src/50-mutter-windows.xml.in.h:12
+#: ../src/include/all-keybindings.h:282
 msgid "Restore window"
 msgstr "Restaurar la ventana"
 
-#: ../src/include/all-keybindings.h:284 ../src/50-mutter-windows.xml.in.h:15
+#: ../src/include/all-keybindings.h:284
 msgid "Toggle shaded state"
 msgstr "Activa estáu endolcáu"
 
-#: ../src/include/all-keybindings.h:286 ../src/50-mutter-windows.xml.in.h:7
+#: ../src/include/all-keybindings.h:286
 msgid "Minimize window"
 msgstr "Minimizar ventana"
 
-#: ../src/include/all-keybindings.h:288 ../src/50-mutter-windows.xml.in.h:2
+#: ../src/include/all-keybindings.h:288
 msgid "Close window"
 msgstr "Zarrar ventana"
 
-#: ../src/include/all-keybindings.h:290 ../src/50-mutter-windows.xml.in.h:8
+#: ../src/include/all-keybindings.h:290
 msgid "Move window"
 msgstr "Mover ventana"
 
-#: ../src/include/all-keybindings.h:292 ../src/50-mutter-windows.xml.in.h:11
+#: ../src/include/all-keybindings.h:292
 msgid "Resize window"
 msgstr "Cambiar el tamañu la ventana"
 
@@ -690,22 +689,18 @@ msgid "Toggle whether window is on all workspaces or just one"
 msgstr "Conmutar si la ventana apaez en toles árees de trabayu o namái nuna"
 
 #: ../src/include/all-keybindings.h:299
-#: ../src/50-mutter-navigation.xml.in.h:10
 msgid "Move window to workspace 1"
 msgstr "Mover ventana al espaciu de trabayu 1"
 
 #: ../src/include/all-keybindings.h:302
-#: ../src/50-mutter-navigation.xml.in.h:11
 msgid "Move window to workspace 2"
 msgstr "Mover ventana al espaciu de trabayu 2"
 
 #: ../src/include/all-keybindings.h:305
-#: ../src/50-mutter-navigation.xml.in.h:12
 msgid "Move window to workspace 3"
 msgstr "Mover ventana al espaciu de trabayu 3"
 
 #: ../src/include/all-keybindings.h:308
-#: ../src/50-mutter-navigation.xml.in.h:13
 msgid "Move window to workspace 4"
 msgstr "Mover ventana al espaciu de trabayu 4"
 
@@ -741,24 +736,19 @@ msgstr "Mover ventana al espaciu de trabayu 11"
 msgid "Move window to workspace 12"
 msgstr "Mover ventana al espaciu de trabayu 12"
 
-#: ../src/include/all-keybindings.h:344 ../src/50-mutter-navigation.xml.in.h:7
+#: ../src/include/all-keybindings.h:344
 msgid "Move window one workspace to the left"
 msgstr "Mover ventana un espaciu de trabayu a manzorga"
 
-#: ../src/include/all-keybindings.h:347 ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
+#: ../src/include/all-keybindings.h:347
 msgid "Move window one workspace to the right"
-msgstr ""
-"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
-"Mover ventana un espaciu de trabayu a derecha\n"
-"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
-"Mover ventana un espaciu de trabayu a madrecha"
+msgstr "Mover ventana un espaciu de trabayu a derecha"
 
-#: ../src/include/all-keybindings.h:350 ../src/50-mutter-navigation.xml.in.h:9
+#: ../src/include/all-keybindings.h:350
 msgid "Move window one workspace up"
 msgstr "Mover ventana un espaciu de trabayu p'arriba"
 
-#: ../src/include/all-keybindings.h:353 ../src/50-mutter-navigation.xml.in.h:6
+#: ../src/include/all-keybindings.h:353
 msgid "Move window one workspace down"
 msgstr "Mover ventana un espaciu de trabayu p'abaxo"
 
@@ -767,29 +757,19 @@ msgid "Raise window if it's covered by another window, otherwise lower it"
 msgstr ""
 "Llevantar la ventana si ta cubierta por otra ventana, minimizala n'otru casu"
 
-#: ../src/include/all-keybindings.h:358 ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
+#: ../src/include/all-keybindings.h:358
 msgid "Raise window above other windows"
-msgstr ""
-"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
-"Poner el ventanu en primer planu\n"
-"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
-"Poner la ventana en primer planu"
+msgstr "Poner el ventanu en primer planu"
 
-#: ../src/include/all-keybindings.h:360 ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
+#: ../src/include/all-keybindings.h:360
 msgid "Lower window below other windows"
-msgstr ""
-"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
-"Ventanu más baxu per debaxo d'otros ventanos\n"
-"#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
-"Ventana más baxa per debaxo d'otres ventanes"
+msgstr "Ventanu más baxu per debaxo d'otros ventanos"
 
-#: ../src/include/all-keybindings.h:364 ../src/50-mutter-windows.xml.in.h:6
+#: ../src/include/all-keybindings.h:364
 msgid "Maximize window vertically"
 msgstr "Maximizar ventana verticalmente"
 
-#: ../src/include/all-keybindings.h:368 ../src/50-mutter-windows.xml.in.h:5
+#: ../src/include/all-keybindings.h:368
 msgid "Maximize window horizontally"
 msgstr "Maximizar ventana horizontalmente"
 
@@ -1003,6 +983,7 @@ msgstr "Espaciu de Trabayu %d%n"
 
 #: ../src/ui/menu.c:213
 #, c-format
+#, c-format
 msgid "Workspace 1_0"
 msgstr "Espaciu de Trabayu 1_0"
 
@@ -1743,6 +1724,7 @@ msgstr "Nun se permite testu dientro del elementu <%s>"
 #: ../src/ui/theme-parser.c:3748 ../src/ui/theme-parser.c:3760
 #: ../src/ui/theme-parser.c:3772
 #, c-format
+#, c-format
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> especificáu dos vegaes pa esti tema"
 
@@ -1954,96 +1936,6 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d espresiones de coordenaes interpretaes en %g segundos (%g segundos de "
 "media)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Anubrir toles ventanes normales"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Mover al área de trabayu d'arriba"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Mover al área de trabayu d'abaxo"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Mover al área de trabayu de la izquierda"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Mover al área de trabayu de la derecha"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Navegación"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Movese ente aplicaciones"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Cambiar ente controles del sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Movese ente los controles del sistema direutamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Cambiar ventanes direutamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Movese ente les ventanes d'una aplicación direutamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Movese ente les ventanes d'una aplicación"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Amosar el resume d'actividaes"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Amosar l'elementu «executar comando»"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Sistema"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Llevantar la ventana si ta cubierta, minimizala n'otru casu"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Conmutar la ventana en toles árees de trabayu o namái nuna"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Windows"
-msgstr "Ventanes"
-
 #~ msgid "Desktop"
 #~ msgstr "Escritoriu"
 

po/be.po

@@ -1592,218 +1592,3 @@ msgstr "Y-значэнне было %d, а чакалася %d"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d каардынатных выразаў разабраныя за %g секунд (у сярэднім %g секунд)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Навігацыя"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Перамясціць акно ў прастору 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Перамясціць акно ў прастору 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Перамясціць акно ў прастору 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Перамясціць акно ў прастору 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Перамясціць акно ў прастору злева ад дзейнай"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Перамясціць акно ў прастору справа ад дзейнай"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Перамясціць акно ў прастору зверху ад дзейнай"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Перамясціць акно ў прастору знізу ад дзейнай"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Перамяшчацца паміж праграмамі"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Перамяшчацца паміж вокнамі праграмы"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Перамяшчацца паміж сістэмнымі элементамі кіравання"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Непасрэдна перамяшчацца паміж вокнамі"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Непасрэдна перамяшчацца паміж вокнамі праграмы"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Непасрэдна перамяшчацца паміж сістэмнымі элементамі кіравання"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Схаваць усе звычайныя вокны"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Перайсці ў прастору працы 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Перайсці ў прастору працы 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Перайсці ў прастору працы 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Перайсці ў прастору працы 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Перамясціць на прастору працы з_лева"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Перамясціць на прастору працы с_права"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Перамясціць на прастору працы з_лева"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Перамясціць на прастору працы з_нізу"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Сістэма"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Паказаць акенца выкананняў загадаў"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Паказаць агляд дзейнасцяў"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Адкрыць меню акна"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Перамяніць рэжым \"на ўвесь экран\""
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Перамяніць максімалізацыю акна"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Максімалізаваць акно"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Аднавіць былы памер акна"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Перамяніць скручанасць акна ў загаловак"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Закрыць акно"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Мінімалізаваць акно"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Перамясціць акно"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Змяніць памер акна"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Перамяніць, ці бачнае акно на ўсіх прасторах працы"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Узняць акно, калі яно закрыта іншымі вокнамі, іначай апусціць яго"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Узняць акно над астатнімі"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Апусціць акно ніжэй за астатнія"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Вертыкальна максімалізаваць акно"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Гарызантальна максімалізаваць акно"

po/bg.po

@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Прозорци"
 
@@ -1595,218 +1595,3 @@ msgstr "стойността y бе %d, а се очакваше %d"
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d координатен израз обработен за %g секунди (%g секунди средно)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Скриване на всички обикновен прозорци"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Преместване на горния работен плот"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Преместване на долния работен плот"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Преместване на левия работен плот"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Преместване на десния работен плот"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Преместване на прозореца един работен плот надолу"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Преместване на прозореца един работен плот наляво"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Преместване на прозореца един работен плот надясно"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Преместване на прозореца един работен плот нагоре"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Преместване на прозореца в работен плот 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Преместване на прозореца в работен плот 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Преместване на прозореца в работен плот 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Преместване на прозореца в работен плот 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Навигация"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Преместване на фокуса между програмите"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Преместване на фокуса между служебните обекти"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Незабавно преместване на фокуса между служебните обекти"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Превключване към работен плот 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Превключване към работен плот 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Превключване към работен плот 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Превключване към работен плот 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Незабавно преместване на фокуса между програмите"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Незабавно преместване на фокуса между прозорците на едно приложение"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Преместване на фокуса между прозорците на едно приложение"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Преглед на дейностите"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Показване на прозореца за стартиране на команда"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Система"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Активиране на менюто за прозорците"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Затваряне на прозореца"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Понижаване на прозореца под другите прозорци"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Максимизиране на прозорец"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Максимизиране на прозореца хоризонтално"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Максимизиране прозореца вертикално"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Минимизиране на прозореца"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Преместване на прозорец"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Издигане на прозореца над другите"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Ако прозорецът е под друг, го издига, иначе го понижава"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Оразмеряване на прозорец"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Възстановяване на прозорец"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Превключване на режима за цял екран"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Превключване на състоянието на максимизиране"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Превключване на състоянието на навиване"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Превключване на появата на прозореца на всички работни места"

po/ca.po

@@ -1615,222 +1615,6 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d expressions de coordenades analitzades en %g segons (%g segons de mitja)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Canvia a l'espai de treball 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Canvia a l'espai de treball 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Canvia a l'espai de treball 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Canvia a l'espai de treball 4"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Activa el menú de finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Si s'utilitza el mode a pantalla completa"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Canvia l'estat de maximització"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maximitza la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Restaura la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Canvia l'estat d'ombrejat"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimitza la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Tanca la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Mou la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Redimensiona la finestra"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Mou la finestra a l'espai de treball 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Mou la finestra a l'espai de treball 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Mou la finestra a l'espai de treball 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Mou la finestra a l'espai de treball 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Mou la finestra un espai de treball a l'esquerra"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Mou la finestra un espai de treball a la dreta"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Mou la finestra un espai de treball amunt"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Mou la finestra un espai de treball avall"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Alça una finestra per damunt de les altres"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Baixa la finestra sota les altres"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maximitza la finestra verticalment"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maximitza la finestra horitzontalment"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navegació"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Commutació d'aplicacions"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Commutació de les finestres d'una aplicació"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Commutació de controls del sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Commutació immediata de finestres"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Commutació immediata de les finestres d'una aplicació"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Commutació directa dels controls del sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Oculta totes les finestres normals"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Mou a l'espai de treball de l'esquerra"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Mou a l'espai de treball de la dreta"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Mou a l'espai de treball de sobre"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Mou a l'espai de treball de sota"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Sistema"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Mostra l'indicador d'execució d'aplicacions"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Mostra el resum d'activitats"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr ""
-"Commuta la funció que fa que la finestra estigui en tots els espais de "
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Alça una finestra coberta per una altra, o sinó baixa-la"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Llista separada per comes de connectors de composició"
 
@@ -1877,6 +1661,18 @@ msgstr "Alça una finestra coberta per una altra, o sinó baixa-la"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Posa la finestra només a un espai de treball"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Canvia a l'espai de treball 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Canvia a l'espai de treball 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Canvia a l'espai de treball 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Canvia a l'espai de treball 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Canvia a l'espai de treball 5"
 
@@ -1973,16 +1769,58 @@ msgstr "Alça una finestra coberta per una altra, o sinó baixa-la"
 #~ msgid "Run a terminal"
 #~ msgstr "Executa un terminal"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Activa el menú de finestra"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Si s'utilitza el mode a pantalla completa"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Canvia l'estat de maximització"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr ""
 #~ "Commuta la funció que fa que una finestra sempre serà visible per sobre "
 #~ "de les altres"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maximitza la finestra"
+
+#~ msgid "Restore window"
+#~ msgstr "Restaura la finestra"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Canvia l'estat d'ombrejat"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimitza la finestra"
+
+#~ msgid "Close window"
+#~ msgstr "Tanca la finestra"
+
+#~ msgid "Move window"
+#~ msgstr "Mou la finestra"
+
+#~ msgid "Resize window"
+#~ msgstr "Redimensiona la finestra"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr ""
 #~ "Commuta la funció que fa que la finestra estigui en tots els espais de "
 #~ "treball o només en un"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Mou la finestra a l'espai de treball 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Mou la finestra a l'espai de treball 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Mou la finestra a l'espai de treball 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Mou la finestra a l'espai de treball 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Mou la finestra a l'espai de treball 5"
 
@@ -2007,9 +1845,33 @@ msgstr "Alça una finestra coberta per una altra, o sinó baixa-la"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Mou la finestra a l'espai de treball 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Mou la finestra un espai de treball a l'esquerra"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Mou la finestra un espai de treball a la dreta"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Mou la finestra un espai de treball amunt"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Mou la finestra un espai de treball avall"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Alça una finestra coberta per una altra, o sinó la baixa"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Alça una finestra per damunt de les altres"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Baixa la finestra sota les altres"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maximitza la finestra verticalment"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maximitza la finestra horitzontalment"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Mou la finestra a la cantonada nord-oest (part superior esquerra)"
 

po/ca@valencia.po

@@ -1612,221 +1612,6 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d expressions de coordenades analitzades en %g segons (%g segons de mitja)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Canvia a l'espai de treball 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Canvia a l'espai de treball 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Canvia a l'espai de treball 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Canvia a l'espai de treball 4"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Activa el menú de finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Si s'utilitza el mode a pantalla completa"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Canvia l'estat de maximització"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maximitza la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Restaura la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Canvia l'estat d'ombrejat"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimitza la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Tanca la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Mou la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Redimensiona la finestra"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Mou la finestra a l'espai de treball 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Mou la finestra a l'espai de treball 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Mou la finestra a l'espai de treball 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Mou la finestra a l'espai de treball 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Mou la finestra un espai de treball a l'esquerra"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Mou la finestra un espai de treball a la dreta"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Mou la finestra un espai de treball amunt"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Mou la finestra un espai de treball avall"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Alça una finestra per damunt de les altres"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Baixa la finestra sota les altres"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maximitza la finestra verticalment"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maximitza la finestra horitzontalment"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navegació"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Commutació d'aplicacions"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Commutació de les finestres d'una aplicació"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Commutació de controls del sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Commutació immediata de finestres"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Commutació immediata de les finestres d'una aplicació"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Commutació directa dels controls del sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Oculta totes les finestres normals"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Mou a l'espai de treball de l'esquerra"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Mou a l'espai de treball de la dreta"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Mou a l'espai de treball de sobre"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Mou a l'espai de treball de sota"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Sistema"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Mostra l'indicador d'execució d'aplicacions"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Mostra el resum d'activitats"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Commuta la funció que fa que la finestra estiga en tots els espais de "
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Alça una finestra coberta per una altra, o sinó baixa-la"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Llista separada per comes de connectors de composició"
 
@@ -1873,6 +1658,18 @@ msgstr "Alça una finestra coberta per una altra, o sinó baixa-la"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Posa la finestra només a un espai de treball"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Canvia a l'espai de treball 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Canvia a l'espai de treball 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Canvia a l'espai de treball 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Canvia a l'espai de treball 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Canvia a l'espai de treball 5"
 
@@ -1969,16 +1766,58 @@ msgstr "Alça una finestra coberta per una altra, o sinó baixa-la"
 #~ msgid "Run a terminal"
 #~ msgstr "Executa un terminal"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Activa el menú de finestra"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Si s'utilitza el mode a pantalla completa"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Canvia l'estat de maximització"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr ""
 #~ "Commuta la funció que fa que una finestra sempre serà visible per sobre "
 #~ "de les altres"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maximitza la finestra"
+
+#~ msgid "Restore window"
+#~ msgstr "Restaura la finestra"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Canvia l'estat d'ombrejat"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimitza la finestra"
+
+#~ msgid "Close window"
+#~ msgstr "Tanca la finestra"
+
+#~ msgid "Move window"
+#~ msgstr "Mou la finestra"
+
+#~ msgid "Resize window"
+#~ msgstr "Redimensiona la finestra"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr ""
 #~ "Commuta la funció que fa que la finestra estigui en tots els espais de "
 #~ "treball o només en un"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Mou la finestra a l'espai de treball 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Mou la finestra a l'espai de treball 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Mou la finestra a l'espai de treball 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Mou la finestra a l'espai de treball 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Mou la finestra a l'espai de treball 5"
 
@@ -2003,9 +1842,33 @@ msgstr "Alça una finestra coberta per una altra, o sinó baixa-la"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Mou la finestra a l'espai de treball 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Mou la finestra un espai de treball a l'esquerra"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Mou la finestra un espai de treball a la dreta"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Mou la finestra un espai de treball amunt"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Mou la finestra un espai de treball avall"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Alça una finestra coberta per una altra, o sinó la baixa"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Alça una finestra per damunt de les altres"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Baixa la finestra sota les altres"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maximitza la finestra verticalment"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maximitza la finestra horitzontalment"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Mou la finestra a la cantonada nord-oest (part superior esquerra)"
 

po/cs.po

@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-metacity-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Okna"
 
@@ -1573,218 +1573,3 @@ msgstr "Hodnota y byla %d, bylo očekáváno %d"
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "Zpracováno %d výrazů souřadnic za %g sekund (průměr %g sekund)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Skrýt všechna normální okna"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Přesunout na plochu nad"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Přesunout na plochu pod"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Přesunout na plochu vlevo"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Přesunout na plochu vpravo"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Posunout okno o plochu dolů"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Posunout okno o plochu doleva"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Posunout okno o plochu doprava"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Posunout okno o plochu nahoru"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Přesunout okno na plochu 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Přesunout okno na plochu 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Přesunout okno na plochu 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Přesunout okno na plochu 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigace"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Přepnout mezi aplikacemi"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Přepnout mezi systémovými ovládacími prvky"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Přepnout přímo mezi systémovými ovládacími prvky"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Přepnout na plochu 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Přepnout na plochu 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Přepnout na plochu 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Přepnout na plochu 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Přepnout přímo mezi okny"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Přepnout přímo mezi okny aplikace"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Přepnout mezi okny aplikace"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Zobrazit přehled činností"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Zobrazit výzvu ke spuštění příkazu"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Systém"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Aktivovat nabídku okna"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Zavřít okno"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Odsunou okno do pozadí pod ostatní okna"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maximalizovat okno"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maximalizovat okno vodorovně"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maximalizovat okno svisle"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimalizovat okno"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Přesunout okno"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Přenést okno do popředí nad ostatní okna"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr ""
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Změnit velikost okna"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Obnovit okno"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Přepnout režim na celou obrazovku"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Přepnout stav maximalizace"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Přepnout stav svinutí"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Přepnout výskyt okna na všech plochách nebo jen na jedné"

po/da.po

@@ -27,8 +27,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-metacity-windows.xml.in.h:17
-#: ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Vinduer"
 
@@ -1593,222 +1592,6 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d koordinatudtryk fortolket på %g sekunder (%g sekunder i gennemsnit)\n"
 
-#: ../src/50-metacity-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Skift til arbejdsområde 1"
-
-#: ../src/50-metacity-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Skift til arbejdsområde 2"
-
-#: ../src/50-metacity-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Skift til arbejdsområde 3"
-
-#: ../src/50-metacity-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Skift til arbejdsområde 4"
-
-#: ../src/50-metacity-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Aktivér vinduesmenuen"
-
-#: ../src/50-metacity-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Skift fuldskærmstilstand"
-
-#: ../src/50-metacity-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Skift maksimeringstilstand"
-
-#: ../src/50-metacity-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maksimér vindue"
-
-#: ../src/50-metacity-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Gendan vindue"
-
-#: ../src/50-metacity-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Skift oprullethed"
-
-#: ../src/50-metacity-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimér vindue"
-
-#: ../src/50-metacity-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Luk vindue"
-
-#: ../src/50-metacity-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Flyt vindue"
-
-#: ../src/50-metacity-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr ""
-"Ændr størrelsen på vindue"
-
-#: ../src/50-metacity-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Flyt vindue til arbejdsområde 1"
-
-#: ../src/50-metacity-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Flyt vindue til arbejdsområde 2"
-
-#: ../src/50-metacity-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Flyt vindue til arbejdsområde 3"
-
-#: ../src/50-metacity-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Flyt vindue til arbejdsområde 4"
-
-#: ../src/50-metacity-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Flyt vindue et arbejdsområde til venstre"
-
-#: ../src/50-metacity-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Flyt vindue et arbejdsområde til højre"
-
-#: ../src/50-metacity-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Flyt vindue et arbejdsområde op"
-
-#: ../src/50-metacity-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Flyt vindue et arbejdsområde ned"
-
-#: ../src/50-metacity-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Hæv vindue over andre vinduer"
-
-#: ../src/50-metacity-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Sænk vindue under andre vinduer"
-
-#: ../src/50-metacity-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maksimér et vindue lodret"
-
-#: ../src/50-metacity-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maksimér et vindue vandret"
-
-#: ../src/50-metacity-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Skjul alle normale vinduer"
-
-#: ../src/50-metacity-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Flyt til arbejdsområdet over"
-
-#: ../src/50-metacity-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Flyt til arbejdsområdet under"
-
-#: ../src/50-metacity-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Flyt til arbejdsområdet til venstre"
-
-#: ../src/50-metacity-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Flyt til arbejdsområdet til højre"
-
-#: ../src/50-metacity-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigation"
-
-#: ../src/50-metacity-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Skift mellem programmer"
-
-#: ../src/50-metacity-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Skift mellem systemkontroller"
-
-#: ../src/50-metacity-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Skift direkte mellem systemkontroller"
-
-#: ../src/50-metacity-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Skift direkte mellem vinduer"
-
-#: ../src/50-metacity-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Skift direkte mellem vinduer i et program"
-
-#: ../src/50-metacity-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Skift mellem vinduer i et program"
-
-#: ../src/50-metacity-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Vis aktivitetsoversigten"
-
-#: ../src/50-metacity-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Vis kør-kommandoprompten"
-
-#: ../src/50-metacity-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "System"
-
-#: ../src/50-metacity-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Hæv vindue hvis det er dækket, ellers sænk det"
-
-#: ../src/50-metacity-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Skift mellem visning af vindue på alle eller kun et arbejdsområde"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Kommaadskilt liste af komposit-udvidelsesmoduler"
 
@@ -1856,6 +1639,18 @@ msgstr "Skift mellem visning af vindue på alle eller kun et arbejdsområde"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Vis vindue på kun ét arbejdsområde"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Skift til arbejdsområde 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Skift til arbejdsområde 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Skift til arbejdsområde 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Skift til arbejdsområde 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Skift til arbejdsområde 5"
 
@@ -1950,16 +1745,58 @@ msgstr "Skift mellem visning af vindue på alle eller kun et arbejdsområde"
 #~ msgid "Run a terminal"
 #~ msgstr "Start en terminal"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Aktivér vinduesmenuen"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Skift fuldskærmstilstand"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Skift maksimeringstilstand"
+
 # Nogen bedre forslag?
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr ""
 #~ "Slå til eller fra hvorvidt et vindue altid vil være synligt over andre "
 #~ "vinduer"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maksimér vindue"
+
+#~ msgid "Restore window"
+#~ msgstr "Gendan vindue"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Skift oprullethed"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimér vindue"
+
+#~ msgid "Close window"
+#~ msgstr "Luk vindue"
+
+#~ msgid "Move window"
+#~ msgstr "Flyt vindue"
+
+#~ msgid "Resize window"
+#~ msgstr "Ændre størrelsen på vindue"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr ""
 #~ "Skift mellem hvorvidt vinduet vises på alle arbejdsområder eller kun et"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Flyt vindue til arbejdsområde 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Flyt vindue til arbejdsområde 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Flyt vindue til arbejdsområde 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Flyt vindue til arbejdsområde 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Flyt vindue til arbejdsområde 5"
 
@@ -1984,9 +1821,33 @@ msgstr "Skift mellem visning af vindue på alle eller kun et arbejdsområde"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Flyt vindue til arbejdsområde 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Flyt vindue et arbejdsområde til venstre"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Flyt vindue et arbejdsområde til højre"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Flyt vindue et arbejdsområde op"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Flyt vindue et arbejdsområde ned"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Hæv vindue hvis det er dækket af et andet vindue, ellers sænk det"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Hæv vindue over andre vinduer"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Sænk vindue under andre vinduer"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maksimér et vindue lodret"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maksimér et vindue vandret"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Flyt vindue til det nordvestlige (øverste venstre) hjørne"
 

po/de.po

@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.5\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Fenster"
 
@@ -1635,222 +1635,6 @@ msgstr ""
 "%d Koordinatenausdrücke in %g Sekunden verarbeitet (im Durchschnitt %g pro "
 "Sekunde)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Zur Arbeitsfläche 1 wechseln"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Zur Arbeitsfläche 2 wechseln"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Zur Arbeitsfläche 3 wechseln"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Zur Arbeitsfläche 4 wechseln"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Das Fenstermenü aktivieren"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Vollbildmodus ein-/ausschalten"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Maximierungszustand ein-/ausschalten"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Fenster maximieren"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Fenstergröße wiederherstellen"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Fenster ein-/ausrollen"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Fenster minimieren"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Fenster schließen"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Fenster verschieben"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Fenstergröße ändern"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Fenster auf Arbeitsfläche 1 verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Fenster auf Arbeitsfläche 2 verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Fenster auf Arbeitsfläche 3 verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Fenster auf Arbeitsfläche 4 verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Fenster eine Arbeitsfläche nach links verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Fenster eine Arbeitsfläche nach rechts verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Fenster eine Arbeitsfläche nach oben verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Fenster eine Arbeitsfläche nach unten verschieben"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Fenster vor die anderen Fenster anheben"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Fenster hinter die anderen Fenster absenken"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Fenster vertikal maximieren"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Fenster horizontal maximieren"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Alle normalen Fenster verbergen"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Auf Arbeitsfläche darüber verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Auf Arbeitsfläche darunter verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Auf Arbeitsfläche links verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Auf Arbeitsfläche rechts verschieben"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigation"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Anwendungen wechseln"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Systemsteuerungen umschalten"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Systemsteuerungen sofort umschalten"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Fenster sofort wechseln"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Sofort zwischen den Fenstern einer Anwendung wechseln"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Zwischen den Fenstern einer Anwendung wechseln"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Übersicht der Aktivitäten anzeigen"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Den »Befehl ausführen«-Dialog anzeigen"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "System"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Fenster anheben, falls es verdeckt ist, andernfalls absenken"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr ""
-"Festlegen, ob das Fenster auf allen oder nur einer Arbeitsfläche sichtbar ist"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Eine durch Kommata getrennte Liste von Plugins für den Compositor"
 
@@ -1864,6 +1648,18 @@ msgstr ""
 #~ "Legt fest, ob verborgene Fenster (d.h. minimierte Fenster und Fenster auf "
 #~ "anderen Arbeitsflächen) erhalten bleiben sollen."
 
+#~ 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 workspace 5"
 #~ msgstr "Zur Arbeitsfläche 5 wechseln"
 
@@ -1970,12 +1766,54 @@ msgstr ""
 #~ msgid "Run a terminal"
 #~ msgstr "Ein Terminal starten"
 
+#~ 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 "Toggle whether a window will always be visible over other windows"
 #~ msgstr "Fenster ständig im Vordergrund ein-/ausschalten"
 
+#~ msgid "Maximize window"
+#~ msgstr "Fenster maximieren"
+
+#~ msgid "Restore window"
+#~ msgstr "Fenstergröße wiederherstellen"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Fenster ein-/ausrollen"
+
+#~ msgid "Minimize window"
+#~ msgstr "Fenster minimieren"
+
+#~ msgid "Close window"
+#~ msgstr "Fenster schließen"
+
+#~ msgid "Move window"
+#~ msgstr "Fenster verschieben"
+
+#~ msgid "Resize window"
+#~ msgstr "Fenstergröße ändern"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "Fenster sichtbar auf allen Arbeitsflächen ein-/ausschalten"
 
+#~ 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 workspace 5"
 #~ msgstr "Fenster auf Arbeitsfläche 5 verschieben"
 
@@ -2000,9 +1838,33 @@ msgstr ""
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Fenster auf Arbeitsfläche 12 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 "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Fenster anheben falls überdeckt, sonst 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 "Move window to north-west (top left) corner"
 #~ msgstr "Fenster in linke obere Ecke des Bildschirms verschieben"
 

po/el.po

@@ -28,7 +28,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Παράθυρα"
 
@@ -1645,223 +1645,9 @@ msgstr "η τιμή y ήταν %d, αναμενόταν %d"
 #: ../src/ui/theme-viewer.c:1352
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
-msgstr "οι εκφράσεις συντεταγμένης %d αναλύθηκαν σε %g δευτερόλεπτα (%g δευτερόλεπτα μέσος όρος)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Απόκρυψη όλων των κανονικών παραθύρων"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Μετακίνηση στο χώρο εργασίας επάνω"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Μετακίνηση στο χώρο εργασίας κάτω"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Μετακίνηση στο χώρο εργασίας αριστερά"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Μετακίνηση στο χώρο εργασίας δεξιά"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Μετακίνηση του παραθύρου ένα χώρο εργασίας κάτω"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Μετακίνηση του παραθύρου ένα χώρο εργασίας αριστερά"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Μετακίνηση του παραθύρου ένα χώρο εργασίας δεξιά"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Μετακίνηση του παραθύρου ένα χώρο εργασίας πάνω"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Πλοήγηση"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Εναλλαγή εφαρμογών"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Εναλλαγή ελέγχων συστήματος"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Αναστροφή άμεση εναλλαγή ελέγχων συστήματος"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Αλλαγή στο χώρο εργασίας 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Αλλαγή στο χώρο εργασίας 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Αλλαγή στο χώρο εργασίας 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Αλλαγή στο χώρο εργασίας 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Απευθείας εναλλαγή παραθύρων"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Άμεση εναλλαγή μεταξύ παραθύρων μιας εφαρμογής"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Άμεση εναλλαγή μεταξύ παραθύρων μιας εφαρμογής"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Εμφάνιση της επισκόπησης των δραστηριοτήτων"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Εμφάνιση της ειδοποίησης της εντολής run"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Σύστημα"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Ενεργοποίηση του μενού του παραθύρου"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Κλείσιμο παραθύρου"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Χαμήλωμα παραθύρου κάτω από τα άλλα παράθυρα"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Μεγιστοποίηση παραθύρου"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Μεγιστοποίηση ενός παραθύρου οριζόντια"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Μεγιστοποίηση ενός παραθύρου κάθετα"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Ελαχιστοποίηση παραθύρου"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Μετακίνηση παραθύρου"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Ανασήκωση παραθύρου πάνω από τα άλλα παράθυρα"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
 msgstr ""
-"Ανασήκωση παραθύρου αν καλύπτεται από άλλο παράθυρο, αλλιώς χαμήλωμα του"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Αλλαγή μεγέθους παραθύρου"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Επαναφορά παραθύρου"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Εναλλαγή κατάστασης πλήρους οθόνης"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Εναλλαγή κατάστασης μεγιστοποίησης"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Εναλλαγή σκιασμένης κατάστασης"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Εναλλαγή παραθύρου σε όλες τις επιφάνειες εργασίας ή σε μία"
+"οι εκφράσεις συντεταγμένης %d αναλύθηκαν σε %g δευτερόλεπτα (%g δευτερόλεπτα "
+"μέσος όρος)\n"
 
 #~ msgid ""
 #~ "There was an error running <tt>%s</tt>:\n"

po/en_GB.po

@@ -1575,221 +1575,6 @@ msgstr "y value was %d, %d was expected"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Switch to workspace 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Switch to workspace 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Switch to workspace 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Switch to workspace 4"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Activate the window menu"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Toggle fullscreen mode"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Toggle maximisation state"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maximise window"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Restore window"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Toggle shaded state"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimise window"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Close window"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Move window"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Resize window"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Move window to workspace 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Move window to workspace 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Move window to workspace 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Move window to workspace 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Move window one workspace to the left"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Move window one workspace to the right"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Move window one workspace up"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Move window one workspace down"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Raise window above other windows"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Lower window below other windows"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maximise window vertically"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maximise window horizontally"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigation"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Switch applications"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Switch windows of an application"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Switch system controls"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Switch windows directly"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Switch windows of an app directly"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Switch system controls directly"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Hide all normal windows"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Move to workspace left"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Move to workspace right"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Move to workspace above"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Move to workspace below"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "System"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Show the run command prompt"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Show the activities overview"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Toggle window on all workspaces or one"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Raise window if covered, otherwise lower it"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Comma-separated list of compositor plugins"
 
@@ -1836,6 +1621,18 @@ msgstr "Raise window if covered, otherwise lower it"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Put Window On Only One Workspace"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Switch to workspace 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Switch to workspace 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Switch to workspace 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Switch to workspace 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Switch to workspace 5"
 
@@ -1931,12 +1728,54 @@ msgstr "Raise window if covered, otherwise lower it"
 #~ msgid "Run a terminal"
 #~ msgstr "Run a terminal"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Activate the window menu"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Toggle fullscreen mode"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Toggle maximisation state"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "Toggle whether a window will always be visible over other windows"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maximise window"
+
+#~ msgid "Restore window"
+#~ msgstr "Restore window"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Toggle shaded state"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimise window"
+
+#~ msgid "Close window"
+#~ msgstr "Close window"
+
+#~ msgid "Move window"
+#~ msgstr "Move window"
+
+#~ msgid "Resize window"
+#~ msgstr "Resize window"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "Toggle whether window is on all workspaces or just one"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Move window to workspace 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Move window to workspace 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Move window to workspace 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Move window to workspace 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Move window to workspace 5"
 
@@ -1961,9 +1800,33 @@ msgstr "Raise window if covered, otherwise lower it"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Move window to workspace 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Move window one workspace to the left"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Move window one workspace to the right"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Move window one workspace up"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Move window one workspace down"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Raise window if it's covered by another window, otherwise lower it"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Raise window above other windows"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Lower window below other windows"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maximise window vertically"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maximise window horizontally"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Move window to north-west (top left) corner"
 

po/eo.po

@@ -1493,260 +1493,17 @@ msgstr "Y-valoro estis %d, %d estis atendita"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Ŝalti al laborspaco 1"
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Ŝalti al laborspaco 1"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Ŝalti al laborspaco 2"
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Ŝalti al laborspaco 2"
 
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Ŝalti al laborspaco 3"
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Ŝalti al laborspaco 3"
 
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Ŝalti al laborspaco 4"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Aktivigi la fenestromenuon"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Baskuligi tutekranan reĝimon"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maksimumigi la fenestron"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Restaŭri fenestron"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimumigi fenestron"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Fermi la fenestron"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr ""
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi la fenestron\n"
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi fenestron"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr ""
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Ŝanĝi la fenestrograndon\n"
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Ŝanĝi fenestrograndon"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr ""
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi la fenestron al laborspaco 1\n"
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi fenestron al laborspaco 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr ""
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi la fenestron al laborspaco 2\n"
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi fenestron al laborspaco 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr ""
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi la fenestron al laborspaco 3\n"
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi fenestron al laborspaco 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr ""
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi la fenestron al laborspaco 4\n"
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi fenestron al laborspaco 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr ""
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi la fenestron al la maldekstra laborspaco\n"
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi fenestron al la maldekstra laborspaco"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr ""
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi la fenestron al la dekstra laborspaco\n"
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi fenestron al la dekstra laborspaco"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr ""
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi la fenestron al la supra laborspaco\n"
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi fenestron al la supra laborspaco"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr ""
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi la fenestron al la suba laborspaco\n"
-"#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
-"Movi fenestron al la suba laborspaco"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Vertikale maksimumigi la fenestron"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Horizontale maksimumigi la fenestron"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigado"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr ""
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Ŝalti fenestrojn de aplikaĵo"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr ""
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr ""
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr ""
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr ""
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Kaŝi ĉiujn normalajn fenestrojn"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Movi al la maldekstra laborspaco"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Movi al la dekstra laborspaco"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Movi al la supra laborspaco"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Movi al la malsupra laborspaco"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Sistemo"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr ""
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr ""
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr ""
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr ""
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr ""
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr ""
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr ""
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr ""
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Ŝalti al laborspaco 4"
 
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Ŝalti al laborspaco 5"
@@ -1841,6 +1598,42 @@ msgstr ""
 #~ msgid "Run a terminal"
 #~ msgstr "Ruli terminalon"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Aktivigi la fenestromenuon"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Baskuligi tutekranan reĝimon"
+
+#~ msgid "Maximize window"
+#~ msgstr "Maksimumigi la fenestron"
+
+#~ msgid "Restore window"
+#~ msgstr "Restaŭri fenestron"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimumigi fenestron"
+
+#~ msgid "Close window"
+#~ msgstr "Fermi la fenestron"
+
+#~ msgid "Move window"
+#~ msgstr "Movi la fenestron"
+
+#~ msgid "Resize window"
+#~ msgstr "Ŝanĝi la fenestrograndon"
+
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Movi la fenestron al laborspaco 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Movi la fenestron al laborspaco 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Movi la fenestron al laborspaco 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Movi la fenestron al laborspaco 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Movi la fenestron al laborspaco 5"
 
@@ -1865,6 +1658,24 @@ msgstr ""
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Movi la fenestron al laborspaco 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Movi la fenestron al la maldekstra laborspaco"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Movi la fenestron al la dekstra laborspaco"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Movi la fenestron al la supra laborspaco"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Movi la fenestron al la suba laborspaco"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Vertikale maksimumigi la fenestron"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Horizontale maksimumigi la fenestron"
+
 #~ msgid ""
 #~ "There was an error running <tt>%s</tt>:\n"
 #~ "\n"

po/es.po

@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Gtranslator 2.91.5\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-metacity-windows.xml.in.h:1
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Ventanas"
 
@@ -1630,229 +1630,6 @@ msgstr ""
 "%d expresiones de coordenadas interpretadas en %g segundos (%g segundos de "
 "media)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Cambiar al área de trabajo 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Cambiar al área de trabajo 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Cambiar al área de trabajo 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Cambiar al área de trabajo 4"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Activar el menú de la ventana"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Cambiar a modo de pantalla completa"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Cambiar el estado de maximización"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maximizar la ventana"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr ""
-"#-#-#-#-#  es.po (mutter.master)  #-#-#-#-#\n"
-"Restablecer la ventana\n"
-"#-#-#-#-#  es.po (mutter.master)  #-#-#-#-#\n"
-"Restaurar la ventana"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Cambiar el estado de enrollado"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimizar la ventana"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Cerrar la ventana"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Mover la ventana"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr ""
-"#-#-#-#-#  es.po (mutter.master)  #-#-#-#-#\n"
-"Redimensiona la ventana\n"
-"#-#-#-#-#  es.po (mutter.master)  #-#-#-#-#\n"
-"Redimensionar la ventana"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Mover la ventana al área de trabajo 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Mover la ventana al área de trabajo 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Mover la ventana al área de trabajo 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Mover la ventana al área de trabajo 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Mover la ventana un área de trabajo a la izquierda"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Mover la ventana un área de trabajo a la derecha"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Subir la ventana un área de trabajo"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Bajar la ventana un área de trabajo"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Levanta la ventana por encima de otras ventanas"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Bajar la ventana por debajo de otras ventanas"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maximizar la ventana verticalmente"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maximizar la ventana horizontalmente"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navegación"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Moverse entre aplicaciones"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Moverse entre las ventanas de una aplicación"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Cambiar entre controles del sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Cambiar ventanas directamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Moverse entre las ventanas de una aplicación directamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Moverse entre los controles del sistema directamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Ocultar todas las ventanas normales"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Mover al área de trabajo de la izquierda"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Mover al área de trabajo de la derecha"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Mover al área de trabajo de la arriba"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Mover al área de trabajo de abajo"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Sistema"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Mostrar el elemento «ejecutar comando»"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Mostrar el resumen de actividades"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Conmutar la ventana en todas las áreas de trabajo o sólo en una"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Levantar la ventana si está cubierta, minimizarla en otro caso"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Lista de complementos del compositor separados por comas"
 
@@ -1899,6 +1676,18 @@ msgstr "Levantar la ventana si está cubierta, minimizarla en otro caso"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Poner la ventana sólo en un área de trabajo"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Cambiar al área de trabajo 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Cambiar al área de trabajo 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Cambiar al área de trabajo 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Cambiar al área de trabajo 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Cambiar al área de trabajo 5"
 
@@ -1999,13 +1788,55 @@ msgstr "Levantar la ventana si está cubierta, minimizarla en otro caso"
 #~ msgid "Run a terminal"
 #~ msgstr "Ejecutar en un terminal"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Activar el menú de la ventana"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Cambiar a modo de pantalla completa"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Cambiar el estado de maximización"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "Conmutar si una ventana siempre se verá encima de otras ventanas"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maximizar la ventana"
+
+#~ msgid "Restore window"
+#~ msgstr "Restablecer la ventana"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Cambiar el estado de enrollado"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimizar la ventana"
+
+#~ msgid "Close window"
+#~ msgstr "Cerrar la ventana"
+
+#~ msgid "Move window"
+#~ msgstr "Mover la ventana"
+
+#~ msgid "Resize window"
+#~ msgstr "Redimensiona la ventana"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr ""
 #~ "Conmutar si la ventana aparece en todas las áreas de trabajo o sólo en una"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Mover la ventana al área de trabajo 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Mover la ventana al área de trabajo 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Mover la ventana al área de trabajo 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Mover la ventana al área de trabajo 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Mover la ventana al área de trabajo 5"
 
@@ -2030,11 +1861,35 @@ msgstr "Levantar la ventana si está cubierta, minimizarla en otro caso"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Mover la ventana al área de trabajo 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Mover la ventana un área de trabajo a la izquierda"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Mover la ventana un área de trabajo a la derecha"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Subir la ventana un área de trabajo"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Bajar la ventana un área de trabajo"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr ""
 #~ "Levantar la ventana si está cubierta por otra ventana, minimizarla en "
 #~ "otro caso"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Levanta la ventana por encima de otras ventanas"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Bajar la ventana por debajo de otras ventanas"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maximizar la ventana verticalmente"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maximizar la ventana horizontalmente"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Mover la ventana a la esquina noroeste (arriba a la izquierda)"
 

po/eu.po

@@ -31,7 +31,7 @@ msgstr "Ikusi zatia ezkerrean"
 msgid "View split on right"
 msgstr "Ikusi zatia eskuinean"
 
-#: ../src/50-mutter-windows.xml.in.h:3 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "Windows"
 msgstr "Leihoak"
 
@@ -1630,224 +1630,17 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d koordenada adierazpen analizatua %g segundotan (%g segundo batazbesteko)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Aldatu 1. laneko areara"
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Aldatu 1. laneko areara"
 
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Aldatu 2. laneko areara"
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Aldatu 2. laneko areara"
 
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Aldatu 3. laneko areara"
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Aldatu 3. laneko areara"
 
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Aldatu 4. laneko areara"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Aktibatu leiho-menua"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Txandakatu pantaila osoaren modua"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Txandakatu maximizatze-egoera"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maximizatu leihoa"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Leheneratu leihoa"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Txandakatu bildutako egoera"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr ""
-"#-#-#-#-#  eu.po (eu)  #-#-#-#-#\n"
-"Ikonotu leihoa\n"
-"#-#-#-#-#  eu.po (eu)  #-#-#-#-#\n"
-"Minimizatu leihoa"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Itxi leihoa"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Lekuz aldatu leihoa"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Aldatu leihoaren tamaina"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Eraman leihoa 1. laneko areara"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Eraman leihoa 2. laneko areara"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Eraman leihoa 3. laneko areara"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Eraman leihoa 4. laneko areara"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Eraman leihoa laneko area bat ezkerrera"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Eraman leihoa laneko area bat eskuinera"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Eraman leihoa laneko area bat gora"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Eraman leihoa laneko area bat behera"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Goratu leihoa beste leihoen gainera"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Beheratu leihoa beste leihoen azpira"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maximizatu leihoa bertikalki"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maximizatu leihoa horizontalki"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Ezkutatu leiho arrunt guztiak"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Eraman gaineko laneko areara"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Eraman azpiko laneko areara"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Eraman ezkerreko laneko areara"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Eraman eskuineko laneko areara"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Nabigazioa"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Aldatu aplikazioz"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Aldatu sistemaren kontrolak"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Aldatu sistemaren kontrolak zuzenean"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Aldatu leihoa zuzenean"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Aldatu aplikazio baten leihoa zuzenean"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Aldatu aplikazio baten leihoen artean"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Erakutsi jardueren aurkezpen orokorra"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Erakutsi gonbitea komandoa exekutatzeko"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Sistema"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Goratu leihoa beste leiho batek estaltzen badu, bestela beheratu"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Txandakatu leihoa laneko area guztietan edo bakar batean egotea"
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Aldatu 4. laneko areara"
 
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Aldatu 5. laneko areara"
@@ -1945,13 +1738,55 @@ msgstr "Txandakatu leihoa laneko area guztietan edo bakar batean egotea"
 #~ msgid "Run a terminal"
 #~ msgstr "Exekutatu terminala"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Aktibatu leiho-menua"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Txandakatu pantaila osoaren modua"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Txandakatu maximizatze-egoera"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr ""
 #~ "Txandakatu leiho bat beste leiho guztien gainean ikusgai egongo den edo ez"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maximizatu leihoa"
+
+#~ msgid "Restore window"
+#~ msgstr "Leheneratu leihoa"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Txandakatu bildutako egoera"
+
+#~ msgid "Minimize window"
+#~ msgstr "Ikonotu leihoa"
+
+#~ msgid "Close window"
+#~ msgstr "Itxi leihoa"
+
+#~ msgid "Move window"
+#~ msgstr "Lekuz aldatu leihoa"
+
+#~ msgid "Resize window"
+#~ msgstr "Aldatu leihoaren tamaina"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "Txandakatu leihoa laneko area guztietan edo bakar batean egotea"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Eraman leihoa 1. laneko areara"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Eraman leihoa 2. laneko areara"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Eraman leihoa 3. laneko areara"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Eraman leihoa 4. laneko areara"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Eraman leihoa 5. laneko areara"
 
@@ -1976,9 +1811,33 @@ msgstr "Txandakatu leihoa laneko area guztietan edo bakar batean egotea"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Eraman leihoa 12. laneko areara"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Eraman leihoa laneko area bat ezkerrera"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Eraman leihoa laneko area bat eskuinera"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Eraman leihoa laneko area bat gora"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Eraman leihoa laneko area bat behera"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Goratu leihoa beste leiho batek estaltzen badu, bestela beheratu"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Goratu leihoa beste leihoen gainera"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Beheratu leihoa beste leihoen azpira"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maximizatu leihoa bertikalki"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maximizatu leihoa horizontalki"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Eraman leihoa ipar-mendebaldeko (goi-ezkerreko) ertzera"
 

po/fa.po

@@ -20,7 +20,8 @@ msgstr ""
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
+#| msgid "/_Windows"
 msgid "Windows"
 msgstr "پنجره‌ها"
 
@@ -1485,291 +1486,6 @@ msgstr "مقدار y %Id بود، %Id انتظار می‌رفت"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%Id عبارت مختصاتی در %Ig ثانیه تجزیه شد (متوسط %Ig ثانیه)\n"
 
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "بستن پنجره"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "پایین بردن پنجره زیر پنجره‌های دیگر"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"حداکثر کردن پنجره\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"بیشینه کردن پنجره"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "حداکثر کردن افقی پنجره"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "حداکثر کردن عمودی پنجره"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"حداقل کردن پنجره\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"کمینه کردن پنجره"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "جابه‌جایی پنجره"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای کاری پایینی\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای‌کاری پایینی"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای کاری چپ \n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای‌کاری چپ "
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای کاری راست\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای‌کاری راست"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای کاری بالایی\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای‌کاری بالایی"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای کاری ۱\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای‌کاری ۱"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای کاری ۲\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای‌کاری ۲"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"نقل‌مکان پنجره به فضای کاری ۳\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای‌کاری ۳"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای کاری ۴\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"جابه‌جایی پنجره به فضای‌کاری ۴"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "پیش آوردن پنجره روی همه‌ی پنجره‌ها"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "تغییر اندازه‌ی پنجره"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"تعویض به فضای کاری ۱\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"رفتن به فضای‌کاری ۱"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"تعویض به فضای کاری ۲\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"رفتن به فضای‌کاری ۲"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"تعویض به فضای کاری ۳\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"رفتن به فضای‌کاری ۳"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"تعویض به فضای کاری ۴\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"رفتن به فضای‌کاری ۴"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "ضامن حالت تمام صفحه"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr ""
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"ضامن همیشه در وضیعت حداکثر\n"
-"#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
-"ضامن همیشه در وضعیت حداکثر"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "ضامن وضعیت سایه خورده"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-#| msgid "Hide all normal windows and set focus to the desktop"
-msgid "Hide all normal windows"
-msgstr "مخفی کردن همه‌ی پنجره‌های معمول"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-#| msgid "Move to Workspace _Left"
-msgid "Move to workspace above"
-msgstr "جابه‌جایی به فضای‌کاری _چپ"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-#| msgid "Move to Workspace _Down"
-msgid "Move to workspace below"
-msgstr "جابه‌جایی به فضای‌کاری پایین"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-#| msgid "Move to Workspace _Left"
-msgid "Move to workspace left"
-msgstr "جابه‌جایی به فضای‌کاری سمت چپ"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-#| msgid "Move to Workspace R_ight"
-msgid "Move to workspace right"
-msgstr "جابه‌جایی به فضای‌کاری سمت راست"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "جابه‌جایی"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "تعویض برنامه‌ها"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "تعویض کنترل‌های سیستم"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "تعویض مستقیمِ کنترل‌های سیستم"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "تعویض مستیقیم پنجره‌ها"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-#| msgid "Move between windows of an application immediately"
-msgid "Switch windows of an app directly"
-msgstr "تعویض مستقیمِ پنجره‌های یک برنامه"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-#| msgid "Move between windows of an application immediately"
-msgid "Switch windows of an application"
-msgstr "تعویض پنجره‌های یک برنامه"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "نمایش نمای‌کلی فعالیت‌ها"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-#| msgid "Show the panel's main menu"
-msgid "Show the run command prompt"
-msgstr "نمایش خط فرمان اجرا"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "سیستم"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "فعال کردن منوی پنجره"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-#| msgid "Raise window if it's covered by another window, otherwise lower it"
-msgid "Raise window if covered, otherwise lower it"
-msgstr "بالا آوردن پنجره در صورتی که پوشیده شده است، در غیر اینصورت پایین برود"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "بازگرداندن پنجره"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-#| msgid "Toggle whether window is on all workspaces or just one"
-msgid "Toggle window on all workspaces or one"
-msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌کاری"
-
 #~ msgid "Failed to parse message \"%s\" from dialog process\n"
 #~ msgstr "شکست در تجزیه پیغام «%s» از پردازش محاوره\n"
 
@@ -1906,6 +1622,9 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ "(کلیک راست) می‌شود. تغییردهنده به صورت مثلاً«<Alt>» یا «<Super>» "
 #~ "نمایش داده می‌شود."
 
+#~ msgid "Close window"
+#~ msgstr "بستن پنجره"
+
 #~ msgid "Commands to run in response to keybindings"
 #~ msgstr "فرمان‌هایی که در پاسخ به کلیدهای مقید اجرا می‌شوند"
 
@@ -1984,6 +1703,21 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ msgstr ""
 #~ "اگر درست بود از قابلیت کاربری در قبال استفاده‌ی کمتر از منابع صرف نظر شود"
 
+#~ msgid "Lower window below other windows"
+#~ msgstr "پایین بردن پنجره زیر پنجره‌های دیگر"
+
+#~ msgid "Maximize window"
+#~ msgstr "حداکثر کردن پنجره"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "حداکثر کردن افقی پنجره"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "حداکثر کردن عمودی پنجره"
+
+#~ msgid "Minimize window"
+#~ msgstr "حداقل کردن پنجره"
+
 #~ msgid "Move backward between panels and the desktop immediately"
 #~ msgstr "جابه‌جایی آنی به عقب بین تابلو و رومیزی"
 
@@ -2005,6 +1739,24 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ msgid "Move focus backwards between windows using popup display"
 #~ msgstr "انتقال تمرکز به عقب بین پنجره‌ها با نمایش واشو"
 
+#~ msgid "Move window"
+#~ msgstr "جابه‌جایی پنجره"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "جابه‌جایی پنجره به فضای کاری پایینی"
+
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "جابه‌جایی پنجره به فضای کاری چپ "
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "جابه‌جایی پنجره به فضای کاری راست"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "جابه‌جایی پنجره به فضای کاری بالایی"
+
+#~ msgid "Move window to workspace 1"
+#~ msgstr "جابه‌جایی پنجره به فضای کاری ۱"
+
 #~ msgid "Move window to workspace 10"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری ۱۰"
 
@@ -2014,6 +1766,15 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ msgid "Move window to workspace 12"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری ۱۲"
 
+#~ msgid "Move window to workspace 2"
+#~ msgstr "جابه‌جایی پنجره به فضای کاری ۲"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "نقل‌مکان پنجره به فضای کاری ۳"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "جابه‌جایی پنجره به فضای کاری ۴"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری ۵"
 
@@ -2043,6 +1804,12 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ "تعداد فضاهای کاری. باید بیش از صفر باشد و حداکثر مشخصی دارد (برای این که "
 #~ "اتفاقی رومیزی‌تان را با درخواست ۳۴ میلیون فضای کاری از بین نبرید)."
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "پیش آوردن پنجره روی همه‌ی پنجره‌ها"
+
+#~ msgid "Resize window"
+#~ msgstr "تغییر اندازه‌ی پنجره"
+
 #~ msgid "Run a defined command"
 #~ msgstr "اجرای یک فرمان تعریف شده"
 
@@ -2083,6 +1850,9 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ "بعضی از دور زدن‌ها دورزدن کمبودهای خود قواعد جزئی هستند، بنابراین بعضی "
 #~ "وقت‌ها اشکال در حالت دور زدن بدون دستکاری قواعد قبل رفع نیست."
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "تعویض به فضای کاری ۱"
+
 #~ msgid "Switch to workspace 10"
 #~ msgstr "تعویض به فضای کاری ۱۰"
 
@@ -2092,6 +1862,15 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ msgid "Switch to workspace 12"
 #~ msgstr "تعویض به فضای کاری ۱۲"
 
+#~ msgid "Switch to workspace 2"
+#~ msgstr "تعویض به فضای کاری ۲"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "تعویض به فضای کاری ۳"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "تعویض به فضای کاری ۴"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "تعویض به فضای کاری ۵"
 
@@ -3146,6 +2925,15 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ msgid "Toggle always on top state"
 #~ msgstr "ضامن همیشه در وضعیت بالایی"
 
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "ضامن حالت تمام صفحه"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "ضامن همیشه در وضیعت حداکثر"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "ضامن وضعیت سایه خورده"
+
 #~ msgid "Toggle window on all workspaces"
 #~ msgstr "ضامن پنجره در تمام فضاهای کاری"
 

po/fi.po

@@ -1565,221 +1565,6 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d-sijaintilauseketta jäsentyi %g sekunnissa (%g sekuntia keksimäärin)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigointi"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Siirrä ikkuna työtilaan 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Siirrä ikkuna työtilaan 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Siirrä ikkuna työtilaan 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Siirrä ikkuna työtilaan 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Siirrä ikkunaa yksi työtila vasemmalle"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Siirrä ikkunaa yksi työtila oikealle"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Siirrä ikkunaa yksi työtila ylös"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Siirrä ikkunaa yksi työtila alas"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Vaihda sovelluksia"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Vaihda sovelluksen ikkunoiden välillä"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Vaihda järjestelmän kontrolleja"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Vaihda ikkunoita suoraan"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Vaihda sovelluksen ikkunoiden välillä suoraan"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Vaihda järjestelmän kontrolleja suoraan"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Piilota kaikki tavalliset ikkunat"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Siirry työtilaan 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Siirry työtilaan 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Siirry työtilaan 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Siirry työtilaan 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Siirrä vasempaan työtilaan"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Siirrä oikeaan työtilaan"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Siirrä ylempään työtilaan"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Siirrä alla olevaan työtilaan"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Järjestelmä"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Näytä komennonsuorituskehote"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Näytä toimintojen yhteenveto"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Aktivoi ikkunavalikko"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Vaihda kokoruututilaa"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Vaihda suurennustilaa"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Suurenna ikkuna"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Palauta ikkuna"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Vaihda rullaustilaa"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Sulje ikkuna"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Pienennä ikkuna"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Siirrä ikkunaa"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Muuta ikkunan kokoa"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Valitse onko ikkuna yhdessä vai kaikissa työtiloissa"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Nosta ikkuna, jos se on peittynyt, muuten laske se"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Nosta ikkuna muiden päälle"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Laske ikkuna muiden alle"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Suurenna ikkuna pystysuunnassa"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Suurenna ikkuna vaakasuunnassa"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Pilkuilla eroteltu luettelo ladontaohjelman liitännäisistä"
 

po/fr.po

@@ -29,7 +29,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Fenêtres"
 
@@ -1655,219 +1655,3 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d expressions de coordonnées analysées en %g secondes (%g secondes en "
 "moyenne)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Masquer toutes les fenêtres normales"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Déplacer vers l'espace de travail du dessus"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Déplacer vers l'espace de travail du dessous"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Déplacer vers l'espace de travail de gauche"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Déplacer vers l'espace de travail de droite"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Déplacer la fenêtre d'un espace de travail vers le bas"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Déplacer la fenêtre d'un espace de travail vers la gauche"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Déplacer la fenêtre d'un espace de travail vers la droite"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Déplacer la fenêtre d'un espace de travail vers le haut"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Déplacer la fenêtre vers l'espace de travail 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Déplacer la fenêtre vers l'espace de travail 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Déplacer la fenêtre vers l'espace de travail 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Déplacer la fenêtre vers l'espace de travail 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigation"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Changer d'application"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Changer les contrôles système"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Changer les contrôles système directement"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Passer à l'espace de travail 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Passer à l'espace de travail 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Passer à l'espace de travail 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Passer à l'espace de travail 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Changer de fenêtre directement"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Changer de fenêtre d'une application directement"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Changer de fenêtre d'une application"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Afficher l'aperçu des activités"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Afficher la fenêtre pour lancer une commande"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Système"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Activer le menu fenêtre"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Fermer la fenêtre"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Mettre la fenêtre sous les autres fenêtres"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maximiser la fenêtre"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maximiser la fenêtre horizontalement"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maximiser la fenêtre verticalement"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Réduire la fenêtre"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Déplacer la fenêtre"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Mettre la fenêtre au premier plan"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr ""
-"Mettre la fenêtre au premier plan si elle est cachée, sinon à l'arrière-plan"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Redimensionner la fenêtre"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Restaurer la fenêtre"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Basculer en mode plein écran"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Basculer l'état d'agrandissement"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Basculer l'état de repli"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Placer la fenêtre sur tous les espaces de travail, ou sur un seul"

po/gl.po

@@ -1612,221 +1612,6 @@ msgstr ""
 "%d expresións de coordenadas interpretadas en %g segundos (%g segundos de "
 "media)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Cambiar ao espazo de traballo 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Cambiar ao espazo de traballo 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Cambiar ao espazo de traballo 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Cambiar ao espazo de traballo 4"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Activar o menú da xanela"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Alternar o modo de pantalla completa"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Alternar o estado maximizado"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maximizar a xanela"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Restaurar a xanela"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Alternar o estado ensombrecido"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimizar a xanela"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Pechar a xanela"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Mover a xanela"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Redimensionar a xanela"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Mover a xanela ao espazo de traballo 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Mover a xanela ao espazo de traballo 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Mover a xanela ao espazo de traballo 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Mover a xanela ao espazo de traballo 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Mover a xanela un espazo de traballo cara á esquerda"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Mover a xanela un espazo de traballo cara á dereita"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Mover a xanela un espazo de traballo cara a arriba"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Mover a xanela un espazo de traballo cara a abaixo"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Subir a xanela por enriba doutras xanelas"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Baixar unha xanela debaixo doutras xanelas"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maximizar a xanela verticalmente"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maximizar a xanela horizontalmente"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navegación"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Cambiar entre aplicativos"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Cambiar entre as xanelas dun aplicativo"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Cambiar entre os controles do sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Cambiar xanelas directamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Moverse entre as xanelas dun aplicativo directamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Moverse entre os controles do sistema directamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Agochar todas as xanelas normais"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Mover ao espazo da esquerda"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Mover ao espazo da dereita"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Mover ao espazo de arriba"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Mover ao espazo de abaixo"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Sistema"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Mostrar o diálogo de executar orde"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Mostrar a vista previa das actividades"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Trocar que a xanela apareza en tódolos espazos de traballo ou nun"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Elevar a xanela se está cuberta por outra, en caso contrario baixala"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Lista de separadas por comas dos complementos do compositor"
 
@@ -1873,6 +1658,18 @@ msgstr "Elevar a xanela se está cuberta por outra, en caso contrario baixala"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Pór a xanela nun só espazo de traballo"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Cambiar ao espazo de traballo 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Cambiar ao espazo de traballo 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Cambiar ao espazo de traballo 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Cambiar ao espazo de traballo 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Cambiar ao espazo de traballo 5"
 
@@ -1971,16 +1768,58 @@ msgstr "Elevar a xanela se está cuberta por outra, en caso contrario baixala"
 #~ msgid "Run a terminal"
 #~ msgstr "Executar nun terminal"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Activar o menú da xanela"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Alternar o modo de pantalla completa"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Alternar o estado maximizado"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr ""
 #~ "Alternar entre se unha xanela será visíbel sempre sobre outras xanelas ou "
 #~ "non"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maximizar a xanela"
+
+#~ msgid "Restore window"
+#~ msgstr "Restaurar a xanela"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Alternar o estado ensombrecido"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimizar a xanela"
+
+#~ msgid "Close window"
+#~ msgstr "Pechar a xanela"
+
+#~ msgid "Move window"
+#~ msgstr "Mover a xanela"
+
+#~ msgid "Resize window"
+#~ msgstr "Redimensionar a xanela"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr ""
 #~ "Alternar entre se unha xanela está en todos os espazos de traballo ou só "
 #~ "nun"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Mover a xanela ao espazo de traballo 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Mover a xanela ao espazo de traballo 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Mover a xanela ao espazo de traballo 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Mover a xanela ao espazo de traballo 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Mover a xanela ao espazo de traballo 5"
 
@@ -2005,10 +1844,34 @@ msgstr "Elevar a xanela se está cuberta por outra, en caso contrario baixala"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Mover a xanela ao espazo de traballo 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Mover a xanela un espazo de traballo cara á esquerda"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Mover a xanela un espazo de traballo cara á dereita"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Mover a xanela un espazo de traballo cara a arriba"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Mover a xanela un espazo de traballo cara a abaixo"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr ""
 #~ "Elevar unha xanela se está cuberta por outra, en caso contrario baixala"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Subir a xanela por enriba doutras xanelas"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Baixar unha xanela debaixo doutras xanelas"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maximizar a xanela verticalmente"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maximizar a xanela horizontalmente"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Mover a xanela á esquina noroeste (arriba á esquerda)"
 

po/gu.po

@@ -1537,27 +1537,6 @@ msgstr "y કિંમત %d હતી, %d ની ઈચ્છા હતી"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d યામાક્ષ સમીકરણ %g સેકન્ડોમાં પદચ્છેદ થયુ (સરેરાશ %g સેકન્ડો)\n"
 
-#: ../src/50-mutter-launchers.xml.in.h:1
-#, fuzzy
-msgid "Launchers"
-msgstr ""
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr ""
-
-#: ../src/50-mutter-screenshot.xml.in.h:1
-#, fuzzy
-#| msgid "Take a screenshot"
-msgid "Screenshots"
-msgstr "સ્ક્રીનશોટ"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "સિસ્ટમ"
-
 #~ msgid "Live Hidden Windows"
 #~ msgstr "છુપાયેલ વિન્ડોને જીવંત કરો"
 

po/he.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-07 18:40+0200\n"
-"PO-Revision-Date: 2012-11-07 18:40+0200\n"
+"POT-Creation-Date: 2012-07-24 22:26+0300\n"
+"PO-Revision-Date: 2012-07-24 22:26+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "חלונות"
 
@@ -47,38 +47,38 @@ msgstr "אירוע פעמון"
 msgid "Unknown window information request: %d"
 msgstr "Unknown window information request: %d"
 
-#: ../src/core/delete.c:111
+#: ../src/core/delete.c:114
 #, c-format
-msgid "“%s” is not responding."
-msgstr "„%s“ אינו מגיב."
+msgid "%s is not responding."
+msgstr "%s אינו מגיב"
 
-#: ../src/core/delete.c:113
+#: ../src/core/delete.c:118
 msgid "Application is not responding."
 msgstr "היישום אינו מגיב."
 
-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:123
 msgid "You may choose to wait a short while for it to continue or force the application to quit entirely."
 msgstr "באפשרותך להמתין זמן קצר ולתת ליישום להמשיך או להכריח את היישום להסתיים."
 
-#: ../src/core/delete.c:125
+#: ../src/core/delete.c:130
 msgid "_Wait"
 msgstr "ה_מתנה"
 
-#: ../src/core/delete.c:125
+#: ../src/core/delete.c:130
 msgid "_Force Quit"
 msgstr "_אילוץ סגירה"
 
-#: ../src/core/display.c:399
+#: ../src/core/display.c:380
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Missing %s extension required for compositing"
 
-#: ../src/core/display.c:496
+#: ../src/core/display.c:446
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"
 
-#: ../src/core/keybindings.c:853
+#: ../src/core/keybindings.c:844
 #, c-format
 msgid "Some other program is already using the key %s with modifiers %x as a binding\n"
 msgstr "תוכנית אחרת כבר משתמשת במקש %s עם המקש %x כצירוף\n"
@@ -138,26 +138,26 @@ msgstr "Print version"
 msgid "Mutter plugin to use"
 msgstr "תוסף ה־mutter לשימוש"
 
-#: ../src/core/prefs.c:1079
+#: ../src/core/prefs.c:1065
 msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 msgstr "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 
-#: ../src/core/prefs.c:1154
+#: ../src/core/prefs.c:1140
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Could not parse font description \"%s\" from GSettings key %s\n"
 
-#: ../src/core/prefs.c:1220
+#: ../src/core/prefs.c:1206
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 msgstr "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 
-#: ../src/core/prefs.c:1747
+#: ../src/core/prefs.c:1724
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 msgstr "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 
-#: ../src/core/prefs.c:1844
+#: ../src/core/prefs.c:1821
 #, c-format
 msgid "Workspace %d"
 msgstr "סביבת עבודה %d"
@@ -279,7 +279,7 @@ msgid "Window manager error: "
 msgstr "Window manager error: "
 
 #. first time through
-#: ../src/core/window.c:7240
+#: ../src/core/window.c:7234
 #, c-format
 msgid "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
 msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
@@ -291,27 +291,27 @@ msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADE
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7905
+#: ../src/core/window.c:7899
 #, c-format
 msgid "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
 
-#: ../src/core/window-props.c:274
+#: ../src/core/window-props.c:310
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Application set a bogus _NET_WM_PID %lu\n"
 
-#: ../src/core/window-props.c:393
+#: ../src/core/window-props.c:429
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (מעל %s)"
 
-#: ../src/core/window-props.c:1448
+#: ../src/core/window-props.c:1484
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 
-#: ../src/core/window-props.c:1459
+#: ../src/core/window-props.c:1495
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
@@ -395,26 +395,18 @@ msgid "Determines whether the use of popup and highlight frame should be disable
 msgstr "Determines whether the use of popup and highlight frame should be disabled for window cycling."
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
-msgid "Delay focus changes until the pointer stops moving"
-msgstr "Delay focus changes until the pointer stops moving"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
-msgid "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then the focus will not be changed immediately when entering a window, but only after the pointer stops moving."
-msgstr "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."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Draggable border width"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
 msgid "The amount of total draggable borders. If the theme's visible borders are not enough, invisible borders will be added to meet this value."
 msgstr "The amount of total draggable borders. If the theme's visible borders are not enough, invisible borders will be added to meet this value."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Select window from tab popup"
 msgstr "Select window from tab popup"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:18
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
 msgid "Cancel tab popup"
 msgstr "Cancel tab popup"
 
@@ -1432,305 +1424,6 @@ msgstr "y value was %d, %d was expected"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "מעבר למרחב עבודה 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "מעבר למרחב עבודה 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "מעבר למרחב עבודה 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "מעבר למרחב עבודה 4"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"הפעלת תפריט החלון\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"הפעלת החלון הפעיל"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"כניסה למצב מסך מלא\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"הפעלה/כיבוי מצב מסך מלא"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "הפעלה/כיבוי מצב הגדלה"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Maximize window\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"הגדלת חלון"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Restore window\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"שחזור חלון"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Toggle shaded state\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"החלפת מצב ההצללה"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Minimize window\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"מזעור חלון"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Close window\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"סגירת חלון"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Move window\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"הזזת חלון"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Resize window\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"שינוי גודל חלון"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Move window to workspace 1\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"העברה למרחב עבודה 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Move window to workspace 2\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"העברה למרחב עבודה 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Move window to workspace 3\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"העברה למרחב עבודה 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Move window to workspace 4\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"העברה למרחב עבודה 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Move window one workspace to the left\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"העברת החלון לשולחן העבודה שמשמאל"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Move window one workspace to the right\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"העברת החלון לשולחן העבודה שמימין"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Move window one workspace up\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"העברת החלון לשולחן העבודה שמלמעלה"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Move window one workspace down\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"העברת החלון לשולחן העבודה שמלמטה"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Raise window above other windows\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"הגבהת החלון מעל לחלונות אחרים"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Lower window below other windows\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"הנמכת החלון מתחת לחלונות אחרים"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Maximize window vertically\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"הגדלת החלון אנכית"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr ""
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"Maximize window horizontally\n"
-"#-#-#-#-#  he.po (metacity.HEAD.he)  #-#-#-#-#\n"
-"הגדלת החלון אופקית"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "הסתרת כל החלונות הרגילים"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "העברה למרחב העבודה שמלמעלה"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "העברה למרחב העבודה שמלמטה"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "העברה למרחב העבודה לשמאל"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "העברה למרחב העבודה לימין"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "ניווט"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "החלפה בין יישומים"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "החלפה בין פקדי המערכת"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "החלפת פקדי המערכת באופן ישיר"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "החלפת החלונות באופן ישיר"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "החלפת חלונות של יישום באופן ישיר"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "החלפה בין חלונות של יישום"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "הצגת סקירת הפעילויות"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "הצגת הבקשה להרצת פקודה"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "מערכת"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "הגבהת החלון אם הוא מכוסה, אחרת יש להנמיכו"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "החלפת המצב בין האם החלון מופיע במרחב עבודה אחד או בכולם"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Comma-separated list of compositor plugins"
 
@@ -1777,6 +1470,18 @@ msgstr "החלפת המצב בין האם החלון מופיע במרחב עב
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "הראה את החלון על סביבת עבודה אחת בלבד"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "מעבר למרחב עבודה 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "מעבר למרחב עבודה 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "מעבר למרחב עבודה 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "מעבר למרחב עבודה 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "מעבר למרחב עבודה 5"
 
@@ -1872,12 +1577,54 @@ msgstr "החלפת המצב בין האם החלון מופיע במרחב עב
 #~ msgid "Run a terminal"
 #~ msgstr "הפעלת מסוף"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "הפעלת תפריט החלון"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "כניסה למצב מסך מלא"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "הפעלה/כיבוי מצב הגדלה"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "Toggle whether a window will always be visible over other windows"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maximize window"
+
+#~ msgid "Restore window"
+#~ msgstr "Restore window"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Toggle shaded state"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimize window"
+
+#~ msgid "Close window"
+#~ msgstr "Close window"
+
+#~ msgid "Move window"
+#~ msgstr "Move window"
+
+#~ msgid "Resize window"
+#~ msgstr "Resize window"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "Toggle whether window is on all workspaces or just one"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Move window to workspace 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Move window to workspace 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Move window to workspace 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Move window to workspace 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Move window to workspace 5"
 
@@ -1902,9 +1649,33 @@ msgstr "החלפת המצב בין האם החלון מופיע במרחב עב
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Move window to workspace 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Move window one workspace to the left"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Move window one workspace to the right"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Move window one workspace up"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Move window one workspace down"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Raise window if it's covered by another window, otherwise lower it"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Raise window above other windows"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Lower window below other windows"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maximize window vertically"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maximize window horizontally"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Move window to north-west (top left) corner"
 

po/hi.po

@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "विंडोज़"
 
@@ -1587,239 +1587,6 @@ msgstr "वाई मूल्य था %d, %d वांछित था"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d निर्देशांक एक्सप्रेशन्स पार्स किया %g सेकण्ड्स में (औसतन %g सेकण्ड्स)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "कार्यस्थान 1 पर जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "कार्यस्थान 2 पर जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "कार्यस्थान 3 पर जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "कार्यस्थान 4 पर जाएँ"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr ""
-"#-#-#-#-#  hi.po (metacity.gnome-2-26.hi)  #-#-#-#-#\n"
-"विंडो मेन्यू सक्रिय करें\n"
-"#-#-#-#-#  hi.po (metacity.gnome-2-26.hi)  #-#-#-#-#\n"
-"विंडो मेनू सक्रिय करें"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "पूरा स्क्रीन मोड टॉगल करें"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "अधिकतम स्थिति टॉगल करें"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "विंडो अधिकतम करें"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr ""
-"#-#-#-#-#  hi.po (metacity.gnome-2-26.hi)  #-#-#-#-#\n"
-"विंडो फिर बहाल करें\n"
-"#-#-#-#-#  hi.po (metacity.gnome-2-26.hi)  #-#-#-#-#\n"
-"विंडो पुनर्बहाल करें"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "आभायुक्त स्थिति टॉगल करें"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "विंडो को न्यूनतम करें"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "विंडो बंद करें"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "विंडो खिसकाएँ"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "विंडो का आकार बदलें"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "विंडो को कार्यस्थान 1 पर ले जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "विंडो को कार्यस्थान 2 पर ले जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "विंडो को कार्यस्थान 3 पर ले जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "विंडो को कार्यस्थान 4 पर ले जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "विंडो को एक कार्यस्थान बाएँ लाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "विंडो को एक कार्यस्थान दाएँ लाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "विंडो को एक कार्यस्थान ऊपर लाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "विंडो को एक कार्यस्थान नीचे लाएँ"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "विंडो को अन्य विंडो के ऊपर रखें"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "विंडो को अन्य विंडो के नीचे रखें"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "विंडो खड़ा अधिकतम करें"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "विंडो आड़ा अधिकतम करें"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-#| msgid "Hide all normal windows and set focus to the desktop"
-msgid "Hide all normal windows"
-msgstr "सभी सामान्य विंडो को छुपाएँ "
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-#| msgid "Move to Workspace _Left"
-msgid "Move to workspace above"
-msgstr "ऊपर कार्यस्थान में ले जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-#| msgid "Move to Workspace _Down"
-msgid "Move to workspace below"
-msgstr "नीचे कार्यस्थान में ले जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-#| msgid "Move to Workspace _Left"
-msgid "Move to workspace left"
-msgstr "बाएँ कार्यस्थान में ले जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-#| msgid "Move to Workspace R_ight"
-msgid "Move to workspace right"
-msgstr "दाएँ कार्यस्थान में ले जाएँ"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "नेविगेशन"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "अनुप्रयोगों के बीच स्विच करें"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "नियंत्रण प्रणाली को स्विच करें "
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "सीधे नियंत्रण प्रणाली को स्विच करें "
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "सीधे विंडोज़ को स्विच करें "
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-#| msgid "Move between windows of an application immediately"
-msgid "Switch windows of an app directly"
-msgstr "तत्काल अनुप्रयोग के विंडो के बीच स्विच करें "
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-#| msgid "Move between windows of an application immediately"
-msgid "Switch windows of an application"
-msgstr "अनुप्रयोग के विंडो के बीच जायें"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "गतिविधियों के अवलोकन दिखाएँ"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-#| msgid "Show the panel's main menu"
-msgid "Show the run command prompt"
-msgstr "चलाए जाने वाले कमांड फ़लक को दिखाएँ"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "तंत्र"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-#| msgid "Raise window if it's covered by another window, otherwise lower it"
-msgid "Raise window if covered, otherwise lower it"
-msgstr "विंडो ऊपर करें यदि यह ढ़ंका है अन्यथा नीचे रखें"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-#| msgid "Toggle whether window is on all workspaces or just one"
-msgid "Toggle window on all workspaces or one"
-msgstr "टॉगल करें कि विंडो सभी कार्यस्थान पर है या केवल एक"
-
 #~ msgid "Window Management"
 #~ msgstr "विंडो प्रबंधन"
 
@@ -1933,6 +1700,18 @@ msgstr "टॉगल करें कि विंडो सभी कार्
 #~ msgid "Metacity"
 #~ msgstr "मेटासिटी"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "कार्यस्थान 1 पर जाएँ"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "कार्यस्थान 2 पर जाएँ"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "कार्यस्थान 3 पर जाएँ"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "कार्यस्थान 4 पर जाएँ"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "कार्यस्थान 5 पर जाएँ"
 
@@ -2024,12 +1803,54 @@ msgstr "टॉगल करें कि विंडो सभी कार्
 #~ msgid "Run a terminal"
 #~ msgstr "एक टर्मिनल चलायें"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "विंडो मेन्यू सक्रिय करें"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "पूरा स्क्रीन मोड टॉगल करें"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "अधिकतम स्थिति टॉगल करें"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "टॉगल करें कि क्या दूसरे विंडो के बीच एक विंडो हमेशा दृश्य रहेगा"
 
+#~ msgid "Maximize window"
+#~ msgstr "विंडो अधिकतम करें"
+
+#~ msgid "Restore window"
+#~ msgstr "विंडो फिर बहाल करें"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "आभायुक्त स्थिति टॉगल करें"
+
+#~ msgid "Minimize window"
+#~ msgstr "विंडो को न्यूनतम करें"
+
+#~ msgid "Close window"
+#~ msgstr "विंडो बंद करें"
+
+#~ msgid "Move window"
+#~ msgstr "विंडो खिसकाएँ"
+
+#~ msgid "Resize window"
+#~ msgstr "विंडो का आकार बदलें"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "टॉगल करें कि विंडो सभी कार्यस्थान पर है या केवल एक पर"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "विंडो को कार्यस्थान 1 पर ले जाएँ"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "विंडो को कार्यस्थान 2 पर ले जाएँ"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "विंडो को कार्यस्थान 3 पर ले जाएँ"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "विंडो को कार्यस्थान 4 पर ले जाएँ"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "विंडो को कार्यस्थान 5 पर ले जाएँ"
 
@@ -2054,9 +1875,33 @@ msgstr "टॉगल करें कि विंडो सभी कार्
 #~ msgid "Move window to workspace 12"
 #~ msgstr "विंडो को कार्यस्थान 12 पर ले जाएँ"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "विंडो को एक कार्यस्थान बाएँ लाएँ"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "विंडो को एक कार्यस्थान दाएँ लाएँ"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "विंडो को एक कार्यस्थान ऊपर लाएँ"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "विंडो को एक कार्यस्थान नीचे लाएँ"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "विंडो बढ़ाएँ कि क्या यह दूसरे विंडो द्वारा आच्छादित है, अन्यथा इसे नीचे करें"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "विंडो को अन्य विंडो के ऊपर रखें"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "विंडो को अन्य विंडो के नीचे रखें"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "विंडो खड़ा अधिकतम करें"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "विंडो आड़ा अधिकतम करें"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "विंडो को उत्तर-पश्चिमी (उपरी बाएँ) कोने में ले जाएँ"
 

po/hu.po

@@ -22,7 +22,7 @@ msgstr ""
 "X-Generator: Lokalize 1.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Ablakok"
 
@@ -1592,221 +1592,6 @@ msgstr ""
 "A %d koordináta kifejezések %g másodperc alatt lettek feldolgozva (átlagosan "
 "%g másodperc)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Átváltás az 1. munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Átváltás a 2. munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Átváltás a 3. munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Átváltás a 4. munkaterületre"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Ablakmenü aktiválása"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Teljes képernyős üzemmód"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Maximalizált állapot átváltása"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Ablak maximalizálása"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Ablak visszaállítása"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Felgördített állapot átváltása"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Ablak minimalizálása"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Ablak bezárása"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Ablak áthelyezése"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Ablak átméretezése"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Ablak áthelyezése az 1. munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Ablak áthelyezése a 2. munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Ablak áthelyezése a 3. munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Ablak áthelyezése a 4. munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Ablak áthelyezése a balra lévő munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Ablak áthelyezése a jobbra lévő munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Ablak áthelyezése egy munkaterülettel feljebb"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Ablak áthelyezése egy munkaterülettel lejjebb"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Ablak más ablakok elé hozása"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Ablak más ablakok mögé küldése"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Ablak függőleges maximalizálása"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Ablak vízszintes maximalizálása"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Minden normál ablak elrejtése"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Áthelyezés a felső munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Áthelyezés az alsó munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Áthelyezés a bal oldali munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Áthelyezés a jobb oldali munkaterületre"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigáció"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Váltás az alkalmazások között"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Váltás a rendszer vezérlői közt"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Váltás a rendszer vezérlői közt közvetlenül"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Váltás az ablakok közt közvetlenül"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Váltás egy alkalmazás ablakai között közvetlenül"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Váltás egy alkalmazás ablakai között"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "A tevékenységek áttekintés megjelenítése"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "A parancs futtatása ablak megjelenítése"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Rendszer"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Fedett ablak előtérbe hozása, egyébként háttérbe küldése"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Ablak megjelenítése minden munkaterületen vagy csak az egyiken"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Kompozitáló bővítmények vesszőkkel elválasztott listája"
 
@@ -1853,6 +1638,18 @@ msgstr "Ablak megjelenítése minden munkaterületen vagy csak az egyiken"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Ablak kirakása csak egy munkaterületre"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Átváltás az 1. munkaterületre"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Átváltás a 2. munkaterületre"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Átváltás a 3. munkaterületre"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Átváltás a 4. munkaterületre"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Átváltás az 5. munkaterületre"
 
@@ -1947,12 +1744,54 @@ msgstr "Ablak megjelenítése minden munkaterületen vagy csak az egyiken"
 #~ msgid "Run a terminal"
 #~ msgstr "Terminál nyitása"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Ablakmenü aktiválása"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Teljes képernyős üzemmód"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Maximalizált állapot átváltása"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "Az ablak mindig látható lesz más ablakok fölött"
 
+#~ msgid "Maximize window"
+#~ msgstr "Ablak maximalizálása"
+
+#~ msgid "Restore window"
+#~ msgstr "Ablak visszaállítása"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Felgördített állapot átváltása"
+
+#~ msgid "Minimize window"
+#~ msgstr "Ablak minimalizálása"
+
+#~ msgid "Close window"
+#~ msgstr "Ablak bezárása"
+
+#~ msgid "Move window"
+#~ msgstr "Ablak áthelyezése"
+
+#~ msgid "Resize window"
+#~ msgstr "Ablak átméretezése"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "Ablak megjelenítése minden munkaterületen vagy csak az egyiken"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Ablak áthelyezése az 1. munkaterületre"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Ablak áthelyezése a 2. munkaterületre"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Ablak áthelyezése a 3. munkaterületre"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Ablak áthelyezése a 4. munkaterületre"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Ablak áthelyezése az 5. munkaterületre"
 
@@ -1977,9 +1816,33 @@ msgstr "Ablak megjelenítése minden munkaterületen vagy csak az egyiken"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Ablak áthelyezése a 12. munkaterületre"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Ablak áthelyezése a balra lévő munkaterületre"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Ablak áthelyezése a jobbra lévő munkaterületre"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Ablak áthelyezése egy munkaterülettel feljebb"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Ablak áthelyezése egy munkaterülettel lejjebb"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Fedett ablak előtérbe hozása, egyébként háttérbe küldése"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Ablak más ablakok elé hozása"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Ablak más ablakok mögé küldése"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Ablak függőleges maximalizálása"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Ablak vízszintes maximalizálása"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Ablak áthelyezése az északnyugati (bal felső) sarokba"
 

po/id.po

@@ -1578,218 +1578,3 @@ msgstr "nilai y sebelumnya %d, padahal seharusnya %d"
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "ekspresi koordinat %d diambil dalam %g detik (rata-rata %g detik)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigasi"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Pindahkan jendela ke area kerja 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Pindahkan jendela ke area kerja 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Pindahkan jendela ke area kerja 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Pindahkan jendela ke area kerja 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Pindahkan jendela ke area kerja kiri"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Pindahkan jendela ke area kerja kanan"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Pindahkan jendela ke area kerja atas"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Pindahkan jendela ke area kerja bawah"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Berpindah aplikasi"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Berpindah jendela aplikasi"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Berpindah kendali sistem"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Berpindah jendela secara langsung"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Berpindah jendela aplikasi secara langsung"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Berpindah kendali sistem secara langsung"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Menyembunyikan semua jendela normal"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Pindah ke area kerja 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Pindah ke area kerja 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Pindah ke area kerja 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Pindah ke area kerja 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Pindah ke area kerja kiri"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Pindah ke area kerja kanan"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Pindah ke area kerja atas"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Pindah ke area kerja bawah"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Sistem"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Menampilkan dialog untuk mengetik perintah"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Menampilkan ikhtisar aktivitas"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Mengaktifkan menu jendela"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Mengubah mode layar penuh"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Ubah kondisi maksimal"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maksimalkan ukuran jendela"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Kembalikan ukuran jendela"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Ubah kondisi berbayang"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Tutup jendela"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimalkan ukuran jendela"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Pindahkan jendela"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Ubah ukuran jendela"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Menampilkan jendela pada semua atau satu area kerja"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Naikkan jendela bila tertutup jendela lain, sebaliknya diturunkan"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Naikkan jendela di atas jendela-jendela lain"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Turunkan jendela di bawah jendela lain"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maksimalkan ukuran jendela secara vertikal"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maksimalkan ukuran jendela secara horisontal"

po/it.po

@@ -1653,220 +1653,3 @@ msgstr "valore y era %d, era atteso %d"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d espressioni di coordinate analizzate in %g secondi (%g secondi in media)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigazione"
-
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Sposta la finestra sullo spazio di lavoro 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Sposta la finestra sullo spazio di lavoro 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Sposta la finestra sullo spazio di lavoro 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Sposta la finestra sullo spazio di lavoro 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Sposta la finestra sullo spazio di lavoro a sinistra"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Sposta la finestra sullo spazio di lavoro a destra"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Sposta la finestra sullo spazio di lavoro in alto"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Sposta la finestra sullo spazio di lavoro in basso"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Evidenzia le applicazioni"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Evidenzia le finestre di un'applicazione"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Evidenzia i controlli di sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Evidenzia direttamente le finestre"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Evidenzia direttamente le finestre di una applicazione"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Evidenzia direttamente i controlli di sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Nasconde tutte le finestre normali"
-
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Passa allo spazio di lavoro 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Passa allo spazio di lavoro 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Passa allo spazio di lavoro 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Passa allo spazio di lavoro 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Sposta su spazio di lavoro a sinistra"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Sposta su spazio di lavoro a destra"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Sposta su spazio di lavoro in alto"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Sposta su spazio di lavoro in basso"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Sistema"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Mostra il prompt esegui comando"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Mostra la panoramica delle attività"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Attiva il menù della finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Commuta la modalità schermo intero"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Commuta lo stato massimizzazione"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Massimizza la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Ripristina la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Commuta lo stato arrotolato"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Chiudi la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimizza la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Muovi la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Ridimensiona la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Commuta la stato «su tutti gli spazi di lavoro» per la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Solleva la finestra è coperta, in caso contrario l'abbassa"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Solleva la finestra sopra le altre finestre"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Abbassa la finestra sotto le altre"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Massimizza verticalmente la finestra"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Massimizza orizzontalmente la finestra"

po/ja.po

@@ -1383,256 +1383,27 @@ msgstr "yの値は %d でした (期待値: %d)"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d個の座標式を %g秒 (平均 %g秒) で解析しました\n"
 
-# #-#-#-#-#  ja.po (mutter master)  #-#-#-#-#
-# ｢キーボード・ショートカット｣のアプレット (gnome-control-center) で表示するメッセージ
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "ワークスペース 1 へ切り替える"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "ワークスペース 2 へ切り替える"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "ワークスペース 3 へ切り替える"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "ワークスペース 4 へ切り替える"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr ""
-"#-#-#-#-#  ja.po (mutter master)  #-#-#-#-#\n"
-"ウィンドウ・メニューを開く\n"
-"#-#-#-#-#  ja.po (mutter master)  #-#-#-#-#\n"
-"ウィンドウ・メニューをアクティブにする"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr ""
-"#-#-#-#-#  ja.po (mutter master)  #-#-#-#-#\n"
-"フル・スクリーン表示を切り替える\n"
-"#-#-#-#-#  ja.po (mutter master)  #-#-#-#-#\n"
-"フルスクリーンモードを切り替える"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "最大化/最小化の状態を切り替える"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "ウィンドウを最大化する"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr ""
-"#-#-#-#-#  ja.po (mutter master)  #-#-#-#-#\n"
-"ウィンドウの状態を元に戻す\n"
-"#-#-#-#-#  ja.po (mutter master)  #-#-#-#-#\n"
-"ウィンドウを戻す"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "シェードの状態を切り替える"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "ウィンドウを最小化する"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "ウィンドウを閉じる"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "ウィンドウを移動する"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "ウィンドウ・サイズを変更する"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "ウィンドウをワークスペース 1 へ移動する"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "ウィンドウをワークスペース 2 へ移動する"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "ウィンドウをワークスペース 3 へ移動する"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "ウィンドウをワークスペース 4 へ移動する"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "ウィンドウを左側のワークスペースへ移動する"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "ウィンドウを右側のワークスペースへ移動する"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "ウィンドウを上側のワークスペースへ移動する"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "ウィンドウを下側のワークスペースへ移動する"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr ""
-"#-#-#-#-#  ja.po (mutter master)  #-#-#-#-#\n"
-"ウィンドウを前面に表示する\n"
-"#-#-#-#-#  ja.po (mutter master)  #-#-#-#-#\n"
-"ウィンドウを最前面に移動する"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr ""
-"#-#-#-#-#  ja.po (mutter master)  #-#-#-#-#\n"
-"ウィンドウを一番奥に移動する\n"
-"#-#-#-#-#  ja.po (mutter master)  #-#-#-#-#\n"
-"ウィンドウを最背面に移動する"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "ウィンドウを垂直方向に最大化する"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "ウィンドウを水平方向に最大化する"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "ナビゲーション"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "アプリケーションを切り替える"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "ひとつのアプリケーション内のウィンドウを切り替える"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "システムのコントロールを切り替える"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "ウィンドウを直接切り替える"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "ひとつのアプリケーション内のウィンドウを直接切り替える"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "システムのコントロールを直接切り替える"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "すべての通常のウィンドウを隠す"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "左側のワークスペースへ移動する"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "右側のワークスペースへ移動する"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "上側のワークスペースへ移動する"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "下側のワークスペースへ移動する"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "システム"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "コマンド実行プロンプトを表示する"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "アクティビティを表示する"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "ウィンドウをすべてのワークスペースに固定するかどうかを切り替える"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "ウィンドウが覆われていれば最前面に、そうでなければ最背面に移動する"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "画像の合成プラグインを指定する (複数ある時はカンマ ',' で区切る)"
 
 #~ msgid "Live Hidden Windows"
 #~ msgstr "表示されていないウィンドウをそのままにしておくかどうか"
 
-#~ msgid ""
-#~ "Determines whether hidden windows (i.e., minimized windows and windows on "
-#~ "other workspaces than the current one) should be kept alive."
-#~ msgstr ""
-#~ "現在表示されていないウィンドウ (すなわち、最小化したウィンドウや現在のワー"
-#~ "クスペースにはないウィンドウなど) を (表示させずに) そのままの状態にしてお"
-#~ "くかどうかです。"
+#~ msgid "Determines whether hidden windows (i.e., minimized windows and windows on other workspaces than the current one) should be kept alive."
+#~ msgstr "現在表示されていないウィンドウ (すなわち、最小化したウィンドウや現在のワークスペースにはないウィンドウなど) を (表示させずに) そのままの状態にしておくかどうかです。"
+
+# ｢キーボード・ショートカット｣のアプレット (gnome-control-center) で表示するメッセージ
+#~ msgid "Switch to workspace 1"
+#~ msgstr "ワークスペース 1 へ切り替える"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "ワークスペース 2 へ切り替える"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "ワークスペース 3 へ切り替える"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "ワークスペース 4 へ切り替える"
 
 #~ msgid "Switch to workspace 5"
 #~ msgstr "ワークスペース 5 へ切り替える"
@@ -1727,12 +1498,54 @@ msgstr "ウィンドウが覆われていれば最前面に、そうでなけれ
 #~ msgid "Run a terminal"
 #~ msgstr "端末を起動する"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "ウィンドウ・メニューを開く"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "フル・スクリーン表示を切り替える"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "最大化/最小化の状態を切り替える"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "ウィンドウを常に前面に表示するかどうかの設定を切り替える"
 
+#~ msgid "Maximize window"
+#~ msgstr "ウィンドウを最大化する"
+
+#~ msgid "Restore window"
+#~ msgstr "ウィンドウの状態を元に戻す"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "シェードの状態を切り替える"
+
+#~ msgid "Minimize window"
+#~ msgstr "ウィンドウを最小化する"
+
+#~ msgid "Close window"
+#~ msgstr "ウィンドウを閉じる"
+
+#~ msgid "Move window"
+#~ msgstr "ウィンドウを移動する"
+
+#~ msgid "Resize window"
+#~ msgstr "ウィンドウ・サイズを変更する"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "ウィンドウを全てのワークスペースに配置するか切り替える"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "ウィンドウをワークスペース 1 へ移動する"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "ウィンドウをワークスペース 2 へ移動する"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "ウィンドウをワークスペース 3 へ移動する"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "ウィンドウをワークスペース 4 へ移動する"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "ウィンドウをワークスペース 5 へ移動する"
 
@@ -1757,9 +1570,33 @@ msgstr "ウィンドウが覆われていれば最前面に、そうでなけれ
 #~ msgid "Move window to workspace 12"
 #~ msgstr "ウィンドウをワークスペース 12 へ移動する"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "ウィンドウを左側のワークスペースへ移動する"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "ウィンドウを右側のワークスペースへ移動する"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "ウィンドウを上側のワークスペースへ移動する"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "ウィンドウを下側のワークスペースへ移動する"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "隠れているウィンドウを前面に表示する"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "ウィンドウを前面に表示する"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "ウィンドウを一番奥に移動する"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "ウィンドウを垂直方向に最大化する"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "ウィンドウを水平方向に最大化する"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "ウィンドウを画面の左上隅へ移動する"
 

po/ko.po

@@ -1576,218 +1576,3 @@ msgstr "세로값이 %d입니다. 와야 하는 값은 %d입니다"
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d개의 좌표 표현식을 %g초에 파싱했습니다(평균 %g초)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "네비게이션"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "창을 1번째 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "창을 2번째 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "창을 3번째 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "창을 4번째 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "창을 왼쪽의 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "창을 오른쪽의 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "창을 위의 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "창을 아래의 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "프로그램 전환"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "한 개 프로그램의 창 사이에서 전환"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "시스템 컨트롤 전환"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "창 바로 전환"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "한 개 프로그램의 창 사이에서 전환"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "시스템 컨트롤 바로 전환"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "모든 일반 창 숨기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "1번째 작업 공간으로 이동"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "2번째 작업 공간으로 이동"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "3번째 작업 공간으로 이동"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "4번째 작업 공간으로 이동"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "왼쪽 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "오른쪽 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "위쪽 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "아래쪽 작업 공간으로 옮기기"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "시스템"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "명령어 실행 프롬프트 표시"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "현재 활동 요약 표시"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "창 메뉴 활성"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "전체 화면 모드 토글"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "창 최대화 토글"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "창 최대화"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "창 복귀"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "창 숨기기 토글"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "창 닫기"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "창 최소화"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "창을 옮기기"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "창 크기 조절"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "창을 모든 작업 공간에 둘지 아니면 한 작업 공간에 둘지 토글"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "다른 창에 덮여 있으면 창을 올리고, 덮여 있지 않으면 창 내리기"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "창을 다른창 위로 올리기"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "창을 다른창 아래로 내리기"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "창 세로로 최대화"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "창 가로로 최대화"

po/lt.po

@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Langai"
 
@@ -1435,218 +1435,3 @@ msgstr "y reikšmė buvo %d, tikėtasi %d"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "Koordinačių %d išraiška apdorota per %g sekundžių (%g sekundžių vidurkis)\n"
 
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Paslėpti visus įprastus langus"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Perkelti į darbalaukį viršuje"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Perkelti į darbalaukį apačioje"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Perkelti į darbalaukį kairėje"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Perkelti į darbalaukį dešinėje"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Perkelti langą į žemiau esantį darbalaukį"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Perkelti langą į kairiau esantį darbalaukį"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Perkelti langą į dešiniau esantį darbalaukį"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Perkelti langą į aukščiau esantį darbalaukį"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Perkelti langą į darbalaukį Nr.1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Perkelti langą į darbalaukį Nr.2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Perkelti langą į darbalaukį Nr.3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Perkelti langą į darbalaukį Nr.4"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigacija"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Perjungti programas"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Perjungti sistemos valdiklius"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Tiesiogiai perjungti sistemos valdiklius"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Perjungti į darbalaukį Nr.1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Perjungti į darbalaukį Nr.2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Perjungti į darbalaukį Nr.3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Perjungti į darbalaukį Nr.4"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Tiesiogiai perjungti langus"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Tiesiogiai persijungti tarp programos langų"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Persijungti tarp programos langų"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Rodyti veiklų apžvalgą"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Rodyti komandų paleidimo langelį"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Sistema"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Parodyti lango meniu"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Užverti langą"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Nuleisti langą žemiau kitų langų"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Išdidinti langą"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Išdidinti langą horizontaliai"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Išdidinti langą vertikaliai"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Sumažinti langą"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Perkelti langą"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Iškelti langą virš kitų langų"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Iškelti langą, jei jis uždengtas kito lango, priešingu atveju paslėpti jį"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Keisti lango dydį"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Atkurti lango dydį"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Perjungti viso ekrano veikseną"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Perjungti lango išdidinimo veikseną"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Perjungti lango sutraukimo būseną"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Perjungti lango buvimo visuose darbalaukiuose būseną"

po/lv.po

@@ -1567,229 +1567,6 @@ msgstr "y vērtība bija %d, tika gaidīta %d"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d koordinātas izteiksme noparsēta %g sekundēs (vidēji %g sekundēs)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Pārslēgties uz 1. darbvietu"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Pārslēgties uz 2. darbvietu"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Pārslēgties uz 3. darbvietu"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Pārslēgties uz 4. darbvietu"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Aktivizēt loga izvēlni"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Pārslēgt pilnekrāna režīmu"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Pārslēgt maksimizācijas stāvokli"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maksimizēt logu"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Atjaunot logu"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Pārslēgt ēnoto stāvokli"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimizēt logu"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Aizvērt logu"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Pārvietot logu"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Mainīt loga izmēru"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Pārvietot logu uz 1. darbvietu"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Pārvietot logu uz 2. darbvietu"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Pārvietot logu uz 3. darbvietu"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Pārvietot logu uz 4. darbvietu"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Pārvietot logu vienu darbvietu pa kreisi"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr ""
-"#-#-#-#-#  lv.po (lv)  #-#-#-#-#\n"
-"Pārvietot logu vienu darbvietu pa labi\n"
-"#-#-#-#-#  lv.po (lv)  #-#-#-#-#\n"
-"Pārvietot logu uz darbvietu pa labi"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr ""
-"#-#-#-#-#  lv.po (lv)  #-#-#-#-#\n"
-"Pārvietot logu vienu darbvietu augšup\n"
-"#-#-#-#-#  lv.po (lv)  #-#-#-#-#\n"
-"Pārvietot logu uz darbvietu augšup"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Pārvietot logu vienu darbvietu lejup"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Pacelt logu virs citiem logiem"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Pazemināt logu zem citiem logiem"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maksimizēt logu vertikāli"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maksimizēt logu horizontāli"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigācija"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Pārslēgt lietotnes"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Pārslēgt lietotnes logus"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Pārslēgt sistēmas vadīklas"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Pārslēgt logu tieši"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Pārslēgt lietotnes logu tieši"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Pārslēgt sistēmas vadīklas tieši"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Slēpt visus parastos logus"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Pārvietot uz darbvietu pa kreisi"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Pārvietot uz darbvietu pa labi"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Pārvietot uz darbvietu uz augšu"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Pārvietot uz darbvietu zemāk"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Sistēma"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Rādīt palaišanas komandrindu"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Rādīt aktivitāšu pārskatu"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Pārslēgt loga redzamību visās darbvirsmās vai tikai vienā"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Pacelt logu, ja to aizsedz, citādi pazemināt"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Ar komatu atdalīts kompozīcijas spraudņu saraksts"
 
@@ -1836,6 +1613,18 @@ msgstr "Pacelt logu, ja to aizsedz, citādi pazemināt"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Turēt logu tikai vienā darbvietā"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Pārslēgties uz 1. darbvietu"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Pārslēgties uz 2. darbvietu"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Pārslēgties uz 3. darbvietu"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Pārslēgties uz 4. darbvietu"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Pārslēgties uz 5. darbvietu"
 
@@ -1931,12 +1720,54 @@ msgstr "Pacelt logu, ja to aizsedz, citādi pazemināt"
 #~ msgid "Run a terminal"
 #~ msgstr "Palaist termināli"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Aktivizēt loga izvēlni"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Pārslēgt pilnekrāna režīmu"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Pārslēgt maksimizācijas stāvokli"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "Pārslēdz to, vai logs vienmēr redzams virs citiem logiem"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maksimizēt logu"
+
+#~ msgid "Restore window"
+#~ msgstr "Atjaunot logu"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Pārslēgt ēnoto stāvokli"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimizēt logu"
+
+#~ msgid "Close window"
+#~ msgstr "Aizvērt logu"
+
+#~ msgid "Move window"
+#~ msgstr "Pārvietot logu"
+
+#~ msgid "Resize window"
+#~ msgstr "Mainīt loga izmēru"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "Pārslēgt, vai logs ir redzams visās darbvirsmās vai tikai vienā"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Pārvietot logu uz 1. darbvietu"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Pārvietot logu uz 2. darbvietu"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Pārvietot logu uz 3. darbvietu"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Pārvietot logu uz 4. darbvietu"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Pārvietot logu uz 5. darbvietu"
 
@@ -1961,9 +1792,33 @@ msgstr "Pacelt logu, ja to aizsedz, citādi pazemināt"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Pārvietot logu uz 12. darbvietu"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Pārvietot logu vienu darbvietu pa kreisi"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Pārvietot logu vienu darbvietu pa labi"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Pārvietot logu vienu darbvietu augšup"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Pārvietot logu vienu darbvietu lejup"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Pacelt logu, ja to aizsedz kāds cits, citādi pazemināt"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Pacelt logu virs citiem logiem"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Pazemināt logu zem citiem logiem"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maksimizēt logu vertikāli"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maksimizēt logu horizontāli"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Pārvietot logu uz ekrāna ziemeļrietumu (augšējo kreiso) stūri"
 

po/mr.po

@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "पटल"
 
@@ -1597,309 +1597,8 @@ msgstr "वाय किंमत होती %d, %d ही हवी होत
 #: ../src/ui/theme-viewer.c:1352
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
-msgstr "%d सेकंदात निबंधक वाक्यरचना वर्णन पार्स %g झाले (%g  सेकंदाची सरासरी)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "कार्यक्षेत्र १ वर जा"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "कार्यक्षेत्र २ वर जा"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "कार्यक्षेत्र ३ वर जा"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "कार्यक्षेत्र ४ वर जा"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
 msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"खिडकी मेन्यू सक्रीय करा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल मेन्यू सक्रीय करा"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "पूर्ण पडदा पध्दती टॉगल करा"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "जास्तीत जास्त स्थितीत टॉगल करा"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-#, fuzzy
-msgid "Maximize window"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट मोठी करा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल मोठी करा"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"खिडकी पूर्वस्थितीत आणा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल पूर्वस्थितीत आणा"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "सावलीतील स्थितीत टॉगल करा"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट लहान करा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल लहान करा"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट बंद करा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल बंद करा"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट हलवा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल हलवा"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट पुनःआकार करा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल पुनःआकार करा"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट कार्यक्षेत्र १ वर हलवा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल कार्यक्षेत्र १ वर हलवा"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट कार्यक्षेत्र २ वर हलवा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल कार्यक्षेत्र २ वर हलवा"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट कार्यक्षेत्र ३ वर हलवा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल कार्यक्षेत्र ३ वर हलवा"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट कार्यक्षेत्र ४ वर हलवा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल कार्यक्षेत्र ४ वर हलवा"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट एक कार्यक्षेत्र डावीकडे हलवा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल एक कार्यक्षेत्र डावीकडे हलवा"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट एक कार्यक्षेत्र उजवीकडे हलवा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल एक कार्यक्षेत्र उजवीकडे हलवा"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट एक कार्यक्षेत्र वर हलवा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल एक कार्यक्षेत्र वर हलवा"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट एक कार्यक्षेत्र खाली हलवा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल एक कार्यक्षेत्र खाली हलवा"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"इतर चौकटवर चौकट प्राधान्यकृत करा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"इतर पटलवर पटल प्राधान्यकृत करा"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"इतर खिडक्यांच्या खाली तळाची चौकट\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"इतर खिडक्यांच्या खाली तळाची पटल"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट उभी मोठी करा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल उभी मोठी करा"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr ""
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"चौकट आडवी मोठी करा\n"
-"#-#-#-#-#  mr.po (metacity.gnome-2-26.mr)  #-#-#-#-#\n"
-"पटल आडवी मोठी करा"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-#| msgid "Hide all normal windows and set focus to the desktop"
-msgid "Hide all normal windows"
-msgstr "साधारण पटलांना लपवा"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-#| msgid "Move to Workspace _Left"
-msgid "Move to workspace above"
-msgstr "वरील कार्यक्षेत्रावर जा"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-#| msgid "Move to Workspace _Down"
-msgid "Move to workspace below"
-msgstr "खालिल कार्यक्षेत्रावर जा"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-#| msgid "Move to Workspace _Left"
-msgid "Move to workspace left"
-msgstr "डाव्या कार्यक्षेत्रावर जा"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-#| msgid "Move to Workspace R_ight"
-msgid "Move to workspace right"
-msgstr "उजव्या कार्यक्षेत्रावर जा"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "संचारन"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "ॲप्लिकेशन्स् बदला"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "सिस्टम कंट्रोल्स् बदला"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "सिस्टम कंट्रोल्स् प्रत्यक्षरित्या बदला"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "पटलांना प्रत्यक्षरित्या बदला"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-#| msgid "Move between windows of an application immediately"
-msgid "Switch windows of an app directly"
-msgstr "पटलांना ॲप्लिकेशनकरीता प्रत्यक्षरित्या बदला"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-#| msgid "Move between windows of an application immediately"
-msgid "Switch windows of an application"
-msgstr "ॲप्लिकेशनच्या पटलांना बदला"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "कार्यांचे अवलोकन दाखवा"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-#| msgid "Show the panel's main menu"
-msgid "Show the run command prompt"
-msgstr "रन कमांड प्रॉम्प्ट दाखवा"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "प्रणाली"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-#| msgid "Raise window if it's covered by another window, otherwise lower it"
-msgid "Raise window if covered, otherwise lower it"
-msgstr "कवर केले असल्यास पटल ऊंचवा, नाहीतर खाली करा"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-#| msgid "Toggle whether window is on all workspaces or just one"
-msgid "Toggle window on all workspaces or one"
-msgstr "पटलास सर्व कार्यक्षेत्र किंवा एका कार्यक्षेत्राचा वापर करा"
+"%d सेकंदात निबंधक वाक्यरचना वर्णन पार्स %g झाले (%g  सेकंदाची सरासरी)\n"
 
 #~ msgid "Window Management"
 #~ msgstr "चौकट व्यवस्थापन"
@@ -2039,6 +1738,18 @@ msgstr "पटलास सर्व कार्यक्षेत्र कि
 #~ msgid "Metacity"
 #~ msgstr "Metacity"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "कार्यक्षेत्र १ वर जा"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "कार्यक्षेत्र २ वर जा"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "कार्यक्षेत्र ३ वर जा"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "कार्यक्षेत्र ४ वर जा"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "कार्यक्षेत्र ५ वर जा"
 
@@ -2145,14 +1856,58 @@ msgstr "पटलास सर्व कार्यक्षेत्र कि
 #~ msgid "Run a terminal"
 #~ msgstr "टर्मिनल चालवा"
 
+#~| msgid "Activate window menu"
+#~ msgid "Activate the window menu"
+#~ msgstr "खिडकी मेन्यू सक्रीय करा"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "पूर्ण पडदा पध्दती टॉगल करा"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "जास्तीत जास्त स्थितीत टॉगल करा"
+
 #~| msgid "Lower window below other windows"
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "खिडकी इतर खिडकींवर नेहमी दृष्यास्पद होईल का त्याकरीता टॉगल करा"
 
+#~ msgid "Maximize window"
+#~ msgstr "चौकट मोठी करा"
+
+#~| msgid "Resize window"
+#~ msgid "Restore window"
+#~ msgstr "खिडकी पूर्वस्थितीत आणा"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "सावलीतील स्थितीत टॉगल करा"
+
+#~ msgid "Minimize window"
+#~ msgstr "चौकट लहान करा"
+
+#~ msgid "Close window"
+#~ msgstr "चौकट बंद करा"
+
+#~ msgid "Move window"
+#~ msgstr "चौकट हलवा"
+
+#~ msgid "Resize window"
+#~ msgstr "चौकट पुनःआकार करा"
+
 #~| msgid "Toggle window on all workspaces"
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "सर्व किंवा फक्त एकच वर्कस्पेस वर खिडकी स्थित आहे त्याकरीता टॉगल करा"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "चौकट कार्यक्षेत्र १ वर हलवा"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "चौकट कार्यक्षेत्र २ वर हलवा"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "चौकट कार्यक्षेत्र ३ वर हलवा"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "चौकट कार्यक्षेत्र ४ वर हलवा"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "चौकट कार्यक्षेत्र ५ वर हलवा"
 
@@ -2177,10 +1932,34 @@ msgstr "पटलास सर्व कार्यक्षेत्र कि
 #~ msgid "Move window to workspace 12"
 #~ msgstr "चौकट कार्यक्षेत्र १२ वर हलवा"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "चौकट एक कार्यक्षेत्र डावीकडे हलवा"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "चौकट एक कार्यक्षेत्र उजवीकडे हलवा"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "चौकट एक कार्यक्षेत्र वर हलवा"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "चौकट एक कार्यक्षेत्र खाली हलवा"
+
 #~| msgid "Raise obscured window, otherwise lower"
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "इतर खिडकी द्वारे झाकलेले असल्यावर खिडकी उंचावा, नाहीतर खाली सरकवा"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "इतर चौकटवर चौकट प्राधान्यकृत करा"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "इतर खिडक्यांच्या खाली तळाची चौकट"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "चौकट उभी मोठी करा"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "चौकट आडवी मोठी करा"
+
 #~| msgid "Move window to north-west corner"
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "खिडकीला उत्तर-पश्चिम (वरून डावीकडे) बाजूस हलवा"

po/nb.po

@@ -1564,218 +1564,3 @@ msgstr "y-verdi var %d, %d var ventet"
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d koordinatuttrykk lest på %g sekunder (%g sekunder i snitt)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigering"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Flytt vindu til arbeidsområde 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Flytt vindu til arbeidsområde 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Flytt vindu til arbeidsområde 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Flytt vindu til arbeidsområde 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Flytt vindu et arbeidsområde til venstre"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Flytt vindu ett arbeidsområde til høyre"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Flytt vindu ett arbeidsområde opp"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Flytt vindu ett arbeidsområde ned"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Bytt programmer"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Bytt mellom et programs vinduer"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Bytt systemkontroller"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Bytt vinduer direkte"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Bla gjennom et programs vinduer direkte"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Bytt systemkontroller direkte"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Skjul alle normale vinduer"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Bytt til arbeidsområde 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Bytt til arbeidsområde 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Bytt til arbeidsområde 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Bytt til arbeidsområde 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Flytt til arbeidsområdet til venstre"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Flytt til arbeidsområdet til høyre"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Flytt til arbeidsområdet over"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Flytt til arbeidsområdet under"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "System"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Vis kommandolinje"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Vis oversikt over aktiviteter"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Aktiver vindumenyen"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Slå av/på fullskjermmodus"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Endre tilstand for maksimering"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maksimer vindu"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Gjenopprett vindu"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Endre tilstand for skyggelegging"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Lukk vindu"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimer vindu"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Flytt vindu"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Endre størrelse på vindu"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Slå av/på om vinduet skal vises på alle arbeidsområder eller bare ett"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Hev vindu hvis skjult av et annet vindu, senk det ellers"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Hev vinduet over andre vinduer"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Senk vinduet under andre vinduer"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maksimer vinduet vertikalt"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maksimer vinduet horisontalt"

po/nl.po

@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Vensters"
 
@@ -1589,220 +1589,17 @@ msgstr ""
 "%d coördinatenexpressies verwerkt in %g seconden (gemiddelde van %g "
 "seconden)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Schakelen naar werkblad 1"
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Schakelen naar werkblad 1"
 
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Schakelen naar werkblad 2"
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Schakelen naar werkblad 2"
 
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Schakelen naar werkblad 3"
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Schakelen naar werkblad 3"
 
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Schakelen naar werkblad 4"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Venstermenu activeren"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Volledig scherm-modus omschakelen"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Maximalisatie in- of uitschakelen"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Venster maximaliseren"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Venster herstellen"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Oprollen in- of uitschakelen"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Venster minimaliseren"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Venster sluiten"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Venster verplaatsen"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Vensterafmetingen veranderen"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Venster verplaatsen naar werkblad 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Venster verplaatsen naar werkblad 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Venster verplaatsen naar werkblad 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Venster verplaatsen naar werkblad 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Venster één werkblad naar links verplaatsen"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Venster één werkblad naar rechts verplaatsen"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Venster één werkblad naar boven verplaatsen"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Venster één werkblad naar beneden verplaatsen"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Venster voor andere vensters brengen"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Venster achter andere vensters brengen"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Een venster verticaal maximaliseren"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Een venster horizontaal maximaliseren"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Alle normale vensters verbergen"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Verplaatsen naar werkblad hierboven"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Verplaatsen naar werkblad hieronder"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Verplaatsen naar werkblad links"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Verplaatsen naar werkblad rechts"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigatie"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Tussen toepassingen schakelen"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Systeemschermen wisselen"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Direct tussen systeemschermen schakelen"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Direct tussen vensters schakelen"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Direct wisselen van venster binnen een toepassing"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Wisselen van venster binnen een toepassing"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Het activiteitenoverzicht tonen"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Het opdrachtregelvenster tonen"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Systeem"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Deels bedekte vensters naar voren halen of anders naar achter halen"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "‘Venster is op alle werkbladen zichtbaar’ in- of uitschakelen"
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Schakelen naar werkblad 4"
 
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Schakelen naar werkblad 5"
@@ -1902,12 +1699,54 @@ msgstr "‘Venster is op alle werkbladen zichtbaar’ in- of uitschakelen"
 #~ msgid "Run a terminal"
 #~ msgstr "Een terminal opstarten"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Venstermenu activeren"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Volledig scherm-modus omschakelen"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Maximalisatie in- of uitschakelen"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "‘Altijd bovenop’-instelling omschakelen"
 
+#~ msgid "Maximize window"
+#~ msgstr "Venster maximaliseren"
+
+#~ msgid "Restore window"
+#~ msgstr "Venster herstellen"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Oprollen in- of uitschakelen"
+
+#~ msgid "Minimize window"
+#~ msgstr "Venster minimaliseren"
+
+#~ msgid "Close window"
+#~ msgstr "Venster sluiten"
+
+#~ msgid "Move window"
+#~ msgstr "Venster verplaatsen"
+
+#~ msgid "Resize window"
+#~ msgstr "Vensterafmetingen veranderen"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "‘Venster is op alle werkbladen zichtbaar’ omschakelen"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Venster verplaatsen naar werkblad 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Venster verplaatsen naar werkblad 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Venster verplaatsen naar werkblad 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Venster verplaatsen naar werkblad 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Venster verplaatsen naar werkblad 5"
 
@@ -1932,11 +1771,35 @@ msgstr "‘Venster is op alle werkbladen zichtbaar’ in- of uitschakelen"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Venster verplaatsen naar werkblad 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Venster één werkblad naar links verplaatsen"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Venster één werkblad naar rechts verplaatsen"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Venster één werkblad naar boven verplaatsen"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Venster één werkblad naar beneden verplaatsen"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr ""
 #~ "Venster naar boven halen indien overlapt door een ander venster, anders "
 #~ "naar beneden halen"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Venster voor andere vensters brengen"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Venster achter andere vensters brengen"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Een venster verticaal maximaliseren"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Een venster horizontaal maximaliseren"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Venster verplaatsen naar de noordwest-hoek (linksboven)"
 

po/or.po

@@ -2456,29 +2456,3 @@ msgstr "y ମୂଲ୍ଯ %d ଥିଲା, %d ପ୍ରତ୍ଯାଶିତ ଥ
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%2$g ସେକଣ୍ଡରେ %1$d ସ୍ଥାନ ନିର୍ଣ୍ଣୟ ଅଭିବ୍ଯକ୍ତି ବିଶ୍ଳେଷିତ (%3$g ସେକଣ୍ଡ ମାଧ୍ଯମାନ)\n"
 
-#: ../src/50-mutter-launchers.xml.in.h:1
-#, fuzzy
-msgid "Launchers"
-msgstr "ପ୍ରାରମ୍ଭକର୍ତ୍ତାମାନେ"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "ଅନ୍ୱେଷଣ"
-
-#: ../src/50-mutter-screenshot.xml.in.h:1
-#, fuzzy
-#| msgid "Take a screenshot"
-msgid "Screenshots"
-msgstr "ପରଦା ପ୍ରତିଛବିଗୁଡ଼ିକ"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "ତନ୍ତ୍ର"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-#| msgid "/_Windows"
-msgid "Windows"
-msgstr "ୱିଣ୍ଡୋମାନ"

po/pa.po

@@ -28,14 +28,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋਜ਼"
+msgstr "ਵਿੰਡੋ"
 
 #: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
@@ -1586,261 +1581,6 @@ msgstr "y ਕੀਮਤ %d ਸੀ, %d ਦੀ ਉਮੀਦ ਸੀ"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d ਕੋਆਰਡੀਨੇਟਰ ਸਮੀਕਰਨ ਪਾਰਸ %g ਸਕਿੰਟਾਂ ਵਿੱਚ ਕੀਤੀ (ਔਸਤਨ %g ਸਕਿੰਟ)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਰਕਸਪੇਸ ੧ ਵਿੱਚ ਜਾਓ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਰਕਸਪੇਸ 1 ਵਿੱਚ ਜਾਓ"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਰਕਸਪੇਸ ੨ ਵਿੱਚ ਜਾਓ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਰਕਸਪੇਸ 2 ਵਿੱਚ ਜਾਓ"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਰਕਸਪੇਸ ੩ ਵਿੱਚ ਜਾਓ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਰਕਸਪੇਸ 3 ਵਿੱਚ ਜਾਓ"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਰਕਸਪੇਸ ੪ ਵਿੱਚ ਜਾਓ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਰਕਸਪੇਸ 4 ਵਿੱਚ ਜਾਓ"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਮੇਨੂ ਐਕਟੀਵੇਟ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਐਕਟਿਵ ਵਿੰਡੋ ਮੇਨੂ"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "ਪੂਰੀ ਸਕਰੀਨ ਕਰੋ"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "ਅਧਿਕਤਮ ਸਥਿਤੀ ਕਰੋ"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "ਵਿੰਡੋ ਅਧਿਕਤਮ"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "ਵਿੰਡੋ ਮੁੜ-ਸਟੋਰ"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "ਰੰਗਤ ਸਥਿਤੀ ਕਰੋ"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਘੱਟੋ-ਘੱਟ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਅਲਪੀਕਰਨ"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "ਵਿੰਡੋ ਹਿਲਾਓ"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "ਵਿੰਡੋ ਮੁੜ-ਅਕਾਰ"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੧ ਵਿੱਚ ਲਿਜਾਓ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ 1 ਵਿੱਚ ਲਿਜਾਓ"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੨ ਵਿੱਚ ਲਿਜਾਓ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ 2 ਵਿੱਚ ਲਿਜਾਓ"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੩ ਵਿੱਚ ਲਿਜਾਓ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ 3 ਵਿੱਚ ਲਿਜਾਓ"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr ""
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੪ ਵਿੱਚ ਲਿਜਾਓ\n"
-"#-#-#-#-#  pa.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ 4 ਵਿੱਚ ਲਿਜਾਓ"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਖੱਬੇ ਵੱਲ ਲਿਜਾਓ"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਸੱਜੇ ਵੱਲ ਲਿਜਾਓ"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਉੱਤੇ ਲਿਜਾਓ"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਹੇਠਾਂ ਲਿਜਾਓ"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "ਹੋਰ ਵਿੰਡੋ ਤੋਂ ਉੱਪਰਲੀ ਵਿੰਡੋ ਉਠਾਓ"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "ਹੋਰ ਵਿੰਡੋ ਹੇਠਾਂ ਥੱਲੇ ਵਾਲੀ ਵਿੰਡੋ"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "ਵਿੰਡੋ ਲੰਬਕਾਰੀ ਅਧਿਕਤਮ"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "ਵਿੰਡੋ ਖਿਤਿਜੀ ਅਧਿਕਤਮ"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "ਸਭ ਸਧਾਰਨ ਵਿੰਡੋਜ਼ ਓਹਲੇ ਕਰੋ"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "ਉੱਤੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "ਹੇਠਾਂ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "ਖੱਬੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "ਸੱਜੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "ਨੇਵੀਗੇਸ਼ਨ"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਬਦਲੋ"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "ਸਿਸਟਮ ਕੰਟਰੋਲ ਬਦਲੋ"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "ਸਿਸਟਮ ਕੰਟਰੋਲ ਸਿੱਧੇ ਬਦਲੋ"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "ਵਿੰਡੋਜ਼ ਸਿੱਧੀਆਂ ਬਦਲੋ"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਵਿੰਡੋ ਸਿੱਧੀ ਬਦਲੋ"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਵਿੰਡੋਜ਼ ਬਦਲੋ"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "ਸਰਗਰਮੀ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਵੇਖੋ"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "ਕਮਾਂਡ ਚਲਾਉ ਪਰੋਉਟ ਵੇਖੋ"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "ਸਿਸਟਮ"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "ਵਿੰਡੋ ਉਭਾਰੋ, ਜੇ ਢੱਕੀ ਹੈ, ਨਹੀਂ ਤਾਂ ਹੇਠਾਂ ਭੇਜੋ"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "ਵਿੰਡੋ ਸਭ ਵਰਕਸਪੇਸ ਜਾਂ ਇੱਕ ਵਿੱਚ ਬਦਲੋ"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਕੀਤੀ ਕੰਪੋਜ਼ਿਤਰ ਪਲੱਗਇਨ ਦੀ ਲਿਸਟ"
 
@@ -1887,6 +1627,18 @@ msgstr "ਵਿੰਡੋ ਸਭ ਵਰਕਸਪੇਸ ਜਾਂ ਇੱਕ ਵਿ
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "ਵਿੰਡੋ ਨੂੰ ਸਿਰਫ਼ ਇੱਕ ਵਰਕਸਪੇਸ ਉੱਤੇ ਰੱਖੋ"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "ਵਰਕਸਪੇਸ ੧ ਵਿੱਚ ਜਾਓ"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "ਵਰਕਸਪੇਸ ੨ ਵਿੱਚ ਜਾਓ"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "ਵਰਕਸਪੇਸ ੩ ਵਿੱਚ ਜਾਓ"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "ਵਰਕਸਪੇਸ ੪ ਵਿੱਚ ਜਾਓ"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "ਵਰਕਸਪੇਸ ੫ ਵਿੱਚ ਜਾਓ"
 
@@ -1981,12 +1733,54 @@ msgstr "ਵਿੰਡੋ ਸਭ ਵਰਕਸਪੇਸ ਜਾਂ ਇੱਕ ਵਿ
 #~ msgid "Run a terminal"
 #~ msgstr "ਟਰਮੀਨਲ ਚਲਾਓ"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "ਵਿੰਡੋ ਮੇਨੂ ਐਕਟੀਵੇਟ"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "ਪੂਰੀ ਸਕਰੀਨ ਕਰੋ"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "ਅਧਿਕਤਮ ਸਥਿਤੀ ਕਰੋ"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "ਬਦਲੋ ਕਿ ਕੀ ਵਿੰਡੋ ਹਮੇਸ਼ਾ ਦੂਜੀਆਂ ਵਿੰਡੋਜ਼ ਦੇ ਉੱਤੇ ਵੇਖਾਈ ਦੇਵੇ"
 
+#~ msgid "Maximize window"
+#~ msgstr "ਵਿੰਡੋ ਅਧਿਕਤਮ"
+
+#~ msgid "Restore window"
+#~ msgstr "ਵਿੰਡੋ ਮੁੜ-ਸਟੋਰ"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "ਰੰਗਤ ਸਥਿਤੀ ਕਰੋ"
+
+#~ msgid "Minimize window"
+#~ msgstr "ਵਿੰਡੋ ਘੱਟੋ-ਘੱਟ"
+
+#~ msgid "Close window"
+#~ msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
+
+#~ msgid "Move window"
+#~ msgstr "ਵਿੰਡੋ ਹਿਲਾਓ"
+
+#~ msgid "Resize window"
+#~ msgstr "ਵਿੰਡੋ ਮੁੜ-ਅਕਾਰ"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "ਕੀ ਵਿੰਡੋ ਸਭ ਵਰਕਸਪੇਸ ਵਿੱਚ ਵੇਖਾਈ ਦੇਵੇ ਜਾਂ ਕੇਵਲ ਇੱਕ ਵਿੱਚ"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੧ ਵਿੱਚ ਲਿਜਾਓ"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੨ ਵਿੱਚ ਲਿਜਾਓ"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੩ ਵਿੱਚ ਲਿਜਾਓ"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੪ ਵਿੱਚ ਲਿਜਾਓ"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੫ ਵਿੱਚ ਲਿਜਾਓ"
 
@@ -2011,9 +1805,33 @@ msgstr "ਵਿੰਡੋ ਸਭ ਵਰਕਸਪੇਸ ਜਾਂ ਇੱਕ ਵਿ
 #~ msgid "Move window to workspace 12"
 #~ msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੧੨ ਵਿੱਚ ਲਿਜਾਓ"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਖੱਬੇ ਵੱਲ ਲਿਜਾਓ"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਸੱਜੇ ਵੱਲ ਲਿਜਾਓ"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਉੱਤੇ ਲਿਜਾਓ"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਹੇਠਾਂ ਲਿਜਾਓ"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "ਵਿੰਡੋ ਉਭਾਰੋ, ਜੇ ਇਹ ਹੋਰ ਵਿੰਡੋ ਨਾਲ ਢੱਕੀ ਹੈ ਜਾਂ ਇਸ ਨੂੰ ਹੇਠਾਂ ਕਰੋ"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "ਹੋਰ ਵਿੰਡੋ ਤੋਂ ਉੱਪਰਲੀ ਵਿੰਡੋ ਉਠਾਓ"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "ਹੋਰ ਵਿੰਡੋ ਹੇਠਾਂ ਥੱਲੇ ਵਾਲੀ ਵਿੰਡੋ"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "ਵਿੰਡੋ ਲੰਬਕਾਰੀ ਅਧਿਕਤਮ"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "ਵਿੰਡੋ ਖਿਤਿਜੀ ਅਧਿਕਤਮ"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "ਵਿੰਡੋ ਉੱਤਰੀ-ਪੱਛਮੀ (ਉੱਤੇ ਖੱਬੇ) ਕੋਨੇ 'ਚ ਭੇਜੋ"
 

po/pl.po

@@ -1630,220 +1630,3 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "Wyrażenia współrzędnych %d zostało przetworzone w %g sekund (średnio %g "
 "sekund)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Nawigacja"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Przeniesienie okna na 1. obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Przeniesienie okna na 2. obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Przeniesienie okna na 3. obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Przeniesienie okna na 4. obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Przeniesienie okna o obszar roboczy w lewo"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Przeniesienie okna o obszar roboczy w prawo"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Przeniesienie okna o obszar roboczy w górę"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Przeniesienie okna o obszar roboczy w dół"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Przełączenie programów"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Przełączenie między oknami programu"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Przełączenie kontroli systemowej"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Bezpośrednie przełączenie między oknami"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Bezpośrednie przełączenie między oknami programu"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Bezpośrednie przełączenie kontroli systemowej"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Ukrycie wszystkich zwykłych okien"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Przełączenie na 1. obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Przełączenie na 2. obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Przełączenie na 3. obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Przełączenie na 4. obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Przeniesienie na lewy obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Przeniesienie na prawy obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Przeniesienie na górny obszar roboczy"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Przeniesienie na dolny obszar roboczy"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "System"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Wyświetlenie okna wykonania polecenia"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Wyświetlenie podglądu aktywności"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Otwarcie menu okna"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Przełączenie trybu pełnoekranowego"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Przełączenie trybu maksymalizacji"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maksymalizacja okna"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Przywrócenie okna"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Przełączenie trybu zwinięcia"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Zamknięcie okna"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimalizacja okna"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Przeniesienie okna"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Zmiana rozmiaru okna"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr ""
-"Przełączenie obecności okna na wszystkich obszarach roboczych lub jednym "
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr ""
-"Wysunięcie okna, jeśli jest zasłonięte, odsunięcie w przeciwnym wypadku"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Wysunięcie okna przed pozostałe"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Odsunięcie okna pod pozostałe"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Pionowa maksymalizacja okna"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Pozioma maksymalizacja okna"

po/pt.po

@@ -1585,221 +1585,6 @@ msgstr ""
 "expressões de coordenada %d processadas em %g segundos (%g segundos em "
 "média)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Mover para a área de trabalho 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Mover para a área de trabalho 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Mover para a área de trabalho 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Mover para a área de trabalho 4"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Activar o menu de janela"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Alternar modo de ecrã completo"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Alternar estado de maximização"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maximizar a janela"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Restore window"
-msgstr "Restaurar a janela"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Alternar estado sombreado"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimizar a janela"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Close window"
-msgstr "Fechar a janela"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Move window"
-msgstr "Mover a janela"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Redimensionar a janela"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Mover janela para a área de trabalho 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Mover janela para a área de trabalho 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Mover janela para a área de trabalho 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Mover janela para a área de trabalho 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Mover a janela uma área de trabalho para a esquerda"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Mover a janela uma área de trabalho para a direita"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Mover a janela uma área de trabalho acima"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Mover a janela uma área de trabalho abaixo"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Elevar janela acima de outras janelas"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Baixar janela abaixo de outras janelas"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maximizar janela verticalmente"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maximizar janela horizontalmente"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navegação"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Switch applications"
-msgstr "Alternar entre aplicações"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Alternar entre janelas de uma aplicação"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Alternar entre controlos de sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Alternar directamente janelas"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Alternar directamente entre janelas de uma aplicação"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Alternar directamente controlos de sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Esconder todas as janelas normais"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Mover para a área de trabalho à esquerda"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Mover para a área de trabalho à direita"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Mover para a área de trabalho acima"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Mover para a área de trabalho abaixo"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Sistema"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Apresentar a linha de comando de execução"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Apresentar o resumo de actividades"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Alternar janela em todas as áreas de trabalho ou apenas numa"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Elevar a janela se estiver tapada, caso contrário baixá-la"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Lista separada por vírgulas de plugins de compositor"
 
@@ -1846,6 +1631,18 @@ msgstr "Elevar a janela se estiver tapada, caso contrário baixá-la"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Colocar a Janela Apenas em Uma Área de Trabalho"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Mover para a área de trabalho 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Mover para a área de trabalho 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Mover para a área de trabalho 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Mover para a área de trabalho 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Mover para a área de trabalho 5"
 
@@ -1947,14 +1744,56 @@ msgstr "Elevar a janela se estiver tapada, caso contrário baixá-la"
 #~ msgid "Run a terminal"
 #~ msgstr "Executar uma consola"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Activar o menu de janela"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Alternar modo de ecrã completo"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Alternar estado de maximização"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr ""
 #~ "Alternar se uma janela será ou não sempre visível sobre as outras janelas"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maximizar a janela"
+
+#~ msgid "Restore window"
+#~ msgstr "Restaurar a janela"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Alternar estado sombreado"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimizar a janela"
+
+#~ msgid "Close window"
+#~ msgstr "Fechar a janela"
+
+#~ msgid "Move window"
+#~ msgstr "Mover a janela"
+
+#~ msgid "Resize window"
+#~ msgstr "Redimensionar a janela"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr ""
 #~ "Alternar se a janela está em todas as áreas de trabalho ou apenas numa"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Mover janela para a área de trabalho 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Mover janela para a área de trabalho 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Mover janela para a área de trabalho 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Mover janela para a área de trabalho 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Mover janela para a área de trabalho 5"
 
@@ -1979,11 +1818,35 @@ msgstr "Elevar a janela se estiver tapada, caso contrário baixá-la"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Mover janela para a área de trabalho 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Mover a janela uma área de trabalho para a esquerda"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Mover a janela uma área de trabalho para a direita"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Mover a janela uma área de trabalho acima"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Mover a janela uma área de trabalho abaixo"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr ""
 #~ "Elevar a janela se estiver tapada por outra janela, caso contrário baixá-"
 #~ "la"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Elevar janela acima de outras janelas"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Baixar janela abaixo de outras janelas"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maximizar janela verticalmente"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maximizar janela horizontalmente"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Mover a janela para o canto noroeste (superior esquerdo)"
 

po/pt_BR.po

@@ -30,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Virtaal 0.6.1\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Janelas"
 
@@ -1621,222 +1621,6 @@ msgstr ""
 "%d expressões de coordenadas analisadas em %g segundos (%g segundos em "
 "média)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Trocar para o espaço de trabalho 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Trocar para o espaço de trabalho 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Trocar para o espaço de trabalho 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Trocar para o espaço de trabalho 4"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Ativar o menu da janela"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Alternar modo de tela inteira"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Alternar estado de maximização"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Maximizar a janela"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Restaurar janela"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Alternar estado sombreado"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Minimizar a janela"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Fechar a janela"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Mover a janela"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Redimensionar a janela"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Mover a janela para o espaço de trabalho 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Mover a janela para o espaço de trabalho 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Mover a janela para o espaço de trabalho 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Mover a janela para o espaço de trabalho 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Mover a janela um espaço de trabalho à esquerda"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Mover a janela um espaço de trabalho à direita"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Mover a janela um espaço de trabalho acima"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Mover a janela um espaço de trabalho abaixo"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Elevar a janela para frente das outras"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Colocar a janela atrás das outras"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Maximizar a janela verticalmente"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Maximizar a janela horizontalmente"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Ocultar todas as janelas normais"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Mover para o espaço de trabalho acima"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Mover para o espaço de trabalho abaixo"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Mover para o espaço de trabalho à esquerda"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Mover para o espaço de trabalho à direita"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Navegação"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Alterna aplicativos"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Alterna controles do sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Alterna controles do sistema diretamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Alterna janelas diretamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Alterna janelas de um aplicativo diretamente"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Alterna janelas de um aplicativo"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Mostra a visão geral das atividades"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Mostrar o prompt de executar comando"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Sistema"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr ""
-"Elevar janela se ela estiver coberta por outra; caso contrário, baixe-a"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Alternar janela em todos os espaços de trabalho ou em um"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Lista de plugins de composição separados por vírgula"
 
@@ -1850,6 +1634,18 @@ msgstr "Alternar janela em todos os espaços de trabalho ou em um"
 #~ msgid "Live Hidden Windows"
 #~ msgstr "Janelas ocultas ativas"
 
+#~ 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 workspace 5"
 #~ msgstr "Trocar para o espaço de trabalho 5"
 
@@ -1950,13 +1746,55 @@ msgstr "Alternar janela em todos os espaços de trabalho ou em um"
 #~ msgid "Run a terminal"
 #~ msgstr "Executar um terminal"
 
+#~ 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 "Toggle whether a window will always be visible over other windows"
 #~ msgstr "Alternar se uma janela será sempre visível sobre as outras"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maximizar a janela"
+
+#~ msgid "Restore window"
+#~ msgstr "Restaurar janela"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Alternar estado sombreado"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimizar a janela"
+
+#~ msgid "Close window"
+#~ msgstr "Fechar a janela"
+
+#~ msgid "Move window"
+#~ msgstr "Mover a janela"
+
+#~ msgid "Resize window"
+#~ msgstr "Redimensionar a janela"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr ""
 #~ "Alternar se a janela está em todos os espaços de trabalho ou em apenas um"
 
+#~ 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 workspace 5"
 #~ msgstr "Mover a janela para o espaço de trabalho 5"
 
@@ -1981,11 +1819,35 @@ msgstr "Alternar janela em todos os espaços de trabalho ou em um"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Mover a janela para o espaço de trabalho 12"
 
+#~ 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"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr ""
 #~ "Elevar a janela se ela estiver coberta por outra; caso contrário, abaixá-"
 #~ "la"
 
+#~ 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 "Move window to north-west (top left) corner"
 #~ msgstr "Mover a janela para o canto superior esquerdo"
 

po/ro.po

@@ -1944,33 +1944,6 @@ msgstr ""
 "Expresiile pentru coordonate %d parsate în %g secunde (o medie de %g "
 "secunde)\n"
 
-#: ../src/50-mutter-launchers.xml.in.h:1
-#, fuzzy
-msgid "Launchers"
-msgstr "Lansatori"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Navigation"
-msgstr "Navigare"
-
-#: ../src/50-mutter-screenshot.xml.in.h:1
-#, fuzzy
-#| msgid "Take a screenshot"
-msgid "Screenshots"
-msgstr "Capturi de ecran"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "System"
-msgstr "Sistem"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-#| msgid "/_Windows"
-msgid "Windows"
-msgstr "Ferestre"
-
 #~ msgid "Window Management"
 #~ msgstr "Administrare ferestre"
 

po/ru.po

@@ -26,7 +26,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Окна"
 
@@ -1597,218 +1597,3 @@ msgstr "значение y было %d, а ожидалось %d"
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d координатных выражений разобрано за %g секунд (в среднем %g c)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Скрыть все обычные окна"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Переместить на рабочее место вверх"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Переместить на рабочее место вниз"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Переместить на рабочее место влево"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Переместить на рабочее место вправо"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Переместить окно на одно рабочее место вниз"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Переместить окно на одно рабочее место влево"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Переместить окно на одно рабочее место вправо"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Переместить окно на одно рабочее место вверх"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Переместить окно на рабочее место 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Переместить окно на рабочее место 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Переместить окно на рабочее место 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Переместить окно на рабочее место 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Перемещение"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Переключить приложение"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Переключить элемент управления"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Немедленно переключить элемент управления"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Переключиться на рабочее место 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Переключиться на рабочее место 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Переключиться на рабочее место 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Переключиться на рабочее место 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Немедленно переключить окно"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Немедленно переключить окно приложения"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Переключить окно приложения"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Показать действия"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Показать диалог запуска команды"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Система"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Активировать меню окна"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Закрыть окно"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Поместить окно под другими окнами"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Развернуть окно на весь экран"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Развернуть окно на весь экран горизонтально"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Развернуть окно на весь экран вертикально"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Свернуть окно"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Переместить окно"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Поднять окно на передний план"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Поднять окно на передний план, если оно перекрыто другим окном, иначе — опустить"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Изменить размер окна"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Восстановить окно"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Переключить полноэкранный режим"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Переключить состояние развёрнутости на весь экран"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Переключить состояние скрученности в полоску"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Поместить окно на все рабочие места или на одно"

po/sl.po

@@ -23,7 +23,7 @@ msgstr ""
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Okna"
 
@@ -1463,221 +1463,6 @@ msgstr "vrednost y je %d, pričakovana pa je %d"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d izjav koordinat razčlenjenih v %g sekundah (%g sekund v povprečju)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:1
-#, fuzzy
-msgid "Hide all normal windows"
-msgstr "Skrij vsa običajna okna"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-#, fuzzy
-msgid "Move to workspace above"
-msgstr "Premakni na zgornjo delovno površino"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-#, fuzzy
-msgid "Move to workspace below"
-msgstr "Premakni na spodnjo delovno površino"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-#, fuzzy
-msgid "Move to workspace left"
-msgstr "Premakni na levo delovno površino"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-#, fuzzy
-msgid "Move to workspace right"
-msgstr "Premakni na desno delovno površino"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr "Prestavi okno eno delovno površino navzdol"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr "Premakni okno eno delovno površino levo"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr "Premakni okno eno delovno površino desno"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr "Premakni okno eno delovno površino navzgor"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr "Premakni okno na delovno površino 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr "Premakni okno na delovno površino 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr "Premakni okno na delovno površino 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr "Premakni okno na delovno površino 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-#, fuzzy
-msgid "Navigation"
-msgstr "Krmarjenje"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-#, fuzzy
-msgid "Switch applications"
-msgstr "Preklopi programe"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-#, fuzzy
-msgid "Switch system controls"
-msgstr "Preklopi tipkovne bližnjice"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch system controls directly"
-msgstr "Preklopi tipkovne bližnjice neposredno"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr "Preklopi na delovno površino 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr "Preklopi na delovno površino 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr "Preklopi na delovno površino 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr "Preklopi na delovno površino 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-#, fuzzy
-msgid "Switch windows directly"
-msgstr "Preklopi okna neposredno"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-#, fuzzy
-msgid "Switch windows of an app directly"
-msgstr "Preklopi okna programa neposredno"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-#, fuzzy
-msgid "Switch windows of an application"
-msgstr "Preklopi okna programa"
-
-#: ../src/50-mutter-system.xml.in.h:1
-#, fuzzy
-msgid "Show the activities overview"
-msgstr "Pokaži okno pregleda dejavnosti"
-
-#: ../src/50-mutter-system.xml.in.h:2
-#, fuzzy
-msgid "Show the run command prompt"
-msgstr "Pokaži možnost zagona ukazne vrstice"
-
-#: ../src/50-mutter-system.xml.in.h:3
-#, fuzzy
-msgid "System"
-msgstr "Sistem"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr "Omogoči meni okna"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr "Zapri okno"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr "Spusti okno pod druga"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr "Razpni okno"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr "Razpni okno vodoravno"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr "Razpni okno navpično"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr "Skrči okno"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr "Premakni okno"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr "Dvigni okno nad druga okna"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-#, fuzzy
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Dvigni okno, če ga prekriva drugo okno, sicer ga spusti"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr "Spremeni velikost okna"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr "Obnovi okno"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr "Preklopi celozaslonski način"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr "Preklopi stanje razpetosti"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr "Preklopi stanje senčenja"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-#, fuzzy
-msgid "Toggle window on all workspaces or one"
-msgstr "Preklopi okno na vse delovne površine oziroma le na eno"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Z vejico ločen seznam vstavkov sestavljanja"
 

po/sr.po

@@ -22,7 +22,7 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Прозори"
 
@@ -1578,175 +1578,3 @@ msgstr "y вредност је била „%d“, а очекивана је
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d израза координата је обрађено за %g секунде (просек %g секунде)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Hide all normal windows"
-msgstr "Скрива све обичне прозоре"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move to workspace above"
-msgstr "Премешта на радни простор изнад"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move to workspace below"
-msgstr "Премешта на радни простор испод"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move to workspace left"
-msgstr "Премешта на радни простор лево"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move to workspace right"
-msgstr "Премешта на радни простор десно"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-msgid "Move window one workspace down"
-msgstr "Премешта прозор један радни простор на доле"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "Премешта прозор један радни простор улево"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "Премешта прозор један радни простор удесно"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "Премешта прозор један радни простор на горе"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-msgid "Move window to workspace 1"
-msgstr "Премешта прозор на радни простор број 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Move window to workspace 2"
-msgstr "Премешта прозор на радни простор број 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-msgid "Move window to workspace 3"
-msgstr "Премешта прозор на радни простор број 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-msgid "Move window to workspace 4"
-msgstr "Премешта прозор на радни простор број 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Navigation"
-msgstr "Навигација"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "Пребацује програме"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Switch system controls"
-msgstr "Пребацује контроле система"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-msgid "Switch system controls directly"
-msgstr "Пребацује контроле система директно"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-msgid "Switch to workspace 1"
-msgstr "Пребацује се на радни простор 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-msgid "Switch to workspace 2"
-msgstr "Пребацује се на радни простор 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-msgid "Switch to workspace 3"
-msgstr "Пребацује се на радни простор 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-msgid "Switch to workspace 4"
-msgstr "Пребацује се на радни простор 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Switch windows directly"
-msgstr "Пребацује прозоре директно"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows of an app directly"
-msgstr "Пребацује прозоре програма директно"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Switch windows of an application"
-msgstr "Пребацује прозор програма"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "Show the activities overview"
-msgstr "Приказује преглед активности"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "Приказује промпт за покретање наредбе"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "System"
-msgstr "Систем"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-msgid "Activate the window menu"
-msgstr "Активира мени прозора"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "Close window"
-msgstr "Затвара прозор"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Lower window below other windows"
-msgstr "Спушта прозор испод осталих прозора"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-msgid "Maximize window"
-msgstr "Увећава прозор"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-msgid "Maximize window horizontally"
-msgstr "Увећава прозор хоризонтално"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-msgid "Maximize window vertically"
-msgstr "Увећава прозор вертикално"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-msgid "Minimize window"
-msgstr "Умањује прозор"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-msgid "Move window"
-msgstr "Премешта прозор"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-msgid "Raise window above other windows"
-msgstr "Издиже прозор изнад осталих прозора"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Издиже прозор уколико га други прозор заклања, у противном га спушта"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "Мења величину прозора"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-msgid "Restore window"
-msgstr "Враћа величину прозора"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-msgid "Toggle fullscreen mode"
-msgstr "Искључује/укључује приказ преко целог екрана"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-msgid "Toggle maximization state"
-msgstr "Искључује/укључује стање увећања"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-msgid "Toggle shaded state"
-msgstr "Искључује/укључује стање засенчености"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Toggle window on all workspaces or one"
-msgstr "Приказује прозор на свим радним просторима или само на једном"

po/sr@latin.po

@@ -22,7 +22,7 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Prozori"
 
@@ -1578,175 +1578,3 @@ msgstr "y vrednost je bila „%d“, a očekivana je „%d“"
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d izraza koordinata je obrađeno za %g sekunde (prosek %g sekunde)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Hide all normal windows"
-msgstr "Skriva sve obične prozore"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move to workspace above"
-msgstr "Premešta na radni prostor iznad"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move to workspace below"
-msgstr "Premešta na radni prostor ispod"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move to workspace left"
-msgstr "Premešta na radni prostor levo"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move to workspace right"
-msgstr "Premešta na radni prostor desno"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-msgid "Move window one workspace down"
-msgstr "Premešta prozor jedan radni prostor na dole"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "Premešta prozor jedan radni prostor ulevo"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "Premešta prozor jedan radni prostor udesno"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "Premešta prozor jedan radni prostor na gore"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-msgid "Move window to workspace 1"
-msgstr "Premešta prozor na radni prostor broj 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Move window to workspace 2"
-msgstr "Premešta prozor na radni prostor broj 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-msgid "Move window to workspace 3"
-msgstr "Premešta prozor na radni prostor broj 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-msgid "Move window to workspace 4"
-msgstr "Premešta prozor na radni prostor broj 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Navigation"
-msgstr "Navigacija"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "Prebacuje programe"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Switch system controls"
-msgstr "Prebacuje kontrole sistema"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-msgid "Switch system controls directly"
-msgstr "Prebacuje kontrole sistema direktno"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-msgid "Switch to workspace 1"
-msgstr "Prebacuje se na radni prostor 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-msgid "Switch to workspace 2"
-msgstr "Prebacuje se na radni prostor 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-msgid "Switch to workspace 3"
-msgstr "Prebacuje se na radni prostor 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-msgid "Switch to workspace 4"
-msgstr "Prebacuje se na radni prostor 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Switch windows directly"
-msgstr "Prebacuje prozore direktno"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows of an app directly"
-msgstr "Prebacuje prozore programa direktno"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Switch windows of an application"
-msgstr "Prebacuje prozor programa"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "Show the activities overview"
-msgstr "Prikazuje pregled aktivnosti"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "Prikazuje prompt za pokretanje naredbe"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "System"
-msgstr "Sistem"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-msgid "Activate the window menu"
-msgstr "Aktivira meni prozora"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "Close window"
-msgstr "Zatvara prozor"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Lower window below other windows"
-msgstr "Spušta prozor ispod ostalih prozora"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-msgid "Maximize window"
-msgstr "Uvećava prozor"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-msgid "Maximize window horizontally"
-msgstr "Uvećava prozor horizontalno"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-msgid "Maximize window vertically"
-msgstr "Uvećava prozor vertikalno"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-msgid "Minimize window"
-msgstr "Umanjuje prozor"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-msgid "Move window"
-msgstr "Premešta prozor"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-msgid "Raise window above other windows"
-msgstr "Izdiže prozor iznad ostalih prozora"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Izdiže prozor ukoliko ga drugi prozor zaklanja, u protivnom ga spušta"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "Menja veličinu prozora"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-msgid "Restore window"
-msgstr "Vraća veličinu prozora"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-msgid "Toggle fullscreen mode"
-msgstr "Isključuje/uključuje prikaz preko celog ekrana"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-msgid "Toggle maximization state"
-msgstr "Isključuje/uključuje stanje uvećanja"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-msgid "Toggle shaded state"
-msgstr "Isključuje/uključuje stanje zasenčenosti"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Toggle window on all workspaces or one"
-msgstr "Prikazuje prozor na svim radnim prostorima ili samo na jednom"

po/sv.po

@@ -1429,180 +1429,7 @@ msgstr "y-värdet var %d, %d förväntades"
 #: ../src/ui/theme-viewer.c:1352
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
-msgstr ""
-"%d koordinatuttryck tolkades på %g sekunder (%g sekunder i medelvärde)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-msgid "Switch to workspace 1"
-msgstr "Växla till arbetsyta 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-msgid "Switch to workspace 2"
-msgstr "Växla till arbetsyta 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-msgid "Switch to workspace 3"
-msgstr "Växla till arbetsyta 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-msgid "Switch to workspace 4"
-msgstr "Växla till arbetsyta 4"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "Activate the window menu"
-msgstr "Aktivera fönstermenyn"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Toggle fullscreen mode"
-msgstr "Växla helskärmsläge"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-msgid "Toggle maximization state"
-msgstr "Växla maximeringstillstånd"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-msgid "Maximize window"
-msgstr "Maximera fönster"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-msgid "Restore window"
-msgstr "Återställ fönster"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-msgid "Toggle shaded state"
-msgstr "Växla upprullat tillstånd"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-msgid "Minimize window"
-msgstr "Minimera fönster"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-msgid "Close window"
-msgstr "Stäng fönster"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Move window"
-msgstr "Flytta fönster"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "Ändra storlek på fönster"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move window to workspace 1"
-msgstr "Flytta fönster till arbetsyta 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move window to workspace 2"
-msgstr "Flytta fönster till arbetsyta 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move window to workspace 3"
-msgstr "Flytta fönster till arbetsyta 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move window to workspace 4"
-msgstr "Flytta fönster till arbetsyta 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-msgid "Move window one workspace to the left"
-msgstr "Flytta fönster en arbetsyta åt vänster"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the right"
-msgstr "Flytta fönster en arbetsyta åt höger"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace up"
-msgstr "Flytta fönster en arbetsyta uppåt"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace down"
-msgstr "Flytta fönster en arbetsyta nedåt"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-msgid "Raise window above other windows"
-msgstr "Höj fönstret över andra fönster"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-msgid "Lower window below other windows"
-msgstr "Sänk fönster under andra fönster"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Maximize window vertically"
-msgstr "Maximera fönster vertikalt"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-msgid "Maximize window horizontally"
-msgstr "Maximera fönster horisontellt"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Navigation"
-msgstr "Navigation"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-msgid "Switch applications"
-msgstr "Växla program"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Switch windows of an application"
-msgstr "Växla fönster för ett program"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-msgid "Switch system controls"
-msgstr "Växla systemkontroller"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-msgid "Switch windows directly"
-msgstr "Växla fönster direkt"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Switch windows of an app directly"
-msgstr "Växla fönster för ett program direkt"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch system controls directly"
-msgstr "Växla systemkontroller direkt"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Hide all normal windows"
-msgstr "Dölj alla normala fönster"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-msgid "Move to workspace left"
-msgstr "Flytta till arbetsyta till vänster"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Move to workspace right"
-msgstr "Flytta till arbetsyta till höger"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Move to workspace above"
-msgstr "Flytta till arbetsyta ovanför"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Move to workspace below"
-msgstr "Flytta till arbetsyta nedanför"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "System"
-msgstr "System"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "Visa Kör kommando-dialogen"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "Show the activities overview"
-msgstr "Visa aktivitetsöversikt"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-msgid "Toggle window on all workspaces or one"
-msgstr "Växla fönster på alla arbetsytor eller bara en"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Höj fönstret om det skyms av ett annat fönster, sänk det annars"
+msgstr "%d koordinatuttryck tolkades på %g sekunder (%g sekunder i medelvärde)\n"
 
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Kommaseparerad lista över compositor-instick"
@@ -1650,6 +1477,18 @@ msgstr "Höj fönstret om det skyms av ett annat fönster, sänk det annars"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Placera fönstret på endast en arbetsyta"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Växla till arbetsyta 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Växla till arbetsyta 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Växla till arbetsyta 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Växla till arbetsyta 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Växla till arbetsyta 5"
 
@@ -1748,14 +1587,56 @@ msgstr "Höj fönstret om det skyms av ett annat fönster, sänk det annars"
 #~ msgid "Run a terminal"
 #~ msgstr "Kör en terminal"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Aktivera fönstermenyn"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Växla helskärmsläge"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Växla maximeringstillstånd"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr ""
 #~ "Växla huruvida ett fönster alltid kommer att vara synlig över andra "
 #~ "fönster"
 
+#~ msgid "Maximize window"
+#~ msgstr "Maximera fönster"
+
+#~ msgid "Restore window"
+#~ msgstr "Återställ fönster"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Växla upprullat tillstånd"
+
+#~ msgid "Minimize window"
+#~ msgstr "Minimera fönster"
+
+#~ msgid "Close window"
+#~ msgstr "Stäng fönster"
+
+#~ msgid "Move window"
+#~ msgstr "Flytta fönster"
+
+#~ msgid "Resize window"
+#~ msgstr "Ändra storlek på fönster"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "Växla huruvida fönstret finns på alla arbetsytor eller bara en"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Flytta fönster till arbetsyta 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Flytta fönster till arbetsyta 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Flytta fönster till arbetsyta 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Flytta fönster till arbetsyta 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Flytta fönster till arbetsyta 5"
 
@@ -1780,9 +1661,33 @@ msgstr "Höj fönstret om det skyms av ett annat fönster, sänk det annars"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Flytta fönster till arbetsyta 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Flytta fönster en arbetsyta åt vänster"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Flytta fönster en arbetsyta åt höger"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Flytta fönster en arbetsyta uppåt"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Flytta fönster en arbetsyta nedåt"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Höj fönstret om det skyms av ett annat fönster, sänk det annars"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Höj fönstret över andra fönster"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Sänk fönster under andra fönster"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Maximera fönster vertikalt"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Maximera fönster horisontellt"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Flytta fönstret till nordvästra (övre vänstra) hörnet"
 

po/ta.po

@@ -37,7 +37,7 @@ msgstr "இடது பக்கத்தில் பிளந்து பா
 msgid "View split on right"
 msgstr "வலது பக்கத்தில் பிளந்து பார்"
 
-#: ../src/50-mutter-windows.xml.in.h:3 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "Windows"
 msgstr "சாளரங்கள்"
 
@@ -1527,188 +1527,6 @@ msgstr "y மதிப்பு %d, %d எதிர்பார்க்கப
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d அச்சு கூற்று பகுக்கப்பட்டது %g செகண்டில் (%g சராசரி செகண்ட்)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-msgid "Switch to workspace 1"
-msgstr "பணியிடம் 1க்கு மாறு"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-msgid "Switch to workspace 2"
-msgstr "பணியிடம் 2 க்கு மாறு"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-msgid "Switch to workspace 3"
-msgstr "பணியிடம் 3 க்கு மாறு"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-msgid "Switch to workspace 4"
-msgstr "பணியிடம் 4 க்கு மாறு"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr ""
-"#-#-#-#-#  ta.po (metacity.gnome-2-26.ta)  #-#-#-#-#\n"
-"சாளர பட்டியலை செயல்படுத்து \n"
-"#-#-#-#-#  ta.po (metacity.gnome-2-26.ta)  #-#-#-#-#\n"
-"சாளர மெனுவை செயல்படுத்து"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-msgid "Toggle fullscreen mode"
-msgstr "எப்போதும் முழுதிரை பாங்கிற்கு செல்"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-msgid "Toggle maximization state"
-msgstr "எப்போதும் பெரிய சாளர நிலைக்கு செல்"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-msgid "Maximize window"
-msgstr "சாளரத்தை பெரிதாக்கு"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr ""
-"#-#-#-#-#  ta.po (metacity.gnome-2-26.ta)  #-#-#-#-#\n"
-"சாளரத்தை மீட்டமை\n"
-"#-#-#-#-#  ta.po (metacity.gnome-2-26.ta)  #-#-#-#-#\n"
-"சாளரத்தை மீட்டெடு "
-
-#: ../src/50-mutter-windows.xml.in.h:15
-msgid "Toggle shaded state"
-msgstr "எப்போதும் நிழை நிலைக்கு செல்"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-msgid "Minimize window"
-msgstr "சாளரத்தை சிறிதாக்கு"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "Close window"
-msgstr "சாளரம் மூடவும்"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-msgid "Move window"
-msgstr "சாளரத்தை நகர்த்தவும்"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "சாளரத்தின் அளவை மாற்று"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-msgid "Move window to workspace 1"
-msgstr "பணியிடம் 1 க்கு சாளரத்தை நகர்த்தவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Move window to workspace 2"
-msgstr "பணியிடம் 2 க்கு சாளரத்தை நகர்த்தவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-msgid "Move window to workspace 3"
-msgstr "பணியிடம் 3 க்கு சாளரத்தை நகர்த்தவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-msgid "Move window to workspace 4"
-msgstr "பணியிடம் 4 க்கு சாளரத்தை நகர்த்தவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "ஒருபணியிடத்திற்கு இடது பக்கம் சாளரத்தை நகர்த்தவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "ஒருபணியிடத்திற்கு வலதுபக்கம் சாளரத்தை நகர்த்தவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "ஒருபணியிடத்திற்கு மேலே சாளரத்தை நகர்த்தவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-msgid "Move window one workspace down"
-msgstr "ஒருபணியிடத்திற்கு கீழே சாளரத்தை நகர்த்தவும்"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-msgid "Raise window above other windows"
-msgstr "மற்ற சாளரத்திற்கு மேல் இந்த சாளரத்தை உயர்த்து"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Lower window below other windows"
-msgstr "மற்ற சாளரத்திற்கு கீழே சாளரத்தை வைக்கவும்"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-msgid "Maximize window vertically"
-msgstr "சாளரத்தை இடவலமாக பெரிதாக்கு "
-
-#: ../src/50-mutter-windows.xml.in.h:5
-msgid "Maximize window horizontally"
-msgstr "சாளரத்தை செங்குத்தாக பெரிதாக்கு "
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Hide all normal windows"
-msgstr "எல்லா வழக்கமான சாளரங்களையும் மறை"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move to workspace above"
-msgstr "வேலையிடத்தை மேல்பக்கத்திற்கு நகர்த்தவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move to workspace below"
-msgstr "வேலையிடத்தை கீழே நகர்த்தவும் "
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move to workspace left"
-msgstr "வேலையிடத்தை இடப்பக்கத்திற்கு நகர்த்தவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move to workspace right"
-msgstr "வேலையிடத்தை வலப்பக்கத்திற்கு நகர்த்தவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Navigation"
-msgstr "திசையறிதல்"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "பயன்பாடுகளுக்கிடையே மாறவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Switch system controls"
-msgstr "கணினி கட்டுப்பாடுகளை மாற்றவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-msgid "Switch system controls directly"
-msgstr "கணினி கட்டுப்பாடுகளை நேரடியாக மாற்றவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Switch windows directly"
-msgstr "சாளரங்களிடையே உடனடியாக நகரவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows of an app directly"
-msgstr "ஒரு பயன்பாட்டின் சாளரங்களிடையே நேரடியாக நகரவும்"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Switch windows of an application"
-msgstr "ஒரு பயன்பாட்டின் சாளரங்களிடையே மாறவும்"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "Show the activities overview"
-msgstr "செயல்பாடுகளின் மேல் பார்வையை காட்டுக"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "இயக்கு கட்டளையின் தூண்டலைக் காட்டு"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "System"
-msgstr "கணினி"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Raise window if covered, otherwise lower it"
-msgstr "வேறொரு சாளரத்தால் மறைக்கப்பட்டிருந்தால் சாளரத்தை உயர்த்து, அல்லது கீழிறக்கு"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Toggle window on all workspaces or one"
-msgstr "சாளரம் அனைத்து பணியிடங்களிலும் இருக்குமா அல்லது ஒரே பணியிடத்திலா என்பதை நிலை "
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "பல்வினையாக்கியின் சொருகிகளின் கமாவால் பிரித்த பட்டியல்."
 
@@ -1755,6 +1573,18 @@ msgstr "சாளரம் அனைத்து பணியிடங்கள
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "சாளரத்தை ஒரே ஒரு பணியிடத்தில் மட்டும் வைக்கவும்"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "பணியிடம் 1க்கு மாறு"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "பணியிடம் 2 க்கு மாறு"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "பணியிடம் 3 க்கு மாறு"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "பணியிடம் 4 க்கு மாறு"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "பணியிடம் 5 க்கு மாறு"
 
@@ -1849,13 +1679,55 @@ msgstr "சாளரம் அனைத்து பணியிடங்கள
 #~ msgid "Run a terminal"
 #~ msgstr "முனையம் ஒன்றை இயக்கு"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "சாளர பட்டியலை செயல்படுத்து "
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "எப்போதும் முழுதிரை பாங்கிற்கு செல்"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "எப்போதும் பெரிய சாளர நிலைக்கு செல்"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "ஒரு சாளரம் மற்றவற்றின் மேலே எப்போதும் இருக்குமா என்பதை  நிலைமாற்று"
 
+#~ msgid "Maximize window"
+#~ msgstr "சாளரத்தை பெரிதாக்கு"
+
+#~ msgid "Restore window"
+#~ msgstr "சாளரத்தை மீட்டமை"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "எப்போதும் நிழை நிலைக்கு செல்"
+
+#~ msgid "Minimize window"
+#~ msgstr "சாளரத்தை சிறிதாக்கு"
+
+#~ msgid "Close window"
+#~ msgstr "சாளரம் மூடவும்"
+
+#~ msgid "Move window"
+#~ msgstr "சாளரத்தை நகர்த்தவும்"
+
+#~ msgid "Resize window"
+#~ msgstr "சாளரத்தின் அளவை மாற்று"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr ""
 #~ "சாளரம்  எல்லா பணியிடங்களிலும் இருக்குமா அல்லது ஒள்றில் மட்டுமா என்பதை  நிலைமாற்று"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "பணியிடம் 1 க்கு சாளரத்தை நகர்த்தவும்"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "பணியிடம் 2 க்கு சாளரத்தை நகர்த்தவும்"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "பணியிடம் 3 க்கு சாளரத்தை நகர்த்தவும்"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "பணியிடம் 4 க்கு சாளரத்தை நகர்த்தவும்"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "பணியிடம் 5 க்கு சாளரத்தை நகர்த்தவும்"
 
@@ -1880,9 +1752,33 @@ msgstr "சாளரம் அனைத்து பணியிடங்கள
 #~ msgid "Move window to workspace 12"
 #~ msgstr "பணியிடம் 12 க்கு சாளரத்தை நகர்த்தவும்"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "ஒருபணியிடத்திற்கு இடது பக்கம் சாளரத்தை நகர்த்தவும்"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "ஒருபணியிடத்திற்கு வலதுபக்கம் சாளரத்தை நகர்த்தவும்"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "ஒருபணியிடத்திற்கு மேலே சாளரத்தை நகர்த்தவும்"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "ஒருபணியிடத்திற்கு கீழே சாளரத்தை நகர்த்தவும்"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "வேறு சாளரத்தால் சாளரம் மூடப்பட்டு இருந்தால் அதை உயர்த்து இல்லையானால் தாழ்த்து"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "மற்ற சாளரத்திற்கு மேல் இந்த சாளரத்தை உயர்த்து"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "மற்ற சாளரத்திற்கு கீழே சாளரத்தை வைக்கவும்"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "சாளரத்தை இடவலமாக பெரிதாக்கு "
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "சாளரத்தை செங்குத்தாக பெரிதாக்கு "
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "சாளரத்தை வடமேற்கே (மேல் இடது) மூலைக்கு நகர்த்து "
 

po/te.po

@@ -23,7 +23,7 @@ msgstr ""
 "X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "కిటికీలు"
 
@@ -1619,309 +1619,8 @@ msgstr "y విలువ %d అని ఉండెడది, %d ఊహించ
 #: ../src/ui/theme-viewer.c:1352
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
-msgstr "%d అనుకరించు వైఖరిలను %g సెకన్‌లలో పార్స్ చేయబడినవి(సగటుగా %g సెకన్‌లు)\n"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 1"
 msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"పనిప్రదేశము 1 కి మారుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కార్యక్షేత్రం 1కు మారు"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"పనిప్రదేశము 2 కి మారుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కార్యక్షేత్రం 2కు మారు"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"పనిప్రదేశము 3 కి మారుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కార్యక్షేత్రం 3కు మారు"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"పనిప్రదేశము 4 కి మారుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కార్యక్షేత్రం 4కు మారు"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-#, fuzzy
-msgid "Activate the window menu"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండో జాబితాను క్రియాశీలపరుచుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీ మెనూను క్రియాశీలముచేయి"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"పూర్తితెర సంవిధానమును మార్చుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"పూర్తితెర రీతిని మార్చు"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"పెద్దదిగాచేయు స్థితిని మార్చుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"గరిష్ట స్థితికి మార్చుము"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Maximize window"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని పెద్దదిగా చేయుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీ పెద్దదిచేయి"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-#, fuzzy
-msgid "Restore window"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని పునఃస్ధాపించు\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీ పూర్వస్థితికి వుంచు"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-#, fuzzy
-msgid "Toggle shaded state"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"మూసివున్న స్ధితిని మార్చుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"షేడెడ్ స్థితిని మార్చుము"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-#, fuzzy
-msgid "Minimize window"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని చిన్నదిగా చేయుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీ చిన్నదిచేయి"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-#, fuzzy
-msgid "Close window"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"గవాక్షమును మూయుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను మూసివేయి"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-#, fuzzy
-msgid "Move window"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని జరుపుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను కదుపు"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని పునఃపరిమాణించుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీ పూర్వస్థితికి వుంచు"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-#, fuzzy
-msgid "Move window to workspace 1"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని పనిప్రదేశము 1 నకు జరుపుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను కార్యక్షేత్రం 1కు తరలించు"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-#, fuzzy
-msgid "Move window to workspace 2"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని పనిప్రదేశము 2 నకు జరుపుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను కార్యక్షేత్రం 2కు తరలించు"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-#, fuzzy
-msgid "Move window to workspace 3"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని పనిప్రదేశము 3 నకు  జరుపుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను కార్యక్షేత్రం 3కు తరలించు"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-#, fuzzy
-msgid "Move window to workspace 4"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని పనిప్రదేశము 4 నకు  జరుపుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను కార్యక్షేత్రం 4కు తరలించు"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండో ఒక పనిప్రదేశమును ఎడమ భాగమునకు జరుపుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను వొక కార్యక్షేత్రం ఎడమనకు తరలించు"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండో ఒక పనిప్రదేశమును కుడి భాగమునకు జరుపుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను వొక కార్యక్షేత్రం కుడికు తరలించు"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-#, fuzzy
-msgid "Move window one workspace up"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండో ఒక పనిప్రదేశమును పై భాగమునకు జరుపుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను వొక కార్యక్షేత్రం పైనకు తరలించు"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace down"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండో ఒక పనిప్రదేశమును క్రింది భాగమునకు జరుపుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను వొక కార్యక్షేత్రం క్రిందనకు తరలించు"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని ఇతర విండోల వెలుపలికి తీసుకొనిరమ్ము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను యితర కిటికీలపైన వృద్దిచేయి"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని ఇతర విండోల లోపలికి తీసుకొనివెళ్ళుమ్ము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను క్రింది యితర కిటికీలకు తగ్గించు"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-#, fuzzy
-msgid "Maximize window vertically"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని నిలువుగా పెద్దది చేయుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను నిలువుగా పెద్దదిచేయి"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window horizontally"
-msgstr ""
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"విండోని అడ్డంగా పెద్దది చేయుము\n"
-"#-#-#-#-#  te.po (metacity.gnome-2-26)  #-#-#-#-#\n"
-"కిటికీను అడ్డముగా పెద్దదిచేయి"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Hide all normal windows"
-msgstr "అన్ని సాధారణ కిటికీలను దాయి"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move to workspace above"
-msgstr "కార్యక్షేత్రం నుండి ఎడమవైపుకు కదులు"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move to workspace below"
-msgstr "కార్యక్షేత్రం నుండి కదులు "
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move to workspace left"
-msgstr "కార్యక్షేత్రం నుండి ఎడమవైపుకు కదులు "
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move to workspace right"
-msgstr "కార్యక్షేత్రం నుండి కుడివైపుకు కదులు "
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Navigation"
-msgstr "విహారణ"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "అనువర్తనాలను మార్చు"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Switch system controls"
-msgstr "వ్యవస్థ నియంత్రణల మీట"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-msgid "Switch system controls directly"
-msgstr "సూటిగా వ్యవస్థ నియంత్రణకు మీట"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Switch windows directly"
-msgstr "సూటిగా కిటికీకు మీట"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows of an app directly"
-msgstr "అనువర్తనము యొక్క కిటికీలమద్య సూటిగా కదులుము"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Switch windows of an application"
-msgstr "అనువర్తనము యొక్క కిటికీల మధ్య మారు"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "Show the activities overview"
-msgstr "కార్యకలాపాల పై పై పరిశీలనను చూపించు"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "రన్ కమాండు మెనూను చూపించు"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "System"
-msgstr "వ్యవస్థ"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Raise window if covered, otherwise lower it"
-msgstr "ఒక కిటికీ  కప్పివుంటే దానిని వృద్దిచేయుము, లేదా దానిని తగ్గించు"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Toggle window on all workspaces or one"
-msgstr "కిటికీ అన్ని కార్యక్షేత్రంలపై వన్నా లేక వొకటి  వున్నా మార్చుము"
+"%d అనుకరించు వైఖరిలను %g సెకన్‌లలో పార్స్ చేయబడినవి(సగటుగా %g సెకన్‌లు)\n"
 
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "కామ-కూర్పుచేయు ప్లగ్ - ఇన్‌ల వేరుచేయబడిన జాబిత"
@@ -1936,6 +1635,18 @@ msgstr "కిటికీ అన్ని కార్యక్షేత్ర
 #~ "దాగివున్న కిటికీలను (అనగా చిన్నవిగా చేసిన కిటికీలు మరియువేరొక కార్యక్షేత్రముల పైనున్న కిటికీలు) వెలికి "
 #~ "తీయవలయునోలేదో వివరిస్తుంది."
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "పనిప్రదేశము 1 కి మారుము"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "పనిప్రదేశము 2 కి మారుము"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "పనిప్రదేశము 3 కి మారుము"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "పనిప్రదేశము 4 కి మారుము"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "పనిప్రదేశము 5 కి మారుము"
 
@@ -2030,12 +1741,54 @@ msgstr "కిటికీ అన్ని కార్యక్షేత్ర
 #~ msgid "Run a terminal"
 #~ msgstr "అగ్రమును నడుపుము"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "విండో జాబితాను క్రియాశీలపరుచుము"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "పూర్తితెర సంవిధానమును మార్చుము"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "పెద్దదిగాచేయు స్థితిని మార్చుము"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "ఒక విండో ఇతర విండోలపై గోచరించునో లేదో మార్చి చూడుము"
 
+#~ msgid "Maximize window"
+#~ msgstr "విండోని పెద్దదిగా చేయుము"
+
+#~ msgid "Restore window"
+#~ msgstr "విండోని పునఃస్ధాపించు"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "మూసివున్న స్ధితిని మార్చుము"
+
+#~ msgid "Minimize window"
+#~ msgstr "విండోని చిన్నదిగా చేయుము"
+
+#~ msgid "Close window"
+#~ msgstr "గవాక్షమును మూయుము"
+
+#~ msgid "Move window"
+#~ msgstr "విండోని జరుపుము"
+
+#~ msgid "Resize window"
+#~ msgstr "విండోని పునఃపరిమాణించుము"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "విండో అన్ని పనిప్రదేశములపైన లేక ఒకదానిపైన మాత్రమే ఉన్నదా లేదా మార్చి చుడుము"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "విండోని పనిప్రదేశము 1 నకు జరుపుము"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "విండోని పనిప్రదేశము 2 నకు జరుపుము"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "విండోని పనిప్రదేశము 3 నకు  జరుపుము"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "విండోని పనిప్రదేశము 4 నకు  జరుపుము"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "విండోని పనిప్రదేశము 5 నకు జరుపుము"
 
@@ -2060,10 +1813,34 @@ msgstr "కిటికీ అన్ని కార్యక్షేత్ర
 #~ msgid "Move window to workspace 12"
 #~ msgstr "విండోని పనిప్రదేశము 12 నకు  జరుపుము"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "విండో ఒక పనిప్రదేశమును ఎడమ భాగమునకు జరుపుము"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "విండో ఒక పనిప్రదేశమును కుడి భాగమునకు జరుపుము"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "విండో ఒక పనిప్రదేశమును పై భాగమునకు జరుపుము"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "విండో ఒక పనిప్రదేశమును క్రింది భాగమునకు జరుపుము"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr ""
 #~ "ఒకవేళ విండోను వేరొక విండో చేత  మూసివున్నచో దానిని వెలుపలికి తీసుకురమ్ము లేనిచో లోనికి తీసుకువెళ్ళుము"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "విండోని ఇతర విండోల వెలుపలికి తీసుకొనిరమ్ము"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "విండోని ఇతర విండోల లోపలికి తీసుకొనివెళ్ళుమ్ము"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "విండోని నిలువుగా పెద్దది చేయుము"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "విండోని అడ్డంగా పెద్దది చేయుము"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "విండోని ఉత్తర-పడమర (ఎడమ పైభాగము)పు మూలలోనికి జరుపుము"
 

po/th.po

@@ -1543,177 +1543,8 @@ msgstr "ค่าของ y เป็น %d แต่ที่คาดหว
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "แจงค่านิพจน์พิกัดทั้งหมด %d นิพจน์ ในเวลา %g วินาที (%g วินาทีโดยเฉลี่ย)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:17
-msgid "Switch to workspace 1"
-msgstr "สลับไปพื้นที่ทำงาน 1"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "Activate the window menu"
-msgstr "เปิดเมนูหน้าต่าง"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Toggle fullscreen mode"
-msgstr "สลับโหมดเต็มหน้าจอ"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-msgid "Toggle maximization state"
-msgstr "สลับสถานะขยายแผ่"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-msgid "Maximize window"
-msgstr "ขยายแผ่หน้าต่างเต็มพื้นโต๊ะ"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-msgid "Restore window"
-msgstr "คืนขนาดหน้าต่าง"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-msgid "Toggle shaded state"
-msgstr "ม้วน/คลี่หน้าต่าง"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-msgid "Minimize window"
-msgstr "ย่อเก็บหน้าต่าง"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-msgid "Close window"
-msgstr "ปิดหน้าต่าง"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Move window"
-msgstr "ย้ายหน้าต่าง"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "ปรับขนาดหน้าต่าง"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-msgid "Move window one workspace to the left"
-msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านซ้าย"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the right"
-msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านขวา"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace up"
-msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านบน"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace down"
-msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านล่าง"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-msgid "Raise window above other windows"
-msgstr "ยกหน้าต่างขึ้นมาไว้หน้าหน้าต่างอื่นๆ"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-msgid "Lower window below other windows"
-msgstr "ถอยหน้าต่างลงไปใว้หลังหน้าต่างอื่น"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Maximize window vertically"
-msgstr "ขยายแผ่หน้าต่างเต็มด้านสูง"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-msgid "Maximize window horizontally"
-msgstr "ขยายแผ่หน้าต่างเต็มด้านกว้าง"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Navigation"
-msgstr "ท่องย้าย"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move window to workspace 1"
-msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move window to workspace 2"
-msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move window to workspace 3"
-msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move window to workspace 4"
-msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-msgid "Switch applications"
-msgstr "สลับโปรแกรม"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Switch windows of an application"
-msgstr "สลับหน้าต่างภายในโปรแกรม"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-msgid "Switch system controls"
-msgstr "สลับส่วนควบคุมระบบ"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-msgid "Switch windows directly"
-msgstr "สลับหน้าต่างโดยตรง"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Switch windows of an app directly"
-msgstr "สลับหน้าต่างภายในโปรแกรมโดยตรง"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch system controls directly"
-msgstr "สลับส่วนควบคุมระบบโดยตรง"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Hide all normal windows"
-msgstr "ซ่อนหน้าต่างทั้งหมด"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-msgid "Switch to workspace 2"
-msgstr "สลับไปพื้นที่ทำงาน 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-msgid "Switch to workspace 3"
-msgstr "สลับไปพื้นที่ทำงาน 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-msgid "Switch to workspace 4"
-msgstr "สลับไปพื้นที่ทำงาน 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-msgid "Move to workspace left"
-msgstr "ย้ายไปพื้นที่ทำงานซ้าย"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Move to workspace right"
-msgstr "ย้ายไปพื้นที่ทำงานขวา"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Move to workspace above"
-msgstr "ย้ายไปพื้นที่ทำงานซ้าย"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Move to workspace below"
-msgstr "ย้ายไปพื้นที่ทำงานล่าง"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "System"
-msgstr "ระบบ"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "แสดงกล่องเรียกคำสั่ง"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "Show the activities overview"
-msgstr "แสดงภาพรวมของกิจกรรมต่างๆ"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-msgid "Toggle window on all workspaces or one"
-msgstr "สลับการแสดงหน้าต่างบนทุกพื้นที่ทำงานกับบนพื้นที่เดียว"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-msgid "Raise window if covered, otherwise lower it"
-msgstr "ยกหน้าต่างขึ้นถ้าถูกบัง มิฉะนั้นก็เอาลงด้านหลัง"
+#~ msgid "Switch to workspace 1"
+#~ msgstr "สลับไปพื้นที่ทำงาน 1"
 
 #~ msgid "Switch to workspace on the left of the current workspace"
 #~ msgstr "สลับไปพื้นที่ทำงานด้านซ้ายของพื้นที่ทำงานปัจจุบัน"
@@ -1785,15 +1616,69 @@ msgstr "ยกหน้าต่างขึ้นถ้าถูกบัง
 #~ msgid "Run a terminal"
 #~ msgstr "เปิดเทอร์มินัล"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "เปิดเมนูหน้าต่าง"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "สลับโหมดเต็มหน้าจอ"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "สลับสถานะขยายแผ่"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "สลับสถานะหน้าต่าง ว่าค้างอยู่บนสุดเหนือหน้าต่างอื่นหรือไม่"
 
+#~ msgid "Maximize window"
+#~ msgstr "ขยายแผ่หน้าต่างเต็มพื้นโต๊ะ"
+
+#~ msgid "Restore window"
+#~ msgstr "คืนขนาดหน้าต่าง"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "ม้วน/คลี่หน้าต่าง"
+
+#~ msgid "Minimize window"
+#~ msgstr "ย่อเก็บหน้าต่าง"
+
+#~ msgid "Close window"
+#~ msgstr "ปิดหน้าต่าง"
+
+#~ msgid "Move window"
+#~ msgstr "ย้ายหน้าต่าง"
+
+#~ msgid "Resize window"
+#~ msgstr "ปรับขนาดหน้าต่าง"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "สลับสถานะหน้าต่าง ว่าแสดงบนทุกพื้นที่ทำงาน หรือแค่พื้นที่ทำงานเดียว"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านซ้าย"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านขวา"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านบน"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านล่าง"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "ยกหน้าต่างขึ้นถ้าถูกบัง มิฉะนั้นก็เอาลงด้านหลัง"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "ยกหน้าต่างขึ้นมาไว้หน้าหน้าต่างอื่นๆ"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "ถอยหน้าต่างลงไปใว้หลังหน้าต่างอื่น"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "ขยายแผ่หน้าต่างเต็มด้านสูง"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "ขยายแผ่หน้าต่างเต็มด้านกว้าง"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "ย้ายหน้าต่างไปที่มุมบนซ้ายของหน้าจอ"
 

po/ug.po

@@ -1989,26 +1989,6 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d كوئوردېنات ئىپادىسى %g سېكۇنتتا تەھلىل قىلىندى(%g ئوتتۇرىچە سېكۇنت)\n"
 
-#: ../src/50-mutter-launchers.xml.in.h:1
-msgid "Launchers"
-msgstr "ئىجراچىلار"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Navigation"
-msgstr "يولباشچى"
-
-#: ../src/50-mutter-screenshot.xml.in.h:1
-msgid "Screenshots"
-msgstr "ئېكران كۆرۈنۈشلىرى"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "System"
-msgstr "سىستېما"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-msgid "Windows"
-msgstr "كۆزنەكلەر"
-
 #~ msgid "Failed to retrieve color %s[%s] from GTK+ theme.\n"
 #~ msgstr "GTK+ ئۆرنەكتىن رەڭ %s[%s] نى ئىزدىيەلمىدى\n"
 

po/uk.po

@@ -1568,224 +1568,6 @@ msgstr ""
 "%d координатних виразів проаналізовано за %g секунд (середнє значення: %g "
 "секунд)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:17
-#, fuzzy
-msgid "Switch to workspace 1"
-msgstr ""
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перейти на робочий простір 1\n"
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перейти до робочого простору 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-#, fuzzy
-msgid "Switch to workspace 2"
-msgstr ""
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перейти на робочий простір 2\n"
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перейти до робочого простору 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-#, fuzzy
-msgid "Switch to workspace 3"
-msgstr ""
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перейти на робочий простір 3\n"
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перейти до робочого простору 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-#, fuzzy
-msgid "Switch to workspace 4"
-msgstr ""
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перейти на робочий простір 4\n"
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перейти до робочого простору 4"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "Activate the window menu"
-msgstr "Активувати меню вікна"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Toggle fullscreen mode"
-msgstr "Перемикання повноекранного режиму"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-#, fuzzy
-msgid "Toggle maximization state"
-msgstr ""
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перемикання стану розгортання\n"
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перемикання стану розгортання вікна на весь екран"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-#, fuzzy
-msgid "Maximize window"
-msgstr ""
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Розгорнути вікно\n"
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Розгорнути вікно на весь екран"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-msgid "Restore window"
-msgstr "Відновити вікно"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-msgid "Toggle shaded state"
-msgstr "Перемикання стану згорнутості"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-msgid "Minimize window"
-msgstr "Згорнути вікно"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-msgid "Close window"
-msgstr "Закрити вікно"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Move window"
-msgstr "Перемістити вікно"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr ""
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Змінити розмір вікна\n"
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Змінити розміри вікна"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move window to workspace 1"
-msgstr "Перемістити вікно на робочий простір 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move window to workspace 2"
-msgstr "Перемістити вікно на робочий простір 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move window to workspace 3"
-msgstr "Перемістити вікно на робочий простір 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move window to workspace 4"
-msgstr "Перемістити вікно на робочий простір 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-#, fuzzy
-msgid "Move window one workspace to the left"
-msgstr ""
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перемістити вікно у робочий простір ліворуч\n"
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перемістити вікно на робочий простір ліворуч"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-#, fuzzy
-msgid "Move window one workspace to the right"
-msgstr ""
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перемістити вікно у робочий простір праворуч\n"
-"#-#-#-#-#  uk.po (metacity)  #-#-#-#-#\n"
-"Перемістити вікно на робочий простір праворуч"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace up"
-msgstr "Перемістити вікно на робочий простір вище"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace down"
-msgstr "Перемістити вікно на робочий простір нижче"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-msgid "Raise window above other windows"
-msgstr "Підняти вікно над іншими"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-msgid "Lower window below other windows"
-msgstr "Перемістити вікна нижче усіх вікон"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Maximize window vertically"
-msgstr "Розгорнути вікно на весь екран вертикально"
-
-#: ../src/50-mutter-windows.xml.in.h:17
-msgid "Maximize window horizontally"
-msgstr "Розгорнути вікно на весь екран горизонтально"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Navigation"
-msgstr "Навігація"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-msgid "Switch applications"
-msgstr "Перемкнути програми"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Switch windows of an application"
-msgstr "Перемкнути вікна програм"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-msgid "Switch system controls"
-msgstr "Перемкнути системні керування"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-msgid "Switch windows directly"
-msgstr "Перемкнути вікна напряму"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Switch windows of an app directly"
-msgstr "Перемкнути вікна програм напряму"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch system controls directly"
-msgstr "Перемкнути системні керування напряму"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Hide all normal windows"
-msgstr "Сховати всі звичайні вікна"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-msgid "Move to workspace left"
-msgstr "Перейти до робочого простору ліворуч"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Move to workspace right"
-msgstr "Перейти до робочого простору праворуч"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Move to workspace above"
-msgstr "Перейти до робочого простору вище"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Move to workspace below"
-msgstr "Перейти до робочого простору знизу"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "System"
-msgstr "Система"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "Показати запуск командного рядка"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "Show the activities overview"
-msgstr "Показати огляд активності"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-msgid "Toggle window on all workspaces or one"
-msgstr "Перемикання вікна на всі робочі простори або один"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-msgid "Raise window if covered, otherwise lower it"
-msgstr ""
-"Підняти вікно на передній план, якщо воно прикрите іншим, інакше опустити "
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Список композитних додатків розділених комою"
 
@@ -1832,6 +1614,18 @@ msgstr ""
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Розміщувати вікно лише на одному робочому просторі"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Перейти на робочий простір 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Перейти на робочий простір 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Перейти на робочий простір 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Перейти на робочий простір 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Перейти на робочий простір 5"
 
@@ -1929,12 +1723,54 @@ msgstr ""
 #~ msgid "Run a terminal"
 #~ msgstr "Запустити термінал"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Активувати меню вікна"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Перемикання повноекранного режиму"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Перемикання стану розгортання"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "Перемикання видимості вікна над усіма іншими вікнами назавжди"
 
+#~ msgid "Maximize window"
+#~ msgstr "Розгорнути вікно"
+
+#~ msgid "Restore window"
+#~ msgstr "Відновити вікно"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Перемикання стану згорнутості"
+
+#~ msgid "Minimize window"
+#~ msgstr "Згорнути вікно"
+
+#~ msgid "Close window"
+#~ msgstr "Закрити вікно"
+
+#~ msgid "Move window"
+#~ msgstr "Перемістити вікно"
+
+#~ msgid "Resize window"
+#~ msgstr "Змінити розмір вікна"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "Перемикання розміщення вікна всіх робочих просторах або одному "
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Перемістити вікно на робочий простір 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Перемістити вікно на робочий простір 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Перемістити вікно на робочий простір 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Перемістити вікно на робочий простір 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Перемістити вікно на робочий простір 5"
 
@@ -1959,9 +1795,33 @@ msgstr ""
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Перемістити вікно на робочий простір 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Перемістити вікно у робочий простір ліворуч"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Перемістити вікно у робочий простір праворуч"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Перемістити вікно на робочий простір вище"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Перемістити вікно на робочий простір нижче"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Підняти вікно, якщо його покрито іншим, інакше опустити його"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Підняти вікно над іншими"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Перемістити вікна нижче усіх вікон"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Розгорнути вікно на весь екран вертикально"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Розгорнути вікно на весь екран горизонтально"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Перемістити вікно у верхній лівий край"
 

po/vi.po

@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Cửa sổ"
 
@@ -1581,198 +1581,6 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "phân tích \"%d\" biểu thức tọa độ trong vòng %g giây (%g giây trung bình).\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-msgid "Switch to workspace 1"
-msgstr "Chuyển sang vùng làm việc 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-msgid "Switch to workspace 2"
-msgstr "Chuyển sang vùng làm việc 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-msgid "Switch to workspace 3"
-msgstr "Chuyển sang vùng làm việc 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-msgid "Switch to workspace 4"
-msgstr "Chuyển sang vùng làm việc 4"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-msgid "Activate the window menu"
-msgstr "Kích hoạt trình đơn cửa sổ"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-#, fuzzy
-msgid "Toggle fullscreen mode"
-msgstr ""
-"#-#-#-#-#  vi.po (metacity GNOME 2.26)  #-#-#-#-#\n"
-"Bật/Tắt Chế độ Toàn màn hình\n"
-"#-#-#-#-#  vi.po (metacity GNOME 2.26)  #-#-#-#-#\n"
-"Bật/Tắt toàn màn hình"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-msgid "Toggle maximization state"
-msgstr "Bật tắt trạng thái phóng to"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-msgid "Maximize window"
-msgstr "Phóng to cửa sổ"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-msgid "Restore window"
-msgstr "Phục hồi cửa sổ"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-msgid "Toggle shaded state"
-msgstr "Bật tắt trạng thái đánh bóng"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-msgid "Minimize window"
-msgstr "Thu nhỏ cửa sổ"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "Close window"
-msgstr "Đóng cửa sổ"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-msgid "Move window"
-msgstr "Di chuyển cửa sổ"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-#, fuzzy
-msgid "Resize window"
-msgstr ""
-"#-#-#-#-#  vi.po (metacity GNOME 2.26)  #-#-#-#-#\n"
-"Co giãn cửa sổ\n"
-"#-#-#-#-#  vi.po (metacity GNOME 2.26)  #-#-#-#-#\n"
-"Đổi cỡ cửa sổ"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-msgid "Move window to workspace 1"
-msgstr "Chuyển cửa sổ sang vùng làm việc 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Move window to workspace 2"
-msgstr "Chuyển cửa sổ sang vùng làm việc 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-msgid "Move window to workspace 3"
-msgstr "Chuyển cửa sổ sang vùng làm việc 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-msgid "Move window to workspace 4"
-msgstr "Chuyển cửa sổ sang vùng làm việc 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "Chuyển cửa sổ sang vùng làm việc bên trái"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "Chuyển cửa sổ sang vùng làm việc bên phải"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "Chuyển cửa sổ lên vùng làm việc trên"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-msgid "Move window one workspace down"
-msgstr "Chuyển cửa sổ xuống vùng làm việc dưới"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-#, fuzzy
-msgid "Raise window above other windows"
-msgstr ""
-"#-#-#-#-#  vi.po (metacity GNOME 2.26)  #-#-#-#-#\n"
-"Nâng cửa sổ lên trên các cửa sổ khác\n"
-"#-#-#-#-#  vi.po (metacity GNOME 2.26)  #-#-#-#-#\n"
-"Nâng cửa sổ trên các cửa sổ khác"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-#, fuzzy
-msgid "Lower window below other windows"
-msgstr ""
-"#-#-#-#-#  vi.po (metacity GNOME 2.26)  #-#-#-#-#\n"
-"Hạ thấp cửa sổ xuống dưới các cửa sổ khác\n"
-"#-#-#-#-#  vi.po (metacity GNOME 2.26)  #-#-#-#-#\n"
-"Hạ cửa sổ dưới các cửa sổ khác"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-msgid "Maximize window vertically"
-msgstr "Phóng to cửa sổ theo chiều dọc"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-msgid "Maximize window horizontally"
-msgstr "Phóng to cửa sổ theo chiều ngang"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Hide all normal windows"
-msgstr "Ẩn mọi cửa sổ thường"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move to workspace above"
-msgstr "Chuyển sang vùng làm việc trên"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move to workspace below"
-msgstr "Chuyển sang vùng làm việc dưới"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move to workspace left"
-msgstr "Chuyển sang vùng làm việc trái"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move to workspace right"
-msgstr "Chuyển sang vùng làm việc phải"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Navigation"
-msgstr "Di chuyển"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "Chuyển ứng dụng"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Switch system controls"
-msgstr "Chuyển điều khiển hệ thống"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-msgid "Switch system controls directly"
-msgstr "Chuyển điều khiển hệ thống trực tiếp"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Switch windows directly"
-msgstr "Chuyển cửa sổ trực tiếp"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows of an app directly"
-msgstr "Chuyển trực tiếp cửa sổ cùng ứng dụng"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Switch windows of an application"
-msgstr "Chuyển cửa sổ cùng ứng dụng"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "Show the activities overview"
-msgstr "Hiện tổng quan hoạt động"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "Hiện dấu nhắc dòng lệnh"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "System"
-msgstr "Hệ thống"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Nâng cửa sổ nếu bị che, không thì hạ xuống"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Toggle window on all workspaces or one"
-msgstr "Bật/Tắt cửa sổ trên mọi vùng làm việc"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Danh sách phần bổ sung tổng hợp cách nhau bằng dấu phẩy"
 
@@ -1819,6 +1627,18 @@ msgstr "Bật/Tắt cửa sổ trên mọi vùng làm việc"
 #~ msgid "Put Window On Only One Workspace"
 #~ msgstr "Đặt cửa sổ trên chỉ một vùng làm việc"
 
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Chuyển sang vùng làm việc 1"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Chuyển sang vùng làm việc 2"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Chuyển sang vùng làm việc 3"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Chuyển sang vùng làm việc 4"
+
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Chuyển sang vùng làm việc 5"
 
@@ -1915,14 +1735,56 @@ msgstr "Bật/Tắt cửa sổ trên mọi vùng làm việc"
 #~ msgid "Run a terminal"
 #~ msgstr "Chạy thiết bị cuối"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "Kích hoạt trình đơn cửa sổ"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Bật/Tắt Chế độ Toàn màn hình"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Bật tắt trạng thái phóng to"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr ""
 #~ "Bật/tắt nếu một cửa sổ nào đó lúc nào cũng hiển thị phía trước các cửa sổ "
 #~ "khác"
 
+#~ msgid "Maximize window"
+#~ msgstr "Phóng to cửa sổ"
+
+#~ msgid "Restore window"
+#~ msgstr "Phục hồi cửa sổ"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Bật tắt trạng thái đánh bóng"
+
+#~ msgid "Minimize window"
+#~ msgstr "Thu nhỏ cửa sổ"
+
+#~ msgid "Close window"
+#~ msgstr "Đóng cửa sổ"
+
+#~ msgid "Move window"
+#~ msgstr "Di chuyển cửa sổ"
+
+#~ msgid "Resize window"
+#~ msgstr "Co giãn cửa sổ"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "Bật/tắt nếu cửa sổ nằm trên mọi vùng làm việc, hay chỉ trên một"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Chuyển cửa sổ sang vùng làm việc 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Chuyển cửa sổ sang vùng làm việc 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Chuyển cửa sổ sang vùng làm việc 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Chuyển cửa sổ sang vùng làm việc 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Chuyển cửa sổ sang vùng làm việc 5"
 
@@ -1947,9 +1809,33 @@ msgstr "Bật/Tắt cửa sổ trên mọi vùng làm việc"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Chuyển cửa sổ sang vùng làm việc 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Chuyển cửa sổ sang vùng làm việc bên trái"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Chuyển cửa sổ sang vùng làm việc bên phải"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Chuyển cửa sổ lên vùng làm việc trên"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Chuyển cửa sổ xuống vùng làm việc dưới"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "Nâng cửa sổ bị cửa sổ khác lấp,  không bị lấp thì hạ nó xuống"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "Nâng cửa sổ lên trên các cửa sổ khác"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Hạ thấp cửa sổ xuống dưới các cửa sổ khác"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Phóng to cửa sổ theo chiều dọc"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Phóng to cửa sổ theo chiều ngang"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "Chuyển cửa sổ sang góc tây bắc (trái trên)"
 

po/zh_CN.po

@@ -25,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "窗口"
 
@@ -1530,177 +1530,17 @@ msgstr "y 值为 %d，但应该为 %d "
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "在 %2$g 秒内处理了 %1$d 个坐标表达式(平均 %3$g 秒)\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:18
-msgid "Switch to workspace 1"
-msgstr "切换到工作区 1"
+#~ msgid "Switch to workspace 1"
+#~ msgstr "切换到工作区 1"
 
-#: ../src/50-mutter-navigation.xml.in.h:19
-msgid "Switch to workspace 2"
-msgstr "切换到工作区 2"
+#~ msgid "Switch to workspace 2"
+#~ msgstr "切换到工作区 2"
 
-#: ../src/50-mutter-navigation.xml.in.h:20
-msgid "Switch to workspace 3"
-msgstr "切换到工作区 3"
+#~ msgid "Switch to workspace 3"
+#~ msgstr "切换到工作区 3"
 
-#: ../src/50-mutter-navigation.xml.in.h:21
-msgid "Switch to workspace 4"
-msgstr "切换到工作区 4"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-msgid "Activate the window menu"
-msgstr "激活窗口菜单"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-msgid "Toggle fullscreen mode"
-msgstr "切换全屏模式"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-msgid "Toggle maximization state"
-msgstr "切换最大化状态"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-msgid "Maximize window"
-msgstr "最大化窗口"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-msgid "Restore window"
-msgstr "恢复窗口"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-msgid "Toggle shaded state"
-msgstr "切换卷起状态"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-msgid "Minimize window"
-msgstr "最小化窗口"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "Close window"
-msgstr "关闭窗口"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-msgid "Move window"
-msgstr "移动窗口"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "改变窗口大小"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-msgid "Move window to workspace 1"
-msgstr "将窗口移到工作区 1"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Move window to workspace 2"
-msgstr "将窗口移到工作区 2"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-msgid "Move window to workspace 3"
-msgstr "将窗口移到工作区 3"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-msgid "Move window to workspace 4"
-msgstr "将窗口移到工作区 4"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "将窗口左移一个工作区"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "将窗口右移一个工作区"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "将窗口上移一个工作区"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-msgid "Move window one workspace down"
-msgstr "将窗口下移一个工作区"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-msgid "Raise window above other windows"
-msgstr "将窗口提升到其它窗口之上"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Lower window below other windows"
-msgstr "将窗口降低到其它窗口之下"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-msgid "Maximize window vertically"
-msgstr "垂直最大化窗口"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-msgid "Maximize window horizontally"
-msgstr "水平最大化窗口"
-
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Hide all normal windows"
-msgstr "隐藏所有正常窗口"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move to workspace above"
-msgstr "移动到上层工作区"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move to workspace below"
-msgstr "移动到下层工作区"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move to workspace left"
-msgstr "移动到左侧工作区"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move to workspace right"
-msgstr "移动到右侧工作区"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Navigation"
-msgstr "导航"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "切换应用程序"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Switch system controls"
-msgstr "切换系统控制"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-msgid "Switch system controls directly"
-msgstr "直接切换系统控制"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Switch windows directly"
-msgstr "直接切换窗口"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows of an app directly"
-msgstr "在应用程序窗口间直接移动焦点"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Switch windows of an application"
-msgstr "在应用程序的窗口之间切换窗口"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "Show the activities overview"
-msgstr "显示活动大纲"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "显示运行命令提示符"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "System"
-msgstr "系统"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Raise window if covered, otherwise lower it"
-msgstr "如果窗口被其他窗口遮盖，则提升它，否则降低它"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Toggle window on all workspaces or one"
-msgstr "在位于所有或仅一个工作区的窗口间切换"
+#~ msgid "Switch to workspace 4"
+#~ msgstr "切换到工作区 4"
 
 #~ msgid "Switch to workspace 5"
 #~ msgstr "切换到工作区 5"
@@ -1796,12 +1636,54 @@ msgstr "在位于所有或仅一个工作区的窗口间切换"
 #~ msgid "Run a terminal"
 #~ msgstr "运行终端"
 
+#~ msgid "Activate the window menu"
+#~ msgstr "激活窗口菜单"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "切换全屏模式"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "切换最大化状态"
+
 #~ msgid "Toggle whether a window will always be visible over other windows"
 #~ msgstr "在窗口是否永远可见于其它窗口之上间切换"
 
+#~ msgid "Maximize window"
+#~ msgstr "最大化窗口"
+
+#~ msgid "Restore window"
+#~ msgstr "恢复窗口"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "切换卷起状态"
+
+#~ msgid "Minimize window"
+#~ msgstr "最小化窗口"
+
+#~ msgid "Close window"
+#~ msgstr "关闭窗口"
+
+#~ msgid "Move window"
+#~ msgstr "移动窗口"
+
+#~ msgid "Resize window"
+#~ msgstr "改变窗口大小"
+
 #~ msgid "Toggle whether window is on all workspaces or just one"
 #~ msgstr "在窗口位于所有或仅一个工作区间切换"
 
+#~ msgid "Move window to workspace 1"
+#~ msgstr "将窗口移到工作区 1"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "将窗口移到工作区 2"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "将窗口移到工作区 3"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "将窗口移到工作区 4"
+
 #~ msgid "Move window to workspace 5"
 #~ msgstr "将窗口移到工作区 5"
 
@@ -1826,9 +1708,33 @@ msgstr "在位于所有或仅一个工作区的窗口间切换"
 #~ msgid "Move window to workspace 12"
 #~ msgstr "将窗口移到工作区 12"
 
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "将窗口左移一个工作区"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "将窗口右移一个工作区"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "将窗口上移一个工作区"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "将窗口下移一个工作区"
+
 #~ msgid "Raise window if it's covered by another window, otherwise lower it"
 #~ msgstr "如果窗口被其他窗口遮盖，则提升它，否则降低它"
 
+#~ msgid "Raise window above other windows"
+#~ msgstr "将窗口提升到其它窗口之上"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "将窗口降低到其它窗口之下"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "垂直最大化窗口"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "水平最大化窗口"
+
 #~ msgid "Move window to north-west (top left) corner"
 #~ msgstr "将窗口移到西北(左上)角"
 

po/zh_HK.po

@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "視窗"
 
@@ -1490,178 +1490,6 @@ msgstr "y 的數值是 %d，%d是預期中的數值"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "分析 %d 座標表現需時 %g 秒（平均 %g 秒）\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Hide all normal windows"
-msgstr "隱藏所有一般視窗"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move to workspace above"
-msgstr "移至上方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move to workspace below"
-msgstr "移至下方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move to workspace left"
-msgstr "移至左方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move to workspace right"
-msgstr "移至右方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-msgid "Move window one workspace down"
-msgstr "將視窗移至下方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "將視窗移至左方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "將視窗移至右方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "將視窗移至上方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-msgid "Move window to workspace 1"
-msgstr "將視窗移至第 1 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Move window to workspace 2"
-msgstr "將視窗移至第 2 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-msgid "Move window to workspace 3"
-msgstr "將視窗移至第 3 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-msgid "Move window to workspace 4"
-msgstr "將視窗移至第 4 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Navigation"
-msgstr "導航"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "切換程式"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Switch system controls"
-msgstr "切換系統控制"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-msgid "Switch system controls directly"
-msgstr "直接切換系統控制"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-msgid "Switch to workspace 1"
-msgstr "切換至第 1 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-msgid "Switch to workspace 2"
-msgstr "切換至第 2 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-msgid "Switch to workspace 3"
-msgstr "切換至第 3 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-msgid "Switch to workspace 4"
-msgstr "切換至第 4 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Switch windows directly"
-msgstr "直接切換視窗"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows of an app directly"
-msgstr "直接切換程式的視窗"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Switch windows of an application"
-msgstr "切換程式的視窗"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "Show the activities overview"
-msgstr "顯示活動概覽"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "顯示執行指令提示"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "System"
-msgstr "系統"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-msgid "Activate the window menu"
-msgstr "使用視窗選單"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "Close window"
-msgstr "關閉視窗"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Lower window below other windows"
-msgstr "遮蔽某個視窗"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-msgid "Maximize window"
-msgstr "視窗最大化"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-msgid "Maximize window horizontally"
-msgstr "將視窗橫向最大化"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-msgid "Maximize window vertically"
-msgstr "將視窗縱向最大化"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-msgid "Minimize window"
-msgstr "視窗最小化"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-msgid "Move window"
-msgstr "移動視窗"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-msgid "Raise window above other windows"
-msgstr "令某個視窗覆蓋其它視窗"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Raise window if covered, otherwise lower it"
-msgstr "若被其他視窗遮蔽就抬升它，否則將它降下"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "調整視窗大小"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-msgid "Restore window"
-msgstr "還原視窗"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-msgid "Toggle fullscreen mode"
-msgstr "切換全螢幕模式"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-msgid "Toggle maximization state"
-msgstr "切換最大化狀態"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-msgid "Toggle shaded state"
-msgstr "切換視窗捲起/放下狀態"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Toggle window on all workspaces or one"
-msgstr "切換視窗顯示在所有工作區或是只顯示於其中之一"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "以逗號分隔的複合視窗外掛程式清單"
 

po/zh_TW.po

@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "視窗"
 
@@ -1526,178 +1526,6 @@ msgstr "y 的數值是 %d，%d是預期中的數值"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "分析 %d 座標表現需時 %g 秒（平均 %g 秒）\n"
 
-#: ../src/50-mutter-navigation.xml.in.h:1
-msgid "Hide all normal windows"
-msgstr "隱藏所有一般視窗"
-
-#: ../src/50-mutter-navigation.xml.in.h:2
-msgid "Move to workspace above"
-msgstr "移至上方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:3
-msgid "Move to workspace below"
-msgstr "移至下方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:4
-msgid "Move to workspace left"
-msgstr "移至左方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:5
-msgid "Move to workspace right"
-msgstr "移至右方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:6
-msgid "Move window one workspace down"
-msgstr "將視窗移至下方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "將視窗移至左方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "將視窗移至右方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "將視窗移至上方的工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:10
-msgid "Move window to workspace 1"
-msgstr "將視窗移至第 1 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Move window to workspace 2"
-msgstr "將視窗移至第 2 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
-msgid "Move window to workspace 3"
-msgstr "將視窗移至第 3 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:13
-msgid "Move window to workspace 4"
-msgstr "將視窗移至第 4 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:14
-msgid "Navigation"
-msgstr "導航"
-
-#: ../src/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "切換程式"
-
-#: ../src/50-mutter-navigation.xml.in.h:16
-msgid "Switch system controls"
-msgstr "切換系統控制"
-
-#: ../src/50-mutter-navigation.xml.in.h:17
-msgid "Switch system controls directly"
-msgstr "直接切換系統控制"
-
-#: ../src/50-mutter-navigation.xml.in.h:18
-msgid "Switch to workspace 1"
-msgstr "切換至第 1 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:19
-msgid "Switch to workspace 2"
-msgstr "切換至第 2 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:20
-msgid "Switch to workspace 3"
-msgstr "切換至第 3 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:21
-msgid "Switch to workspace 4"
-msgstr "切換至第 4 個工作區"
-
-#: ../src/50-mutter-navigation.xml.in.h:22
-msgid "Switch windows directly"
-msgstr "直接切換視窗"
-
-#: ../src/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows of an app directly"
-msgstr "直接切換程式的視窗"
-
-#: ../src/50-mutter-navigation.xml.in.h:24
-msgid "Switch windows of an application"
-msgstr "切換程式的視窗"
-
-#: ../src/50-mutter-system.xml.in.h:1
-msgid "Show the activities overview"
-msgstr "顯示活動概覽"
-
-#: ../src/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "顯示執行指令提示"
-
-#: ../src/50-mutter-system.xml.in.h:3
-msgid "System"
-msgstr "系統"
-
-#: ../src/50-mutter-windows.xml.in.h:1
-msgid "Activate the window menu"
-msgstr "使用視窗選單"
-
-#: ../src/50-mutter-windows.xml.in.h:2
-msgid "Close window"
-msgstr "關閉視窗"
-
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Lower window below other windows"
-msgstr "遮蔽某個視窗"
-
-#: ../src/50-mutter-windows.xml.in.h:4
-msgid "Maximize window"
-msgstr "視窗最大化"
-
-#: ../src/50-mutter-windows.xml.in.h:5
-msgid "Maximize window horizontally"
-msgstr "將視窗橫向最大化"
-
-#: ../src/50-mutter-windows.xml.in.h:6
-msgid "Maximize window vertically"
-msgstr "將視窗縱向最大化"
-
-#: ../src/50-mutter-windows.xml.in.h:7
-msgid "Minimize window"
-msgstr "視窗最小化"
-
-#: ../src/50-mutter-windows.xml.in.h:8
-msgid "Move window"
-msgstr "移動視窗"
-
-#: ../src/50-mutter-windows.xml.in.h:9
-msgid "Raise window above other windows"
-msgstr "令某個視窗覆蓋其它視窗"
-
-#: ../src/50-mutter-windows.xml.in.h:10
-msgid "Raise window if covered, otherwise lower it"
-msgstr "若被其他視窗遮蔽就抬升它，否則將它降下"
-
-#: ../src/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "調整視窗大小"
-
-#: ../src/50-mutter-windows.xml.in.h:12
-msgid "Restore window"
-msgstr "還原視窗"
-
-#: ../src/50-mutter-windows.xml.in.h:13
-msgid "Toggle fullscreen mode"
-msgstr "切換全螢幕模式"
-
-#: ../src/50-mutter-windows.xml.in.h:14
-msgid "Toggle maximization state"
-msgstr "切換最大化狀態"
-
-#: ../src/50-mutter-windows.xml.in.h:15
-msgid "Toggle shaded state"
-msgstr "切換視窗捲起/放下狀態"
-
-#: ../src/50-mutter-windows.xml.in.h:16
-msgid "Toggle window on all workspaces or one"
-msgstr "切換視窗顯示在所有工作區或是只顯示於其中之一"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "以逗號分隔的複合視窗外掛程式清單"
 

src/50-mutter-navigation.xml.in

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
-                group="system"
-                _name="Navigation"
-                wm_name="Mutter"
-                package="mutter">
-
-	<KeyListEntry name="move-to-workspace-1"
-	              _description="Move window to workspace 1" />
-
-	<KeyListEntry name="move-to-workspace-2"
-	              _description="Move window to workspace 2" />
-
-	<KeyListEntry name="move-to-workspace-3"
-	              _description="Move window to workspace 3" />
-
-	<KeyListEntry name="move-to-workspace-4"
-	              _description="Move window to workspace 4" />
-
-	<KeyListEntry name="move-to-workspace-left"
-	              _description="Move window one workspace to the left" />
-
-	<KeyListEntry name="move-to-workspace-right"
-	              _description="Move window one workspace to the right" />
-
-	<KeyListEntry name="move-to-workspace-up"
-	              _description="Move window one workspace up" />
-
-	<KeyListEntry name="move-to-workspace-down"
-	              _description="Move window one workspace down" />
-
-	<KeyListEntry name="switch-windows"
-	              _description="Switch applications"/>
-
-	<KeyListEntry name="switch-group"
-	              _description="Switch windows of an application"/>
-
-	<KeyListEntry name="switch-panels"
-	              _description="Switch system controls"/>
-
-	<KeyListEntry name="cycle-windows"
-	              _description="Switch windows directly"/>
-
-	<KeyListEntry name="cycle-group"
-	              _description="Switch windows of an app directly"/>
-
-	<KeyListEntry name="cycle-panels"
-	              _description="Switch system controls directly"/>
-
-	<KeyListEntry name="show-desktop"
-	              _description="Hide all normal windows"/>
-
-	<KeyListEntry name="switch-to-workspace-1"
-	              _description="Switch to workspace 1" />
-
-	<KeyListEntry name="switch-to-workspace-2"
-	              _description="Switch to workspace 2" />
-
-	<KeyListEntry name="switch-to-workspace-3"
-	              _description="Switch to workspace 3" />
-
-	<KeyListEntry name="switch-to-workspace-4"
-	              _description="Switch to workspace 4" />
-
-	<KeyListEntry name="switch-to-workspace-left"
-	              _description="Move to workspace left" />
-
-	<KeyListEntry name="switch-to-workspace-right"
-	              _description="Move to workspace right" />
-
-	<KeyListEntry name="switch-to-workspace-up"
-	              _description="Move to workspace above" />
-
-	<KeyListEntry name="switch-to-workspace-down"
-	              _description="Move to workspace below" />
-
-</KeyListEntries>

src/50-mutter-system.xml.in

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
-                group="system"
-                _name="System"
-                wm_name="Mutter"
-                package="mutter">
-
-	<KeyListEntry name="panel-run-dialog" _description="Show the run command prompt"/>
-
-	<KeyListEntry name="panel-main-menu" _description="Show the activities overview"/>
-
-</KeyListEntries>
-

src/50-mutter-windows.xml.in

@@ -1,49 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+<KeyListEntries schema="org.gnome.mutter.keybindings"
                 group="system"
                 _name="Windows"
                 wm_name="Mutter"
                 package="mutter">
 
-	<KeyListEntry name="activate-window-menu" _description="Activate the window menu"/>
-
-	<KeyListEntry name="toggle-fullscreen" _description="Toggle fullscreen mode"/>
-
-	<KeyListEntry name="toggle-maximized" _description="Toggle maximization state"/>
-
-	<KeyListEntry name="maximize" _description="Maximize window"/>
-
-	<KeyListEntry name="unmaximize" _description="Restore window"/>
-
-	<KeyListEntry name="toggle-shaded" _description="Toggle shaded state"/>
-
-	<KeyListEntry name="close" _description="Close window"/>
-
-	<KeyListEntry name="minimize" _description="Minimize window"/>
-
-	<KeyListEntry name="begin-move" _description="Move window"/>
-
-	<KeyListEntry name="begin-resize" _description="Resize window"/>
-
-	<KeyListEntry name="toggle-on-all-workspaces"
-	              _description="Toggle window on all workspaces or one"/>
-
-	<KeyListEntry name="raise-or-lower" _description="Raise window if covered, otherwise lower it"/>
-
-	<KeyListEntry name="raise" _description="Raise window above other windows"/>
-
-	<KeyListEntry name="lower" _description="Lower window below other windows"/>
-
-	<KeyListEntry name="maximize-vertically" _description="Maximize window vertically"/>
-
-	<KeyListEntry name="maximize-horizontally" _description="Maximize window horizontally"/>
-
 	<KeyListEntry name="toggle-tiled-left"
-                      schema="org.gnome.mutter.keybindings"
                       _description="View split on left"/>
 
 	<KeyListEntry name="toggle-tiled-right"
-                      schema="org.gnome.mutter.keybindings"
                       _description="View split on right"/>
 
 </KeyListEntries>

src/Makefile.am

@@ -75,6 +75,20 @@ libmutter_la_SOURCES =				\
 	core/constraints.h			\
 	core/core.c				\
 	core/delete.c				\
+	core/device.c				\
+	meta/device.h				\
+	core/device-keyboard.c			\
+	core/device-keyboard.h			\
+	core/device-pointer.c			\
+	core/device-pointer.h			\
+	core/device-private.h			\
+	core/device-map.c			\
+	meta/device-map.h			\
+	core/device-map-private.h		\
+	core/device-map-core.c			\
+	core/device-map-core.h			\
+	core/devices-core.c			\
+	core/devices-core.h			\
 	core/display.c				\
 	core/display-private.h			\
 	meta/display.h				\
@@ -97,6 +111,8 @@ libmutter_la_SOURCES =				\
 	meta/group.h				\
 	core/iconcache.c			\
 	core/iconcache.h			\
+	core/input-events.c			\
+	core/input-events.h			\
 	core/keybindings.c			\
 	core/keybindings-private.h		\
 	core/main.c				\
@@ -151,6 +167,14 @@ libmutter_la_SOURCES =				\
 	ui/preview-widget.c			\
 	$(mutter_built_sources)
 
+if HAVE_XINPUT2
+libmutter_la_SOURCES += 			\
+	core/device-map-xi2.c			\
+	core/device-map-xi2.h			\
+	core/devices-xi2.c			\
+	core/devices-xi2.h
+endif
+
 libmutter_la_LDFLAGS = -no-undefined
 libmutter_la_LIBADD  = $(MUTTER_LIBS)
 
@@ -161,6 +185,8 @@ libmutterinclude_base_headers =		\
 	meta/common.h				\
 	meta/compositor-mutter.h		\
 	meta/compositor.h			\
+	meta/device.h				\
+	meta/device-map.h			\
 	meta/display.h				\
 	meta/errors.h				\
 	meta/gradient.h				\
@@ -221,7 +247,7 @@ typelib_DATA = Meta-$(api_version).typelib
 INTROSPECTION_GIRS = Meta-$(api_version).gir
 
 Meta-$(api_version).gir: libmutter.la
-@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0 Cogl-1.0
+@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0
 @META_GIR@_EXPORT_PACKAGES = libmutter
 @META_GIR@_CFLAGS = $(INCLUDES)
 @META_GIR@_LIBS = libmutter.la
@@ -259,8 +285,6 @@ wmproperties_DATA = $(wmproperties_files)
 
 xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
 xml_in_files = \
-        50-mutter-navigation.xml.in	\
-        50-mutter-system.xml.in		\
         50-mutter-windows.xml.in
 xml_DATA     = $(xml_in_files:.xml.in=.xml)
 

src/compositor/compositor.c

@@ -18,6 +18,8 @@
 #include "meta-background-actor-private.h"
 #include "window-private.h" /* to check window->hidden */
 #include "display-private.h" /* for meta_display_lookup_x_window() */
+#include "core.h" /* for meta_core_select_events() */
+#include "input-events.h"
 #include <X11/extensions/shape.h>
 #include <X11/extensions/Xcomposite.h>
 
@@ -155,7 +157,6 @@ get_output_window (MetaScreen *screen)
   MetaDisplay *display = meta_screen_get_display (screen);
   Display     *xdisplay = meta_display_get_xdisplay (display);
   Window       output, xroot;
-  XWindowAttributes attr;
   long         event_mask;
 
   xroot = meta_screen_get_xroot (screen);
@@ -169,13 +170,7 @@ get_output_window (MetaScreen *screen)
                KeyPressMask | KeyReleaseMask;
 
   output = XCompositeGetOverlayWindow (xdisplay, xroot);
-
-  if (XGetWindowAttributes (xdisplay, output, &attr))
-      {
-        event_mask |= attr.your_event_mask;
-      }
-
-  XSelectInput (xdisplay, output, event_mask);
+  meta_core_select_events (xdisplay, output, event_mask, TRUE);
 
   return output;
 }
@@ -347,26 +342,34 @@ meta_begin_modal_for_plugin (MetaScreen       *screen,
    * merge the two.
    */
   MetaDisplay    *display    = meta_screen_get_display (screen);
-  Display        *xdpy       = meta_display_get_xdisplay (display);
   MetaCompositor *compositor = display->compositor;
   gboolean pointer_grabbed = FALSE;
   gboolean keyboard_grabbed = FALSE;
-  int result;
+  gboolean result;
+  MetaDevice     *device;
+  MetaGrabInfo   *grab_info;
 
-  if (compositor->modal_plugin != NULL || display->grab_op != META_GRAB_OP_NONE)
+  /* FIXME: need a real device here, and probably
+   * some exclusion mode for other devices */
+  device = meta_device_map_lookup (display->device_map,
+                                   META_CORE_POINTER_ID);
+
+  grab_info = meta_display_get_grab_info (display, device);
+
+  if (compositor->modal_plugin != NULL || grab_info != NULL)
     return FALSE;
 
   if ((options & META_MODAL_POINTER_ALREADY_GRABBED) == 0)
     {
-      result = XGrabPointer (xdpy, grab_window,
-                             False, /* owner_events */
-                             (ButtonPressMask | ButtonReleaseMask |
-                              EnterWindowMask | LeaveWindowMask | PointerMotionMask),
-                             GrabModeAsync, GrabModeAsync,
-                             None, /* confine to */
-                             cursor,
-                             timestamp);
-      if (result != Success)
+      result = meta_device_grab (device,
+                                 grab_window,
+                                 (ButtonPressMask | ButtonReleaseMask |
+                                  EnterWindowMask | LeaveWindowMask | PointerMotionMask),
+                                 cursor,
+                                 FALSE,
+                                 FALSE,
+                                 timestamp);
+      if (!result)
         goto fail;
 
       pointer_grabbed = TRUE;
@@ -374,22 +377,25 @@ meta_begin_modal_for_plugin (MetaScreen       *screen,
 
   if ((options & META_MODAL_KEYBOARD_ALREADY_GRABBED) == 0)
     {
-      result = XGrabKeyboard (xdpy, grab_window,
-                              False, /* owner_events */
-                              GrabModeAsync, GrabModeAsync,
-                              timestamp);
-
-      if (result != Success)
+      result = meta_device_grab (meta_device_get_paired_device (device),
+                                 grab_window,
+                                 (KeyPressMask | KeyReleaseMask),
+                                 META_CURSOR_DEFAULT,
+                                 FALSE, FALSE,
+                                 timestamp);
+      if (!result)
         goto fail;
 
       keyboard_grabbed = TRUE;
     }
 
-  display->grab_op = META_GRAB_OP_COMPOSITOR;
-  display->grab_window = NULL;
-  display->grab_screen = screen;
-  display->grab_have_pointer = TRUE;
-  display->grab_have_keyboard = TRUE;
+  grab_info = meta_display_create_grab_info (display, device);
+
+  grab_info->grab_op = META_GRAB_OP_COMPOSITOR;
+  grab_info->grab_window = NULL;
+  grab_info->grab_screen = screen;
+  grab_info->grab_have_pointer = TRUE;
+  grab_info->grab_have_keyboard = TRUE;
 
   compositor->modal_plugin = plugin;
 
@@ -397,9 +403,9 @@ meta_begin_modal_for_plugin (MetaScreen       *screen,
 
  fail:
   if (pointer_grabbed)
-    XUngrabPointer (xdpy, timestamp);
+    meta_device_ungrab (device, timestamp);
   if (keyboard_grabbed)
-    XUngrabKeyboard (xdpy, timestamp);
+    meta_device_ungrab (meta_device_get_paired_device (device), timestamp);
 
   return FALSE;
 }
@@ -410,20 +416,19 @@ meta_end_modal_for_plugin (MetaScreen     *screen,
                            guint32         timestamp)
 {
   MetaDisplay    *display    = meta_screen_get_display (screen);
-  Display        *xdpy = meta_display_get_xdisplay (display);
   MetaCompositor *compositor = display->compositor;
+  MetaDevice     *device;
 
   g_return_if_fail (compositor->modal_plugin == plugin);
 
-  XUngrabPointer (xdpy, timestamp);
-  XUngrabKeyboard (xdpy, timestamp);
+  /* FIXME: need a real device here */
+  device = meta_device_map_lookup (display->device_map,
+                                   META_CORE_POINTER_ID);
 
-  display->grab_op = META_GRAB_OP_NONE;
-  display->grab_window = NULL;
-  display->grab_screen = NULL;
-  display->grab_have_pointer = FALSE;
-  display->grab_have_keyboard = FALSE;
+  meta_device_ungrab (device, timestamp);
+  meta_device_ungrab (meta_device_get_paired_device (device), timestamp);
 
+  meta_display_remove_grab_info (display, device);
   compositor->modal_plugin = NULL;
 }
 
@@ -456,7 +461,6 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   Window          xroot         = meta_screen_get_xroot (screen);
   Window          xwin;
   gint            width, height;
-  XWindowAttributes attr;
   long            event_mask;
   guint           n_retries;
   guint           max_retries;
@@ -533,12 +537,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
                KeyPressMask | KeyReleaseMask |
                StructureNotifyMask;
 
-  if (XGetWindowAttributes (xdisplay, xwin, &attr))
-      {
-        event_mask |= attr.your_event_mask;
-      }
-
-  XSelectInput (xdisplay, xwin, event_mask);
+  meta_core_select_events (xdisplay, xwin, event_mask, TRUE);
 
   info->window_group = meta_window_group_new (screen);
   info->background_actor = meta_background_actor_new_for_screen (screen);
@@ -695,9 +694,15 @@ meta_compositor_set_updates (MetaCompositor *compositor,
 }
 
 static gboolean
-is_grabbed_event (XEvent *event)
+is_grabbed_event (MetaDisplay *display,
+                  XEvent      *event)
 {
-  switch (event->xany.type)
+  guint evtype;
+
+  if (!meta_input_event_get_type (display, event, &evtype))
+    return FALSE;
+
+  switch (evtype)
     {
     case ButtonPress:
     case ButtonRelease:
@@ -730,7 +735,8 @@ meta_compositor_process_event (MetaCompositor *compositor,
                                XEvent         *event,
                                MetaWindow     *window)
 {
-  if (compositor->modal_plugin && is_grabbed_event (event))
+  if (compositor->modal_plugin &&
+      is_grabbed_event (compositor->display, event))
     {
       MetaPluginClass *klass = META_PLUGIN_GET_CLASS (compositor->modal_plugin);
 
@@ -815,19 +821,6 @@ meta_compositor_process_event (MetaCompositor *compositor,
   return FALSE;
 }
 
-gboolean
-meta_compositor_filter_keybinding (MetaCompositor *compositor,
-                                   MetaScreen     *screen,
-                                   MetaKeyBinding *binding)
-{
-  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-
-  if (info->plugin_mgr)
-    return meta_plugin_manager_filter_keybinding (info->plugin_mgr, binding);
-
-  return FALSE;
-}
-
 void
 meta_compositor_show_window (MetaCompositor *compositor,
 			     MetaWindow	    *window,

src/compositor/meta-background-actor.c

@@ -55,7 +55,7 @@ struct _MetaScreenBackground
 
   float texture_width;
   float texture_height;
-  CoglTexture *texture;
+  CoglHandle texture;
   CoglMaterialWrapMode wrap_mode;
   guint have_pixmap : 1;
 };
@@ -63,8 +63,7 @@ struct _MetaScreenBackground
 struct _MetaBackgroundActorPrivate
 {
   MetaScreenBackground *background;
-  CoglPipeline *pipeline;
-
+  CoglHandle material;
   cairo_region_t *visible_region;
   float dim_factor;
 };
@@ -141,7 +140,7 @@ update_wrap_mode_of_actor (MetaBackgroundActor *self)
 {
   MetaBackgroundActorPrivate *priv = self->priv;
 
-  cogl_pipeline_set_layer_wrap_mode (priv->pipeline, 0, priv->background->wrap_mode);
+  cogl_material_set_layer_wrap_mode (priv->material, 0, priv->background->wrap_mode);
 }
 
 static void
@@ -175,7 +174,7 @@ set_texture_on_actor (MetaBackgroundActor *self)
    * the underlying X pixmap is already gone has the tendency to trigger
    * X errors inside DRI. For safety, trap errors */
   meta_error_trap_push (display);
-  cogl_pipeline_set_layer_texture (priv->pipeline, 0, priv->background->texture);
+  cogl_material_set_layer (priv->material, 0, priv->background->texture);
   meta_error_trap_pop (display);
 
   clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
@@ -211,7 +210,7 @@ set_texture (MetaScreenBackground *background,
   update_wrap_mode (background);
 }
 
-/* Sets our pipeline to paint with a 1x1 texture of the stage's background
+/* Sets our material to paint with a 1x1 texture of the stage's background
  * color; doing this when we have no pixmap allows the application to turn
  * off painting the stage. There might be a performance benefit to
  * painting in this case with a solid color, but the normal solid color
@@ -251,7 +250,11 @@ meta_background_actor_dispose (GObject *object)
       priv->background = NULL;
     }
 
-  g_clear_pointer(&priv->pipeline, cogl_object_unref);
+  if (priv->material != COGL_INVALID_HANDLE)
+    {
+      cogl_handle_unref (priv->material);
+      priv->material = COGL_INVALID_HANDLE;
+    }
 
   G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
 }
@@ -306,13 +309,13 @@ meta_background_actor_paint (ClutterActor *actor)
 
   color_component = (int)(0.5 + opacity * priv->dim_factor);
 
-  cogl_pipeline_set_color4ub (priv->pipeline,
+  cogl_material_set_color4ub (priv->material,
                               color_component,
                               color_component,
                               color_component,
                               opacity);
 
-  cogl_set_source (priv->pipeline);
+  cogl_set_source (priv->material);
 
   if (priv->visible_region)
     {
@@ -480,8 +483,7 @@ meta_background_actor_new_for_screen (MetaScreen *screen)
   priv->background = meta_screen_background_get (screen);
   priv->background->actors = g_slist_prepend (priv->background->actors, self);
 
-  /* A CoglMaterial and a CoglPipeline are the same thing */
-  priv->pipeline = (CoglPipeline*) meta_create_texture_material (NULL);
+  priv->material = meta_create_texture_material (NULL);
 
   set_texture_on_actor (self);
   update_wrap_mode_of_actor (self);
@@ -623,83 +625,3 @@ meta_background_actor_screen_size_changed (MetaScreen *screen)
   for (l = background->actors; l; l = l->next)
     clutter_actor_queue_relayout (l->data);
 }
-
-/**
- * meta_background_actor_add_glsl_snippet:
- * @actor: a #MetaBackgroundActor
- * @hook: where to insert the code
- * @declarations: GLSL declarations
- * @code: GLSL code
- * @is_replace: wheter Cogl code should be replaced by the custom shader
- *
- * Adds a GLSL snippet to the pipeline used for drawing the background.
- * See #CoglSnippet for details.
- */
-void
-meta_background_actor_add_glsl_snippet (MetaBackgroundActor *actor,
-                                        MetaSnippetHook      hook,
-                                        const char          *declarations,
-                                        const char          *code,
-                                        gboolean             is_replace)
-{
-  MetaBackgroundActorPrivate *priv;
-  CoglSnippet *snippet;
-
-  g_return_if_fail (META_IS_BACKGROUND_ACTOR (actor));
-
-  priv = actor->priv;
-
-  if (is_replace)
-    {
-      snippet = cogl_snippet_new (hook, declarations, NULL);
-      cogl_snippet_set_replace (snippet, code);
-    }
-  else
-    {
-      snippet = cogl_snippet_new (hook, declarations, code);
-    }
-
-  if (hook == META_SNIPPET_HOOK_VERTEX ||
-      hook == META_SNIPPET_HOOK_FRAGMENT)
-    cogl_pipeline_add_snippet (priv->pipeline, snippet);
-  else
-    cogl_pipeline_add_layer_snippet (priv->pipeline, 0, snippet);
-
-  cogl_object_unref (snippet);
-}
-
-/**
- * meta_background_actor_set_uniform_float:
- * @actor: a #MetaBackgroundActor
- * @uniform_name:
- * @n_components: number of components (for vector uniforms)
- * @count: number of uniforms (for array uniforms)
- * @uniform: (array length=uniform_length): the float values to set
- * @uniform_length: the length of @uniform. Must be exactly @n_components x @count,
- *                  and is provided mainly for language bindings.
- *
- * Sets a new GLSL uniform to the provided value. This is mostly
- * useful in congiunction with meta_background_actor_add_glsl_snippet().
- */
-
-void
-meta_background_actor_set_uniform_float (MetaBackgroundActor *actor,
-                                         const char          *uniform_name,
-                                         int                  n_components,
-                                         int                  count,
-                                         const float         *uniform,
-                                         int                  uniform_length)
-{
-  MetaBackgroundActorPrivate *priv;
-
-  g_return_if_fail (META_IS_BACKGROUND_ACTOR (actor));
-  g_return_if_fail (uniform_length == n_components * count);
-
-  priv = actor->priv;
-
-  cogl_pipeline_set_uniform_float (priv->pipeline,
-                                   cogl_pipeline_get_uniform_location (priv->pipeline,
-                                                                       uniform_name),
-                                   n_components, count, uniform);
-}
-

src/compositor/meta-plugin-manager.c

@@ -281,19 +281,6 @@ meta_plugin_manager_switch_workspace (MetaPluginManager   *plugin_mgr,
   return retval;
 }
 
-gboolean
-meta_plugin_manager_filter_keybinding (MetaPluginManager *plugin_mgr,
-                                       MetaKeyBinding    *binding)
-{
-  MetaPlugin *plugin = plugin_mgr->plugin;
-  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
-
-  if (klass->keybinding_filter)
-    return klass->keybinding_filter (plugin, binding);
-
-  return FALSE;
-}
-
 /*
  * The public method that the compositor hooks into for desktop switching.
  *

src/compositor/meta-plugin-manager.h

@@ -67,9 +67,6 @@ gboolean meta_plugin_manager_switch_workspace (MetaPluginManager   *mgr,
                                                gint                 to,
                                                MetaMotionDirection  direction);
 
-gboolean meta_plugin_manager_filter_keybinding (MetaPluginManager  *mgr,
-                                                MetaKeyBinding     *binding);
-
 gboolean meta_plugin_manager_xevent_filter (MetaPluginManager *mgr,
                                             XEvent            *xev);
 

src/core/bell.c

@@ -239,6 +239,35 @@ bell_flash_window_frame (MetaWindow *window)
       bell_unflash_frame, window->frame, NULL);
 }
 
+static MetaWindow *
+get_flash_window (MetaDisplay *display,
+                  XkbAnyEvent *xkb_ev)
+{
+  XkbBellNotifyEvent *xkb_bell_event;
+  MetaWindow *window;
+
+  g_assert (xkb_ev->xkb_type == XkbBellNotify);
+
+  xkb_bell_event = (XkbBellNotifyEvent *) xkb_ev;
+  window = meta_display_lookup_x_window (display, xkb_bell_event->window);
+
+  if (!window &&
+      g_hash_table_size (display->focus_info) == 1)
+    {
+      GHashTableIter iter;
+      MetaFocusInfo *info;
+
+      /* If there is only one focused window, use it */
+      g_hash_table_iter_init (&iter, display->focus_info);
+
+      if (g_hash_table_iter_next (&iter, NULL, (gpointer *) &info) &&
+          info->focus_window && info->focus_window->frame)
+        window = info->focus_window;
+    }
+
+  return window;
+}
+
 /**
  * bell_flash_frame:
  * @display:  The display the bell event came in on
@@ -251,15 +280,11 @@ static void
 bell_flash_frame (MetaDisplay *display, 
 		  XkbAnyEvent *xkb_ev)
 {
-  XkbBellNotifyEvent *xkb_bell_event = (XkbBellNotifyEvent *) xkb_ev;
   MetaWindow *window;
   
   g_assert (xkb_ev->xkb_type == XkbBellNotify);
-  window = meta_display_lookup_x_window (display, xkb_bell_event->window);
-  if (!window && (display->focus_window))
-    {
-      window = display->focus_window;
-    }
+  window = get_flash_window (display, xkb_ev);
+
   if (window && window->frame)
     {
       bell_flash_window_frame (window);
@@ -320,9 +345,7 @@ meta_bell_notify (MetaDisplay *display,
       ca_proplist_sets (p, CA_PROP_EVENT_DESCRIPTION, _("Bell event"));
       ca_proplist_sets (p, CA_PROP_CANBERRA_CACHE_CONTROL, "permanent");
 
-      window = meta_display_lookup_x_window (display, xkb_bell_event->window);
-      if (!window && (display->focus_window) && (display->focus_window->frame))
-        window = display->focus_window;
+      window = get_flash_window (display, xkb_ev);
 
       if (window)
         {

src/core/constraints.c

@@ -1365,15 +1365,18 @@ constrain_titlebar_visible (MetaWindow         *window,
   int bottom_amount;
   int horiz_amount_offscreen, vert_amount_offscreen;
   int horiz_amount_onscreen,  vert_amount_onscreen;
+  MetaGrabInfo *grab_info;
 
   if (priority > PRIORITY_TITLEBAR_VISIBLE)
     return TRUE;
 
+  grab_info = window->cur_grab;
+
   /* Allow the titlebar beyond the top of the screen only if the user wasn't
    * clicking on the frame to start the move.
    */
   unconstrained_user_action =
-    info->is_user_action && !window->display->grab_frame_action;
+    info->is_user_action && (!grab_info || !grab_info->grab_frame_action);
 
   /* Exit early if we know the constraint won't apply--note that this constraint
    * is only meant for normal windows (e.g. we don't want docks to be shoved 

src/core/core.c

@@ -27,9 +27,15 @@
 #include "core.h"
 #include "frame.h"
 #include "workspace-private.h"
+#include "input-events.h"
 #include <meta/prefs.h>
 #include <meta/errors.h>
 
+#ifdef HAVE_XINPUT2
+#include <X11/extensions/XInput2.h>
+#include "devices-xi2.h"
+#endif
+
 /* Looks up the MetaWindow representing the frame of the given X window.
  * Used as a helper function by a bunch of the functions below.
  *
@@ -245,9 +251,19 @@ lower_window_and_transients (MetaWindow *window,
 void
 meta_core_user_lower_and_unfocus (Display *xdisplay,
                                   Window   frame_xwindow,
+                                  int      device_id,
                                   guint32  timestamp)
 {
   MetaWindow *window = get_window (xdisplay, frame_xwindow);
+  MetaDevice *pointer;
+
+  pointer = meta_device_map_lookup (window->display->device_map, device_id);
+
+  if (pointer == NULL)
+    return;
+
+  if (!META_IS_DEVICE_POINTER (pointer))
+    pointer = meta_device_get_paired_device (pointer);
 
   lower_window_and_transients (window, NULL);
 
@@ -256,6 +272,7 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
   * this will be invoked via keyboard action or by a mouse action;
   * in either case the window or a modal child will have been focused.) */
   meta_workspace_focus_default_window (window->screen->active_workspace,
+                                       pointer,
                                        NULL,
                                        timestamp);
 }
@@ -263,16 +280,21 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
 void
 meta_core_lower_beneath_grab_window (Display *xdisplay,
                                      Window   xwindow,
+                                     int      device_id,
                                      guint32  timestamp)
 {
   XWindowChanges changes;
   MetaDisplay *display;
   MetaScreen *screen;
   MetaWindow *grab_window;
+  MetaDevice *pointer;
+  MetaGrabInfo *grab_info;
 
   display = meta_display_for_x_display (xdisplay);
   screen = meta_display_screen_for_xwindow (display, xwindow);
-  grab_window = display->grab_window;
+  pointer = meta_device_map_lookup (display->device_map, device_id);
+  grab_info = meta_display_get_grab_info (display, pointer);
+  grab_window = grab_info->grab_window;
 
   if (grab_window == NULL)
     return;
@@ -491,18 +513,27 @@ meta_core_get_active_workspace (Screen *xscreen)
 void
 meta_core_show_window_menu (Display *xdisplay,
                             Window   frame_xwindow,
+                            int      device_id,
                             int      root_x,
                             int      root_y,
                             int      button,
                             guint32  timestamp)
 {
   MetaWindow *window = get_window (xdisplay, frame_xwindow);
-  
+  MetaDevice *device;
+
+  /* There is already a menu popped up,
+   * most likely from another device
+   */
+  if (window->menu)
+    return;
+
   if (meta_prefs_get_raise_on_click ())
     meta_window_raise (window);
   meta_window_focus (window, timestamp);
 
-  meta_window_show_menu (window, root_x, root_y, button, timestamp);
+  device = meta_device_map_lookup (window->display->device_map, device_id);
+  meta_window_show_menu (window, device, root_x, root_y, button, timestamp);
 }
 
 void
@@ -638,6 +669,7 @@ meta_core_get_workspace_name_with_index (Display *xdisplay,
 gboolean
 meta_core_begin_grab_op (Display    *xdisplay,
                          Window      frame_xwindow,
+                         int         device_id,
                          MetaGrabOp  op,
                          gboolean    pointer_already_grabbed,
                          gboolean    frame_action,
@@ -650,13 +682,16 @@ meta_core_begin_grab_op (Display    *xdisplay,
   MetaWindow *window = get_window (xdisplay, frame_xwindow);
   MetaDisplay *display;
   MetaScreen *screen;
-  
+  MetaDevice *device;
+
   display = meta_display_for_x_display (xdisplay);
   screen = meta_display_screen_for_xwindow (display, frame_xwindow);
 
   g_assert (screen != NULL);
-  
-  return meta_display_begin_grab_op (display, screen, window,
+
+  device = meta_device_map_lookup (display->device_map, device_id);
+
+  return meta_display_begin_grab_op (display, screen, window, device,
                                      op, pointer_already_grabbed,
                                      frame_action,
                                      button, modmask,
@@ -665,57 +700,58 @@ meta_core_begin_grab_op (Display    *xdisplay,
 
 void
 meta_core_end_grab_op (Display *xdisplay,
+                       int      device_id,
                        guint32  timestamp)
 {
   MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
+  MetaDevice *device;
 
-  meta_display_end_grab_op (display, timestamp);
+  display = meta_display_for_x_display (xdisplay);
+  device = meta_device_map_lookup (display->device_map, device_id);
+
+  meta_display_end_grab_op (display, device, timestamp);
 }
 
 MetaGrabOp
-meta_core_get_grab_op (Display *xdisplay)
+meta_core_frame_has_grab (Display    *xdisplay,
+                          Window      frame_xwindow,
+                          gint       *device_id,
+                          gint       *button_ret)
 {
-  MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
+  MetaWindow *window;
 
-  return display->grab_op;
+  window = get_window (xdisplay, frame_xwindow);
+
+  if (window != NULL &&
+      window->cur_grab != NULL)
+    {
+      if (button_ret)
+        *button_ret = window->cur_grab->grab_button;
+
+      if (device_id)
+        *device_id = meta_device_get_id (window->cur_grab->grab_pointer);
+
+      return window->cur_grab->grab_op;
+    }
+
+  return META_GRAB_OP_NONE;
 }
 
 Window
-meta_core_get_grab_frame (Display *xdisplay)
+meta_core_get_frame (Display *xdisplay,
+                     Window   client_xwindow)
 {
   MetaDisplay *display;
-  
+  MetaWindow *window;
+
   display = meta_display_for_x_display (xdisplay);
+  window = meta_display_lookup_x_window (display, client_xwindow);
 
-  g_assert (display != NULL);
-  g_assert (display->grab_op == META_GRAB_OP_NONE || 
-            display->grab_screen != NULL);
-  g_assert (display->grab_op == META_GRAB_OP_NONE ||
-            display->grab_screen->display->xdisplay == xdisplay);
-  
-  if (display->grab_op != META_GRAB_OP_NONE &&
-      display->grab_window &&
-      display->grab_window->frame)
-    return display->grab_window->frame->xwindow;
-  else
-    return None;
-}
+  if (window &&
+      window->frame)
+    return window->frame->xwindow;
 
-int
-meta_core_get_grab_button (Display  *xdisplay)
-{
-  MetaDisplay *display;
-  
-  display = meta_display_for_x_display (xdisplay);
-
-  if (display->grab_op == META_GRAB_OP_NONE)
-    return -1;
-  
-  return display->grab_button;
+  return None;
 }
 
 void
@@ -731,13 +767,24 @@ meta_core_grab_buttons  (Display *xdisplay,
 }
 
 void
-meta_core_set_screen_cursor (Display *xdisplay,
-                             Window   frame_on_screen,
-                             MetaCursor cursor)
+meta_core_set_screen_cursor (Display    *xdisplay,
+                             Window      frame_on_screen,
+                             gint        device_id,
+                             MetaCursor  cursor)
 {
   MetaWindow *window = get_window (xdisplay, frame_on_screen);
+  MetaDevice *pointer;
 
-  meta_frame_set_screen_cursor (window->frame, cursor);
+  pointer = meta_device_map_lookup (window->display->device_map,
+                                    device_id);
+
+  if (pointer == NULL)
+    return;
+
+  if (!META_IS_DEVICE_POINTER (pointer))
+    pointer = meta_device_get_paired_device (pointer);
+
+  meta_frame_set_screen_cursor (window->frame, pointer, cursor);
 }
 
 void
@@ -775,3 +822,70 @@ meta_invalidate_default_icons (void)
   g_slist_free (windows);
 }
 
+/* Selects events on an xwindow, using XInput2 if available/in use,
+ * this function doesn't require the xwindow to have a backing
+ * MetaWindow.
+ */
+void
+meta_core_select_events (Display  *xdisplay,
+                         Window    xwindow,
+                         gint      evmask,
+                         gboolean  preserve_old_mask)
+{
+  MetaDisplay *display;
+
+  display = meta_display_for_x_display (xdisplay);
+
+#ifdef HAVE_XINPUT2
+  if (display->have_xinput2)
+    {
+      XIEventMask mask;
+
+      mask.deviceid = XIAllMasterDevices;
+      mask.mask = meta_device_xi2_translate_event_mask (evmask,
+                                                        &mask.mask_len);
+
+      if (preserve_old_mask)
+        {
+          XIEventMask *prev;
+          gint n_masks, i, j;
+
+          prev = XIGetSelectedEvents (xdisplay, xwindow, &n_masks);
+
+          for (i = 0; i < n_masks; i++)
+            {
+              if (prev[i].deviceid != XIAllMasterDevices)
+                continue;
+
+              for (j = 0; j < MIN (mask.mask_len, prev[i].mask_len); j++)
+                mask.mask[j] |= prev[i].mask[j];
+            }
+
+          XFree (prev);
+        }
+
+      XISelectEvents (xdisplay, xwindow, &mask, 1);
+
+      /* Unset any input event so they are only handled via XInput2 */
+      evmask &= ~(META_INPUT_TOUCH_EVENTS_MASK |
+                  KeyPressMask | KeyReleaseMask |
+                  ButtonPressMask | ButtonReleaseMask |
+                  EnterWindowMask | LeaveWindowMask |
+                  PointerMotionMask | PointerMotionHintMask |
+                  Button1MotionMask | Button2MotionMask |
+                  Button3MotionMask | Button4MotionMask |
+                  Button5MotionMask | ButtonMotionMask |
+                  FocusChangeMask);
+    }
+#endif
+
+  if (preserve_old_mask)
+    {
+      XWindowAttributes attr;
+
+      if (XGetWindowAttributes (xdisplay, xwindow, &attr))
+        evmask |= attr.your_event_mask;
+    }
+
+  XSelectInput (xdisplay, xwindow, evmask);
+}

src/core/core.h

@@ -110,6 +110,7 @@ void meta_core_user_raise   (Display *xdisplay,
                              Window   frame_xwindow);
 void meta_core_user_lower_and_unfocus (Display *xdisplay,
                                        Window   frame_xwindow,
+                                       int      device_id,
                                        guint32  timestamp);
 
 void meta_core_user_focus   (Display *xdisplay,
@@ -118,6 +119,7 @@ void meta_core_user_focus   (Display *xdisplay,
 
 void meta_core_lower_beneath_grab_window (Display *xdisplay,
                                           Window   xwindow,
+                                          int      device_id,
                                           guint32  timestamp);
 
 void meta_core_minimize         (Display *xdisplay,
@@ -163,6 +165,7 @@ const char* meta_core_get_workspace_name_with_index (Display *xdisplay,
 
 void meta_core_show_window_menu (Display *xdisplay,
                                  Window   frame_xwindow,
+                                 int      device_id,
                                  int      root_x,
                                  int      root_y,
                                  int      button,
@@ -175,6 +178,7 @@ void meta_core_get_menu_accelerator (MetaMenuOp           menu_op,
 
 gboolean   meta_core_begin_grab_op (Display    *xdisplay,
                                     Window      frame_xwindow,
+                                    int         device_id,
                                     MetaGrabOp  op,
                                     gboolean    pointer_already_grabbed,
                                     gboolean    frame_action,
@@ -184,18 +188,29 @@ gboolean   meta_core_begin_grab_op (Display    *xdisplay,
                                     int         root_x,
                                     int         root_y);
 void       meta_core_end_grab_op   (Display    *xdisplay,
+                                    int         device_id,
                                     guint32     timestamp);
-MetaGrabOp meta_core_get_grab_op     (Display    *xdisplay);
-Window     meta_core_get_grab_frame  (Display   *xdisplay);
-int        meta_core_get_grab_button (Display  *xdisplay);
 
+MetaGrabOp meta_core_frame_has_grab  (Display    *xdisplay,
+                                      Window      frame_xwindow,
+                                      gint       *device_id,
+                                      gint       *button_ret);
+Window     meta_core_get_frame       (Display    *xdisplay,
+                                      Window      client_xwindow);
 
 void       meta_core_grab_buttons  (Display *xdisplay,
                                     Window   frame_xwindow);
 
-void       meta_core_set_screen_cursor (Display *xdisplay,
-                                        Window   frame_on_screen,
-                                        MetaCursor cursor);
+void       meta_core_set_screen_cursor (Display    *xdisplay,
+                                        Window      frame_on_screen,
+                                        int         device_id,
+                                        MetaCursor  cursor);
+
+void       meta_core_select_events     (Display  *xdisplay,
+                                        Window    xwindow,
+                                        gint      evmask,
+                                        gboolean  preserve_old_mask);
+
 
 /* Used because we ignore EnterNotify when a window is unmapped that
  * really shouldn't cause focus changes, by comparing the event serial

src/core/device-keyboard.c

@@ -0,0 +1,69 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Keyboard device abstraction */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+#include "device-keyboard.h"
+
+G_DEFINE_ABSTRACT_TYPE (MetaDeviceKeyboard,
+                        meta_device_keyboard,
+                        META_TYPE_DEVICE)
+
+static void
+meta_device_keyboard_class_init (MetaDeviceKeyboardClass *klass)
+{
+}
+
+static void
+meta_device_keyboard_init (MetaDeviceKeyboard *keyboard)
+{
+}
+
+Window
+meta_device_keyboard_get_focus_window (MetaDeviceKeyboard *keyboard)
+{
+  MetaDeviceKeyboardClass *klass;
+
+  g_return_val_if_fail (META_IS_DEVICE_KEYBOARD (keyboard), None);
+
+  klass = META_DEVICE_KEYBOARD_GET_CLASS (keyboard);
+
+  if (!klass->get_focus_window)
+    return None;
+
+  return (klass->get_focus_window) (keyboard);
+}
+
+void
+meta_device_keyboard_set_focus_window (MetaDeviceKeyboard *keyboard,
+                                       Window              xwindow,
+                                       Time                timestamp)
+{
+  MetaDeviceKeyboardClass *klass;
+
+  g_return_if_fail (META_IS_DEVICE_KEYBOARD (keyboard));
+
+  klass = META_DEVICE_KEYBOARD_GET_CLASS (keyboard);
+
+  if (klass->set_focus_window)
+    (klass->set_focus_window) (keyboard, xwindow, timestamp);
+}

src/core/device-keyboard.h

@@ -0,0 +1,69 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file device-keyboard.h  Keyboard device abstraction
+ *
+ * Input devices.
+ * This file contains the internal abstraction of keyboard devices so
+ * XInput2/core events can be handled similarly.
+ */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_DEVICE_KEYBOARD_H
+#define META_DEVICE_KEYBOARD_H
+
+#include "display-private.h"
+#include "device-private.h"
+
+#define META_TYPE_DEVICE_KEYBOARD            (meta_device_keyboard_get_type ())
+#define META_DEVICE_KEYBOARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_DEVICE_KEYBOARD, MetaDeviceKeyboard))
+#define META_DEVICE_KEYBOARD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_DEVICE_KEYBOARD, MetaDeviceKeyboardClass))
+#define META_IS_DEVICE_KEYBOARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_DEVICE_KEYBOARD))
+#define META_IS_DEVICE_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_DEVICE_KEYBOARD))
+#define META_DEVICE_KEYBOARD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_DEVICE_KEYBOARD, MetaDeviceKeyboardClass))
+
+typedef struct _MetaDeviceKeyboard MetaDeviceKeyboard;
+typedef struct _MetaDeviceKeyboardClass MetaDeviceKeyboardClass;
+
+struct _MetaDeviceKeyboard
+{
+  MetaDevice parent_instance;
+};
+
+struct _MetaDeviceKeyboardClass
+{
+  MetaDeviceClass parent_instance;
+
+  Window (* get_focus_window) (MetaDeviceKeyboard *keyboard);
+  void   (* set_focus_window) (MetaDeviceKeyboard *keyboard,
+                               Window              xwindow,
+                               Time                timestamp);
+};
+
+GType    meta_device_keyboard_get_type   (void) G_GNUC_CONST;
+
+Window   meta_device_keyboard_get_focus_window (MetaDeviceKeyboard *keyboard);
+void     meta_device_keyboard_set_focus_window (MetaDeviceKeyboard *keyboard,
+                                                Window              xwindow,
+                                                Time                timestamp);
+
+
+#endif /* META_DEVICE_KEYBOARD_H */

src/core/device-map-core.c

@@ -0,0 +1,134 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Input device map, core protocol implementation */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "config.h"
+#include "device-map-core.h"
+#include "devices-core.h"
+
+G_DEFINE_TYPE (MetaDeviceMapCore, meta_device_map_core, META_TYPE_DEVICE_MAP)
+
+static gboolean
+meta_device_map_core_grab_key (MetaDeviceMap *device_map,
+                               Window         xwindow,
+                               guint          keycode,
+                               guint          modifiers,
+                               gboolean       sync)
+{
+  MetaDisplay *display;
+  gint retval;
+
+  display = meta_device_map_get_display (device_map);
+  retval = XGrabKey (display->xdisplay, keycode, modifiers,
+                     xwindow, True,
+                     GrabModeAsync, /* Never care about the other device */
+                     (sync) ? GrabModeSync : GrabModeAsync);
+
+  return (retval == Success);
+}
+
+static void
+meta_device_map_core_ungrab_key (MetaDeviceMap *device_map,
+                                 Window         xwindow,
+                                 guint          keycode,
+                                 guint          modifiers)
+{
+  MetaDisplay *display;
+
+  display = meta_device_map_get_display (device_map);
+  XUngrabKey (display->xdisplay, keycode, modifiers, xwindow);
+}
+
+static gboolean
+meta_device_map_core_grab_button (MetaDeviceMap *device_map,
+                                  Window         xwindow,
+                                  guint          n_button,
+                                  guint          modifiers,
+                                  guint          evmask,
+                                  gboolean       sync)
+{
+  MetaDisplay *display;
+  gint retval;
+
+  display = meta_device_map_get_display (device_map);
+  retval = XGrabButton (display->xdisplay, n_button,
+                        modifiers, xwindow, False,
+                        evmask,
+                        (sync) ? GrabModeSync : GrabModeAsync,
+                        GrabModeAsync, /* Never care about the other device */
+                        None, None);
+
+  return (retval == Success);
+}
+
+static void
+meta_device_map_core_ungrab_button (MetaDeviceMap *device_map,
+                                    Window         xwindow,
+                                    guint          n_button,
+                                    guint          modifiers)
+{
+  MetaDisplay *display;
+
+  display = meta_device_map_get_display (device_map);
+  XUngrabButton (display->xdisplay, n_button, modifiers, xwindow);
+}
+
+static void
+meta_device_map_core_constructed (GObject *object)
+{
+  MetaDeviceMap *device_map = META_DEVICE_MAP (object);
+  MetaDevice *pointer, *keyboard;
+  MetaDisplay *display;
+
+  display = meta_device_map_get_display (device_map);
+
+  /* Insert core devices */
+  pointer = meta_device_pointer_core_new (display);
+  meta_device_map_add_device (device_map, pointer);
+
+  keyboard = meta_device_keyboard_core_new (display);
+  meta_device_map_add_device (device_map, keyboard);
+
+  meta_device_pair_devices (pointer, keyboard);
+
+  g_object_unref (pointer);
+  g_object_unref (keyboard);
+}
+
+static void
+meta_device_map_core_class_init (MetaDeviceMapCoreClass *klass)
+{
+  MetaDeviceMapClass *device_map_class = META_DEVICE_MAP_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed = meta_device_map_core_constructed;
+
+  device_map_class->grab_key = meta_device_map_core_grab_key;
+  device_map_class->ungrab_key = meta_device_map_core_ungrab_key;
+  device_map_class->grab_button = meta_device_map_core_grab_button;
+  device_map_class->ungrab_button = meta_device_map_core_ungrab_button;
+}
+
+static void
+meta_device_map_core_init (MetaDeviceMapCore *device_map)
+{
+}

src/core/device-map-core.h

@@ -0,0 +1,56 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file device-map-core.h  device map for core devices
+ *
+ * Input devices.
+ * This file contains the core protocol implementation of the device map
+ */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_DEVICE_MAP_CORE_H
+#define META_DEVICE_MAP_CORE_H
+
+typedef struct _MetaDeviceMapCore MetaDeviceMapCore;
+typedef struct _MetaDeviceMapCoreClass MetaDeviceMapCoreClass;
+
+#include "device-map-private.h"
+
+#define META_TYPE_DEVICE_MAP_CORE            (meta_device_map_core_get_type ())
+#define META_DEVICE_MAP_CORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_DEVICE_MAP_CORE, MetaDeviceMapCore))
+#define META_DEVICE_MAP_CORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_DEVICE_MAP_CORE, MetaDeviceMapCoreClass))
+#define META_IS_DEVICE_MAP_CORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_DEVICE_MAP_CORE))
+#define META_IS_DEVICE_MAP_CORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_DEVICE_MAP_CORE))
+#define META_DEVICE_MAP_CORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_DEVICE_MAP_CORE, MetaDeviceMapCoreClass))
+
+struct _MetaDeviceMapCore
+{
+  MetaDeviceMap parent_instance;
+};
+
+struct _MetaDeviceMapCoreClass
+{
+  MetaDeviceMapClass parent_class;
+};
+
+GType           meta_device_map_core_get_type (void) G_GNUC_CONST;
+
+#endif /* META_DEVICE_MAP_CORE_H */

src/core/device-map-private.h

@@ -0,0 +1,120 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file device-map.h  object containing input devices
+ *
+ * Input devices.
+ * This file contains the device map, used to find out the device behind
+ * XInput2/core events.
+ */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_DEVICE_MAP_PRIVATE_H
+#define META_DEVICE_MAP_PRIVATE_H
+
+#include <meta/device-map.h>
+#include <meta/device.h>
+#include "display-private.h"
+#include "device-private.h"
+
+/* Device IDs for Virtual Core Pointer/Keyboard,
+ * use only in case of emergency.
+ */
+#define META_CORE_POINTER_ID  2
+#define META_CORE_KEYBOARD_ID 3
+
+struct _MetaDeviceMap
+{
+  GObject parent_instance;
+  gpointer priv;
+};
+
+struct _MetaDeviceMapClass
+{
+  GObjectClass parent_instance;
+
+  void (* device_added)   (MetaDeviceMap *device_map,
+                           MetaDevice    *device);
+  void (* device_removed) (MetaDeviceMap *device_map,
+                           MetaDevice    *device);
+
+  gboolean (* grab_key)       (MetaDeviceMap *device_map,
+                               Window         xwindow,
+                               guint          keycode,
+                               guint          modifiers,
+                               gboolean       sync);
+  void     (* ungrab_key)     (MetaDeviceMap *device_map,
+                               Window         xwindow,
+                               guint          keycode,
+                               guint          modifiers);
+
+  gboolean (* grab_button)    (MetaDeviceMap *device_map,
+                               Window         xwindow,
+                               guint          n_button,
+                               guint          modifiers,
+                               guint          evmask,
+                               gboolean       sync);
+  void     (* ungrab_button)  (MetaDeviceMap *pointer,
+                               Window         xwindow,
+                               guint          n_button,
+                               guint          modifiers);
+  void     (* grab_touch)     (MetaDeviceMap *pointer,
+                               Window         xwindow);
+  void     (* ungrab_touch)   (MetaDeviceMap *pointer,
+                               Window         xwindow);
+};
+
+GType           meta_device_map_get_type (void) G_GNUC_CONST;
+
+MetaDeviceMap * meta_device_map_new    (MetaDisplay   *display,
+                                        gboolean       force_core);
+
+void            meta_device_map_add_device    (MetaDeviceMap *device_map,
+                                               MetaDevice    *device);
+void            meta_device_map_remove_device (MetaDeviceMap *device_map,
+                                               MetaDevice    *device);
+
+gboolean meta_device_map_grab_key        (MetaDeviceMap      *device_map,
+                                          Window              xwindow,
+                                          guint               keycode,
+                                          guint               modifiers,
+                                          gboolean            sync);
+void     meta_device_map_ungrab_key      (MetaDeviceMap      *device_map,
+                                          Window              xwindow,
+                                          guint               keycode,
+                                          guint               modifiers);
+gboolean meta_device_map_grab_button     (MetaDeviceMap      *device_map,
+                                          Window              xwindow,
+                                          guint               n_button,
+                                          guint               modifiers,
+                                          guint               evmask,
+                                          gboolean            sync);
+void     meta_device_map_ungrab_button   (MetaDeviceMap      *device_map,
+                                          Window              xwindow,
+                                          guint               n_button,
+                                          guint               modifiers);
+
+void     meta_device_map_grab_touch      (MetaDeviceMap      *device_map,
+                                          Window              xwindow);
+void     meta_device_map_ungrab_touch    (MetaDeviceMap      *device_map,
+                                          Window              xwindow);
+
+#endif /* META_DEVICE_MAP_PRIVATE_H */

src/core/device-map-xi2.c

@@ -0,0 +1,327 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Input device map, XInput2 implementation */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "config.h"
+#include "device-map-xi2.h"
+#include <X11/extensions/XInput2.h>
+#include "devices-xi2.h"
+#include "input-events.h"
+
+#define XINPUT2_VERSION_MAJOR 2
+#define XINPUT2_VERSION_MINOR 2
+
+G_DEFINE_TYPE (MetaDeviceMapXI2, meta_device_map_xi2, META_TYPE_DEVICE_MAP)
+
+static gboolean
+meta_device_map_xi2_grab_key (MetaDeviceMap *device_map,
+                              Window         xwindow,
+                              guint          keycode,
+                              guint          modifiers,
+                              gboolean       sync)
+{
+  XIGrabModifiers mods = { modifiers, 0 };
+  MetaDisplay *display;
+  XIEventMask mask;
+  gint retval;
+
+  display = meta_device_map_get_display (device_map);
+
+  mask.deviceid = XIAllMasterDevices;
+  mask.mask = meta_device_xi2_translate_event_mask (KeyPressMask |
+                                                    KeyReleaseMask,
+                                                    &mask.mask_len);
+  /* FIXME: Doesn't seem to work with
+   * XIAllMasterDevices, use the VCK
+   * at the moment
+   */
+  retval = XIGrabKeycode (display->xdisplay,
+                          META_CORE_KEYBOARD_ID,
+                          keycode, xwindow,
+                          (sync) ? GrabModeSync : GrabModeAsync,
+                          GrabModeAsync, /* Never care about the other device */
+                          True, &mask, 1, &mods);
+
+  return (retval == Success);
+}
+
+static void
+meta_device_map_xi2_ungrab_key (MetaDeviceMap *device_map,
+                                Window         xwindow,
+                                guint          keycode,
+                                guint          modifiers)
+{
+  XIGrabModifiers mods = { modifiers, 0 };
+  MetaDisplay *display;
+
+  display = meta_device_map_get_display (device_map);
+  XIUngrabKeycode (display->xdisplay,
+                   META_CORE_KEYBOARD_ID,
+                   keycode, xwindow,
+                   1, &mods);
+}
+
+static gboolean
+meta_device_map_xi2_grab_button (MetaDeviceMap *device_map,
+                                 Window         xwindow,
+                                 guint          n_button,
+                                 guint          modifiers,
+                                 guint          evmask,
+                                 gboolean       sync)
+{
+  XIGrabModifiers mods = { modifiers, 0 };
+  XIEventMask mask;
+  MetaDisplay *display;
+  int retval;
+
+  display = meta_device_map_get_display (device_map);
+
+  mask.deviceid = XIAllMasterDevices;
+  mask.mask = meta_device_xi2_translate_event_mask (evmask, &mask.mask_len);
+
+  retval = XIGrabButton (display->xdisplay,
+                         XIAllMasterDevices,
+                         n_button, xwindow, None,
+                         (sync) ? GrabModeSync : GrabModeAsync,
+                         GrabModeAsync, /* Never care about the other device */
+                         False, &mask, 1, &mods);
+
+  return (retval == Success);
+}
+
+static void
+meta_device_map_xi2_ungrab_button (MetaDeviceMap *device_map,
+                                   Window         xwindow,
+                                   guint          n_button,
+                                   guint          modifiers)
+{
+  XIGrabModifiers mods = { modifiers, 0 };
+  MetaDisplay *display;
+
+  display = meta_device_map_get_display (device_map);
+  XIUngrabButton (display->xdisplay,
+                  META_CORE_POINTER_ID,
+                  //XIAllMasterDevices,
+                  n_button, xwindow, 1, &mods);
+}
+
+static MetaDevice *
+create_device_from_info (MetaDeviceMap *device_map,
+                         gint           use,
+                         gint           device_id)
+{
+  MetaDevice *device = NULL;
+  MetaDisplay *display;
+
+  display = meta_device_map_get_display (device_map);
+
+  if (use == XIMasterPointer ||
+      use == XISlavePointer)
+    device = meta_device_pointer_xi2_new (display, device_id);
+  else if (use == XIMasterKeyboard)
+    device = meta_device_keyboard_xi2_new (display, device_id);
+
+  return device;
+}
+
+static void
+pair_devices (gpointer key,
+              gpointer value,
+              gpointer user_data)
+{
+  MetaDevice *device1, *device2;
+  MetaDeviceMap *device_map;
+
+  device_map = user_data;
+  device1 = meta_device_map_lookup (device_map, GPOINTER_TO_INT (key));
+  device2 = meta_device_map_lookup (device_map, GPOINTER_TO_INT (value));
+
+  meta_device_pair_devices (device1, device2);
+}
+
+static void
+meta_device_map_xi2_constructed (GObject *object)
+{
+  MetaDeviceMap *device_map = META_DEVICE_MAP (object);
+  MetaDisplay *display;
+  XIDeviceInfo *info;
+  GHashTable *pairs;
+  int n_devices, i;
+
+  display = meta_device_map_get_display (device_map);
+
+  /* We're only interested in master devices,
+   * detached slave devices are left for applications
+   * to handle.
+   */
+  info = XIQueryDevice (display->xdisplay, XIAllDevices, &n_devices);
+  pairs = g_hash_table_new (NULL, NULL);
+
+  for (i = 0; i < n_devices; i++)
+    {
+      MetaDevice *device;
+
+      device = create_device_from_info (device_map, info[i].use,
+                                        info[i].deviceid);
+      if (device)
+        {
+          meta_device_map_add_device (device_map, device);
+
+          if (info[i].use == XIMasterPointer ||
+              info[i].use == XIMasterKeyboard)
+            g_hash_table_insert (pairs,
+                                 GINT_TO_POINTER (info[i].deviceid),
+                                 GINT_TO_POINTER (info[i].attachment));
+
+          g_object_unref (device);
+        }
+    }
+
+  g_hash_table_foreach (pairs, pair_devices, device_map);
+  g_hash_table_destroy (pairs);
+
+  XIFreeDeviceInfo (info);
+}
+
+static void
+meta_device_map_xi2_grab_touch (MetaDeviceMap *device_map,
+                                Window         xwindow)
+{
+  XIGrabModifiers unused = { 0 };
+  MetaDisplay *display;
+  XIEventMask mask;
+
+  display = meta_device_map_get_display (device_map);
+
+  g_message ("Grabbing passively on touch begin\n");
+
+  mask.deviceid = XIAllMasterDevices;
+  mask.mask = meta_device_xi2_translate_event_mask (META_INPUT_TOUCH_EVENTS_MASK |
+                                                    ButtonPressMask |
+                                                    ButtonReleaseMask |
+                                                    PointerMotionMask |
+                                                    KeyPressMask |
+                                                    KeyReleaseMask,
+                                                    &mask.mask_len);
+  XIGrabTouchBegin (display->xdisplay,
+                    XIAllMasterDevices,
+                    xwindow, True,
+                    &mask, 1, &unused);
+}
+
+static void
+meta_device_map_xi2_ungrab_touch (MetaDeviceMap *device_map,
+                                  Window         xwindow)
+{
+  XIGrabModifiers unused = { 0 };
+  MetaDisplay *display;
+
+  display = meta_device_map_get_display (device_map);
+  XIUngrabTouchBegin (display->xdisplay,
+                      XIAllMasterDevices,
+                      xwindow, 0, &unused);
+}
+
+static void
+meta_device_map_xi2_class_init (MetaDeviceMapXI2Class *klass)
+{
+  MetaDeviceMapClass *device_map_class = META_DEVICE_MAP_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed = meta_device_map_xi2_constructed;
+
+  device_map_class->grab_key = meta_device_map_xi2_grab_key;
+  device_map_class->ungrab_key = meta_device_map_xi2_ungrab_key;
+  device_map_class->grab_button = meta_device_map_xi2_grab_button;
+  device_map_class->ungrab_button = meta_device_map_xi2_ungrab_button;
+  device_map_class->grab_touch = meta_device_map_xi2_grab_touch;
+  device_map_class->ungrab_touch = meta_device_map_xi2_ungrab_touch;
+}
+
+static void
+meta_device_map_xi2_init (MetaDeviceMapXI2 *device_map)
+{
+}
+
+gboolean
+meta_device_map_xi2_handle_hierarchy_event (MetaDeviceMapXI2 *device_map,
+                                            XEvent           *ev)
+{
+  MetaDisplay *display;
+
+  display = meta_device_map_get_display (META_DEVICE_MAP (device_map));
+
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIHierarchyEvent *xev;
+      GHashTable *pairs;
+      gint i;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      xev = (XIHierarchyEvent *) ev->xcookie.data;
+
+      if (xev->evtype != XI_HierarchyChanged)
+        return FALSE;
+
+      pairs = g_hash_table_new (NULL, NULL);
+
+      for (i = 0; i < xev->num_info; i++)
+        {
+          if (xev->info[i].flags & XIMasterAdded ||
+              xev->info[i].flags & XISlaveAdded)
+            {
+              MetaDevice *device;
+
+              device = create_device_from_info (META_DEVICE_MAP (device_map),
+                                                xev->info[i].use,
+                                                xev->info[i].deviceid);
+
+              if (device &&
+                  xev->info[i].flags & XIMasterAdded)
+                g_hash_table_insert (pairs,
+                                     GINT_TO_POINTER (xev->info[i].deviceid),
+                                     GINT_TO_POINTER (xev->info[i].attachment));
+            }
+          else if (xev->info[i].flags & XIMasterRemoved ||
+                   xev->info[i].flags & XISlaveRemoved)
+            {
+              MetaDevice *device;
+
+              device = meta_device_map_lookup (META_DEVICE_MAP (device_map),
+                                               xev->info[i].deviceid);
+
+              if (device)
+                meta_device_map_remove_device (META_DEVICE_MAP (device_map),
+                                               device);
+            }
+        }
+
+      g_hash_table_foreach (pairs, pair_devices, device_map);
+      g_hash_table_destroy (pairs);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}

src/core/device-map-xi2.h

@@ -0,0 +1,59 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file device-map-xi2.h  device map for XInput2 devices
+ *
+ * Input devices.
+ * This file contains the XInput2 implementation of the device map
+ */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_DEVICE_MAP_XI2_H
+#define META_DEVICE_MAP_XI2_H
+
+typedef struct _MetaDeviceMapXI2 MetaDeviceMapXI2;
+typedef struct _MetaDeviceMapXI2Class MetaDeviceMapXI2Class;
+
+#include "device-map-private.h"
+
+#define META_TYPE_DEVICE_MAP_XI2            (meta_device_map_xi2_get_type ())
+#define META_DEVICE_MAP_XI2(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_DEVICE_MAP_XI2, MetaDeviceMapXI2))
+#define META_DEVICE_MAP_XI2_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_DEVICE_MAP_XI2, MetaDeviceMapXI2Class))
+#define META_IS_DEVICE_MAP_XI2(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_DEVICE_MAP_XI2))
+#define META_IS_DEVICE_MAP_XI2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_DEVICE_MAP_XI2))
+#define META_DEVICE_MAP_XI2_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_DEVICE_MAP_XI2, MetaDeviceMapXI2Class))
+
+struct _MetaDeviceMapXI2
+{
+  MetaDeviceMap parent_instance;
+};
+
+struct _MetaDeviceMapXI2Class
+{
+  MetaDeviceMapClass parent_class;
+};
+
+GType           meta_device_map_xi2_get_type        (void) G_GNUC_CONST;
+
+gboolean meta_device_map_xi2_handle_hierarchy_event (MetaDeviceMapXI2 *device_map,
+                                                     XEvent           *ev);
+
+#endif /* META_DEVICE_MAP_XI2_H */

src/core/device-map.c

@@ -0,0 +1,420 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Input device map */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "config.h"
+#include "device-map-private.h"
+#include "device-map-core.h"
+
+#ifdef HAVE_XINPUT2
+#include <X11/extensions/XInput2.h>
+#include "device-map-xi2.h"
+
+#define XINPUT2_VERSION_MAJOR 2
+#define XINPUT2_VERSION_MINOR 2
+#endif
+
+G_DEFINE_TYPE (MetaDeviceMap, meta_device_map, G_TYPE_OBJECT)
+
+typedef struct MetaDeviceMapPrivate MetaDeviceMapPrivate;
+
+struct MetaDeviceMapPrivate
+{
+  MetaDisplay *display;
+  GHashTable *devices;
+};
+
+enum {
+  PROP_0,
+  PROP_DISPLAY
+};
+
+enum {
+  DEVICE_ADDED,
+  DEVICE_REMOVED,
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+static void
+meta_device_map_get_property (GObject    *object,
+                              guint       param_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
+{
+  MetaDeviceMapPrivate *priv;
+
+  priv = META_DEVICE_MAP (object)->priv;
+
+  switch (param_id)
+    {
+    case PROP_DISPLAY:
+      g_value_set_object (value, priv->display);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
+
+static void
+meta_device_map_set_property (GObject      *object,
+                              guint         param_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  MetaDeviceMapPrivate *priv;
+
+  priv = META_DEVICE_MAP (object)->priv;
+
+  switch (param_id)
+    {
+    case PROP_DISPLAY:
+      priv->display = g_value_get_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
+
+static void
+meta_device_map_finalize (GObject *object)
+{
+  MetaDeviceMapPrivate *priv;
+  GHashTableIter iter;
+  MetaDevice *device;
+
+  priv = META_DEVICE_MAP (object)->priv;
+  g_hash_table_iter_init (&iter, priv->devices);
+
+  while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &device))
+    {
+      /* Detach the device */
+      g_hash_table_iter_steal (&iter);
+
+      g_signal_emit (object, signals[DEVICE_REMOVED], 0, device);
+      g_object_unref (device);
+    }
+
+  g_hash_table_destroy (priv->devices);
+  G_OBJECT_CLASS (meta_device_map_parent_class)->finalize (object);
+}
+
+static void
+meta_device_map_class_init (MetaDeviceMapClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->get_property = meta_device_map_get_property;
+  object_class->set_property = meta_device_map_set_property;
+  object_class->finalize = meta_device_map_finalize;
+
+  g_object_class_install_property (object_class,
+                                   PROP_DISPLAY,
+                                   g_param_spec_object ("display",
+                                                        "Display",
+                                                        "Display",
+                                                        META_TYPE_DISPLAY,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  signals[DEVICE_ADDED] =
+    g_signal_new ("device-added",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1, META_TYPE_DEVICE);
+  signals[DEVICE_REMOVED] =
+    g_signal_new ("device-removed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE, 1, META_TYPE_DEVICE);
+
+  g_type_class_add_private (klass, sizeof (MetaDeviceMapPrivate));
+}
+
+static void
+meta_device_map_init (MetaDeviceMap *device_map)
+{
+  MetaDeviceMapPrivate *priv;
+
+  priv = device_map->priv = G_TYPE_INSTANCE_GET_PRIVATE (device_map,
+                                                         META_TYPE_DEVICE_MAP,
+                                                         MetaDeviceMapPrivate);
+  priv->devices = g_hash_table_new_full (NULL, NULL, NULL,
+                                         (GDestroyNotify) g_object_unref);
+}
+
+void
+meta_device_map_add_device (MetaDeviceMap *device_map,
+                            MetaDevice    *device)
+{
+  MetaDeviceMapPrivate *priv;
+
+  priv = device_map->priv;
+  g_hash_table_insert (priv->devices,
+                       GINT_TO_POINTER (meta_device_get_id (device)),
+                       g_object_ref (device));
+
+  g_signal_emit (device_map, signals[DEVICE_ADDED], 0, device);
+}
+
+void
+meta_device_map_remove_device (MetaDeviceMap *device_map,
+                               MetaDevice    *device)
+{
+  MetaDeviceMapPrivate *priv;
+
+  priv = device_map->priv;
+
+  if (g_hash_table_steal (priv->devices,
+                          GINT_TO_POINTER (meta_device_get_id (device))))
+    {
+      g_signal_emit (device_map, signals[DEVICE_REMOVED], 0, device);
+      g_object_unref (device);
+    }
+}
+
+
+#ifdef HAVE_XINPUT2
+
+static gboolean
+initialize_xinput (MetaDisplay *display)
+{
+  int major, minor, opcode;
+  int unused;
+
+  if (!XQueryExtension (display->xdisplay,
+                        "XInputExtension",
+                        &opcode, &unused, &unused))
+    return FALSE;
+
+  major = XINPUT2_VERSION_MAJOR;
+  minor = XINPUT2_VERSION_MINOR;
+
+  XIQueryVersion (display->xdisplay, &major, &minor);
+
+  if (major == XINPUT2_VERSION_MAJOR &&
+      minor == XINPUT2_VERSION_MINOR)
+    {
+      display->have_xinput2 = TRUE;
+      display->xinput2_opcode = opcode;
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+#endif /* HAVE_XINPUT2 */
+
+MetaDeviceMap *
+meta_device_map_new (MetaDisplay *display,
+                     gboolean     force_core)
+{
+  GType type = META_TYPE_DEVICE_MAP_CORE;
+
+#ifdef HAVE_XINPUT2
+  if (!force_core &&
+      initialize_xinput (display))
+    type = META_TYPE_DEVICE_MAP_XI2;
+#endif
+
+  return g_object_new (type,
+                       "display", display,
+                       NULL);
+}
+
+/**
+ * meta_device_map_lookup:
+ * @device_map: a #MetaDeviceMap
+ * @device_id: ID for a device
+ *
+ * returns the device corresponding to @device_id
+ *
+ * Returns: (transfer none): (allow-none): The matching device, or %NULL.
+ **/
+MetaDevice *
+meta_device_map_lookup (MetaDeviceMap *device_map,
+                        gint           device_id)
+{
+  MetaDeviceMapPrivate *priv;
+
+  g_return_val_if_fail (META_IS_DEVICE_MAP (device_map), NULL);
+
+  priv = device_map->priv;
+  return g_hash_table_lookup (priv->devices,
+                              GINT_TO_POINTER (device_id));
+}
+
+/**
+ * meta_device_map_get_display:
+ * @device_map: a #MetaDeviceMap
+ *
+ * Returns the #MetaDisplay to which @device_map belongs to.
+ *
+ * Returns: (transfer none): The #MetaDisplay.
+ **/
+MetaDisplay *
+meta_device_map_get_display (MetaDeviceMap *device_map)
+{
+  MetaDeviceMapPrivate *priv;
+
+  g_return_val_if_fail (META_IS_DEVICE_MAP (device_map), NULL);
+
+  priv = device_map->priv;
+  return priv->display;
+}
+
+/**
+ * meta_device_map_list_devices:
+ * @device_map: a #MetaDeviceMap
+ *
+ * Returns the list of devices that @device_map holds.
+ *
+ * Returns: (element-type Meta.Device) (transfer container): the list
+ *          of devices, the contained objects are owned by @device_map
+ *          and should not be unref'ed. The list must be freed with
+ *          g_list_free().
+ **/
+GList *
+meta_device_map_list_devices (MetaDeviceMap *device_map)
+{
+  MetaDeviceMapPrivate *priv;
+
+  g_return_val_if_fail (META_IS_DEVICE_MAP (device_map), NULL);
+
+  priv = device_map->priv;
+  return g_hash_table_get_values (priv->devices);
+}
+
+gboolean
+meta_device_map_grab_key (MetaDeviceMap *device_map,
+                          Window         xwindow,
+                          guint          keycode,
+                          guint          modifiers,
+                          gboolean       sync)
+{
+  MetaDeviceMapClass *klass;
+
+  g_return_val_if_fail (META_IS_DEVICE_MAP (device_map), FALSE);
+  g_return_val_if_fail (xwindow != None, FALSE);
+
+  klass = META_DEVICE_MAP_GET_CLASS (device_map);
+
+  if (!klass->grab_key)
+    return FALSE;
+
+  return (klass->grab_key) (device_map, xwindow, keycode, modifiers, sync);
+}
+
+void
+meta_device_map_ungrab_key (MetaDeviceMap *device_map,
+                            Window         xwindow,
+                            guint          keycode,
+                            guint          modifiers)
+{
+  MetaDeviceMapClass *klass;
+
+  g_return_if_fail (META_IS_DEVICE_MAP (device_map));
+  g_return_if_fail (xwindow != None);
+
+  klass = META_DEVICE_MAP_GET_CLASS (device_map);
+
+  if (klass->ungrab_key)
+    (klass->ungrab_key) (device_map, xwindow, keycode, modifiers);
+}
+
+gboolean
+meta_device_map_grab_button (MetaDeviceMap *device_map,
+                             Window         xwindow,
+                             guint          n_button,
+                             guint          modifiers,
+                             guint          evmask,
+                             gboolean       sync)
+{
+  MetaDeviceMapClass *klass;
+
+  g_return_val_if_fail (META_IS_DEVICE_MAP (device_map), FALSE);
+  g_return_val_if_fail (xwindow != None, FALSE);
+
+  klass = META_DEVICE_MAP_GET_CLASS (device_map);
+
+  if (!klass->grab_button)
+    return FALSE;
+
+  return (klass->grab_button) (device_map, xwindow, n_button,
+                               modifiers, evmask, sync);
+}
+
+void
+meta_device_map_ungrab_button (MetaDeviceMap *device_map,
+                               Window         xwindow,
+                               guint          n_button,
+                               guint          modifiers)
+{
+  MetaDeviceMapClass *klass;
+
+  g_return_if_fail (META_IS_DEVICE_MAP (device_map));
+  g_return_if_fail (xwindow != None);
+
+  klass = META_DEVICE_MAP_GET_CLASS (device_map);
+
+  if (klass->ungrab_button)
+    (klass->ungrab_button) (device_map, xwindow, n_button, modifiers);
+}
+
+void
+meta_device_map_grab_touch (MetaDeviceMap *device_map,
+                            Window         xwindow)
+{
+  MetaDeviceMapClass *klass;
+
+  g_return_if_fail (META_IS_DEVICE_MAP (device_map));
+  g_return_if_fail (xwindow != None);
+
+  klass = META_DEVICE_MAP_GET_CLASS (device_map);
+
+  if (klass->grab_touch)
+    (klass->grab_touch) (device_map, xwindow);
+}
+
+void
+meta_device_map_ungrab_touch (MetaDeviceMap *device_map,
+                              Window         xwindow)
+{
+  MetaDeviceMapClass *klass;
+
+  g_return_if_fail (META_IS_DEVICE_MAP (device_map));
+  g_return_if_fail (xwindow != None);
+
+  klass = META_DEVICE_MAP_GET_CLASS (device_map);
+
+  if (klass->ungrab_touch)
+    (klass->ungrab_touch) (device_map, xwindow);
+}

src/core/device-pointer.c

@@ -0,0 +1,124 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Pointer device abstraction */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+#include "device-pointer.h"
+
+G_DEFINE_ABSTRACT_TYPE (MetaDevicePointer,
+                        meta_device_pointer,
+                        META_TYPE_DEVICE)
+
+static void
+meta_device_pointer_class_init (MetaDevicePointerClass *klass)
+{
+}
+
+static void
+meta_device_pointer_init (MetaDevicePointer *pointer)
+{
+}
+
+void
+meta_device_pointer_warp (MetaDevicePointer *pointer,
+                          MetaScreen        *screen,
+                          gint               x,
+                          gint               y)
+{
+  MetaDevicePointerClass *klass;
+
+  g_return_if_fail (META_IS_DEVICE_POINTER (pointer));
+  g_return_if_fail (META_IS_SCREEN (screen));
+
+  klass = META_DEVICE_POINTER_GET_CLASS (pointer);
+
+  if (klass->warp)
+    (klass->warp) (pointer, screen, x, y);
+}
+
+void
+meta_device_pointer_set_window_cursor (MetaDevicePointer *pointer,
+                                       Window             xwindow,
+                                       MetaCursor         cursor)
+{
+  MetaDevicePointerClass *klass;
+
+  g_return_if_fail (META_IS_DEVICE_POINTER (pointer));
+  g_return_if_fail (xwindow != None);
+
+  klass = META_DEVICE_POINTER_GET_CLASS (pointer);
+
+  if (klass->set_window_cursor)
+    (klass->set_window_cursor) (pointer, xwindow, cursor);
+}
+
+gboolean
+meta_device_pointer_query_position (MetaDevicePointer *pointer,
+                                    Window             xwindow,
+                                    Window            *root_ret,
+                                    Window            *child_ret,
+                                    gint              *root_x_ret,
+                                    gint              *root_y_ret,
+                                    gint              *x_ret,
+                                    gint              *y_ret,
+                                    guint             *mask_ret)
+{
+  MetaDevicePointerClass *klass;
+  gint root_x, root_y, x, y;
+  Window root, child;
+  gboolean retval;
+  guint mask;
+
+  g_return_val_if_fail (META_IS_DEVICE_POINTER (pointer), FALSE);
+  g_return_val_if_fail (xwindow != None, FALSE);
+
+  klass = META_DEVICE_POINTER_GET_CLASS (pointer);
+
+  if (!klass->query_position)
+    return FALSE;
+
+  retval = (klass->query_position) (pointer, xwindow, &root, &child,
+                                    &root_x, &root_y, &x, &y, &mask);
+
+  if (root_ret)
+    *root_ret = root;
+
+  if (child_ret)
+    *child_ret = child;
+
+  if (root_x_ret)
+    *root_x_ret = root_x;
+
+  if (root_y_ret)
+    *root_y_ret = root_y;
+
+  if (x_ret)
+    *x_ret = x;
+
+  if (y_ret)
+    *y_ret = y;
+
+  if (mask_ret)
+    *mask_ret = mask;
+
+  return retval;
+}

src/core/device-pointer.h

@@ -0,0 +1,95 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file device-pointer.h  Pointer device abstraction
+ *
+ * Input devices.
+ * This file contains the internal abstraction of pointer devices so
+ * XInput2/core events can be handled similarly.
+ */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_DEVICE_POINTER_H
+#define META_DEVICE_POINTER_H
+
+#include "display-private.h"
+#include <meta/screen.h>
+#include "device-private.h"
+
+#define META_TYPE_DEVICE_POINTER            (meta_device_pointer_get_type ())
+#define META_DEVICE_POINTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_DEVICE_POINTER, MetaDevicePointer))
+#define META_DEVICE_POINTER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_DEVICE_POINTER, MetaDevicePointerClass))
+#define META_IS_DEVICE_POINTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_DEVICE_POINTER))
+#define META_IS_DEVICE_POINTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_DEVICE_POINTER))
+#define META_DEVICE_POINTER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_DEVICE_POINTER, MetaDevicePointerClass))
+
+typedef struct _MetaDevicePointer MetaDevicePointer;
+typedef struct _MetaDevicePointerClass MetaDevicePointerClass;
+
+struct _MetaDevicePointer
+{
+  MetaDevice parent_instance;
+};
+
+struct _MetaDevicePointerClass
+{
+  MetaDeviceClass parent_instance;
+
+  void     (* warp)           (MetaDevicePointer *pointer,
+                               MetaScreen        *screen,
+                               gint               x,
+                               gint               y);
+
+  void (* set_window_cursor)  (MetaDevicePointer *pointer,
+                               Window             xwindow,
+                               MetaCursor         cursor);
+  gboolean (* query_position) (MetaDevicePointer *pointer,
+                               Window             xwindow,
+                               Window            *root,
+                               Window            *child,
+                               gint              *root_x,
+                               gint              *root_y,
+                               gint              *x,
+                               gint              *y,
+                               guint             *mask);
+};
+
+GType    meta_device_pointer_get_type      (void) G_GNUC_CONST;
+
+void     meta_device_pointer_warp              (MetaDevicePointer *pointer,
+                                                MetaScreen        *screen,
+                                                gint               x,
+                                                gint               y);
+void     meta_device_pointer_set_window_cursor (MetaDevicePointer *pointer,
+						Window             xwindow,
+						MetaCursor         cursor);
+
+gboolean meta_device_pointer_query_position    (MetaDevicePointer *pointer,
+                                                Window             xwindow,
+                                                Window            *root,
+                                                Window            *child,
+                                                gint              *root_x,
+                                                gint              *root_y,
+                                                gint              *x,
+                                                gint              *y,
+                                                guint             *mask);
+
+#endif /* META_DEVICE_POINTER_H */

src/core/device-private.h

@@ -0,0 +1,80 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file device.h  Input device abstraction
+ *
+ * Input devices.
+ * This file contains the internal abstraction of input devices so
+ * XInput2/core events can be handled similarly.
+ */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_DEVICE_PRIVATE_H
+#define META_DEVICE_PRIVATE_H
+
+#include <meta/device.h>
+#include "display-private.h"
+
+struct _MetaDevice
+{
+  GObject parent_instance;
+  gpointer priv;
+};
+
+struct _MetaDeviceClass
+{
+  GObjectClass parent_instance;
+
+  void     (* allow_events) (MetaDevice  *device,
+                             int          mode,
+                             Time         time);
+
+  gboolean (* grab)         (MetaDevice *device,
+                             Window      xwindow,
+                             guint       evmask,
+                             MetaCursor  cursor,
+                             gboolean    owner_events,
+                             gboolean    sync,
+                             Time        time);
+  void     (* ungrab)       (MetaDevice *device,
+                             Time        time);
+};
+
+GType        meta_device_get_type     (void) G_GNUC_CONST;
+
+void         meta_device_allow_events (MetaDevice  *device,
+                                       int          mode,
+                                       Time         time);
+
+gboolean     meta_device_grab         (MetaDevice *device,
+                                       Window      xwindow,
+                                       guint       evmask,
+                                       MetaCursor  cursor,
+                                       gboolean    owner_events,
+                                       gboolean    sync,
+                                       Time        time);
+void         meta_device_ungrab       (MetaDevice *device,
+                                       Time        time);
+
+void         meta_device_pair_devices      (MetaDevice *device,
+                                            MetaDevice *other_device);
+
+#endif /* META_DEVICE_PRIVATE_H */

src/core/device.c

@@ -0,0 +1,270 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Input device abstraction */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+#include "device-private.h"
+
+G_DEFINE_ABSTRACT_TYPE (MetaDevice, meta_device, G_TYPE_OBJECT)
+
+enum {
+  PROP_0,
+  PROP_DEVICE_ID,
+  PROP_DISPLAY,
+  PROP_PAIRED_DEVICE
+};
+
+typedef struct MetaDevicePrivate MetaDevicePrivate;
+
+struct MetaDevicePrivate
+{
+  MetaDisplay *display;
+  MetaDevice *paired_device;
+  gint device_id;
+};
+
+static void
+meta_device_get_property (GObject    *object,
+                          guint       param_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  switch (param_id)
+    {
+    case PROP_DEVICE_ID:
+      g_value_set_int (value,
+                       meta_device_get_id (META_DEVICE (object)));
+      break;
+    case PROP_DISPLAY:
+      g_value_set_object (value,
+                          meta_device_get_display (META_DEVICE (object)));
+      break;
+    case PROP_PAIRED_DEVICE:
+      g_value_set_object (value,
+                          meta_device_get_paired_device (META_DEVICE (object)));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
+
+static void
+meta_device_set_property (GObject      *object,
+                          guint         param_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  MetaDevicePrivate *priv = META_DEVICE (object)->priv;
+
+  switch (param_id)
+    {
+    case PROP_DEVICE_ID:
+      priv->device_id = g_value_get_int (value);
+      break;
+    case PROP_DISPLAY:
+      priv->display = g_value_get_object (value);
+      break;
+    case PROP_PAIRED_DEVICE:
+      meta_device_pair_devices (META_DEVICE (object),
+                                g_value_get_object (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    }
+}
+
+static void
+meta_device_class_init (MetaDeviceClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->get_property = meta_device_get_property;
+  object_class->set_property = meta_device_set_property;
+
+  g_object_class_install_property (object_class,
+                                   PROP_DEVICE_ID,
+                                   g_param_spec_int ("device-id",
+                                                     "Device ID",
+                                                     "Device ID",
+                                                     2, G_MAXINT, 2,
+                                                     G_PARAM_READWRITE |
+                                                     G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (object_class,
+                                   PROP_DISPLAY,
+                                   g_param_spec_object ("display",
+                                                        "Display",
+                                                        "Display",
+                                                        META_TYPE_DISPLAY,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (object_class,
+                                   PROP_PAIRED_DEVICE,
+                                   g_param_spec_object ("paired-device",
+                                                        "Paired device",
+                                                        "Paired device",
+                                                        META_TYPE_DEVICE,
+                                                        G_PARAM_READWRITE));
+
+  g_type_class_add_private (klass, sizeof (MetaDevicePrivate));
+}
+
+static void
+meta_device_init (MetaDevice *device)
+{
+  device->priv = G_TYPE_INSTANCE_GET_PRIVATE (device,
+                                              META_TYPE_DEVICE,
+                                              MetaDevicePrivate);
+}
+
+int
+meta_device_get_id (MetaDevice *device)
+{
+  MetaDevicePrivate *priv;
+
+  g_return_val_if_fail (META_IS_DEVICE (device), 0);
+
+  priv = device->priv;
+  return priv->device_id;
+}
+
+/**
+ * meta_device_get_display:
+ * @device: a #MetaDevice
+ *
+ * Returns the #MetaDisplay to which the device belongs
+ *
+ * Returns: (transfer none): the #MetaDisplay to which the device belongs
+ **/
+MetaDisplay *
+meta_device_get_display (MetaDevice *device)
+{
+  MetaDevicePrivate *priv;
+
+  g_return_val_if_fail (META_IS_DEVICE (device), NULL);
+
+  priv = device->priv;
+  return priv->display;
+}
+
+void
+meta_device_allow_events (MetaDevice  *device,
+                          int          mode,
+                          Time         time)
+{
+  MetaDeviceClass *klass;
+
+  g_return_if_fail (META_IS_DEVICE (device));
+
+  klass = META_DEVICE_GET_CLASS (device);
+
+  if (klass->allow_events)
+    (klass->allow_events) (device, mode, time);
+}
+
+gboolean
+meta_device_grab (MetaDevice *device,
+                  Window      xwindow,
+                  guint       evmask,
+                  MetaCursor  cursor,
+                  gboolean    owner_events,
+                  gboolean    sync,
+                  Time        time)
+{
+  MetaDeviceClass *klass;
+
+  g_return_val_if_fail (META_IS_DEVICE (device), FALSE);
+  g_return_val_if_fail (xwindow != None, FALSE);
+
+  klass = META_DEVICE_GET_CLASS (device);
+
+  if (!klass->grab)
+    return FALSE;
+
+  return (klass->grab) (device, xwindow, evmask, cursor,
+                        owner_events, sync, time);
+}
+
+void
+meta_device_ungrab (MetaDevice *device,
+                    Time        time)
+{
+  MetaDeviceClass *klass;
+
+  g_return_if_fail (META_IS_DEVICE (device));
+
+  klass = META_DEVICE_GET_CLASS (device);
+
+  if (klass->ungrab)
+    (klass->ungrab) (device, time);
+}
+
+void
+meta_device_pair_devices (MetaDevice *device,
+                          MetaDevice *other_device)
+{
+  MetaDevicePrivate *priv1, *priv2;
+
+  g_return_if_fail (META_IS_DEVICE (device));
+  g_return_if_fail (META_IS_DEVICE (other_device));
+
+  priv1 = device->priv;
+  priv2 = other_device->priv;
+
+  /* Consider safe multiple calls
+   * on already paired devices
+   */
+  if (priv1->paired_device != NULL &&
+      priv2->paired_device != NULL &&
+      priv1->paired_device == other_device &&
+      priv2->paired_device == device)
+    return;
+
+  g_return_if_fail (priv1->paired_device == NULL);
+  g_return_if_fail (priv2->paired_device == NULL);
+
+  priv1->paired_device = g_object_ref (other_device);
+  priv2->paired_device = g_object_ref (device);
+
+  g_object_notify (G_OBJECT (device), "paired-device");
+  g_object_notify (G_OBJECT (other_device), "paired-device");
+}
+
+/**
+ * meta_device_get_paired_device:
+ * @device: a #MetaDevice
+ *
+ * Returns the paired device. Devices come in keyboard/pointer pairs.
+ *
+ * Returns: (transfer none): The paired device.
+ **/
+MetaDevice *
+meta_device_get_paired_device (MetaDevice *device)
+{
+  MetaDevicePrivate *priv;
+
+  g_return_val_if_fail (META_IS_DEVICE (device), NULL);
+
+  priv = device->priv;
+  return priv->paired_device;
+}

src/core/devices-core.c

@@ -0,0 +1,256 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Core input devices implementation */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+#include "screen-private.h"
+#include "devices-core.h"
+#include "device-map-private.h"
+
+/* Common functions */
+static void
+meta_device_core_common_allow_events (MetaDevice *device,
+                                      int         mode,
+                                      Time        time)
+{
+  MetaDisplay *display;
+
+  display = meta_device_get_display (device);
+  XAllowEvents (display->xdisplay, mode, time);
+}
+
+/* Core pointer */
+
+G_DEFINE_TYPE (MetaDevicePointerCore,
+               meta_device_pointer_core,
+               META_TYPE_DEVICE_POINTER)
+
+static gboolean
+meta_device_pointer_core_grab (MetaDevice *device,
+                               Window      xwindow,
+                               guint       evmask,
+                               MetaCursor  cursor,
+                               gboolean    owner_events,
+                               gboolean    sync,
+                               Time        time)
+{
+  MetaDisplay *display;
+  Cursor xcursor;
+  int retval;
+
+  display = meta_device_get_display (device);
+  xcursor = meta_display_create_x_cursor (display, cursor);
+
+  retval = XGrabPointer (display->xdisplay,
+                         xwindow, owner_events,
+                         evmask,
+                         (sync) ? GrabModeSync : GrabModeAsync,
+                         (sync) ? GrabModeSync : GrabModeAsync,
+                         None, xcursor, time);
+
+  if (xcursor != None)
+    XFreeCursor (display->xdisplay, xcursor);
+
+  return (retval == Success);
+}
+
+static void
+meta_device_pointer_core_ungrab (MetaDevice *device,
+                                 Time        time)
+{
+  MetaDisplay *display;
+
+  display = meta_device_get_display (device);
+  XUngrabPointer (display->xdisplay, time);
+}
+
+static void
+meta_device_pointer_core_warp (MetaDevicePointer *pointer,
+                               MetaScreen        *screen,
+                               gint               x,
+                               gint               y)
+{
+  MetaDisplay *display;
+
+  display = meta_device_get_display (META_DEVICE (pointer));
+  XWarpPointer (display->xdisplay,
+                None, screen->xroot,
+                0, 0, 0, 0, x, y);
+}
+
+static void
+meta_device_pointer_core_set_window_cursor (MetaDevicePointer *pointer,
+                                            Window             xwindow,
+                                            MetaCursor         cursor)
+{
+  MetaDisplay *display;
+  Cursor xcursor;
+
+  display = meta_device_get_display (META_DEVICE (pointer));
+  xcursor = meta_display_create_x_cursor (display, cursor);
+
+  XDefineCursor (display->xdisplay, xwindow, xcursor);
+
+  if (xcursor != None)
+    XFreeCursor (display->xdisplay, xcursor);
+}
+
+static gboolean
+meta_device_pointer_core_query_position (MetaDevicePointer *pointer,
+                                         Window             xwindow,
+                                         Window            *root,
+                                         Window            *child,
+                                         gint              *root_x,
+                                         gint              *root_y,
+                                         gint              *x,
+                                         gint              *y,
+                                         guint             *mask)
+{
+  MetaDisplay *display;
+
+  display = meta_device_get_display (META_DEVICE (pointer));
+  return XQueryPointer (display->xdisplay, xwindow,
+                        root, child, root_x, root_y,
+                        x, y, mask);
+}
+
+static void
+meta_device_pointer_core_class_init (MetaDevicePointerCoreClass *klass)
+{
+  MetaDevicePointerClass *pointer_class = META_DEVICE_POINTER_CLASS (klass);
+  MetaDeviceClass *device_class = META_DEVICE_CLASS (klass);
+
+  device_class->allow_events = meta_device_core_common_allow_events;
+  device_class->grab = meta_device_pointer_core_grab;
+  device_class->ungrab = meta_device_pointer_core_ungrab;
+
+  pointer_class->warp = meta_device_pointer_core_warp;
+  pointer_class->set_window_cursor = meta_device_pointer_core_set_window_cursor;
+  pointer_class->query_position = meta_device_pointer_core_query_position;
+}
+
+static void
+meta_device_pointer_core_init (MetaDevicePointerCore *pointer)
+{
+}
+
+MetaDevice *
+meta_device_pointer_core_new (MetaDisplay *display)
+{
+  return g_object_new (META_TYPE_DEVICE_POINTER_CORE,
+                       "device-id", META_CORE_POINTER_ID,
+                       "display", display,
+                       NULL);
+}
+
+
+/* Core Keyboard */
+
+G_DEFINE_TYPE (MetaDeviceKeyboardCore,
+               meta_device_keyboard_core,
+               META_TYPE_DEVICE_KEYBOARD)
+
+static gboolean
+meta_device_keyboard_core_grab (MetaDevice *device,
+                                Window      xwindow,
+                                guint       evmask,
+                                MetaCursor  cursor,
+                                gboolean    owner_events,
+                                gboolean    sync,
+                                Time        time)
+{
+  MetaDisplay *display;
+  gint retval;
+
+  display = meta_device_get_display (device);
+  retval = XGrabKeyboard (display->xdisplay, xwindow, owner_events,
+                          (sync) ? GrabModeSync : GrabModeAsync,
+                          (sync) ? GrabModeSync : GrabModeAsync,
+                          time);
+
+  return (retval == Success);
+}
+
+static void
+meta_device_keyboard_core_ungrab (MetaDevice *device,
+                                  Time        time)
+{
+  MetaDisplay *display;
+
+  display = meta_device_get_display (device);
+  XUngrabKeyboard (display->xdisplay, time);
+}
+
+static Window
+meta_device_keyboard_core_get_focus_window (MetaDeviceKeyboard *keyboard)
+{
+  MetaDisplay *display;
+  Window xwindow;
+  int unused;
+
+  display = meta_device_get_display (META_DEVICE (keyboard));
+  XGetInputFocus (display->xdisplay, &xwindow, &unused);
+
+  return xwindow;
+}
+
+static void
+meta_device_keyboard_core_set_focus_window (MetaDeviceKeyboard *keyboard,
+                                            Window              xwindow,
+                                            Time                timestamp)
+{
+  MetaDisplay *display;
+
+  display = meta_device_get_display (META_DEVICE (keyboard));
+  XSetInputFocus (display->xdisplay,
+                  xwindow,
+                  RevertToPointerRoot,
+                  timestamp);
+}
+
+static void
+meta_device_keyboard_core_class_init (MetaDeviceKeyboardCoreClass *klass)
+{
+  MetaDeviceKeyboardClass *keyboard_class = META_DEVICE_KEYBOARD_CLASS (klass);
+  MetaDeviceClass *device_class = META_DEVICE_CLASS (klass);
+
+  keyboard_class->get_focus_window = meta_device_keyboard_core_get_focus_window;
+  keyboard_class->set_focus_window = meta_device_keyboard_core_set_focus_window;
+
+  device_class->allow_events = meta_device_core_common_allow_events;
+  device_class->grab = meta_device_keyboard_core_grab;
+  device_class->ungrab = meta_device_keyboard_core_ungrab;
+}
+
+static void
+meta_device_keyboard_core_init (MetaDeviceKeyboardCore *keyboard)
+{
+}
+
+MetaDevice *
+meta_device_keyboard_core_new (MetaDisplay *display)
+{
+  return g_object_new (META_TYPE_DEVICE_KEYBOARD_CORE,
+                       "device-id", META_CORE_KEYBOARD_ID,
+                       "display", display,
+                       NULL);
+}

src/core/devices-core.h

@@ -0,0 +1,85 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file devices-core.h  Core input devices implementation
+ *
+ * Input devices.
+ * This file contains the core X protocol implementation of input devices.
+ */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_DEVICES_CORE_H
+#define META_DEVICES_CORE_H
+
+#include "device-pointer.h"
+#include "device-keyboard.h"
+
+/* Pointer */
+#define META_TYPE_DEVICE_POINTER_CORE            (meta_device_pointer_core_get_type ())
+#define META_DEVICE_POINTER_CORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_DEVICE_POINTER_CORE, MetaDevicePointerCore))
+#define META_DEVICE_POINTER_CORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_DEVICE_POINTER_CORE, MetaDevicePointerCoreClass))
+#define META_IS_DEVICE_POINTER_CORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_DEVICE_POINTER_CORE))
+#define META_IS_DEVICE_POINTER_CORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_DEVICE_POINTER_CORE))
+#define META_DEVICE_POINTER_CORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_DEVICE_POINTER_CORE, MetaDevicePointerCoreClass))
+
+typedef struct _MetaDevicePointerCore MetaDevicePointerCore;
+typedef struct _MetaDevicePointerCoreClass MetaDevicePointerCoreClass;
+
+struct _MetaDevicePointerCore
+{
+  MetaDevicePointer parent_instance;
+};
+
+struct _MetaDevicePointerCoreClass
+{
+  MetaDevicePointerClass parent_class;
+};
+
+GType       meta_device_pointer_core_get_type (void) G_GNUC_CONST;
+
+MetaDevice *meta_device_pointer_core_new      (MetaDisplay *display);
+
+/* Keyboard */
+#define META_TYPE_DEVICE_KEYBOARD_CORE            (meta_device_keyboard_core_get_type ())
+#define META_DEVICE_KEYBOARD_CORE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_DEVICE_KEYBOARD_CORE, MetaDeviceKeyboardCore))
+#define META_DEVICE_KEYBOARD_CORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_DEVICE_KEYBOARD_CORE, MetaDeviceKeyboardCoreClass))
+#define META_IS_DEVICE_KEYBOARD_CORE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_DEVICE_KEYBOARD_CORE))
+#define META_IS_DEVICE_KEYBOARD_CORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_DEVICE_KEYBOARD_CORE))
+#define META_DEVICE_KEYBOARD_CORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_DEVICE_KEYBOARD_CORE, MetaDeviceKeyboardCoreClass))
+
+typedef struct _MetaDeviceKeyboardCore MetaDeviceKeyboardCore;
+typedef struct _MetaDeviceKeyboardCoreClass MetaDeviceKeyboardCoreClass;
+
+struct _MetaDeviceKeyboardCore
+{
+  MetaDeviceKeyboard parent_instance;
+};
+
+struct _MetaDeviceKeyboardCoreClass
+{
+  MetaDeviceKeyboardClass parent_class;
+};
+
+GType       meta_device_keyboard_core_get_type (void) G_GNUC_CONST;
+
+MetaDevice *meta_device_keyboard_core_new      (MetaDisplay *display);
+
+#endif /* META_DEVICES_CORE_H */

src/core/devices-xi2.c

@@ -0,0 +1,351 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* XInput2 devices implementation */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+#include "devices-xi2.h"
+#include "display-private.h"
+#include "screen-private.h"
+#include "input-events.h"
+#include <X11/extensions/XInput2.h>
+
+/* Common functions */
+static void
+meta_device_xi2_common_allow_events (MetaDevice *device,
+                                     int         mode,
+                                     Time        time)
+{
+  MetaDisplay *display;
+  gint device_id;
+
+  display = meta_device_get_display (device);
+  device_id = meta_device_get_id (device);
+
+  switch (mode)
+    {
+    case AsyncPointer:
+    case AsyncKeyboard:
+      mode = XIAsyncDevice;
+      break;
+    case SyncPointer:
+    case SyncKeyboard:
+      mode = XISyncDevice;
+      break;
+    case ReplayPointer:
+    case ReplayKeyboard:
+      mode = XIReplayDevice;
+      break;
+    case AsyncBoth:
+      mode = XIAsyncPair;
+      break;
+    case SyncBoth:
+      mode = XISyncPair;
+      break;
+    }
+
+  XIAllowEvents (display->xdisplay, device_id, mode, time);
+}
+
+guchar *
+meta_device_xi2_translate_event_mask (guint  evmask,
+                                      gint  *len)
+{
+  guchar *mask;
+
+  *len = XIMaskLen (XI_LASTEVENT);
+  mask = g_new0 (guchar, *len);
+
+  if (evmask & KeyPressMask)
+    XISetMask (mask, XI_KeyPress);
+  if (evmask & KeyReleaseMask)
+    XISetMask (mask, XI_KeyRelease);
+  if (evmask & ButtonPressMask)
+    XISetMask (mask, XI_ButtonPress);
+  if (evmask & ButtonReleaseMask)
+    XISetMask (mask, XI_ButtonRelease);
+  if (evmask & EnterWindowMask)
+    XISetMask (mask, XI_Enter);
+  if (evmask & LeaveWindowMask)
+    XISetMask (mask, XI_Leave);
+
+  /* No motion hints in XI2 at the moment... */
+  if (evmask & PointerMotionMask ||
+      evmask & PointerMotionHintMask)
+    XISetMask (mask, XI_Motion);
+
+  if (evmask & FocusChangeMask)
+    {
+      XISetMask (mask, XI_FocusIn);
+      XISetMask (mask, XI_FocusOut);
+    }
+
+  if (evmask & META_INPUT_TOUCH_EVENTS_MASK)
+    {
+      XISetMask (mask, XI_TouchBegin);
+      XISetMask (mask, XI_TouchEnd);
+      XISetMask (mask, XI_TouchUpdate);
+    }
+
+  return mask;
+}
+
+static gboolean
+meta_device_xi2_common_grab (MetaDevice *device,
+                             Window      xwindow,
+                             guint       evmask,
+                             MetaCursor  cursor,
+                             gboolean    owner_events,
+                             gboolean    sync,
+                             Time        time)
+{
+  MetaDisplay *display;
+  XIEventMask mask;
+  gint device_id, retval;
+  Cursor xcursor;
+
+  display = meta_device_get_display (device);
+  device_id = meta_device_get_id (device);
+  xcursor = meta_display_create_x_cursor (display, cursor);
+
+  mask.deviceid = device_id;
+  mask.mask = meta_device_xi2_translate_event_mask (evmask, &mask.mask_len);
+
+  retval = XIGrabDevice (display->xdisplay,
+                         device_id, xwindow,
+                         time, xcursor,
+                         (sync) ? GrabModeSync : GrabModeAsync,
+                         (sync) ? GrabModeSync : GrabModeAsync,
+                         owner_events, &mask);
+
+  if (xcursor != None)
+    XFreeCursor (display->xdisplay, xcursor);
+
+  return (retval == Success);
+}
+
+static void
+meta_device_xi2_common_ungrab (MetaDevice *device,
+                               Time        time)
+{
+  MetaDisplay *display;
+  gint device_id;
+
+  display = meta_device_get_display (device);
+  device_id = meta_device_get_id (device);
+
+  XIUngrabDevice (display->xdisplay, device_id, time);
+}
+
+/* Pointer */
+
+G_DEFINE_TYPE (MetaDevicePointerXI2,
+               meta_device_pointer_xi2,
+               META_TYPE_DEVICE_POINTER)
+
+static void
+meta_device_pointer_xi2_warp (MetaDevicePointer *pointer,
+                              MetaScreen        *screen,
+                              gint               x,
+                              gint               y)
+{
+  MetaDisplay *display;
+  int device_id;
+
+  display = meta_device_get_display (META_DEVICE (pointer));
+  device_id = meta_device_get_id (META_DEVICE (pointer));
+
+  XIWarpPointer (display->xdisplay,
+                 device_id,
+                 None, screen->xroot,
+                 0, 0, 0, 0, x, y);
+}
+
+static void
+meta_device_pointer_xi2_set_window_cursor (MetaDevicePointer *pointer,
+                                           Window             xwindow,
+                                           MetaCursor         cursor)
+{
+  MetaDisplay *display;
+  Cursor xcursor;
+  int device_id;
+
+  display = meta_device_get_display (META_DEVICE (pointer));
+  device_id = meta_device_get_id (META_DEVICE (pointer));
+  xcursor = meta_display_create_x_cursor (display, cursor);
+
+  if (xcursor != None)
+    {
+      XIDefineCursor (display->xdisplay, device_id, xwindow, xcursor);
+      XFreeCursor (display->xdisplay, xcursor);
+    }
+  else
+    XIUndefineCursor (display->xdisplay, device_id, xwindow);
+}
+
+static gboolean
+meta_device_pointer_xi2_query_position (MetaDevicePointer *pointer,
+                                        Window             xwindow,
+                                        Window            *root_ret,
+                                        Window            *child_ret,
+                                        gint              *root_x_ret,
+                                        gint              *root_y_ret,
+                                        gint              *x_ret,
+                                        gint              *y_ret,
+                                        guint             *mask_ret)
+{
+  MetaDisplay *display;
+  XIModifierState mods;
+  XIGroupState group_unused;
+  XIButtonState buttons;
+  gdouble root_x, root_y, x, y;
+  int device_id;
+  gboolean retval;
+
+  display = meta_device_get_display (META_DEVICE (pointer));
+  device_id = meta_device_get_id (META_DEVICE (pointer));
+
+  retval = XIQueryPointer (display->xdisplay,
+                           device_id, xwindow,
+                           root_ret, child_ret,
+                           &root_x, &root_y, &x, &y,
+                           &buttons, &mods,
+                           &group_unused);
+  if (mask_ret)
+    {
+      *mask_ret = mods.effective;
+
+      if (XIMaskIsSet (buttons.mask, 1))
+        *mask_ret |= Button1Mask;
+      else if (XIMaskIsSet (buttons.mask, 2))
+        *mask_ret |= Button2Mask;
+      else if (XIMaskIsSet (buttons.mask, 3))
+        *mask_ret |= Button3Mask;
+    }
+
+  if (root_x_ret)
+    *root_x_ret = (int) root_x;
+
+  if (root_y_ret)
+    *root_y_ret = (int) root_y;
+
+  if (x_ret)
+    *x_ret = (int) x;
+
+  if (y_ret)
+    *y_ret = (int) y;
+
+  return retval;
+}
+
+static void
+meta_device_pointer_xi2_class_init (MetaDevicePointerXI2Class *klass)
+{
+  MetaDevicePointerClass *pointer_class = META_DEVICE_POINTER_CLASS (klass);
+  MetaDeviceClass *device_class = META_DEVICE_CLASS (klass);
+
+  device_class->allow_events = meta_device_xi2_common_allow_events;
+  device_class->grab = meta_device_xi2_common_grab;
+  device_class->ungrab = meta_device_xi2_common_ungrab;
+
+  pointer_class->warp = meta_device_pointer_xi2_warp;
+  pointer_class->set_window_cursor = meta_device_pointer_xi2_set_window_cursor;
+  pointer_class->query_position = meta_device_pointer_xi2_query_position;
+}
+
+static void
+meta_device_pointer_xi2_init (MetaDevicePointerXI2 *pointer)
+{
+}
+
+MetaDevice *
+meta_device_pointer_xi2_new (MetaDisplay *display,
+                             gint         device_id)
+{
+  return g_object_new (META_TYPE_DEVICE_POINTER_XI2,
+                       "device-id", device_id,
+                       "display", display,
+                       NULL);
+}
+
+/* Keyboard */
+
+G_DEFINE_TYPE (MetaDeviceKeyboardXI2,
+               meta_device_keyboard_xi2,
+               META_TYPE_DEVICE_KEYBOARD)
+
+static Window
+meta_device_keyboard_xi2_get_focus_window (MetaDeviceKeyboard *keyboard)
+{
+  MetaDisplay *display;
+  Window xwindow;
+
+  display = meta_device_get_display (META_DEVICE (keyboard));
+  XIGetFocus (display->xdisplay,
+              meta_device_get_id (META_DEVICE (keyboard)),
+              &xwindow);
+
+  return xwindow;
+}
+
+static void
+meta_device_keyboard_xi2_set_focus_window (MetaDeviceKeyboard *keyboard,
+                                           Window              xwindow,
+                                           Time                timestamp)
+{
+  MetaDisplay *display;
+
+  display = meta_device_get_display (META_DEVICE (keyboard));
+
+  XISetFocus (display->xdisplay,
+              meta_device_get_id (META_DEVICE (keyboard)),
+              xwindow,
+              timestamp);
+}
+
+static void
+meta_device_keyboard_xi2_class_init (MetaDeviceKeyboardXI2Class *klass)
+{
+  MetaDeviceKeyboardClass *keyboard_class = META_DEVICE_KEYBOARD_CLASS (klass);
+  MetaDeviceClass *device_class = META_DEVICE_CLASS (klass);
+
+  keyboard_class->get_focus_window = meta_device_keyboard_xi2_get_focus_window;
+  keyboard_class->set_focus_window = meta_device_keyboard_xi2_set_focus_window;
+
+  device_class->allow_events = meta_device_xi2_common_allow_events;
+  device_class->grab = meta_device_xi2_common_grab;
+  device_class->ungrab = meta_device_xi2_common_ungrab;
+}
+
+static void
+meta_device_keyboard_xi2_init (MetaDeviceKeyboardXI2 *keyboard)
+{
+}
+
+MetaDevice *
+meta_device_keyboard_xi2_new (MetaDisplay *display,
+                              gint         device_id)
+{
+  return g_object_new (META_TYPE_DEVICE_KEYBOARD_XI2,
+                       "device-id", device_id,
+                       "display", display,
+                       NULL);
+}

src/core/devices-xi2.h

@@ -0,0 +1,92 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file devices-xi2.h  XInput2 input devices implementation
+ *
+ * Input devices.
+ * This file contains the XInput2 implementation of input devices.
+ */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_DEVICES_XI2_H
+#define META_DEVICES_XI2_H
+
+#include "device-pointer.h"
+#include "device-keyboard.h"
+
+/* Pointer */
+#define META_TYPE_DEVICE_POINTER_XI2            (meta_device_pointer_xi2_get_type ())
+#define META_DEVICE_POINTER_XI2(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_DEVICE_POINTER_XI2, MetaDevicePointerXI2))
+#define META_DEVICE_POINTER_XI2_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_DEVICE_POINTER_XI2, MetaDevicePointerXI2Class))
+#define META_IS_DEVICE_POINTER_XI2(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_DEVICE_POINTER_XI2))
+#define META_IS_DEVICE_POINTER_XI2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_DEVICE_POINTER_XI2))
+#define META_DEVICE_POINTER_XI2_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_DEVICE_POINTER_XI2, MetaDevicePointerXI2Class))
+
+typedef struct _MetaDevicePointerXI2 MetaDevicePointerXI2;
+typedef struct _MetaDevicePointerXI2Class MetaDevicePointerXI2Class;
+
+struct _MetaDevicePointerXI2
+{
+  MetaDevicePointer parent_instance;
+};
+
+struct _MetaDevicePointerXI2Class
+{
+  MetaDevicePointerClass parent_class;
+};
+
+GType       meta_device_pointer_xi2_get_type (void) G_GNUC_CONST;
+
+MetaDevice *meta_device_pointer_xi2_new      (MetaDisplay *display,
+                                              gint         device_id);
+
+/* Keyboard */
+#define META_TYPE_DEVICE_KEYBOARD_XI2            (meta_device_keyboard_xi2_get_type ())
+#define META_DEVICE_KEYBOARD_XI2(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_DEVICE_KEYBOARD_XI2, MetaDeviceKeyboardXI2))
+#define META_DEVICE_KEYBOARD_XI2_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_DEVICE_KEYBOARD_XI2, MetaDeviceKeyboardXI2Class))
+#define META_IS_DEVICE_KEYBOARD_XI2(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_DEVICE_KEYBOARD_XI2))
+#define META_IS_DEVICE_KEYBOARD_XI2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_DEVICE_KEYBOARD_XI2))
+#define META_DEVICE_KEYBOARD_XI2_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_DEVICE_KEYBOARD_XI2, MetaDeviceKeyboardXI2Class))
+
+typedef struct _MetaDeviceKeyboardXI2 MetaDeviceKeyboardXI2;
+typedef struct _MetaDeviceKeyboardXI2Class MetaDeviceKeyboardXI2Class;
+
+struct _MetaDeviceKeyboardXI2
+{
+  MetaDeviceKeyboard parent_instance;
+};
+
+struct _MetaDeviceKeyboardXI2Class
+{
+  MetaDeviceKeyboardClass parent_class;
+};
+
+GType       meta_device_keyboard_xi2_get_type (void) G_GNUC_CONST;
+
+MetaDevice *meta_device_keyboard_xi2_new      (MetaDisplay *display,
+                                               gint         device_id);
+
+/* Helper function for translating event masks */
+guchar * meta_device_xi2_translate_event_mask (guint        evmask,
+                                               gint        *len);
+
+
+#endif /* META_DEVICES_XI2_H */

src/core/display-private.h

@@ -38,6 +38,7 @@
 #include <meta/boxes.h>
 #include <meta/display.h>
 #include "keybindings-private.h"
+#include "device-map-private.h"
 #include <meta/prefs.h>
 
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -56,6 +57,10 @@ typedef struct _MetaWindowPropHooks MetaWindowPropHooks;
 
 typedef struct MetaEdgeResistanceData MetaEdgeResistanceData;
 
+typedef struct _MetaGrabInfo MetaGrabInfo;
+typedef struct _MetaFocusInfo MetaFocusInfo;
+typedef struct _MetaTouchInfo MetaTouchInfo;
+
 typedef void (* MetaWindowPingFunc) (MetaDisplay *display,
 				     Window       xwindow,
 				     guint32      timestamp,
@@ -86,6 +91,79 @@ typedef enum {
   META_TILE_MAXIMIZED
 } MetaTileMode;
 
+struct _MetaGrabInfo
+{
+  MetaDevice *grab_pointer;
+  MetaDevice *grab_keyboard;
+
+  MetaGrabOp  grab_op;
+  MetaScreen *grab_screen;
+  MetaWindow *grab_window;
+  Window      grab_xwindow;
+  int         grab_button;
+  int         grab_anchor_root_x;
+  int         grab_anchor_root_y;
+  MetaRectangle grab_anchor_window_pos;
+  MetaTileMode  grab_tile_mode;
+  int           grab_tile_monitor_number;
+  int         grab_latest_motion_x;
+  int         grab_latest_motion_y;
+  gulong      grab_mask;
+  guint       grab_have_pointer : 1;
+  guint       grab_have_keyboard : 1;
+  guint       grab_frame_action : 1;
+  /* During a resize operation, the directions in which we've broken
+   * out of the initial maximization state */
+  guint       grab_resize_unmaximize : 2; /* MetaMaximizeFlags */
+  MetaRectangle grab_initial_window_pos;
+  int         grab_initial_x, grab_initial_y;  /* These are only relevant for */
+  gboolean    grab_threshold_movement_reached; /* raise_on_click == FALSE.    */
+  MetaResizePopup *grab_resize_popup;
+  GTimeVal    grab_last_moveresize_time;
+  guint32     grab_motion_notify_time;
+  GList*      grab_old_window_stacking;
+  unsigned int grab_last_user_action_was_snap;
+  MetaEdgeResistanceData *grab_edge_resistance_data;
+
+#ifdef HAVE_XSYNC
+  /* alarm monitoring client's _NET_WM_SYNC_REQUEST_COUNTER */
+  XSyncAlarm  grab_sync_request_alarm;
+#endif
+  int	      grab_resize_timeout_id;
+};
+
+struct _MetaFocusInfo
+{
+  /* This is the actual window from focus events,
+   * not the one we last set
+   */
+  MetaWindow *focus_window;
+
+  /* window we are expecting a FocusIn event for or the current focus
+   * window if we are not expecting any FocusIn/FocusOut events; not
+   * perfect because applications can call XSetInputFocus directly.
+   * (It could also be messed up if a timestamp later than current
+   * time is sent to meta_display_set_input_focus_window, though that
+   * would be a programming error).  See bug 154598 for more info.
+   */
+  MetaWindow *expected_focus_window;
+
+  /* last timestamp passed to XSetInputFocus */
+  guint32 last_focus_time;
+};
+
+struct _MetaTouchInfo
+{
+  gdouble root_x;
+  gdouble root_y;
+
+  gdouble initial_root_x;
+  gdouble initial_root_y;
+
+  guint notified : 1;
+  guint use_for_hotspot : 1;
+};
+
 struct _MetaDisplay
 {
   GObject parent_instance;
@@ -104,22 +182,8 @@ struct _MetaDisplay
 #include <meta/atomnames.h>
 #undef item
 
-  /* This is the actual window from focus events,
-   * not the one we last set
-   */
-  MetaWindow *focus_window;
-
-  /* window we are expecting a FocusIn event for or the current focus
-   * window if we are not expecting any FocusIn/FocusOut events; not
-   * perfect because applications can call XSetInputFocus directly.
-   * (It could also be messed up if a timestamp later than current
-   * time is sent to meta_display_set_input_focus_window, though that
-   * would be a programming error).  See bug 154598 for more info.
-   */
-  MetaWindow *expected_focus_window;
-
-  /* last timestamp passed to XSetInputFocus */
-  guint32 last_focus_time;
+  /* keyboard -> MetaFocusInfo hashtable */
+  GHashTable *focus_info;
 
   /* last user interaction time in any app */
   guint32 last_user_time;
@@ -182,35 +246,11 @@ struct _MetaDisplay
   /* Alt+click button grabs */
   unsigned int window_grab_modifiers;
   
-  /* current window operation */
-  MetaGrabOp  grab_op;
-  MetaScreen *grab_screen;
-  MetaWindow *grab_window;
-  Window      grab_xwindow;
-  int         grab_button;
-  int         grab_anchor_root_x;
-  int         grab_anchor_root_y;
-  MetaRectangle grab_anchor_window_pos;
-  MetaTileMode  grab_tile_mode;
-  int           grab_tile_monitor_number;
-  int         grab_latest_motion_x;
-  int         grab_latest_motion_y;
-  gulong      grab_mask;
-  guint       grab_have_pointer : 1;
-  guint       grab_have_keyboard : 1;
-  guint       grab_frame_action : 1;
-  /* During a resize operation, the directions in which we've broken
-   * out of the initial maximization state */
-  guint       grab_resize_unmaximize : 2; /* MetaMaximizeFlags */
-  MetaRectangle grab_initial_window_pos;
-  int         grab_initial_x, grab_initial_y;  /* These are only relevant for */
-  gboolean    grab_threshold_movement_reached; /* raise_on_click == FALSE.    */
-  MetaResizePopup *grab_resize_popup;
-  GTimeVal    grab_last_moveresize_time;
-  guint32     grab_motion_notify_time;
-  GList*      grab_old_window_stacking;
-  MetaEdgeResistanceData *grab_edge_resistance_data;
-  unsigned int grab_last_user_action_was_snap;
+  /* per-device current window operation */
+  GHashTable *current_grabs;
+
+  /* per-screen edge resistance cache */
+  GHashTable *edge_resistance_info;
 
   /* we use property updates as sentinels for certain window focus events
    * to avoid some race conditions on EnterNotify events
@@ -221,11 +261,6 @@ struct _MetaDisplay
   int         xkb_base_event_type;
   guint32     last_bell_time;
 #endif
-#ifdef HAVE_XSYNC
-  /* alarm monitoring client's _NET_WM_SYNC_REQUEST_COUNTER */
-  XSyncAlarm  grab_sync_request_alarm;
-#endif
-  int	      grab_resize_timeout_id;
 
   /* Keybindings stuff */
   MetaKeyBinding *key_bindings;
@@ -272,6 +307,9 @@ struct _MetaDisplay
   /* Managed by compositor.c */
   MetaCompositor *compositor;
 
+  /* Managed by device-map.c */
+  MetaDeviceMap *device_map;
+
   int render_event_base;
   int render_error_base;
 
@@ -295,6 +333,12 @@ struct _MetaDisplay
   int shape_event_base;
   int shape_error_base;
 #endif
+
+#ifdef HAVE_XINPUT2
+  int xinput2_opcode;
+  unsigned int have_xinput2 : 1;
+#endif
+
 #ifdef HAVE_XSYNC
   unsigned int have_xsync : 1;
 #define META_DISPLAY_HAS_XSYNC(display) ((display)->have_xsync)
@@ -380,18 +424,24 @@ Cursor         meta_display_create_x_cursor (MetaDisplay *display,
 
 void     meta_display_set_grab_op_cursor (MetaDisplay *display,
                                           MetaScreen  *screen,
+                                          MetaDevice  *device,
                                           MetaGrabOp   op,
                                           gboolean     change_pointer,
                                           Window       grab_xwindow,
                                           guint32      timestamp);
 
 void    meta_display_check_threshold_reached (MetaDisplay *display,
+                                              MetaDevice  *device,
                                               int          x,
                                               int          y);
 void     meta_display_grab_window_buttons    (MetaDisplay *display,
                                               Window       xwindow);
 void     meta_display_ungrab_window_buttons  (MetaDisplay *display,
                                               Window       xwindow);
+void     meta_display_grab_window_touches    (MetaDisplay *display,
+                                              MetaWindow  *window);
+void     meta_display_ungrab_window_touches  (MetaDisplay *display,
+                                              MetaWindow  *window);
 
 void meta_display_grab_focus_window_button   (MetaDisplay *display,
                                               MetaWindow  *window);
@@ -399,7 +449,8 @@ void meta_display_ungrab_focus_window_button (MetaDisplay *display,
                                               MetaWindow  *window);
 
 /* Next function is defined in edge-resistance.c */
-void meta_display_cleanup_edges              (MetaDisplay *display);
+void meta_display_cleanup_edges              (MetaDisplay *display,
+                                              MetaScreen  *screen);
 
 /* make a request to ensure the event serial has changed */
 void     meta_display_increment_event_serial (MetaDisplay *display);
@@ -447,4 +498,15 @@ void meta_display_overlay_key_activate (MetaDisplay *display);
 /* In above-tab-keycode.c */
 guint meta_display_get_above_tab_keycode (MetaDisplay *display);
 
+MetaGrabInfo * meta_display_create_grab_info         (MetaDisplay  *display,
+                                                      MetaDevice   *device);
+void           meta_display_remove_grab_info         (MetaDisplay  *display,
+                                                      MetaDevice   *device);
+
+MetaGrabInfo * meta_display_get_grab_info            (MetaDisplay  *display,
+                                                      MetaDevice   *device);
+MetaFocusInfo * meta_display_get_focus_info          (MetaDisplay  *display,
+                                                      MetaDevice   *device);
+
+
 #endif

src/core/edge-resistance.c

@@ -30,12 +30,12 @@
 /* A simple macro for whether a given window's edges are potentially
  * relevant for resistance/snapping during a move/resize operation
  */
-#define WINDOW_EDGES_RELEVANT(window, display) \
-  meta_window_should_be_showing (window) &&    \
-  window->screen == display->grab_screen &&    \
-  window         != display->grab_window &&    \
-  window->type   != META_WINDOW_DESKTOP &&     \
-  window->type   != META_WINDOW_MENU    &&     \
+#define WINDOW_EDGES_RELEVANT(window, display, screen) \
+  meta_window_should_be_showing (window) &&            \
+  window->screen == screen &&                          \
+  window->cur_grab == NULL &&                          \
+  window->type   != META_WINDOW_DESKTOP &&             \
+  window->type   != META_WINDOW_MENU    &&             \
   window->type   != META_WINDOW_SPLASHSCREEN
 
 struct ResistanceDataForAnEdge
@@ -44,8 +44,9 @@ struct ResistanceDataForAnEdge
   guint        timeout_id;
   int          timeout_edge_pos;
   gboolean     timeout_over;
-  GSourceFunc  timeout_func;
+  MetaEdgeResistanceFunc timeout_func;
   MetaWindow  *window;
+  MetaDevice  *device;
   int          keyboard_buildup;
 };
 typedef struct ResistanceDataForAnEdge ResistanceDataForAnEdge;
@@ -63,7 +64,9 @@ struct MetaEdgeResistanceData
   ResistanceDataForAnEdge bottom_data;
 };
 
-static void compute_resistance_and_snapping_edges (MetaDisplay *display);
+static MetaEdgeResistanceData *
+        compute_resistance_and_snapping_edges (MetaDisplay *display,
+                                               MetaScreen  *screen);
 
 /* !WARNING!: this function can return invalid indices (namely, either -1 or
  * edges->len); this is by design, but you need to remember this.
@@ -318,20 +321,22 @@ edge_resistance_timeout (gpointer data)
 
   resistance_data->timeout_over = TRUE;
   resistance_data->timeout_id = 0;
-  (*resistance_data->timeout_func)(resistance_data->window);
+  (*resistance_data->timeout_func) (resistance_data->window,
+                                    resistance_data->device);
 
   return FALSE;
 }
 
 static int
 apply_edge_resistance (MetaWindow                *window,
+                       MetaDevice                *device,
                        int                        old_pos,
                        int                        new_pos,
                        const MetaRectangle       *old_rect,
                        const MetaRectangle       *new_rect,
                        GArray                    *edges,
                        ResistanceDataForAnEdge   *resistance_data,
-                       GSourceFunc                timeout_func,
+                       MetaEdgeResistanceFunc     timeout_func,
                        gboolean                   xdir,
                        gboolean                   keyboard_op)
 {
@@ -445,6 +450,7 @@ apply_edge_resistance (MetaWindow                *window,
                   resistance_data->timeout_over = FALSE;
                   resistance_data->timeout_func = timeout_func;
                   resistance_data->window = window;
+                  resistance_data->device = device;
                 }
               if (!resistance_data->timeout_over &&
                   timeout_length_ms != 0)
@@ -533,29 +539,28 @@ apply_edge_snapping (int                  old_pos,
  * a proposed new position (ignoring edge resistance/snapping), and then
  * applies edge resistance to EACH edge (separately) updating new_outer.
  * It returns true if new_outer is modified, false otherwise.
- *
- * display->grab_edge_resistance_data MUST already be setup or calling this
- * function will cause a crash.
  */
 static gboolean 
-apply_edge_resistance_to_each_side (MetaDisplay         *display,
-                                    MetaWindow          *window,
-                                    const MetaRectangle *old_outer,
-                                    MetaRectangle       *new_outer,
-                                    GSourceFunc          timeout_func,
-                                    gboolean             auto_snap,
-                                    gboolean             keyboard_op,
-                                    gboolean             is_resize)
+apply_edge_resistance_to_each_side (MetaDisplay            *display,
+                                    MetaWindow             *window,
+                                    MetaDevice             *device,
+                                    const MetaRectangle    *old_outer,
+                                    MetaRectangle          *new_outer,
+                                    MetaEdgeResistanceFunc  timeout_func,
+                                    gboolean                auto_snap,
+                                    gboolean                keyboard_op,
+                                    gboolean                is_resize)
 {
   MetaEdgeResistanceData *edge_data;
   MetaRectangle           modified_rect;
   gboolean                modified;
   int new_left, new_right, new_top, new_bottom;
 
-  if (display->grab_edge_resistance_data == NULL)
-    compute_resistance_and_snapping_edges (display);
+  edge_data = g_hash_table_lookup (display->edge_resistance_info,
+                                   window->screen);
 
-  edge_data = display->grab_edge_resistance_data;
+  if (!edge_data)
+    edge_data = compute_resistance_and_snapping_edges (display, window->screen);
 
   if (auto_snap)
     {
@@ -601,7 +606,7 @@ apply_edge_resistance_to_each_side (MetaDisplay         *display,
       if (!is_resize || window->size_hints.width_inc == 1)
         {
           /* Now, apply the normal horizontal edge resistance */
-          new_left   = apply_edge_resistance (window,
+          new_left   = apply_edge_resistance (window, device,
                                               BOX_LEFT (*old_outer),
                                               BOX_LEFT (*new_outer),
                                               old_outer,
@@ -611,7 +616,7 @@ apply_edge_resistance_to_each_side (MetaDisplay         *display,
                                               timeout_func,
                                               TRUE,
                                               keyboard_op);
-          new_right  = apply_edge_resistance (window,
+          new_right  = apply_edge_resistance (window, device,
                                               BOX_RIGHT (*old_outer),
                                               BOX_RIGHT (*new_outer),
                                               old_outer,
@@ -630,7 +635,7 @@ apply_edge_resistance_to_each_side (MetaDisplay         *display,
       /* Same for vertical resizes... */
       if (!is_resize || window->size_hints.height_inc == 1)
         {
-          new_top    = apply_edge_resistance (window,
+          new_top    = apply_edge_resistance (window, device,
                                               BOX_TOP (*old_outer),
                                               BOX_TOP (*new_outer),
                                               old_outer,
@@ -640,7 +645,7 @@ apply_edge_resistance_to_each_side (MetaDisplay         *display,
                                               timeout_func,
                                               FALSE,
                                               keyboard_op);
-          new_bottom = apply_edge_resistance (window,
+          new_bottom = apply_edge_resistance (window, device,
                                               BOX_BOTTOM (*old_outer),
                                               BOX_BOTTOM (*new_outer),
                                               old_outer,
@@ -669,15 +674,20 @@ apply_edge_resistance_to_each_side (MetaDisplay         *display,
 }
 
 void
-meta_display_cleanup_edges (MetaDisplay *display)
+meta_display_cleanup_edges (MetaDisplay *display,
+                            MetaScreen  *screen)
 {
   guint i,j;
-  MetaEdgeResistanceData *edge_data = display->grab_edge_resistance_data;
+  MetaEdgeResistanceData *edge_data;
   GHashTable *edges_to_be_freed;
 
+  edge_data = g_hash_table_lookup (display->edge_resistance_info, screen);
+
   if (edge_data == NULL) /* Not currently cached */
     return;
 
+  g_hash_table_steal (display->edge_resistance_info, screen);
+
   /* We first need to clean out any window edges */
   edges_to_be_freed = g_hash_table_new_full (g_direct_hash, g_direct_equal,
                                              g_free, NULL);
@@ -750,8 +760,7 @@ meta_display_cleanup_edges (MetaDisplay *display)
       edge_data->bottom_data.timeout_id != 0)
     g_source_remove (edge_data->bottom_data.timeout_id);
 
-  g_free (display->grab_edge_resistance_data);
-  display->grab_edge_resistance_data = NULL;
+  g_free (edge_data);
 }
 
 static int
@@ -763,8 +772,9 @@ stupid_sort_requiring_extra_pointer_dereference (gconstpointer a,
   return meta_rectangle_edge_cmp_ignore_type (*a_edge, *b_edge);
 }
 
-static void
+static MetaEdgeResistanceData *
 cache_edges (MetaDisplay *display,
+             MetaScreen  *screen,
              GList *window_edges,
              GList *monitor_edges,
              GList *screen_edges)
@@ -848,9 +858,8 @@ cache_edges (MetaDisplay *display,
   /*
    * 2nd: Allocate the edges
    */
-  g_assert (display->grab_edge_resistance_data == NULL);
-  display->grab_edge_resistance_data = g_new0 (MetaEdgeResistanceData, 1);
-  edge_data = display->grab_edge_resistance_data;
+  edge_data = g_new0 (MetaEdgeResistanceData, 1);
+
   edge_data->left_edges   = g_array_sized_new (FALSE,
                                                FALSE,
                                                sizeof(MetaEdge*),
@@ -917,21 +926,21 @@ cache_edges (MetaDisplay *display,
    * avoided this sort by sticking them into the array with some simple
    * merging of the lists).
    */
-  g_array_sort (display->grab_edge_resistance_data->left_edges, 
+  g_array_sort (edge_data->left_edges,
                 stupid_sort_requiring_extra_pointer_dereference);
-  g_array_sort (display->grab_edge_resistance_data->right_edges, 
+  g_array_sort (edge_data->right_edges,
                 stupid_sort_requiring_extra_pointer_dereference);
-  g_array_sort (display->grab_edge_resistance_data->top_edges, 
+  g_array_sort (edge_data->top_edges,
                 stupid_sort_requiring_extra_pointer_dereference);
-  g_array_sort (display->grab_edge_resistance_data->bottom_edges, 
+  g_array_sort (edge_data->bottom_edges,
                 stupid_sort_requiring_extra_pointer_dereference);
+
+  return edge_data;
 }
 
 static void
-initialize_grab_edge_resistance_data (MetaDisplay *display)
+initialize_grab_edge_resistance_data (MetaEdgeResistanceData *edge_data)
 {
-  MetaEdgeResistanceData *edge_data = display->grab_edge_resistance_data;
-
   edge_data->left_data.timeout_setup   = FALSE;
   edge_data->right_data.timeout_setup  = FALSE;
   edge_data->top_data.timeout_setup    = FALSE;
@@ -943,8 +952,9 @@ initialize_grab_edge_resistance_data (MetaDisplay *display)
   edge_data->bottom_data.keyboard_buildup = 0;
 }
 
-static void
-compute_resistance_and_snapping_edges (MetaDisplay *display)
+static MetaEdgeResistanceData *
+compute_resistance_and_snapping_edges (MetaDisplay *display,
+                                       MetaScreen  *screen)
 {
   GList *stacked_windows;
   GList *cur_window_iter;
@@ -956,18 +966,17 @@ compute_resistance_and_snapping_edges (MetaDisplay *display)
    * in the layer that we are working on
    */
   GSList *rem_windows, *rem_win_stacking;
+  MetaEdgeResistanceData *edge_data;
 
-  g_assert (display->grab_window != NULL);
   meta_topic (META_DEBUG_WINDOW_OPS,
-              "Computing edges to resist-movement or snap-to for %s.\n",
-              display->grab_window->desc);
+              "Computing edges to resist-movement or snap-to for screen %s.\n",
+              screen->screen_name);
 
   /*
    * 1st: Get the list of relevant windows, from bottom to top
    */
   stacked_windows = 
-    meta_stack_list_windows (display->grab_screen->stack,
-                             display->grab_screen->active_workspace);
+    meta_stack_list_windows (screen->stack, screen->active_workspace);
 
   /*
    * 2nd: we need to separate that stacked list into a list of windows that
@@ -981,7 +990,7 @@ compute_resistance_and_snapping_edges (MetaDisplay *display)
   while (cur_window_iter != NULL)
     {
       MetaWindow *cur_window = cur_window_iter->data;
-      if (WINDOW_EDGES_RELEVANT (cur_window, display))
+      if (WINDOW_EDGES_RELEVANT (cur_window, display, screen))
         {
           MetaRectangle *new_rect;
           new_rect = g_new (MetaRectangle, 1);
@@ -1016,7 +1025,7 @@ compute_resistance_and_snapping_edges (MetaDisplay *display)
        * resistance (note that dock edges are considered screen edges
        * which are handled separately
        */
-      if (WINDOW_EDGES_RELEVANT (cur_window, display) &&
+      if (WINDOW_EDGES_RELEVANT (cur_window, display, screen) &&
           cur_window->type != META_WINDOW_DOCK)
         {
           GList *new_edges;
@@ -1028,7 +1037,7 @@ compute_resistance_and_snapping_edges (MetaDisplay *display)
            * by other windows or DOCKS, but that's handled below).
            */
           meta_rectangle_intersect (&cur_rect, 
-                                    &display->grab_screen->rect,
+                                    &screen->rect,
                                     &reduced);
 
           new_edges = NULL;
@@ -1123,32 +1132,36 @@ compute_resistance_and_snapping_edges (MetaDisplay *display)
    * monitor edges in an array for quick access.  Free the edges since
    * they've been cached elsewhere.
    */
-  cache_edges (display,
-               edges,
-               display->grab_screen->active_workspace->monitor_edges,
-               display->grab_screen->active_workspace->screen_edges);
+  edge_data = cache_edges (display, screen,
+                           edges,
+                           screen->active_workspace->monitor_edges,
+                           screen->active_workspace->screen_edges);
   g_list_free (edges);
 
   /*
    * 6th: Initialize the resistance timeouts and buildups
    */
-  initialize_grab_edge_resistance_data (display);
+  initialize_grab_edge_resistance_data (edge_data);
+
+  return edge_data;
 }
 
 /* Note that old_[xy] and new_[xy] are with respect to inner positions of
  * the window.
  */
 void
-meta_window_edge_resistance_for_move (MetaWindow  *window,
-                                      int          old_x,
-                                      int          old_y,
-                                      int         *new_x,
-                                      int         *new_y,
-                                      GSourceFunc  timeout_func,
-                                      gboolean     snap,
-                                      gboolean     is_keyboard_op)
+meta_window_edge_resistance_for_move (MetaWindow             *window,
+                                      MetaDevice             *device,
+                                      int                     old_x,
+                                      int                     old_y,
+                                      int                    *new_x,
+                                      int                    *new_y,
+                                      MetaEdgeResistanceFunc  timeout_func,
+                                      gboolean                snap,
+                                      gboolean                is_keyboard_op)
 {
   MetaRectangle old_outer, proposed_outer, new_outer;
+  MetaGrabInfo *grab_info;
   gboolean is_resize;
 
   meta_window_get_outer_rect (window, &old_outer);
@@ -1158,10 +1171,14 @@ meta_window_edge_resistance_for_move (MetaWindow  *window,
   proposed_outer.y += (*new_y - old_y);
   new_outer = proposed_outer;
 
-  window->display->grab_last_user_action_was_snap = snap;
+  grab_info = meta_display_get_grab_info (window->display, device);
+  g_assert (grab_info != NULL);
+
+  grab_info->grab_last_user_action_was_snap = snap;
   is_resize = FALSE;
   if (apply_edge_resistance_to_each_side (window->display,
                                           window,
+                                          device,
                                           &old_outer,
                                           &new_outer,
                                           timeout_func,
@@ -1223,18 +1240,20 @@ meta_window_edge_resistance_for_move (MetaWindow  *window,
  * sizes of the inner window.
  */
 void
-meta_window_edge_resistance_for_resize (MetaWindow  *window,
-                                        int          old_width,
-                                        int          old_height,
-                                        int         *new_width,
-                                        int         *new_height,
-                                        int          gravity,
-                                        GSourceFunc  timeout_func,
-                                        gboolean     snap,
-                                        gboolean     is_keyboard_op)
+meta_window_edge_resistance_for_resize (MetaWindow             *window,
+                                        MetaDevice             *device,
+                                        int                     old_width,
+                                        int                     old_height,
+                                        int                    *new_width,
+                                        int                    *new_height,
+                                        int                     gravity,
+                                        MetaEdgeResistanceFunc  timeout_func,
+                                        gboolean                snap,
+                                        gboolean                is_keyboard_op)
 {
   MetaRectangle old_outer, new_outer;
   int proposed_outer_width, proposed_outer_height;
+  MetaGrabInfo *grab_info;
   gboolean is_resize;
 
   meta_window_get_outer_rect (window, &old_outer);
@@ -1246,10 +1265,14 @@ meta_window_edge_resistance_for_resize (MetaWindow  *window,
                                       proposed_outer_width,
                                       proposed_outer_height);
 
-  window->display->grab_last_user_action_was_snap = snap;
+  grab_info = meta_display_get_grab_info (window->display, device);
+  g_assert (grab_info != NULL);
+
+  grab_info->grab_last_user_action_was_snap = snap;
   is_resize = TRUE;
   if (apply_edge_resistance_to_each_side (window->display,
                                           window,
+                                          device,
                                           &old_outer,
                                           &new_outer,
                                           timeout_func,

src/core/edge-resistance.h

@@ -26,23 +26,28 @@
 
 #include "window-private.h"
 
-void        meta_window_edge_resistance_for_move   (MetaWindow  *window,
-                                                    int          old_x,
-                                                    int          old_y,
-                                                    int         *new_x,
-                                                    int         *new_y,
-                                                    GSourceFunc  timeout_func,
-                                                    gboolean     snap,
-                                                    gboolean     is_keyboard_op);
-void        meta_window_edge_resistance_for_resize (MetaWindow  *window,
-                                                    int          old_width,
-                                                    int          old_height,
-                                                    int         *new_width,
-                                                    int         *new_height,
-                                                    int          gravity,
-                                                    GSourceFunc  timeout_func,
-                                                    gboolean     snap,
-                                                    gboolean     is_keyboard_op);
+typedef gboolean (* MetaEdgeResistanceFunc) (MetaWindow *window,
+                                             MetaDevice *device);
+
+void meta_window_edge_resistance_for_move   (MetaWindow             *window,
+                                             MetaDevice             *device,
+                                             int                     old_x,
+                                             int                     old_y,
+                                             int                    *new_x,
+                                             int                    *new_y,
+                                             MetaEdgeResistanceFunc  func,
+                                             gboolean                snap,
+                                             gboolean                is_keyboard_op);
+void meta_window_edge_resistance_for_resize (MetaWindow             *window,
+                                             MetaDevice             *device,
+                                             int                     old_width,
+                                             int                     old_height,
+                                             int                    *new_width,
+                                             int                    *new_height,
+                                             int                     gravity,
+                                             MetaEdgeResistanceFunc  func,
+                                             gboolean                snap,
+                                             gboolean                is_keyboard_op);
 
 #endif /* META_EDGE_RESISTANCE_H */
 

src/core/frame.c

@@ -28,6 +28,7 @@
 #include "bell.h"
 #include <meta/errors.h>
 #include "keybindings-private.h"
+#include "device-pointer.h"
 
 #include <X11/extensions/Xrender.h>
 
@@ -64,7 +65,7 @@ meta_window_ensure_frame (MetaWindow *window)
   frame->child_y = 0;
   frame->bottom_height = 0;
   frame->right_width = 0;
-  frame->current_cursor = 0;
+  frame->cursors = g_hash_table_new (NULL, NULL);
 
   frame->mapped = FALSE;
   frame->is_flashing = FALSE;
@@ -228,9 +229,10 @@ meta_window_destroy_frame (MetaWindow *window)
 
   /* Move keybindings to window instead of frame */
   meta_window_grab_keys (window);
-  
+
+  g_hash_table_destroy (frame->cursors);
   g_free (frame);
-  
+
   /* Put our state back where it should be */
   meta_window_queue (window, META_QUEUE_CALC_SHOWING);
   meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
@@ -244,6 +246,12 @@ meta_frame_get_flags (MetaFrame *frame)
 
   flags = 0;
 
+  /* Disallow frame operations
+   * while the popup menu is open.
+   */
+  if (frame->window->menu)
+    return flags;
+
   if (frame->window->border_only)
     {
       ; /* FIXME this may disable the _function_ as well as decor
@@ -382,8 +390,7 @@ meta_frame_sync_to_window (MetaFrame *frame,
       /* If we're interactively resizing the frame, repaint
        * it immediately so we don't start to lag.
        */
-      if (frame->window->display->grab_window ==
-          frame->window)
+      if (frame->window->cur_grab != NULL)
         meta_ui_repaint_frame (frame->window->screen->ui,
                                frame->xwindow);
     }
@@ -408,22 +415,22 @@ meta_frame_queue_draw (MetaFrame *frame)
 }
 
 void
-meta_frame_set_screen_cursor (MetaFrame	*frame,
-			      MetaCursor cursor)
+meta_frame_set_screen_cursor (MetaFrame	 *frame,
+                              MetaDevice *pointer,
+			      MetaCursor  cursor)
 {
-  Cursor xcursor;
-  if (cursor == frame->current_cursor)
+  MetaCursor old_cursor;
+
+  old_cursor = GPOINTER_TO_UINT (g_hash_table_lookup (frame->cursors, pointer));
+
+  if (cursor == old_cursor)
     return;
-  frame->current_cursor = cursor;
-  if (cursor == META_CURSOR_DEFAULT)
-    XUndefineCursor (frame->window->display->xdisplay, frame->xwindow);
-  else
-    { 
-      xcursor = meta_display_create_x_cursor (frame->window->display, cursor);
-      XDefineCursor (frame->window->display->xdisplay, frame->xwindow, xcursor);
-      XFlush (frame->window->display->xdisplay);
-      XFreeCursor (frame->window->display->xdisplay, xcursor);
-    }
+
+  g_hash_table_insert (frame->cursors, pointer,
+                       GUINT_TO_POINTER (cursor));
+  meta_device_pointer_set_window_cursor (META_DEVICE_POINTER (pointer),
+                                         frame->xwindow, cursor);
+  XFlush (frame->window->display->xdisplay);
 }
 
 Window

src/core/frame.h

@@ -34,7 +34,7 @@ struct _MetaFrame
   /* reparent window */
   Window xwindow;
 
-  MetaCursor current_cursor;
+  GHashTable *cursors;
 
   /* This rect is trusted info from where we put the
    * frame, not the result of ConfigureNotify
@@ -76,7 +76,8 @@ gboolean meta_frame_sync_to_window (MetaFrame         *frame,
 
 cairo_region_t *meta_frame_get_frame_bounds (MetaFrame *frame);
 
-void meta_frame_set_screen_cursor (MetaFrame	*frame,
+void meta_frame_set_screen_cursor (MetaFrame   *frame,
+                                   MetaDevice  *pointer,
 				   MetaCursor	cursor);
 
 #endif

src/core/input-events.c

@@ -0,0 +1,813 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* XEvent utility methods */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+#include "input-events.h"
+#include "devices-core.h"
+#include "device-map-private.h"
+#include <X11/Xlib.h>
+
+#ifdef HAVE_XINPUT2
+#include <X11/extensions/XInput2.h>
+#endif
+
+/* Quite a hack: normalizes XI2 events to their
+ * core event equivalent, so most code is shared
+ * for both implementations, code handling input
+ * events should use the helper functions so
+ * the actual event is treated correctly.
+ */
+gboolean
+meta_input_event_get_type (MetaDisplay *display,
+                           XEvent      *ev,
+                           guint       *ev_type)
+{
+  guint type = 0; /* Silence gcc */
+  gboolean retval = TRUE;
+
+#ifdef HAVE_XINPUT2
+  if (display->have_xinput2 &&
+      ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      /* NB: GDK event filters already have generic events
+       * allocated, so no need to do XGetEventData() on our own
+       */
+      xev = (XIEvent *) ev->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_Motion:
+          type = MotionNotify;
+          break;
+        case XI_ButtonPress:
+          type = ButtonPress;
+          break;
+        case XI_ButtonRelease:
+          type = ButtonRelease;
+          break;
+        case XI_KeyPress:
+          type = KeyPress;
+          break;
+        case XI_KeyRelease:
+          type = KeyRelease;
+          break;
+        case XI_FocusIn:
+          type = FocusIn;
+          break;
+        case XI_FocusOut:
+          type = FocusOut;
+          break;
+        case XI_Enter:
+          type = EnterNotify;
+          break;
+        case XI_Leave:
+          type = LeaveNotify;
+          break;
+        case XI_TouchBegin:
+          type = ButtonPress;
+          break;
+        case XI_TouchEnd:
+          type = ButtonRelease;
+          break;
+        case XI_TouchUpdate:
+          if (((XIDeviceEvent *) xev)->flags & XITouchPendingEnd)
+            {
+              /* Consider these events like TouchEnd, as we
+               * could still need to call XIAllowTouchEvents()
+               * for this touch sequence so we get the real
+               * TouchEnd event, handling this event type the
+               * second time it arrives should be a NO-OP.
+               */
+              type = ButtonRelease;
+            }
+          else
+            type = MotionNotify;
+          break;
+        default:
+          retval = FALSE;
+          break;
+        }
+    }
+  else
+#endif /* HAVE_XINPUT2 */
+    {
+      switch (ev->type)
+        {
+        case MotionNotify:
+        case ButtonPress:
+        case ButtonRelease:
+        case KeyPress:
+        case KeyRelease:
+        case FocusIn:
+        case FocusOut:
+        case EnterNotify:
+        case LeaveNotify:
+          type = ev->type;
+          break;
+        default:
+          retval = FALSE;
+          break;
+        }
+    }
+
+  if (retval)
+    {
+      if (ev_type)
+        *ev_type = type;
+
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+gboolean
+meta_input_event_is_type (MetaDisplay *display,
+                          XEvent      *ev,
+                          guint        ev_type)
+{
+  guint type;
+
+  if (!meta_input_event_get_type (display, ev, &type))
+    return FALSE;
+
+  return (type == ev_type);
+}
+
+gboolean
+meta_input_event_ignore (MetaDisplay *display,
+                         XEvent      *ev)
+{
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+      xev = (XIEvent *) ev->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+          if (((XIDeviceEvent *) xev)->flags & XIPointerEmulated)
+            return TRUE;
+
+        default:
+          return FALSE;
+        }
+    }
+
+  return FALSE;
+}
+
+gboolean
+meta_input_event_get_touch_id (MetaDisplay *display,
+                               XEvent      *ev,
+                               guint       *touch_id)
+{
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+      xev = (XIEvent *) ev->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_TouchBegin:
+        case XI_TouchEnd:
+        case XI_TouchUpdate:
+          if (touch_id)
+            *touch_id = ((XIDeviceEvent *) xev)->detail;
+          return TRUE;
+        default:
+          return FALSE;
+        }
+    }
+
+  return FALSE;
+}
+
+Window
+meta_input_event_get_window (MetaDisplay *display,
+                             XEvent      *ev)
+{
+#ifdef HAVE_XINPUT2
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      /* GDK event filters already have generic events allocated */
+      xev = (XIEvent *) ev->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+        case XI_KeyPress:
+        case XI_KeyRelease:
+        case XI_TouchBegin:
+        case XI_TouchEnd:
+        case XI_TouchUpdate:
+          return ((XIDeviceEvent *) xev)->event;
+        case XI_FocusIn:
+        case XI_FocusOut:
+        case XI_Enter:
+        case XI_Leave:
+          return ((XIEnterEvent *) xev)->event;
+        default:
+          return None;
+        }
+    }
+  else
+#endif /* HAVE_XINPUT2 */
+    return ev->xany.window;
+}
+
+Window
+meta_input_event_get_root_window (MetaDisplay *display,
+                                  XEvent      *ev)
+{
+#ifdef HAVE_XINPUT2
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      xev = (XIEvent *) ev->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+        case XI_KeyPress:
+        case XI_KeyRelease:
+        case XI_TouchBegin:
+        case XI_TouchEnd:
+        case XI_TouchUpdate:
+          return ((XIDeviceEvent *) xev)->root;
+        case XI_FocusIn:
+        case XI_FocusOut:
+        case XI_Enter:
+        case XI_Leave:
+          return ((XIEnterEvent *) xev)->root;
+        default:
+          break;
+        }
+    }
+  else
+#endif /* HAVE_XINPUT2 */
+    {
+      switch (ev->type)
+        {
+        case KeyPress:
+        case KeyRelease:
+          return ev->xkey.root;
+        case ButtonPress:
+        case ButtonRelease:
+          return ev->xbutton.root;
+        case EnterNotify:
+        case LeaveNotify:
+          return ev->xcrossing.root;
+        case MotionNotify:
+          return ev->xbutton.root;
+        default:
+          break;
+        }
+    }
+
+  return None;
+}
+
+Time
+meta_input_event_get_time (MetaDisplay *display,
+                           XEvent      *ev)
+{
+#ifdef HAVE_XINPUT2
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      xev = (XIEvent *) ev->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+        case XI_KeyPress:
+        case XI_KeyRelease:
+        case XI_TouchBegin:
+        case XI_TouchEnd:
+        case XI_TouchUpdate:
+          return ((XIDeviceEvent *) xev)->time;
+        case XI_FocusIn:
+        case XI_FocusOut:
+        case XI_Enter:
+        case XI_Leave:
+          return ((XIEnterEvent *) xev)->time;
+        default:
+          break;
+        }
+    }
+  else
+#endif /* HAVE_XINPUT2 */
+    {
+      switch (ev->type)
+        {
+        case KeyPress:
+        case KeyRelease:
+          return ev->xkey.time;
+        case ButtonPress:
+        case ButtonRelease:
+          return ev->xbutton.time;
+        case EnterNotify:
+        case LeaveNotify:
+          return ev->xcrossing.time;
+        case MotionNotify:
+          return ev->xmotion.time;
+        default:
+          break;
+        }
+    }
+
+  return CurrentTime;
+}
+
+gboolean
+meta_input_event_get_coordinates (MetaDisplay *display,
+                                  XEvent      *ev,
+                                  gdouble     *x_ret,
+                                  gdouble     *y_ret,
+                                  gdouble     *x_root_ret,
+                                  gdouble     *y_root_ret)
+{
+  gdouble x, y, x_root, y_root;
+  gboolean retval = TRUE;
+
+#ifdef HAVE_XINPUT2
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      xev = (XIEvent *) ev->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+        case XI_KeyPress:
+        case XI_KeyRelease:
+        case XI_TouchBegin:
+        case XI_TouchEnd:
+        case XI_TouchUpdate:
+          {
+            XIDeviceEvent *event = (XIDeviceEvent *) xev;
+
+            x = event->event_x;
+            y = event->event_y;
+            x_root = event->root_x;
+            y_root = event->root_y;
+          }
+
+          break;
+        case XI_FocusIn:
+        case XI_FocusOut:
+        case XI_Enter:
+        case XI_Leave:
+          {
+            XIEnterEvent *event = (XIEnterEvent *) xev;
+
+            x = event->event_x;
+            y = event->event_y;
+            x_root = event->root_x;
+            y_root = event->root_y;
+          }
+
+          break;
+        default:
+          retval = FALSE;
+          break;
+        }
+    }
+  else
+#endif /* HAVE_XINPUT2 */
+    {
+      switch (ev->type)
+        {
+        case KeyPress:
+        case KeyRelease:
+          x = ev->xkey.x;
+          y = ev->xkey.y;
+          x_root = ev->xkey.x_root;
+          y_root = ev->xkey.y_root;
+          break;
+        case ButtonPress:
+        case ButtonRelease:
+          x = ev->xbutton.x;
+          y = ev->xbutton.y;
+          x_root = ev->xbutton.x_root;
+          y_root = ev->xbutton.y_root;
+          break;
+        case EnterNotify:
+        case LeaveNotify:
+          x = ev->xcrossing.x;
+          y = ev->xcrossing.y;
+          x_root = ev->xcrossing.x_root;
+          y_root = ev->xcrossing.y_root;
+          break;
+        case MotionNotify:
+          x = ev->xmotion.x;
+          y = ev->xmotion.y;
+          x_root = ev->xmotion.x_root;
+          y_root = ev->xmotion.y_root;
+          break;
+        default:
+          retval = FALSE;
+          break;
+        }
+    }
+
+  if (retval)
+    {
+      if (x_ret)
+        *x_ret = x;
+
+      if (y_ret)
+        *y_ret = y;
+
+      if (x_root_ret)
+        *x_root_ret = x_root;
+
+      if (y_root_ret)
+        *y_root_ret = y_root;
+    }
+
+  return retval;
+}
+
+gboolean
+meta_input_event_get_state (MetaDisplay *display,
+                            XEvent      *ev,
+                            guint       *state)
+{
+  gboolean retval = TRUE;
+  guint s;
+
+#ifdef HAVE_XINPUT2
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      xev = (XIEvent *) ev->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+        case XI_KeyPress:
+        case XI_KeyRelease:
+        case XI_TouchBegin:
+        case XI_TouchEnd:
+        case XI_TouchUpdate:
+          s = ((XIDeviceEvent *) xev)->mods.effective;
+          break;
+        case XI_FocusIn:
+        case XI_FocusOut:
+        case XI_Enter:
+        case XI_Leave:
+          s = ((XIDeviceEvent *) xev)->mods.effective;
+          break;
+        default:
+          retval = FALSE;
+          break;
+        }
+    }
+  else
+#endif /* HAVE_XINPUT2 */
+    {
+      switch (ev->type)
+        {
+        case KeyPress:
+        case KeyRelease:
+          s = ev->xkey.state;
+          break;
+        case ButtonPress:
+        case ButtonRelease:
+          s = ev->xbutton.state;
+          break;
+        case EnterNotify:
+        case LeaveNotify:
+          s = ev->xcrossing.state;
+          break;
+        case MotionNotify:
+          s = ev->xmotion.state;
+          break;
+        default:
+          retval = FALSE;
+          break;
+        }
+    }
+
+  if (retval && state)
+    *state = s;
+
+  return retval;
+}
+
+gboolean
+meta_input_event_get_keycode (MetaDisplay *display,
+                              XEvent      *ev,
+                              guint       *keycode)
+{
+#ifdef HAVE_XINPUT2
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      xev = (XIEvent *) ev->xcookie.data;
+
+      if (xev->evtype == XI_KeyPress ||
+          xev->evtype == XI_KeyRelease)
+        {
+          if (keycode)
+            {
+              /* The detail field contains keycode for key events */
+              *keycode = ((XIDeviceEvent *) xev)->detail;
+            }
+
+          return TRUE;
+        }
+    }
+  else
+#endif /* HAVE_XINPUT2 */
+    {
+      if (ev->type == KeyPress ||
+          ev->type == KeyRelease)
+        {
+          if (keycode)
+            *keycode = ev->xkey.keycode;
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+gboolean
+meta_input_event_get_button (MetaDisplay *display,
+                             XEvent      *ev,
+                             guint       *button)
+{
+#ifdef HAVE_XINPUT2
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      xev = (XIEvent *) ev->xcookie.data;
+
+      if (xev->evtype == XI_ButtonPress ||
+          xev->evtype == XI_ButtonRelease)
+        {
+          if (button)
+            {
+              /* The detail field contains
+               * button number for button events
+               */
+              *button = ((XIDeviceEvent *) xev)->detail;
+            }
+
+          return TRUE;
+        }
+    }
+  else
+#endif /* HAVE_XINPUT2 */
+    {
+      if (ev->type == ButtonPress ||
+          ev->type == ButtonRelease)
+        {
+          if (button)
+            *button = ev->xbutton.button;
+
+          return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+/* NB: Also works for focus in/out events */
+gboolean
+meta_input_event_get_crossing_details (MetaDisplay *display,
+                                       XEvent      *ev,
+                                       guint       *mode_out,
+                                       guint       *detail_out)
+{
+  gboolean retval = TRUE;
+  guint mode, detail;
+
+#ifdef HAVE_XINPUT2
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      xev = (XIEvent *) ev->xcookie.data;
+
+      if (xev->evtype == XI_Enter ||
+          xev->evtype == XI_Leave ||
+          xev->evtype == XI_FocusIn ||
+          xev->evtype == XI_FocusOut)
+        {
+          mode = ((XIEnterEvent *) xev)->mode;
+          detail = ((XIEnterEvent *) xev)->detail;
+        }
+      else
+        retval = FALSE;
+    }
+  else
+#endif /* HAVE_XINPUT2 */
+    {
+      if (ev->type == EnterNotify ||
+          ev->type == LeaveNotify)
+        {
+          mode = ev->xcrossing.mode;
+          detail = ev->xcrossing.detail;
+        }
+      else if (ev->type == FocusIn ||
+               ev->type == FocusOut)
+        {
+          mode = ev->xfocus.mode;
+          detail = ev->xfocus.detail;
+        }
+      else
+        retval = FALSE;
+    }
+
+  if (retval)
+    {
+      if (mode_out)
+        *mode_out = mode;
+
+      if (detail_out)
+        *detail_out = detail;
+    }
+
+  return retval;
+}
+
+MetaDevice *
+meta_input_event_get_device (MetaDisplay *display,
+                             XEvent      *ev)
+{
+  guint evtype;
+
+  if (!meta_input_event_get_type (display, ev, &evtype))
+    return NULL;
+
+#ifdef HAVE_XINPUT2
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      xev = (XIEvent *) ev->xcookie.data;
+
+      switch (evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+        case XI_KeyPress:
+        case XI_KeyRelease:
+        case XI_TouchBegin:
+        case XI_TouchEnd:
+        case XI_TouchUpdate:
+          return meta_device_map_lookup (display->device_map,
+                                         ((XIDeviceEvent *) xev)->deviceid);
+        case XI_FocusIn:
+        case XI_FocusOut:
+        case XI_Enter:
+        case XI_Leave:
+          return meta_device_map_lookup (display->device_map,
+                                         ((XIEnterEvent *) xev)->deviceid);
+        default:
+          break;
+        }
+    }
+  else
+#endif
+    {
+      switch (ev->type)
+        {
+        case KeyPress:
+        case KeyRelease:
+        case FocusIn:
+        case FocusOut:
+          return meta_device_map_lookup (display->device_map,
+                                         META_CORE_KEYBOARD_ID);
+        default:
+          /* All other events are pointers' */
+          return meta_device_map_lookup (display->device_map,
+                                         META_CORE_POINTER_ID);
+        }
+    }
+
+  return NULL;
+}
+
+MetaDevice *
+meta_input_event_get_source_device (MetaDisplay *display,
+                                    XEvent      *ev)
+{
+#ifdef HAVE_XINPUT2
+  if (ev->type == GenericEvent &&
+      ev->xcookie.extension == display->xinput2_opcode)
+    {
+      XIEvent *xev;
+
+      g_assert (display->have_xinput2 == TRUE);
+
+      xev = (XIEvent *) ev->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+        case XI_KeyPress:
+        case XI_KeyRelease:
+        case XI_TouchBegin:
+        case XI_TouchEnd:
+        case XI_TouchUpdate:
+          return meta_device_map_lookup (display->device_map,
+                                         ((XIDeviceEvent *) xev)->sourceid);
+        case XI_FocusIn:
+        case XI_FocusOut:
+        case XI_Enter:
+        case XI_Leave:
+          return meta_device_map_lookup (display->device_map,
+                                         ((XIEnterEvent *) xev)->sourceid);
+        default:
+          break;
+        }
+    }
+#endif
+
+  return NULL;
+}

src/core/input-events.h

@@ -0,0 +1,88 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/**
+ * \file event.h  Utility functions for handling events
+ *
+ * Handling events.
+ * This file contains helper methods to handle events, specially
+ * input events, which can be either core or XInput2.
+ */
+
+/*
+ * Copyright (C) 2011 Carlos Garnacho
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_EVENT_H
+#define META_EVENT_H
+
+#include <config.h>
+#include <X11/Xlib.h>
+#include "display-private.h"
+#include <meta/device-map.h>
+
+/* Add an extra flag for touch events in
+ * evmasks, an arbitrarily high bit is taken.
+ */
+#define META_INPUT_TOUCH_EVENTS_MASK (1L<<31)
+
+gboolean meta_input_event_get_type          (MetaDisplay *display,
+                                             XEvent      *ev,
+                                             guint       *ev_type);
+gboolean meta_input_event_is_type           (MetaDisplay *display,
+                                             XEvent      *ev,
+                                             guint        ev_type);
+
+gboolean meta_input_event_get_touch_id      (MetaDisplay *display,
+                                             XEvent      *ev,
+                                             guint       *touch_id);
+
+Window   meta_input_event_get_window        (MetaDisplay *display,
+                                             XEvent      *ev);
+Window   meta_input_event_get_root_window   (MetaDisplay *display,
+                                             XEvent      *ev);
+
+Time     meta_input_event_get_time          (MetaDisplay *display,
+                                             XEvent      *ev);
+
+gboolean meta_input_event_get_coordinates   (MetaDisplay *display,
+                                             XEvent      *ev,
+                                             gdouble     *x_ret,
+                                             gdouble     *y_ret,
+                                             gdouble     *x_root_ret,
+                                             gdouble     *y_root_ret);
+
+gboolean meta_input_event_get_state         (MetaDisplay *display,
+                                             XEvent      *ev,
+                                             guint       *state);
+gboolean meta_input_event_get_keycode       (MetaDisplay *display,
+                                             XEvent      *ev,
+                                             guint       *keycode);
+gboolean meta_input_event_get_button        (MetaDisplay *display,
+                                             XEvent      *event,
+                                             guint       *button);
+gboolean meta_input_event_get_crossing_details (MetaDisplay *display,
+                                                XEvent      *ev,
+                                                guint       *mode_out,
+                                                guint       *detail_out);
+
+MetaDevice *meta_input_event_get_device        (MetaDisplay *display,
+                                                XEvent      *ev);
+MetaDevice *meta_input_event_get_source_device (MetaDisplay *display,
+                                                XEvent      *ev);
+
+#endif /* META_EVENT_H */

src/core/keybindings-private.h

@@ -57,14 +57,18 @@ void     meta_display_shutdown_keys         (MetaDisplay *display);
 void     meta_screen_grab_keys              (MetaScreen  *screen);
 void     meta_screen_ungrab_keys            (MetaScreen  *screen);
 gboolean meta_screen_grab_all_keys          (MetaScreen  *screen,
+                                             MetaDevice  *device,
                                              guint32      timestamp);
-void     meta_screen_ungrab_all_keys        (MetaScreen  *screen, 
+void     meta_screen_ungrab_all_keys        (MetaScreen  *screen,
+                                             MetaDevice  *device,
                                              guint32      timestamp);
 void     meta_window_grab_keys              (MetaWindow  *window);
 void     meta_window_ungrab_keys            (MetaWindow  *window);
 gboolean meta_window_grab_all_keys          (MetaWindow  *window,
+                                             MetaDevice  *device,
                                              guint32      timestamp);
 void     meta_window_ungrab_all_keys        (MetaWindow  *window,
+                                             MetaDevice  *device,
                                              guint32      timestamp);
 gboolean meta_display_process_key_event     (MetaDisplay *display,
                                              MetaWindow  *window,

src/core/main.c

@@ -301,9 +301,12 @@ static GSourceFuncs event_funcs = {
 static void
 meta_clutter_init (void)
 {
+  if (!meta_get_use_core_devices ())
+    clutter_x11_enable_xinput ();
+
   clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
   clutter_x11_disable_event_retrieval ();
-  
+
   if (CLUTTER_INIT_SUCCESS == clutter_init (NULL, NULL))
     {
       GSource *source = g_source_new (&event_funcs, sizeof (GSource));
@@ -414,6 +417,8 @@ meta_init (void)
     meta_set_verbose (TRUE);
   if (g_getenv ("MUTTER_DEBUG"))
     meta_set_debugging (TRUE);
+  if (g_getenv ("MUTTER_USE_CORE_DEVICES"))
+    meta_set_use_core_devices (TRUE);
 
   if (g_get_home_dir ())
     if (chdir (g_get_home_dir ()) < 0)

src/core/place.c

@@ -90,6 +90,7 @@ northwestcmp (gconstpointer a, gconstpointer b)
 
 static void
 find_next_cascade (MetaWindow *window,
+                   MetaDevice *pointer,
                    MetaFrameBorders *borders,
                    /* visible windows on relevant workspaces */
                    GList      *windows,
@@ -136,7 +137,7 @@ find_next_cascade (MetaWindow *window,
    * of NW corner of window frame.
    */
 
-  current = meta_screen_get_current_monitor (window->screen);
+  current = meta_screen_get_current_monitor (window->screen, pointer);
   meta_window_get_work_area_for_monitor (window, current, &work_area);
 
   cascade_x = MAX (0, work_area.x);
@@ -354,10 +355,17 @@ avoid_being_obscured_as_second_modal_dialog (MetaWindow *window,
    * know about the modal-to-the-main-window part.
    */
 
-  MetaWindow *focus_window;
+  MetaWindow *focus_window = NULL;
+  MetaFocusInfo *focus_info;
   MetaRectangle overlap;
+  MetaDevice *pointer, *keyboard;
 
-  focus_window = window->display->focus_window;
+  pointer = meta_window_guess_grab_pointer (window);
+  keyboard = meta_device_get_paired_device (pointer);
+  focus_info = meta_display_get_focus_info (window->display, keyboard);
+
+  if (focus_window)
+    focus_window = focus_info->focus_window;
 
   if (window->denied_focus_and_not_transient &&
       window->wm_state_modal && /* FIXME: Maybe do this for all transients? */
@@ -660,6 +668,7 @@ meta_window_place (MetaWindow        *window,
 {
   GList *windows;
   const MetaMonitorInfo *xi;
+  MetaDevice *pointer, *keyboard;
 
   /* frame member variables should NEVER be used in here, only
    * MetaFrameBorders. But remember borders == NULL
@@ -671,7 +680,9 @@ meta_window_place (MetaWindow        *window,
   meta_topic (META_DEBUG_PLACEMENT, "Placing window %s\n", window->desc);
 
   windows = NULL;
-  
+  pointer = meta_window_guess_grab_pointer (window);
+  keyboard = meta_device_get_paired_device (pointer);
+
   switch (window->type)
     {
       /* Run placement algorithm on these. */
@@ -815,7 +826,7 @@ meta_window_place (MetaWindow        *window,
       int w, h;
 
       /* Warning, this function is a round trip! */
-      xi = meta_screen_get_current_monitor_info (window->screen);
+      xi = meta_screen_get_current_monitor_info (window->screen, pointer);
 
       w = xi->rect.width;
       h = xi->rect.height;
@@ -860,8 +871,8 @@ meta_window_place (MetaWindow        *window,
   }
 
   /* Warning, this is a round trip! */
-  xi = meta_screen_get_current_monitor_info (window->screen);
-  
+  xi = meta_screen_get_current_monitor_info (window->screen, pointer);
+
   /* "Origin" placement algorithm */
   x = xi->rect.x;
   y = xi->rect.y;
@@ -899,8 +910,8 @@ meta_window_place (MetaWindow        *window,
   /* If no placement has been done, revert to cascade to avoid 
    * fully overlapping window (e.g. starting multiple terminals)
    * */
-  if (x == xi->rect.x && y == xi->rect.y)  
-    find_next_cascade (window, borders, windows, x, y, &x, &y);
+  if (x == xi->rect.x && y == xi->rect.y)
+    find_next_cascade (window, pointer, borders, windows, x, y, &x, &y);
 
  done_check_denied_focus:
   /* If the window is being denied focus and isn't a transient of the
@@ -913,8 +924,12 @@ meta_window_place (MetaWindow        *window,
       gboolean       found_fit;
       MetaWindow    *focus_window;
       MetaRectangle  overlap;
+      MetaFocusInfo *focus_info;
 
-      focus_window = window->display->focus_window;
+      focus_info = meta_display_get_focus_info (window->display, keyboard);
+      g_assert (focus_info != NULL);
+
+      focus_window = focus_info->focus_window;
       g_assert (focus_window != NULL);
 
       /* No need to do anything if the window doesn't overlap at all */

src/core/prefs.c

@@ -696,13 +696,13 @@ handle_preference_update_int (GSettings *settings,
  */
 void
 meta_prefs_add_listener (MetaPrefsChangedFunc func,
-                         gpointer             user_data)
+                         gpointer             data)
 {
   MetaPrefsListener *l;
 
   l = g_new (MetaPrefsListener, 1);
   l->func = func;
-  l->data = user_data;
+  l->data = data;
 
   listeners = g_list_prepend (listeners, l);
 }
@@ -713,7 +713,7 @@ meta_prefs_add_listener (MetaPrefsChangedFunc func,
  */
 void
 meta_prefs_remove_listener (MetaPrefsChangedFunc func,
-                            gpointer             user_data)
+                            gpointer             data)
 {
   GList *tmp;
 
@@ -723,7 +723,7 @@ meta_prefs_remove_listener (MetaPrefsChangedFunc func,
       MetaPrefsListener *l = tmp->data;
 
       if (l->func == func &&
-          l->data == user_data)
+          l->data == data)
         {
           g_free (l);
           listeners = g_list_delete_link (listeners, tmp);
@@ -1702,18 +1702,8 @@ meta_key_pref_free (MetaKeyPref *pref)
 static void
 init_bindings (void)
 {
-  MetaKeyPref *pref;
-
   key_bindings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
                                         (GDestroyNotify)meta_key_pref_free);
-
-  pref = g_new0 (MetaKeyPref, 1);
-  pref->name = g_strdup ("overlay-key");
-  pref->action = META_KEYBINDING_ACTION_OVERLAY_KEY;
-  pref->bindings = g_slist_prepend (pref->bindings, &overlay_key_combo);
-  pref->builtin = 1;
-
-  g_hash_table_insert (key_bindings, g_strdup ("overlay-key"), pref);
 }
 
 static void

src/core/screen-private.h

@@ -92,7 +92,8 @@ struct _MetaScreen
   MetaStack *stack;
   MetaStackTracker *stack_tracker;
 
-  MetaCursor current_cursor;
+  /* per-pointer cursors */
+  GHashTable *cursors;
 
   Window flash_window;
 
@@ -158,8 +159,10 @@ void          meta_screen_foreach_window      (MetaScreen                 *scree
                                                gpointer                    data);
 
 void          meta_screen_set_cursor          (MetaScreen                 *screen,
+                                               MetaDevice                 *pointer,
                                                MetaCursor                  cursor);
-void          meta_screen_update_cursor       (MetaScreen                 *screen);
+void          meta_screen_update_cursor       (MetaScreen                 *screen,
+                                               MetaDevice                 *pointer);
 
 void          meta_screen_tab_popup_create       (MetaScreen              *screen,
                                                   MetaTabList              list_type,
@@ -182,9 +185,11 @@ void          meta_screen_tile_preview_update          (MetaScreen    *screen,
 void          meta_screen_tile_preview_hide            (MetaScreen    *screen);
 
 MetaWindow*   meta_screen_get_mouse_window     (MetaScreen                 *screen,
+                                                MetaDevice                 *pointer,
                                                 MetaWindow                 *not_this_one);
 
-const MetaMonitorInfo* meta_screen_get_current_monitor_info   (MetaScreen    *screen);
+const MetaMonitorInfo* meta_screen_get_current_monitor_info   (MetaScreen    *screen,
+                                                               MetaDevice    *pointer);
 const MetaMonitorInfo* meta_screen_get_monitor_for_rect   (MetaScreen    *screen,
                                                            MetaRectangle *rect);
 const MetaMonitorInfo* meta_screen_get_monitor_for_window (MetaScreen    *screen,

src/core/screen.c

@@ -37,9 +37,11 @@
 #include "workspace-private.h"
 #include "keybindings-private.h"
 #include "stack.h"
+#include "core.h"
 #include "xprops.h"
 #include <meta/compositor.h>
 #include "mutter-enum-types.h"
+#include "device-pointer.h"
 
 #include <X11/extensions/Xinerama.h>
 
@@ -621,7 +623,6 @@ meta_screen_new (MetaDisplay *display,
   MetaScreen *screen;
   Window xroot;
   Display *xdisplay;
-  XWindowAttributes attr;
   Window new_wm_sn_owner;
   Window current_wm_sn_owner;
   gboolean replace_current_wm;
@@ -736,15 +737,15 @@ meta_screen_new (MetaDisplay *display,
   /* We need to or with the existing event mask since
    * gtk+ may be interested in other events.
    */
-  XGetWindowAttributes (xdisplay, xroot, &attr);
-  XSelectInput (xdisplay,
-                xroot,
-                SubstructureRedirectMask | SubstructureNotifyMask |
-                ColormapChangeMask | PropertyChangeMask |
-                LeaveWindowMask | EnterWindowMask |
-                KeyPressMask | KeyReleaseMask |
-                FocusChangeMask | StructureNotifyMask |
-                ExposureMask | attr.your_event_mask);
+  meta_core_select_events (xdisplay, xroot,
+                           (SubstructureRedirectMask | SubstructureNotifyMask |
+                            ColormapChangeMask | PropertyChangeMask |
+                            LeaveWindowMask | EnterWindowMask |
+                            KeyPressMask | KeyReleaseMask |
+                            FocusChangeMask | StructureNotifyMask |
+                            ExposureMask),
+                           TRUE);
+
   if (meta_error_trap_pop_with_return (display) != Success)
     {
       meta_warning (_("Screen %d on display \"%s\" already has a window manager\n"),
@@ -766,10 +767,10 @@ meta_screen_new (MetaDisplay *display,
   screen->rect.x = screen->rect.y = 0;
   screen->rect.width = WidthOfScreen (screen->xscreen);
   screen->rect.height = HeightOfScreen (screen->xscreen);
-  screen->current_cursor = -1; /* invalid/unset */
   screen->default_xvisual = DefaultVisualOfScreen (screen->xscreen);
   screen->default_depth = DefaultDepthOfScreen (screen->xscreen);
   screen->flash_window = None;
+  screen->cursors = g_hash_table_new (NULL, NULL);
 
   screen->wm_sn_selection_window = new_wm_sn_owner;
   screen->wm_sn_atom = wm_sn_atom;
@@ -794,8 +795,6 @@ meta_screen_new (MetaDisplay *display,
   screen->last_monitor_index = 0;  
   
   reload_monitor_infos (screen);
-  
-  meta_screen_set_cursor (screen, META_CURSOR_DEFAULT);
 
   /* Handle creating a no_focus_window for this screen */  
   screen->no_focus_window =
@@ -930,7 +929,10 @@ meta_screen_free (MetaScreen *screen,
   meta_stack_tracker_free (screen->stack_tracker);
 
   meta_error_trap_push_with_return (screen->display);
-  XSelectInput (screen->display->xdisplay, screen->xroot, 0);
+  meta_core_select_events (screen->display->xdisplay,
+                           screen->xroot, NoEventMask,
+                           FALSE);
+
   if (meta_error_trap_pop_with_return (screen->display) != Success)
     meta_warning (_("Could not release screen %d on display \"%s\"\n"),
                   screen->number, screen->display->name);
@@ -954,6 +956,8 @@ meta_screen_free (MetaScreen *screen,
   
   g_free (screen->screen_name);
 
+  g_hash_table_destroy (screen->cursors);
+
   g_object_unref (screen);
 
   XFlush (display->xdisplay);
@@ -1572,31 +1576,33 @@ update_focus_mode (MetaScreen *screen)
 
 void
 meta_screen_set_cursor (MetaScreen *screen,
+                        MetaDevice *pointer,
                         MetaCursor  cursor)
 {
-  Cursor xcursor;
+  MetaCursor old_cursor;
 
-  if (cursor == screen->current_cursor)
+  old_cursor = GPOINTER_TO_UINT (g_hash_table_lookup (screen->cursors, pointer));
+
+  if (cursor == old_cursor)
     return;
 
-  screen->current_cursor = cursor;
-  
-  xcursor = meta_display_create_x_cursor (screen->display, cursor);
-  XDefineCursor (screen->display->xdisplay, screen->xroot, xcursor);
-  XFlush (screen->display->xdisplay);
-  XFreeCursor (screen->display->xdisplay, xcursor);
+  g_hash_table_insert (screen->cursors, pointer,
+                       GUINT_TO_POINTER (cursor));
+
+  meta_screen_update_cursor (screen, pointer);
 }
 
 void
-meta_screen_update_cursor (MetaScreen *screen)
+meta_screen_update_cursor (MetaScreen *screen,
+                           MetaDevice *pointer)
 {
-  Cursor xcursor;
+  MetaCursor cursor;
 
-  xcursor = meta_display_create_x_cursor (screen->display, 
-					  screen->current_cursor);
-  XDefineCursor (screen->display->xdisplay, screen->xroot, xcursor);
+  cursor = GPOINTER_TO_UINT (g_hash_table_lookup (screen->cursors, pointer));
+  meta_device_pointer_set_window_cursor (META_DEVICE_POINTER (pointer),
+                                         screen->xroot,
+                                         cursor);
   XFlush (screen->display->xdisplay);
-  XFreeCursor (screen->display->xdisplay, xcursor);
 }
 
 void
@@ -1850,8 +1856,20 @@ static gboolean
 meta_screen_tile_preview_update_timeout (gpointer data)
 {
   MetaScreen *screen = data;
-  MetaWindow *window = screen->display->grab_window;
+  MetaWindow *window = NULL;
   gboolean needs_preview = FALSE;
+  MetaGrabInfo *grab_info;
+  MetaDevice *pointer = NULL;
+  GHashTableIter iter;
+
+  /* FIXME: we're just handling the first grab we find */
+  g_hash_table_iter_init (&iter, screen->display->current_grabs);
+
+  if (g_hash_table_iter_next (&iter, NULL, (gpointer *) &grab_info))
+    {
+      window = grab_info->grab_window;
+      pointer = grab_info->grab_pointer;
+    }
 
   screen->tile_preview_timeout_id = 0;
 
@@ -1894,7 +1912,7 @@ meta_screen_tile_preview_update_timeout (gpointer data)
       MetaRectangle tile_rect;
 
       meta_window_get_current_tile_area (window, &tile_rect);
-      meta_tile_preview_show (screen->tile_preview, &tile_rect);
+      meta_tile_preview_show (screen->tile_preview, pointer, &tile_rect);
     }
   else
     meta_tile_preview_hide (screen->tile_preview);
@@ -1939,28 +1957,23 @@ meta_screen_tile_preview_hide (MetaScreen *screen)
 
 MetaWindow*
 meta_screen_get_mouse_window (MetaScreen  *screen,
+                              MetaDevice  *pointer,
                               MetaWindow  *not_this_one)
 {
   MetaWindow *window;
-  Window root_return, child_return;
   int root_x_return, root_y_return;
-  int win_x_return, win_y_return;
-  unsigned int mask_return;
-  
+
   if (not_this_one)
     meta_topic (META_DEBUG_FOCUS,
                 "Focusing mouse window excluding %s\n", not_this_one->desc);
 
   meta_error_trap_push (screen->display);
-  XQueryPointer (screen->display->xdisplay,
-                 screen->xroot,
-                 &root_return,
-                 &child_return,
-                 &root_x_return,
-                 &root_y_return,
-                 &win_x_return,
-                 &win_y_return,
-                 &mask_return);
+  meta_device_pointer_query_position (META_DEVICE_POINTER (pointer),
+                                      screen->xroot,
+                                      NULL, NULL,
+                                      &root_x_return,
+                                      &root_y_return,
+                                      NULL, NULL, NULL);
   meta_error_trap_pop (screen->display);
 
   window = meta_stack_get_default_focus_window_at_point (screen->stack,
@@ -2056,6 +2069,7 @@ meta_screen_get_natural_monitor_list (MetaScreen *screen,
   const MetaMonitorInfo* current;
   const MetaMonitorInfo* tmp;
   GQueue* monitor_queue;
+  MetaDevice *pointer;
   int* visited;
   int cur = 0;
   int i;
@@ -2063,6 +2077,9 @@ meta_screen_get_natural_monitor_list (MetaScreen *screen,
   *n_monitors = screen->n_monitor_infos;
   *monitors_list = g_new (int, screen->n_monitor_infos);
 
+  pointer = meta_device_map_lookup (screen->display->device_map,
+                                    META_CORE_POINTER_ID);
+
   /* we calculate a natural ordering by which to choose monitors for
    * window placement.  We start at the current monitor, and perform
    * a breadth-first search of the monitors starting from that
@@ -2077,7 +2094,7 @@ meta_screen_get_natural_monitor_list (MetaScreen *screen,
       visited[i] = FALSE;
     }
 
-  current = meta_screen_get_current_monitor_info (screen);
+  current = meta_screen_get_current_monitor_info (screen, pointer);
   monitor_queue = g_queue_new ();
   g_queue_push_tail (monitor_queue, (gpointer) current);
   visited[current->number] = TRUE;
@@ -2144,11 +2161,12 @@ meta_screen_get_natural_monitor_list (MetaScreen *screen,
 }
 
 const MetaMonitorInfo*
-meta_screen_get_current_monitor_info (MetaScreen *screen)
+meta_screen_get_current_monitor_info (MetaScreen *screen,
+                                      MetaDevice *pointer)
 {
-    int monitor_index;
-    monitor_index = meta_screen_get_current_monitor (screen);
-    return &screen->monitor_infos[monitor_index];
+  int monitor_index;
+  monitor_index = meta_screen_get_current_monitor (screen, pointer);
+  return &screen->monitor_infos[monitor_index];
 }
 
 /**
@@ -2160,7 +2178,8 @@ meta_screen_get_current_monitor_info (MetaScreen *screen)
  * Return value: a monitor index
  */
 int
-meta_screen_get_current_monitor (MetaScreen *screen)
+meta_screen_get_current_monitor (MetaScreen *screen,
+                                 MetaDevice *pointer)
 {
   if (screen->n_monitor_infos == 1)
     return 0;
@@ -2170,24 +2189,18 @@ meta_screen_get_current_monitor (MetaScreen *screen)
   
   if (screen->display->monitor_cache_invalidated)
     {
-      Window root_return, child_return;
-      int win_x_return, win_y_return;
-      unsigned int mask_return;
       int i;
       MetaRectangle pointer_position;
       
       screen->display->monitor_cache_invalidated = FALSE;
       
       pointer_position.width = pointer_position.height = 1;
-      XQueryPointer (screen->display->xdisplay,
-                     screen->xroot,
-                     &root_return,
-                     &child_return,
-                     &pointer_position.x,
-                     &pointer_position.y,
-                     &win_x_return,
-                     &win_y_return,
-                     &mask_return);
+      meta_device_pointer_query_position (META_DEVICE_POINTER (pointer),
+                                          screen->xroot,
+                                          NULL, NULL,
+                                          &pointer_position.x,
+                                          &pointer_position.y,
+                                          NULL, NULL, NULL);
 
       screen->last_monitor_index = 0;
       for (i = 0; i < screen->n_monitor_infos; i++)
@@ -3060,17 +3073,22 @@ static gboolean startup_sequence_timeout (void *data);
 static void
 update_startup_feedback (MetaScreen *screen)
 {
+  MetaDevice *pointer;
+
+  pointer = meta_device_map_lookup (screen->display->device_map,
+                                    META_CORE_POINTER_ID);
+
   if (screen->startup_sequences != NULL)
     {
       meta_topic (META_DEBUG_STARTUP,
                   "Setting busy cursor\n");
-      meta_screen_set_cursor (screen, META_CURSOR_BUSY);
+      meta_screen_set_cursor (screen, pointer, META_CURSOR_BUSY);
     }
   else
     {
       meta_topic (META_DEBUG_STARTUP,
                   "Setting default cursor\n");
-      meta_screen_set_cursor (screen, META_CURSOR_DEFAULT);
+      meta_screen_set_cursor (screen, pointer, META_CURSOR_DEFAULT);
     }
 }
 

src/core/stack.c

@@ -274,13 +274,23 @@ meta_stack_update_window_tile_matches (MetaStack     *stack,
   g_list_free (windows);
 }
 
+typedef struct _FocusedForeachData FocusedForeachData;
+
+struct _FocusedForeachData
+{
+  MetaWindow *window;
+  gboolean focused_transient;
+};
+
 static gboolean
 is_focused_foreach (MetaWindow *window,
                     void       *data)
 {
-  if (window == window->display->expected_focus_window)
+  FocusedForeachData *focused_data = data;
+
+  if (window == focused_data->window)
     {
-      *((gboolean*) data) = TRUE;
+      focused_data->focused_transient = TRUE;
       return FALSE;
     }
   return TRUE;
@@ -303,6 +313,9 @@ get_standalone_layer (MetaWindow *window)
 {
   MetaStackLayer layer;
   gboolean focused_transient = FALSE;
+  MetaFocusInfo *focus_info;
+  MetaDevice *keyboard;
+  FocusedForeachData focused_data = { 0 };
 
   switch (window->type)
     {
@@ -326,20 +339,30 @@ get_standalone_layer (MetaWindow *window)
     case META_WINDOW_OVERRIDE_OTHER:
       layer = META_LAYER_OVERRIDE_REDIRECT;
       break;
-    default:       
+    default:
+      /* FIXME: How about other keyboards? should
+       * we allow fullscreen for non-VCP/K anyway?
+       */
+      keyboard = meta_device_map_lookup (window->display->device_map,
+                                         META_CORE_KEYBOARD_ID);
+
+      focus_info = meta_display_get_focus_info (window->display, keyboard);
+      focused_data.window = focus_info->expected_focus_window;
+
       meta_window_foreach_transient (window,
                                      is_focused_foreach,
-                                     &focused_transient);
+                                     &focused_data);
 
       if (window->wm_state_below)
         layer = META_LAYER_BOTTOM;
       else if (window->fullscreen &&
                (focused_transient ||
-                window == window->display->expected_focus_window ||
-                window->display->expected_focus_window == NULL ||
-                (window->display->expected_focus_window != NULL &&
+                !focus_info ||
+                window == focus_info->expected_focus_window ||
+                focus_info->expected_focus_window == NULL ||
+                (focus_info->expected_focus_window != NULL &&
                  windows_on_different_monitor (window,
-                                               window->display->expected_focus_window))))
+                                               focus_info->expected_focus_window))))
         layer = META_LAYER_FULLSCREEN;
       else if (window->wm_state_above && !META_WINDOW_MAXIMIZED (window))
         layer = META_LAYER_TOP;