Bump version to 3.7.3

Update NEWS
Fix 'comparison between signed and unsigned integer' compiler errors
2012-12-18 13:31:41 +01:00 · 2012-12-17 12:30:01 +00:00 · 2012-12-17 12:00:55 +00:00 · 2012-12-16 02:50:03 +01:00 · 2012-12-13 18:15:23 -05:00 · 2012-12-13 18:15:23 -05:00
27 changed files with 4951 additions and 4738 deletions
--- a/17
+++ b/17
@ -1,3 +1,20 @@
+3.7.3
+=====
+* Fix maximized windows jumping to other monitors [Alban; #556696]
+* Add 'switch-applications' keybinding [Florian; #688913]
+* Add a convenience method to focus the default window [Jasper; #689652]
+* Increase typical icon size to 96 [Jasper; #689651]
+* Port to XInput2 [Jasper; #688779]
+* Give dynamic keybindings a keybinding action [Florian; #682315]
+* Misc. fixes and cleanups [Jasper, Rui; #688777]
+
+Contributors:
+  Alban Crequy, Rui Matos, Florian Müllner, Jasper St. Pierre
+
+Translations:
+  Nilamdyuti Goswami [as], Piotr Drąg [pl], Yaron Shahrabani [he],
+  Dr.T.Vasudevan [ta], ManojKumar Giri [or], Shankar Prasad [kn]
+
 3.7.2
 =====
 * Fix spurious focus changes when showing desktop [Florian; #686928]
--- a/autogen.sh
+++ b/autogen.sh
@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="mutter"
 REQUIRED_AUTOMAKE_VERSION=1.10

-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
  && test -d $srcdir/src) || {
    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
    echo " top-level metacity directory"
--- a/configure.ac
+++ b/configure.ac
@ -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], [3])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@ -72,7 +72,7 @@ MUTTER_PC_MODULES="
   pango >= 1.2.0
   cairo >= 1.10.0
   gsettings-desktop-schemas >= 3.3.0
-   xcomposite >= 0.2 xfixes xrender xdamage
+   xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
   $CLUTTER_PACKAGE >= 1.9.10
   cogl-1.0 >= 1.9.6
 "
--- a/po/as.po
+++ b/po/as.po
--- a/po/he.po
+++ b/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-11-30 11:36+0200\n"
+"PO-Revision-Date: 2012-11-30 11:53+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@ -19,15 +19,197 @@ 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-navigation.xml.in.h:1
+msgid "Navigation"
+msgstr "ניווט"
+
+#: ../src/50-mutter-navigation.xml.in.h:2
+#, 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:3
+#, 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:4
+msgid "Move window to workspace 3"
+msgstr "העברה למרחב עבודה 3"
+
+#: ../src/50-mutter-navigation.xml.in.h:5
+msgid "Move window to workspace 4"
+msgstr "העברה למרחב עבודה 4"
+
+#: ../src/50-mutter-navigation.xml.in.h:6
+msgid "Move window one workspace to the left"
+msgstr "העברת החלון לשולחן העבודה שמשמאל"
+
+#: ../src/50-mutter-navigation.xml.in.h:7
+msgid "Move window one workspace to the right"
+msgstr "העברת החלון לשולחן העבודה שמימין"
+
+#: ../src/50-mutter-navigation.xml.in.h:8
+msgid "Move window one workspace up"
+msgstr "העברת החלון לשולחן העבודה שמלמעלה"
+
+#: ../src/50-mutter-navigation.xml.in.h:9
+msgid "Move window one workspace down"
+msgstr "העברת החלון לשולחן העבודה שמלמטה"
+
+#: ../src/50-mutter-navigation.xml.in.h:10
+msgid "Switch applications"
+msgstr "החלפה בין יישומים"
+
+#: ../src/50-mutter-navigation.xml.in.h:11
+msgid "Switch windows 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:17
+msgid "Switch to workspace 1"
+msgstr "מעבר למרחב עבודה 1"
+
+#: ../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:1
 msgid "Windows"
 msgstr "חלונות"

 #: ../src/50-mutter-windows.xml.in.h:2
+msgid "Activate the window menu"
+msgstr "הפעלת תפריט החלון"
+
+#: ../src/50-mutter-windows.xml.in.h:3
+msgid "Toggle fullscreen mode"
+msgstr "הפעלה/כיבוי מצב מסך מלא"
+
+#: ../src/50-mutter-windows.xml.in.h:4
+msgid "Toggle maximization state"
+msgstr "הפעלה/כיבוי מצב הגדלה"
+
+#: ../src/50-mutter-windows.xml.in.h:5
+msgid "Maximize window"
+msgstr "הגדלת חלון"
+
+#: ../src/50-mutter-windows.xml.in.h:6
+msgid "Restore window"
+msgstr "שחזור חלון"
+
+#: ../src/50-mutter-windows.xml.in.h:7
+msgid "Toggle shaded state"
+msgstr "החלפת מצב ההצללה"
+
+#: ../src/50-mutter-windows.xml.in.h:8
+msgid "Close window"
+msgstr "סגירת חלון"
+
+#: ../src/50-mutter-windows.xml.in.h:9
+msgid "Minimize window"
+msgstr "מזעור חלון"
+
+#: ../src/50-mutter-windows.xml.in.h:10
+msgid "Move window"
+msgstr "הזזת חלון"
+
+#: ../src/50-mutter-windows.xml.in.h:11
+msgid "Resize window"
+msgstr "שינוי גודל חלון"
+
+#: ../src/50-mutter-windows.xml.in.h:12
+msgid "Toggle window on all workspaces or one"
+msgstr "החלפת המצב בין האם החלון מופיע במרחב עבודה אחד או בכולם"
+
+#: ../src/50-mutter-windows.xml.in.h:13
+msgid "Raise window if covered, otherwise lower it"
+msgstr "הגבהת החלון אם הוא מכוסה, אחרת יש להנמיכו"
+
+#: ../src/50-mutter-windows.xml.in.h:14
+msgid "Raise window above other windows"
+msgstr "הגבהת החלון מעל לחלונות אחרים"
+
+#: ../src/50-mutter-windows.xml.in.h:15
+msgid "Lower window below other windows"
+msgstr "הנמכת החלון מתחת לחלונות אחרים"
+
+#: ../src/50-mutter-windows.xml.in.h:16
+msgid "Maximize window vertically"
+msgstr "הגדלת החלון אנכית"
+
+#: ../src/50-mutter-windows.xml.in.h:17
+msgid "Maximize window horizontally"
+msgstr "הגדלת החלון אופקית"
+
+#: ../src/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr "פיצול הצפייה משמאל"

-#: ../src/50-mutter-windows.xml.in.h:3
+#: ../src/50-mutter-windows.xml.in.h:19
 msgid "View split on right"
 msgstr "פיצול הצפייה מימין"

@ -36,7 +218,7 @@ msgstr "פיצול הצפייה מימין"
 #: ../src/compositor/compositor.c:492
 #, c-format
 msgid "Another compositing manager is already running on screen %i on display \"%s\"."
-msgstr "מנהל תצוגת חלונות אחר כבר פועל במסך %i בתצוגה \"%s\"."
+msgstr "מנהל תצוגת חלונות אחר כבר פועל במסך %i בתצוגה „%s“."

 #: ../src/core/bell.c:320
 msgid "Bell event"
@ -68,20 +250,20 @@ msgstr "ה_מתנה"
 msgid "_Force Quit"
 msgstr "_אילוץ סגירה"

-#: ../src/core/display.c:399
+#: ../src/core/display.c:397
 #, 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:494
 #, 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:860
 #, c-format
 msgid "Some other program is already using the key %s with modifiers %x as a binding\n"
-msgstr "תוכנית אחרת כבר משתמשת במקש %s עם המקש %x כצירוף\n"
+msgstr "תכנית אחרת כבר משתמשת במקש %s עם המקש %x כצירוף\n"

 #: ../src/core/main.c:196
 msgid "Disable connection to session manager"
@ -152,12 +334,12 @@ msgstr "Could not parse font description \"%s\" from GSettings key %s\n"
 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:1757
 #, 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:1854
 #, c-format
 msgid "Workspace %d"
 msgstr "סביבת עבודה %d"
@ -426,79 +608,79 @@ msgstr "שימוש: %s\n"
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
-msgstr "_מזער"
+msgstr "מז_עור"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:71
 msgid "Ma_ximize"
-msgstr "ה_גדל"
+msgstr "ה_גדלה"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:73
 msgid "Unma_ximize"
-msgstr "_שחזר"
+msgstr "_שחזור"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:75
 msgid "Roll _Up"
-msgstr "גלול _מעלה"
+msgstr "גלילה למע_לה"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:77
 msgid "_Unroll"
-msgstr "גלול _חזרה"
+msgstr "גלילה ב_חזרה"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:79
 msgid "_Move"
-msgstr "_הזז"
+msgstr "ה_זזה"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:81
 msgid "_Resize"
-msgstr "_שנה גודל"
+msgstr "_שינוי גודל"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:83
 msgid "Move Titlebar On_screen"
-msgstr "הזז את שורת הכותרת אל ה_מסך"
+msgstr "הזזת שורת הכותרת אל המ_סך"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:86
 #: ../src/ui/menu.c:88
 msgid "Always on _Top"
-msgstr "תמיד מ_למעלה"
+msgstr "_תמיד עליון"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:90
 msgid "_Always on Visible Workspace"
-msgstr "_הראה בכל סביבות העבודה"
+msgstr "ה_צגה בכל מרחבי העבודה"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:92
 msgid "_Only on This Workspace"
-msgstr "רק בסביבת עבודה _זו"
+msgstr "_רק במרחב עבודה זה"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:94
 msgid "Move to Workspace _Left"
-msgstr "הזז חלון לסביבת העבודה ה_שמאלית"
+msgstr "הזזת החלון למרחב העבודה ה_שמאלי"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:96
 msgid "Move to Workspace R_ight"
-msgstr "הזז חלון לסביבת העבודה ה_ימנית"
+msgstr "הזזת החלון למרחב העבודה ה_ימני"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:98
 msgid "Move to Workspace _Up"
-msgstr "הזז חלון לסביבת העבודה למעלה"
+msgstr "הזזת החלון למרחב העבודה ש_למעלה"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:100
 msgid "Move to Workspace _Down"
-msgstr "הזז חלון לסביבת העבודה למטה"
+msgstr "הזזת החלון למרחב העבודה שלמ_טה"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
@ -509,21 +691,21 @@ msgstr "_סגור"
 #: ../src/ui/menu.c:204
 #, c-format
 msgid "Workspace %d%n"
-msgstr "סביבת עבודה %d%n"
+msgstr "מרחב עבודה %d%n"

 #: ../src/ui/menu.c:214
 #, c-format
 msgid "Workspace 1_0"
-msgstr "סביבת עבודה 1_0"
+msgstr "מרחב עבודה 1_0"

 #: ../src/ui/menu.c:216
 #, c-format
 msgid "Workspace %s%d"
-msgstr "סביבת עבודה %s%d"
+msgstr "מרחב עבודה %s%d"

 #: ../src/ui/menu.c:397
 msgid "Move to Another _Workspace"
-msgstr "הזז חלון לסביבת עבודה אחרת"
+msgstr "הזז חלון למרחב עבודה אחר"

 #. This is the text that should appear next to menu accelerators
 #. * that use the shift key. If the text on this key isn't typically
@ -896,13 +1078,13 @@ msgstr "Attribute \"%s\" is invalid on <%s> element in this context"
 #: ../src/ui/theme-parser.c:594
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
-msgstr "לא ניתן להעביר את \"%s\" כמספר שלם"
+msgstr "לא ניתן להעביר את „%s“ כמספר שלם"

 #: ../src/ui/theme-parser.c:603
 #: ../src/ui/theme-parser.c:658
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
-msgstr "לא ניתן להבין את התוים \"%s\" במחרוזת \"%s\""
+msgstr "לא ניתן להבין את התווים „%s“ במחרוזת „%s“"

 #: ../src/ui/theme-parser.c:613
 #, c-format
@ -1282,74 +1464,74 @@ msgstr "כל ה_מעגנים"

 #: ../src/ui/theme-viewer.c:109
 msgid "Des_ktop"
-msgstr "ש_ולחן עבודה"
+msgstr "_שולחן עבודה"

 #: ../src/ui/theme-viewer.c:115
 msgid "Open another one of these windows"
-msgstr "Open another one of these windows"
+msgstr "פתיחת חלון נוסף מהסגנון הזה"

 #: ../src/ui/theme-viewer.c:117
 msgid "This is a demo button with an 'open' icon"
-msgstr "This is a demo button with an 'open' icon"
+msgstr "זהו לחצן הדגמה עם סמל של „פתיחה“"

 #: ../src/ui/theme-viewer.c:119
 msgid "This is a demo button with a 'quit' icon"
-msgstr "This is a demo button with a 'quit' icon"
+msgstr "זהו לחצן הדגמה עם סמל של „יציאה“"

 #: ../src/ui/theme-viewer.c:248
 msgid "This is a sample message in a sample dialog"
-msgstr "This is a sample message in a sample dialog"
+msgstr "זוהי הודעת הדגמה בתיבת דו־שיח מדומה"

 #: ../src/ui/theme-viewer.c:328
 #, c-format
 msgid "Fake menu item %d\n"
-msgstr "Fake menu item %d\n"
+msgstr "פריט תפריט מדומה %d\n"

 #: ../src/ui/theme-viewer.c:363
 msgid "Border-only window"
-msgstr "Border-only window"
+msgstr "חלון עם מסגרת בלבד"

 #: ../src/ui/theme-viewer.c:365
 msgid "Bar"
-msgstr "Bar"
+msgstr "סרגל"

 #: ../src/ui/theme-viewer.c:382
 msgid "Normal Application Window"
-msgstr "Normal Application Window"
+msgstr "חלון יישום רגיל"

 #: ../src/ui/theme-viewer.c:386
 msgid "Dialog Box"
-msgstr "Dialog Box"
+msgstr "תיבת דו־שיח"

 #: ../src/ui/theme-viewer.c:390
 msgid "Modal Dialog Box"
-msgstr "Modal Dialog Box"
+msgstr "תיבת דו־שיח חוסמת"

 #: ../src/ui/theme-viewer.c:394
 msgid "Utility Palette"
-msgstr "Utility Palette"
+msgstr "פלטת כלי"

 #: ../src/ui/theme-viewer.c:398
 msgid "Torn-off Menu"
-msgstr "Torn-off Menu"
+msgstr "תפריט נתלש"

 #: ../src/ui/theme-viewer.c:402
 msgid "Border"
-msgstr "Border"
+msgstr "מסגרת"

 #: ../src/ui/theme-viewer.c:406
 msgid "Attached Modal Dialog"
-msgstr "Attached Modal Dialog"
+msgstr "חלון חוסם מוצמד"

 #: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
-msgstr "Button layout test %d"
+msgstr "בדיקת פריסת לחצנים %d"

 #: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
-msgstr "%g milliseconds to draw one window frame"
+msgstr "%g מילישניות לציור של מסגרת חלון אחת"

 #: ../src/ui/theme-viewer.c:813
 #, c-format
@ -1368,27 +1550,27 @@ msgstr "Loaded theme \"%s\" in %g seconds\n"

 #: ../src/ui/theme-viewer.c:870
 msgid "Normal Title Font"
-msgstr "Normal Title Font"
+msgstr "גופן כותרת רגילה"

 #: ../src/ui/theme-viewer.c:876
 msgid "Small Title Font"
-msgstr "Small Title Font"
+msgstr "גופן כותרת קטנה"

 #: ../src/ui/theme-viewer.c:882
 msgid "Large Title Font"
-msgstr "Large Title Font"
+msgstr "גופן כותרת גדולה"

 #: ../src/ui/theme-viewer.c:887
 msgid "Button Layouts"
-msgstr "Button Layouts"
+msgstr "פריסת לחצנים"

 #: ../src/ui/theme-viewer.c:892
 msgid "Benchmark"
-msgstr "Benchmark"
+msgstr "מדידת ביצועים"

 #: ../src/ui/theme-viewer.c:944
 msgid "Window Title Goes Here"
-msgstr "Window Title Goes Here"
+msgstr "כותרת החלון מופיעה כאן"

 #: ../src/ui/theme-viewer.c:1047
 #, c-format
@ -1432,305 +1614,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"

--- a/po/kn.po
+++ b/po/kn.po
@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: metacity.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-08-06 23:35+0000\n"
-"PO-Revision-Date: 2012-10-05 17:14+0530\n"
+"POT-Creation-Date: 2012-12-13 11:57+0000\n"
+"PO-Revision-Date: 2012-12-13 17:43+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: Kannada <en@li.org>\n"
 "Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"

 #: ../src/50-mutter-windows.xml.in.h:1
@ -49,19 +49,18 @@ msgstr "ಘಂಟೆಯ ಶಬ್ಧ"
 #: ../src/core/core.c:157
 #, c-format
 msgid "Unknown window information request: %d"
-msgstr "ಗೊತ್ತಿರದ ವಿಂಡೊ ಮಾಹಿತಿಯ ಮನವಿ: %d"
+msgstr "ಗೊತ್ತಿರದ ಕಿಟಕಿಯ ಮಾಹಿತಿಯ ಮನವಿ: %d"

-#: ../src/core/delete.c:114
-#, fuzzy, c-format
-#| msgid "<tt>%s</tt> is not responding."
+#: ../src/core/delete.c:113
+#, c-format
 msgid "%s is not responding."
-msgstr "<tt>%s</tt> ಪ್ರತಿಕ್ರಿಯಿಸುತ್ತಿಲ್ಲ."
+msgstr "%s ಪ್ರತಿಕ್ರಿಯಿಸುತ್ತಿಲ್ಲ."

-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:117
 msgid "Application is not responding."
 msgstr "ಅನ್ವಯವು ಪ್ರತಿಕ್ರಿಯಿಸುತ್ತಿಲ್ಲ."

-#: ../src/core/delete.c:123
+#: ../src/core/delete.c:122
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@ -69,25 +68,25 @@ msgstr ""
 "ಅನ್ವಯವು ಮುಂದುವರೆಯುವ ವರೆಗೆ ಕೊಂಚ ಸಮಯ ನೀವು ಕಾಯಬಹುದು ಅಥವ ಅದು ಸಂಪೂರ್ಣವಾಗಿ ಮುಚ್ಚಿ "
 "ಹೋಗುವಂತೆ ಒತ್ತಾಯಿಸಬಹುದು."

-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:129
 msgid "_Wait"
-msgstr "ನಿರೀಕ್ಷಿಸು(_W)"
+msgstr "ನಿರೀಕ್ಷಿಸು (_W)"

-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:129
 msgid "_Force Quit"
-msgstr "ಬಲವಂತವಾಗಿ ಮುಚ್ಚು(_F)"
+msgstr "ಬಲವಂತವಾಗಿ ಮುಚ್ಚು (_F)"

-#: ../src/core/display.c:380
+#: ../src/core/display.c:399
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "ಕಂಪೋಸಿಟಿಂಗ್ ಮಾಡಲು ಅಗತ್ಯವಿರುವ %s ವಿಸ್ತರಣೆಯು ಕಾಣಿಸುತ್ತಿಲ್ಲ"

-#: ../src/core/display.c:446
+#: ../src/core/display.c:496
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
-msgstr "X ವಿಂಡೊ ಗಣಕ ಪ್ರದರ್ಶಕ '%s' ಅನ್ನು ತೆರೆಯುವಲ್ಲಿ ವಿಫಲತೆ\n"
+msgstr "X ಕಿಟಕಿ ಗಣಕ ಪ್ರದರ್ಶಕ '%s' ಅನ್ನು ತೆರೆಯುವಲ್ಲಿ ವಿಫಲತೆ\n"

-#: ../src/core/keybindings.c:844
+#: ../src/core/keybindings.c:853
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@ -102,7 +101,7 @@ msgstr "ಅಧಿವೇಶನ ನಿರ್ವಾಹಕದೊಂದಿಗೆ ಸ

 #: ../src/core/main.c:202
 msgid "Replace the running window manager"
-msgstr "ಚಲಾಯಿತಗೊಳ್ಳುತ್ತಿರುವ ವಿಂಡೊ ವ್ಯವಸ್ಥಾಪಕವನ್ನು ಬದಲಾಯಿಸಿ"
+msgstr "ಚಲಾಯಿತಗೊಳ್ಳುತ್ತಿರುವ ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪಕವನ್ನು ಬದಲಾಯಿಸಿ"

 #: ../src/core/main.c:208
 msgid "Specify session management ID"
@ -155,9 +154,9 @@ msgstr "ಮುದ್ರಿಸಬಹುದಾದ ಆವೃತ್ತಿ"

 #: ../src/core/mutter.c:60
 msgid "Mutter plugin to use"
-msgstr ""
+msgstr "ಬಳಸಬೇಕಿರುವ Mutter ಪ್ಲಗ್ಇನ್"

-#: ../src/core/prefs.c:1065
+#: ../src/core/prefs.c:1079
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@ -166,14 +165,14 @@ msgstr ""
 "ಸರಿಯಾಗಿ "
 "ಕೆಲಸ ಮಾಡದೆ ಇರಬಹುದು.\n"

-#: ../src/core/prefs.c:1140
+#: ../src/core/prefs.c:1154
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "\"%s\" ಎಂಬ ಅಕ್ಷರಶೈಲಿ ವಿವರಣೆಯನ್ನು  %s ಎಂಬ GSettings ಕೀಲಿಯಿಂದ ಇಂದ ಪಾರ್ಸ್ "
 "ಮಾಡಲಾಗಿಲ್ಲ\n"

-#: ../src/core/prefs.c:1206
+#: ../src/core/prefs.c:1220
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@ -183,7 +182,7 @@ msgstr ""
 "ಮಾನ್ಯವಾದ "
 "ಮೌಲ್ಯವಲ್ಲ\n"

-#: ../src/core/prefs.c:1724
+#: ../src/core/prefs.c:1747
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@ -192,7 +191,7 @@ msgstr ""
 "ಸಂರಚನಾ ದತ್ತಸಂಚಯದಲ್ಲಿ ಕಂಡುಬಂದಂತಹ \"%s\" ಕೀಲಿಬೈಂಡಿಂಗ್ \"%s\" ಗೆ ಒಂದು ಮಾನ್ಯವಾದ "
 "ಮೌಲ್ಯವಲ್ಲ\n"

-#: ../src/core/prefs.c:1821
+#: ../src/core/prefs.c:1844
 #, c-format
 msgid "Workspace %d"
 msgstr "ಕಾರ್ಯಕ್ಷೇತ್ರ %d"
@ -208,23 +207,23 @@ msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
 "replace option to replace the current window manager.\n"
 msgstr ""
-"ತೆರೆ %d ಯು (ಪ್ರದರ್ಶಕ \"%s\" ದಲ್ಲಿನ) ಈಗಾಗಲೆ ಒಂದು ವಿಂಡೋ ವ್ಯವಸ್ಥಾಪಕವನ್ನು "
+"ತೆರೆ %d ಯು (ಪ್ರದರ್ಶಕ \"%s\" ದಲ್ಲಿನ) ಈಗಾಗಲೆ ಒಂದು ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪಕವನ್ನು "
 "ಹೊಂದಿದೆ; --"
-"replace ಅನ್ನು ಬಳಸಿಕೊಂಡು ಪ್ರಸಕ್ತ ವಿಂಡೋ ವ್ಯವಸ್ಥಾಪಕವನ್ನು ಬದಲಾಯಿಸಿ.\n"
+"replace ಅನ್ನು ಬಳಸಿಕೊಂಡು ಪ್ರಸಕ್ತ ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪಕವನ್ನು ಬದಲಾಯಿಸಿ.\n"

 #: ../src/core/screen.c:695
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
-"ತೆರೆ %d ಯಲ್ಲಿನ ಪ್ರದರ್ಶಕ \"%s\" ದಲ್ಲಿನ ವಿಂಡೊ ವ್ಯವಸ್ಥಾಪಕದ ಆಯ್ಕೆಯನ್ನು "
+"ತೆರೆ %d ಯಲ್ಲಿನ ಪ್ರದರ್ಶಕ \"%s\" ದಲ್ಲಿನ ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪಕದ ಆಯ್ಕೆಯನ್ನು "
 "ಪಡೆಯಲಾಗಲಿಲ್ಲ\n"

 #: ../src/core/screen.c:750
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
-"ತೆರೆ %d ಯು (ಪ್ರದರ್ಶಕ \"%s\" ದಲ್ಲಿನ) ಈಗಾಗಲೆ ಒಂದು ವಿಂಡೋ ವ್ಯವಸ್ಥಾಪಕವನ್ನು "
+"ತೆರೆ %d ಯು (ಪ್ರದರ್ಶಕ \"%s\" ದಲ್ಲಿನ) ಈಗಾಗಲೆ ಒಂದು ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪಕವನ್ನು "
 "ಹೊಂದಿದೆ\n"

 #: ../src/core/screen.c:935
@ -286,7 +285,7 @@ msgid ""
 "These windows do not support &quot;save current setup&quot; and will have to "
 "be restarted manually next time you log in."
 msgstr ""
-"ಈ ವಿಂಡೊಗಳು &quot;ಪ್ರಸಕ್ತ ಸಿದ್ಧತೆಗಳನ್ನು ಉಳಿಸು&quot;ವುದನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ "
+"ಈ ಕಿಟಕಿಗಳು &quot;ಪ್ರಸಕ್ತ ಸಿದ್ಧತೆಗಳನ್ನು ಉಳಿಸು&quot;ವುದನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ "
 "ಹಾಗು "
 "ನೀವು ಮುಂದಿನ ಬಾರಿ ಪ್ರವೇಶಿಸಿದಾಗ ಕೈಯಾರೆ ಅದನ್ನು ಮರಳಿ ಆರಂಭಿಸಬೇಕಾಗುತ್ತದೆ."

@ -308,32 +307,32 @@ msgstr "ದಾಖಲೆ ಕಡತ %s ಅನ್ನು ತೆರೆಯಲಾಗಿ
 #: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
-msgstr ""
+msgstr "ವರ್ಬೋಸ್ ಕ್ರಮಕ್ಕಾಗಿನ ಬೆಂಬಲವಿಲ್ಲದೆ Mutter ಅನ್ನು ಕಂಪೈಲ್ ಮಾಡಲಾಗಿದೆ\n"

 #: ../src/core/util.c:259
 msgid "Window manager: "
-msgstr "ವಿಂಡೊ ವ್ಯವಸ್ಥಾಪಕ: "
+msgstr "ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪಕ: "

 #: ../src/core/util.c:407
 msgid "Bug in window manager: "
-msgstr "ವಿಂಡೊ ವ್ಯವಸ್ಥಾಪಕದಲ್ಲಿ ಒಂದು ತೊಂದರೆ: "
+msgstr "ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪಕದಲ್ಲಿ ಒಂದು ತೊಂದರೆ: "

 #: ../src/core/util.c:438
 msgid "Window manager warning: "
-msgstr "ವಿಂಡೊ ವ್ಯವಸ್ಥಾಪಕ ಎಚ್ಚರಿಕೆ: "
+msgstr "ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪಕ ಎಚ್ಚರಿಕೆ: "

 #: ../src/core/util.c:466
 msgid "Window manager error: "
-msgstr "ವಿಂಡೊ ವ್ಯವಸ್ಥಾಪಕ ದೋಷ: "
+msgstr "ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪಕ ದೋಷ: "

 #. first time through
-#: ../src/core/window.c:7234
+#: ../src/core/window.c:7237
 #, 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 ""
-"ICCCM ಇಂದ ಸೂಚಿಸಲಾದ WM_CLIENT_LEADER ವಿಂಡೋದ ಬದಲಿಗೆ ವಿಂಡೊ %s ತಾನೆ ಸ್ವತಃ "
+"ICCCM ಇಂದ ಸೂಚಿಸಲಾದ WM_CLIENT_LEADER ಕಿಟಕಿದ ಬದಲಿಗೆ ಕಿಟಕಿ %s ತಾನೆ ಸ್ವತಃ "
 "SM_CLIENT_ID ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸುತ್ತದೆ.\n"

 #. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
@ -343,37 +342,38 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7899
+#: ../src/core/window.c:7902
 #, 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 ""
-"ವಿಂಡೋ %s ಗಾತ್ರವನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ ಎಂದು ಸೂಚಿಸಲು ಒಂದು MWM ಸುಳಿವನ್ನು "
+"ಕಿಟಕಿ %s ಗಾತ್ರವನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ ಎಂದು ಸೂಚಿಸಲು ಒಂದು MWM ಸುಳಿವನ್ನು "
 "ನೀಡುತ್ತದೆ, "
 "ಆದರೆ ಕನಿಷ್ಟ ಗಾತ್ರ %d  x %d ಹಾಗು ಗರಿಷ್ಟ ಗಾತ್ರ %d x %d ಅನ್ನು ಹೊಂದಿಸುತ್ತದೆ; "
 "ಇದಕ್ಕೆ "
 "ಯಾವುದೆ ಅರ್ಥವಿರುವುದಿಲ್ಲ.\n"

-#: ../src/core/window-props.c:310
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "ಅನ್ವಯವು ಒಂದು ಬೋಗಸ್ _NET_WM_PID %lu ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಿದೆ\n"

-#: ../src/core/window-props.c:429
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s ನಲ್ಲಿ)"

-#: ../src/core/window-props.c:1484
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
-msgstr "ಅಮಾನ್ಯವಾದ WM_TRANSIENT_FOR ವಿಂಡೋ 0x%lx ಅನ್ನು %s ಗಾಗಿ ಸೂಚಿಸಲಾಗಿದೆ.\n"
+msgstr "ಅಮಾನ್ಯವಾದ WM_TRANSIENT_FOR ಕಿಟಕಿ 0x%lx ಅನ್ನು %s ಗಾಗಿ ಸೂಚಿಸಲಾಗಿದೆ.\n"

-#: ../src/core/window-props.c:1495
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr ""
+"WM_TRANSIENT_FOR ಕಿಟಕಿ 0x%lx ಎನ್ನುವುದು %s ಗಾಗಿ ಲೂಪ್ ಅನ್ನು ರಚಿಸುತ್ತದೆ.\n"

 #: ../src/core/xprops.c:155
 #, c-format
@ -384,18 +384,24 @@ msgid ""
 "This is most likely an application bug, not a window manager bug.\n"
 "The window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
 msgstr ""
+"ಕಿಟಕಿ 0x%lx ವು %s ಗುಣವನ್ನು ಹೊಂದಿದೆ\n"
+"ಅದು ಬಗೆ %s ವಿನ್ಯಾಸ %d ಅನ್ನು ಹೊಂದಿರಬೇಕು ಎಂದು ನಿರೀಕ್ಷಿಸಲಾಗಿತ್ತು\n"
+"ಹಾಗು ಬಗೆ %s ಬಗೆ %d n_items %d ಅನ್ನು ಹೊಂದಿದೆ.\n"
+"ಇದಕ್ಕೆ ಕಾರಣ ಬಹುಷಃ ಅನ್ವಯದಲ್ಲಿನ ಒಂದು ದೋಷವಾಗಿರಬಹುದೆ ಹೊರತು ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪಕದ "
+"ದೋಷವಲ್ಲ.\n"
+"ಕಿಟಕಿ ಶೀರ್ಷಿಕೆ=\"%s\" ವರ್ಗ=\"%s\" ಹೆಸರು=\"%s\"\n"

 #: ../src/core/xprops.c:411
 #, c-format
 msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
-msgstr "ಗುಣ %s ವು (ವಿಂಡೋ 0x%lx ದಲ್ಲಿನ) ಅಮಾನ್ಯವಾದ UTF-8 ಅನ್ನು ಹೊಂದಿದೆ\n"
+msgstr "ಗುಣ %s ವು (ಕಿಟಕಿ 0x%lx ದಲ್ಲಿನ) ಅಮಾನ್ಯವಾದ UTF-8 ಅನ್ನು ಹೊಂದಿದೆ\n"

 #: ../src/core/xprops.c:494
 #, c-format
 msgid ""
 "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr ""
-"ಗುಣ %s ವು (ವಿಂಡೋ 0x%lx ದಲ್ಲಿನ) ಪಟ್ಟಿಯಲ್ಲಿನ ಅಂಶ %d ಕ್ಕಾಗಿ ಅಮಾನ್ಯವಾದ UTF-8 "
+"ಗುಣ %s ವು (ಕಿಟಕಿ 0x%lx ದಲ್ಲಿನ) ಪಟ್ಟಿಯಲ್ಲಿನ ಅಂಶ %d ಕ್ಕಾಗಿ ಅಮಾನ್ಯವಾದ UTF-8 "
 "ಅನ್ನು "
 "ಹೊಂದಿದೆ\n"

@ -405,7 +411,7 @@ msgstr "Mutter"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
 msgid "Modifier to use for extended window management operations"
-msgstr ""
+msgstr "ವಿಸ್ತರಿಸಲಾದ ಕಿಟಕಿ ವ್ಯವಸ್ಥಾಪನಾ ಕಾರ್ಯಗಳಲ್ಲಿ ಬಳಸಬೇಕಿರುವ ಮಾರ್ಪಡಕ"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
@ -414,10 +420,15 @@ msgid ""
 "\"Windows key\" on PC hardware. It's expected that this binding either the "
 "default or set to the empty string."
 msgstr ""
+"ಈ ಕೀಲಿಯು \"ಓವರ್ಲೇ\" ಅನ್ನು ಆರಂಭಿಸುತ್ತದೆ, ಈ ಸಂಯೋಜನಾ ಕಿಟಕಿಯ ಅವಲೋಕನ ಮತ್ತು ಅನ್ವಯ "
+"ಆರಂಭಿಸುವ ವ್ಯವಸ್ಥೆಯಾಗಿರುತ್ತದೆ. ಪೂರ್ವನಿಯೋಜಿತವು PC ಯ ಯಂತ್ರಾಂಶದಲ್ಲಿನ \"ವಿಂಡೋಸ್ "
+"ಕೀಲಿ\" "
+"ಆಗಿರುತ್ತದೆ. ಈ ಬೈಂಡಿಂಗ್ ಒಂದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿರಬೇಕು ಅಥವ ಖಾಲಿ ವಾಕ್ಯಾಂಶಕ್ಕೆ "
+"ಸೂಚಿತಗೊಂಡಿರಬೇಕು ಎಂದು ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತದೆ."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
-msgstr ""
+msgstr "ಮೋಡಲ್ ಸಂವಾದಗಳನ್ನು ಲಗತ್ತಿಸು"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
@ -425,10 +436,13 @@ msgid ""
 "attached to the titlebar of the parent window and are moved together with "
 "the parent window."
 msgstr ""
+"true ಆಗಿದಲ್ಲಿ, ಪ್ರತ್ಯೇಕ ಶೀರ್ಷಿಕೆಪಟ್ಟಿಗಳ ಬದಲು ಮೂಲ ಕಿಟಕಿಗೆ ಮೋಡಲ್ ಸಂವಾದಗಳು "
+"ಶೀರ್ಷಿಕೆಪಟ್ಟಿಗೆ ಲಗತ್ತಿಸಲಾದಂತೆ ಕಾಣಿಸುತ್ತದೆ ಮತ್ತು ಮೂಲ ಕಿಟಕಿಯ ಜೊತೆಗೆ ಅವೂ ಸಹ "
+"ಚಲಿಸುತ್ತವೆ."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
+msgstr "ಕಿಟಕಿಗಳನ್ನು ತೆರೆಯ ಅಂಚಿನಲ್ಲಿ ಬೀಳಿಸುವಾಗ ಅಂಚಿನ ಟೈಲಿಂಗ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
@ -436,10 +450,15 @@ msgid ""
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
+"ಸಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ಲಂಬ ತೆರೆಯ ಅಂಚುಗಳಲ್ಲಿ ಕಿಟಕಿಗಳನ್ನು ಬೀಳಿಸಿದಾಗ ಅವುಗಳನ್ನು "
+"ಲಂಬವಾಗಿ "
+"ಹಿಗ್ಗಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಲಭ್ಯವಿರುವ ಜಾಗದ ಅರ್ಧ ಭಾಗವನ್ನು ಆವರಿಸುವಂತೆ ಅಡ್ಡಲಾಗಿ ಗಾತ್ರ "
+"ಬದಲಿಸಲಾಗುತ್ತದೆ. ಕಿಟಕಿಗಳನ್ನು ಮೇಲಿನ ತೆರೆಯ ಅಂಚಿನ ಮೇಲೆ ಬೀಳಿಸಿದಾಗ ಅವುಗಳನ್ನು "
+"ಸಂಪೂರ್ಣವಾಗಿ ಹಿಗ್ಗಿಸುವಂತೆ ಮಾಡಲಾಗುತ್ತದೆ."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
-msgstr ""
+msgstr "ಕಾರ್ಯಸ್ಥಳಗಳನ್ನು ಕ್ರಿಯಾತ್ಮಕವಾಗಿ ನಿರ್ವಹಿಸಲಾಗುತ್ತದೆ"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
@ -447,6 +466,11 @@ msgid ""
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
+"ಕಾರ್ಯಸ್ಥಳಗಳನ್ನು ಕ್ರಿಯಾತ್ಮಕವಾಗಿ ನಿರ್ವಹಿಸಲಾಗುತ್ತದೆಯೆ ಅಥವ ಒಂದು ಸ್ಥಿರ ಸಂಖ್ಯೆಯ "
+"ಕಾರ್ಯಸ್ಥಳಗಳು "
+"ಇರುತ್ತವೆಯೆ ಎನ್ನುವುದನ್ನು ನಿರ್ಧರಿಸುತ್ತದೆ (org.gnome.desktop.wm.preferences "
+"ನಲ್ಲಿನ "
+"num-workspaces ಕೀಲಿಯಿಂದ ನಿರ್ಧರಿತಗೊಳ್ಳುತ್ತದೆ)."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
@ -457,32 +481,52 @@ msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
 msgstr ""
+"ಕಾರ್ಯಸ್ಥಳಗಳನ್ನು ಬದಲಾಯಿಸುವಿಕೆಯು ಎಲ್ಲಾ ಪರದೆಗಳಲ್ಲಿನ ಕಿಟಕಿಗಳ ಮೇಲೆ ನಡೆಯಬೇಕೆ ಅಥವ "
+"ಪ್ರಾಥಮಿಕ ಪರದೆಯ ಮೇಲಿನ ಕಿಟಕಿಗಳಲ್ಲಿ ಮಾತ್ರ ನಡೆಯಬೇಕೆ ಎನ್ನುವುದನ್ನು ನಿರ್ಧರಿಸುತ್ತದೆ."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
-msgstr ""
+msgstr "ಟ್ಯಾಬ್ ಪುಟಿಕೆ ಇಲ್ಲ"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
 msgstr ""
+"ಕಿಟಕಿಯ ಆವರ್ತನೆಗಾಗಿ ಪುಟಿಕೆ (ಪಾಪಪ್) ಮತ್ತು ಹೈಲೈಟ್ ಚೌಕಟ್ಟನ್ನು ಬಳಸುವುದನ್ನು "
+"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಬೇಕೆ ಅಥವ ಬೇಡವೆ ಎನ್ನುವುದನ್ನು ನಿರ್ಧರಿಸುತ್ತದೆ."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
-msgid "Draggable border width"
-msgstr ""
+msgid "Delay focus changes until the pointer stops moving"
+msgstr "ಸೂಚಕವು ಚಲಿಸುವುದನ್ನು ನಿಲ್ಲಿಸುವವರೆಗೂ ಗಮನದ ಬದಲಾವಣೆಯು ವಿಳಂಬಗೊಳ್ಳುತ್ತದೆ"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
+msgstr ""
+"true ಗೆ ಹೊಂದಿಸಲಾಗಿದ್ದಲ್ಲಿ, ಮತ್ತು ಗಮನದ ಸ್ಥಿತಿಯು \"sloppy\" ಅಥವ \"mouse\" "
+"ಆಗಿದ್ದಲ್ಲಿ, ಒಂದು ಕಿಟಕಿಗೆ ಪ್ರವೇಶಿಸುವಾಗ ಗಮನವು ಕೂಡಲೆ ಬದಲಾಗುವುದಿಲ್ಲ, ಆದರೆ ಸೂಚಕವು "
+"ಚಲಿಸುವುದನ್ನು ನಿಲ್ಲಿಸಿದ ನಂತರ ಬದಲಾಗುತ್ತದೆ."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Draggable border width"
+msgstr "ಎಳೆಯಬಹುದಾದ ಅಂಚಿನ ಅಗಲ"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+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 ""
+"ಎಳೆಯಬಹುದಾದ ಅಂಚುಗಳ ಒಟ್ಟು ಮೊತ್ತ. ಸಿದ್ಧವಿನ್ಯಾಸದ ಗೋಚರಿಸುವ ಅಂಚುಗಳು ಸಾಕಷ್ಟು ಇಲ್ಲದೆ "
+"ಇದ್ದಲ್ಲಿ, ಈ ಮೌಲ್ಯಕ್ಕೆ ಹೊಂದಿಕೆಯಾಗುವಂತೆ ಅಗೋಚರವಾದ ಅಂಚುಗಳನ್ನು ಸೇರಿಸಲಾಗುತ್ತದೆ."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Select window from tab popup"
 msgstr "ಟ್ಯಾಬ್ ಪುಟಿಕೆಯಿಂದ ಕಿಟಕಿಯನ್ನು ಆರಿಸು"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Cancel tab popup"
 msgstr "ಟ್ಯಾಬ್ ಪುಟಿಕೆಯನ್ನು ರದ್ದುಗೊಳಿಸು"

@ -494,17 +538,17 @@ msgstr "ಬಳಕೆ: %s\n"
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
-msgstr "ಕುಗ್ಗಿಸು(_n)"
+msgstr "ಕುಗ್ಗಿಸು (_n)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:71
 msgid "Ma_ximize"
-msgstr "ಹಿಗ್ಗಿಸು(_x)"
+msgstr "ಹಿಗ್ಗಿಸು (_x)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:73
 msgid "Unma_ximize"
-msgstr "ಹಿಗ್ಗಿಸಬೇಡ(_x)"
+msgstr "ಹಿಗ್ಗಿಸಬೇಡ (_x)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:75
@ -514,17 +558,17 @@ msgstr "ಉರುಳಿಸು (_U)"
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:77
 msgid "_Unroll"
-msgstr "ಸುತ್ತಿ (_U)"
+msgstr "ಸುತ್ತು (_U)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:79
 msgid "_Move"
-msgstr "ಜರುಗಿಸು(_M)"
+msgstr "ಜರುಗಿಸು (_M)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:81
 msgid "_Resize"
-msgstr "ಗಾತ್ರ ಬದಲಾಯಿಸು(_R)"
+msgstr "ಗಾತ್ರ ಬದಲಾಯಿಸು (_R)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:83
@ -535,12 +579,12 @@ msgstr "ಶೀರ್ಷಿಕೆಪಟ್ಟಿಯನ್ನು ತೆರೆಯ
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:86 ../src/ui/menu.c:88
 msgid "Always on _Top"
-msgstr "ಯಾವಾಗಲೂ ಮೇಲ್ಭಾಗದಲ್ಲಿ(_T)"
+msgstr "ಯಾವಾಗಲೂ ಮೇಲ್ಭಾಗದಲ್ಲಿ (_T)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:90
 msgid "_Always on Visible Workspace"
-msgstr "ಯಾವಾಗಲೂ ಕಾಣಿಸುವ ಕಾರ್ಯಕ್ಷೇತ್ರದಲ್ಲಿ(_A)"
+msgstr "ಯಾವಾಗಲೂ ಕಾಣಿಸುವ ಕಾರ್ಯಕ್ಷೇತ್ರದಲ್ಲಿ (_A)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:92
@ -550,28 +594,28 @@ msgstr "ಕೇವಲ ಈ ಕಾರ್ಯಕ್ಷೇತ್ರದಲ್ಲಿ (_O
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:94
 msgid "Move to Workspace _Left"
-msgstr "ಎಡಭಾಗದ ಕಾರ್ಯಕ್ಷೇತ್ರಕ್ಕೆ ವರ್ಗಾಯಿಸು(_L)"
+msgstr "ಎಡಭಾಗದ ಕಾರ್ಯಕ್ಷೇತ್ರಕ್ಕೆ ವರ್ಗಾಯಿಸು (_L)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:96
 msgid "Move to Workspace R_ight"
-msgstr "ಬಲಭಾಗದ ಕಾರ್ಯಕ್ಷೇತ್ರಕ್ಕೆ ವರ್ಗಾಯಿಸು(_i)"
+msgstr "ಬಲಭಾಗದ ಕಾರ್ಯಕ್ಷೇತ್ರಕ್ಕೆ ವರ್ಗಾಯಿಸು (_i)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:98
 msgid "Move to Workspace _Up"
-msgstr "ಮೇಲಿನ ಕಾರ್ಯಕ್ಷೇತ್ರಕ್ಕೆ ವರ್ಗಾಯಿಸು(_U)"
+msgstr "ಮೇಲಿನ ಕಾರ್ಯಕ್ಷೇತ್ರಕ್ಕೆ ವರ್ಗಾಯಿಸು (_U)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:100
 msgid "Move to Workspace _Down"
-msgstr "ಕೆಳಗಿನ ಕಾರ್ಯಕ್ಷೇತ್ರಕ್ಕೆ ವರ್ಗಾಯಿಸು(_D)"
+msgstr "ಕೆಳಗಿನ ಕಾರ್ಯಕ್ಷೇತ್ರಕ್ಕೆ ವರ್ಗಾಯಿಸು (_D)"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:104
 msgid "_Close"
-msgstr "ಮುಚ್ಚು(_C)"
+msgstr "ಮುಚ್ಚು (_C)"

 #: ../src/ui/menu.c:204
 #, c-format
@ -590,7 +634,7 @@ msgstr "ಕಾರ್ಯಕ್ಷೇತ್ರ %s%d"

 #: ../src/ui/menu.c:397
 msgid "Move to Another _Workspace"
-msgstr "ಇನ್ನೊಂದು ಕಾರ್ಯಕ್ಷೇತ್ರಕ್ಕೆ ವರ್ಗಾಯಿಸು(_W)"
+msgstr "ಇನ್ನೊಂದು ಕಾರ್ಯಕ್ಷೇತ್ರಕ್ಕೆ ವರ್ಗಾಯಿಸು (_W)"

 #. This is the text that should appear next to menu accelerators
 #. * that use the shift key. If the text on this key isn't typically
@ -737,6 +781,9 @@ msgid ""
 "GTK custom color specification must have color name and fallback in "
 "parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
 msgstr ""
+"GTK ಬಣ್ಣವನ್ನು ಸೂಚಿಸುವಿಕೆಗಾಗಿ ಸ್ಥಿತಿಯಲ್ಲಿ ಬಣ್ಣದ ಹೆಸರು ಮತ್ತು ಆವರಣ ಚಿಹ್ನೆಯ ಒಳಗೆ "
+"ಹಿಮ್ಮರಳಿಕೆಯ ಮಾಹಿತಿ ಇರಬೇಕು, ಉದಾ. gtk:custom(foo,bar); \"%s\" ಅನ್ನು ಪಾರ್ಸ್ "
+"ಮಾಡಲಾಗಿಲ್ಲ"

 #: ../src/ui/theme.c:1217
 #, c-format
@ -744,6 +791,8 @@ msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
 "_ are valid"
 msgstr ""
+"gtk:custom ನಲ್ಲಿನ color_name ನಲ್ಲಿ ಅಮಾನ್ಯವಾದ ಅಕ್ಷರ '%c' ಕಂಡುಬಂದಿದೆ, ಕೇವಲ A-Za-"
+"z0-9-_ ಮಾತ್ರ ಮಾನ್ಯವಾದವುಗಳಾಗಿರುತ್ತವೆ"

 #: ../src/ui/theme.c:1231
 #, c-format
@ -751,6 +800,8 @@ msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
 "fit the format"
 msgstr ""
+"Gtk:ಅಗತ್ಯಾನುಗುಣ ವಿನ್ಯಾಸವು \"gtk:custom(color_name,fallback)\" ಆಗಿರುತ್ತದೆ, \"%s"
+"\" ಎನ್ನುವುದು ವಿನ್ಯಾಸಕ್ಕೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ"

 #: ../src/ui/theme.c:1276
 #, c-format
@ -976,7 +1027,7 @@ msgstr "\"%s\" ಥೀಮನ್ನು ಲೋಡ್‍ ಮಾಡಲು ವಿಫ
 #: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
 #, c-format
 msgid "No <%s> set for theme \"%s\""
-msgstr ""
+msgstr "ಯಾವುದೆ <%s> ಅನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ (ಪರಿಸರವಿನ್ಯಾಸ \"%s\" ಕ್ಕಾಗಿ)"

 #: ../src/ui/theme.c:5254
 #, c-format
@ -1119,7 +1170,7 @@ msgstr "ಗೊತ್ತಿರದ style_set \"%s\", <%s> ಘಟಕದಲ್ಲಿ
 #: ../src/ui/theme-parser.c:1283
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
-msgstr "ವಿಂಡೋ ಬಗೆ \"%s\" ಈಗಾಗಲೆ ಶೈಲಿ ಜೋಡಿಯನ್ನು ನಿಯೋಜಿಸಿದೆ"
+msgstr "ಕಿಟಕಿ ಬಗೆ \"%s\" ಈಗಾಗಲೆ ಶೈಲಿ ಜೋಡಿಯನ್ನು ನಿಯೋಜಿಸಿದೆ"

 #: ../src/ui/theme-parser.c:1313 ../src/ui/theme-parser.c:1377
 #: ../src/ui/theme-parser.c:1603 ../src/ui/theme-parser.c:2838
@ -1241,12 +1292,12 @@ msgstr ""
 #: ../src/ui/theme-parser.c:3073
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
-msgstr "\"%s\" ಯು ಗಮನ ಗುಣ ವಿಶೇಷಕ್ಕೆ ಒಂದು ಮಾನ್ಯವಾ ಮೌಲ್ಯವಲ್ಲ"
+msgstr "\"%s\" ಯು ಗಮನ ಗುಣ ವಿಶೇಷಕ್ಕೆ ಒಂದು ಮಾನ್ಯವಾದ ಮೌಲ್ಯವಲ್ಲ"

 #: ../src/ui/theme-parser.c:3082
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
-msgstr "\"%s\" ಯು ಸ್ಥಿತಿ ಗುಣ ವಿಶೇಷಕ್ಕೆ ಒಂದು ಮಾನ್ಯವಾ ಮೌಲ್ಯವಲ್ಲ"
+msgstr "\"%s\" ಯು ಸ್ಥಿತಿ ಗುಣ ವಿಶೇಷಕ್ಕೆ ಒಂದು ಮಾನ್ಯವಾದ ಮೌಲ್ಯವಲ್ಲ"

 #: ../src/ui/theme-parser.c:3092
 #, c-format
@ -1256,7 +1307,7 @@ msgstr "\"%s\" ಎಂದು ಕರೆಯಲ್ಪಡುವ ಒಂದು ಶೈ
 #: ../src/ui/theme-parser.c:3113 ../src/ui/theme-parser.c:3136
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
-msgstr "\"%s\" ಯು ಗಾತ್ರ ಬದಲಾವಣೆ ಗುಣ ವಿಶೇಷಕ್ಕೆ ಒಂದು ಮಾನ್ಯವಾ ಮೌಲ್ಯವಲ್ಲ"
+msgstr "\"%s\" ಯು ಗಾತ್ರ ಬದಲಾವಣೆ ಗುಣ ವಿಶೇಷಕ್ಕೆ ಒಂದು ಮಾನ್ಯವಾದ ಮೌಲ್ಯವಲ್ಲ"

 #: ../src/ui/theme-parser.c:3147
 #, c-format
@ -1324,11 +1375,15 @@ msgid ""
 "\"version\" attribute cannot be used in metacity-theme-1.xml or metacity-"
 "theme-2.xml"
 msgstr ""
+"\"version\" ಗುಣವಿಶೇಷವನ್ನು metacity-theme-1.xml ಅಥವ metacity-theme-2.xml ನಲ್ಲಿ "
+"ಬಳಸಲು ಸಾಧ್ಯವಿರುವುದಿಲ್ಲ"

 #: ../src/ui/theme-parser.c:3530
 #, c-format
 msgid "Theme requires version %s but latest supported theme version is %d.%d"
 msgstr ""
+"ಪರಿಸರ ವಿನ್ಯಾಸಕ್ಕಾಗಿ ಆವೃತ್ತಿ %s ಅಗತ್ಯವಿದೆ ಆದರೆ ಇತ್ತೀಚಿನ ಬೆಂಬಲಿತ ಪರಿಸರವಿನ್ಯಾಸ "
+"ಆವೃತ್ತಿಯು %d.%d ಆಗಿದೆ"

 #: ../src/ui/theme-parser.c:3562
 #, c-format
@ -1391,7 +1446,7 @@ msgstr "%s ಥೀಮ್‍ಗೆ ಒಂದು ಮಾನ್ಯವಾದ ಕಡತ

 #: ../src/ui/theme-viewer.c:99
 msgid "_Windows"
-msgstr "ವಿಂಡೋಗಳು (_W)"
+msgstr "ಕಿಟಕಿಗಳು (_W)"

 #: ../src/ui/theme-viewer.c:100
 msgid "_Dialog"
@ -1435,7 +1490,7 @@ msgstr "ಗಣಕತೆರೆ (_k)"

 #: ../src/ui/theme-viewer.c:115
 msgid "Open another one of these windows"
-msgstr "ಈ ವಿಂಡೋಗಳಲ್ಲಿ ಬೇರೊಂದನ್ನು ತೆರೆ"
+msgstr "ಈ ಕಿಟಕಿಗಳಲ್ಲಿ ಬೇರೊಂದನ್ನು ತೆರೆ"

 #: ../src/ui/theme-viewer.c:117
 msgid "This is a demo button with an 'open' icon"
@ -1456,7 +1511,7 @@ msgstr "ನಕಲಿ ಮೆನು ಅಂಶ %d\n"

 #: ../src/ui/theme-viewer.c:363
 msgid "Border-only window"
-msgstr "ಅಂಚು ಮಾತ್ರ ಇರುವ ವಿಂಡೊ"
+msgstr "ಅಂಚು ಮಾತ್ರ ಇರುವ ಕಿಟಕಿ"

 #: ../src/ui/theme-viewer.c:365
 msgid "Bar"
@ -1464,7 +1519,7 @@ msgstr "ಪಟ್ಟಿ"

 #: ../src/ui/theme-viewer.c:382
 msgid "Normal Application Window"
-msgstr "ಸಾಮಾನ್ಯ ಅನ್ವಯ ವಿಂಡೊ"
+msgstr "ಸಾಮಾನ್ಯ ಅನ್ವಯ ಕಿಟಕಿ"

 #: ../src/ui/theme-viewer.c:386
 msgid "Dialog Box"
@ -1498,7 +1553,7 @@ msgstr "ಗುಂಡಿ ಲೇಔಟ್ ಪರೀಕ್ಷೆ %d"
 #: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
-msgstr "ಒಂದು ವಿಂಡೋ ಚೌಕಟ್ಟನ್ನು ಚಿತ್ರಿಸಲು ಸಮಯ %g ಮಿಲಿಸೆಕೆಂಡುಗಳು"
+msgstr "ಒಂದು ಕಿಟಕಿ ಚೌಕಟ್ಟನ್ನು ಚಿತ್ರಿಸಲು ಸಮಯ %g ಮಿಲಿಸೆಕೆಂಡುಗಳು"

 #: ../src/ui/theme-viewer.c:813
 #, c-format
@ -1537,7 +1592,7 @@ msgstr "ಮೈಲಿಗಲ್ಲು"

 #: ../src/ui/theme-viewer.c:944
 msgid "Window Title Goes Here"
-msgstr "ವಿಂಡೊ ಶೀರ್ಷಿಕೆಯು ಹೀಗೆ ಇರುತ್ತದೆ"
+msgstr "ಕಿಟಕಿ ಶೀರ್ಷಿಕೆಯು ಹೀಗೆ ಇರುತ್ತದೆ"

 #: ../src/ui/theme-viewer.c:1047
 #, c-format
@ -2007,14 +2062,6 @@ msgstr ""
 #~ msgid "Enable Visual Bell"
 #~ msgstr "ಗೋಚರ ಗಂಟೆಯನ್ನು ಶಕ್ತಗೊಳಿಸು"

-#, fuzzy
-#~ msgid ""
-#~ "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
-#~ "the focused window will be automatically raised after a delay specified "
-#~ "by the auto_raise_delay key. This is not related to clicking on a window "
-#~ "to raise it, nor to entering a window during drag-and-drop."
-#~ msgstr "  ವಿಂಡೊ ನಂತರ auto   ನಲ್ಲಿ ವಿಂಡೊ ವಿಂಡೊ."
-
 #, fuzzy
 #~ msgid ""
 #~ "If true, ignore the titlebar_font option, and use the standard "
--- a/po/or.po
+++ b/po/or.po
--- a/po/pl.po
+++ b/po/pl.po
@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-12 19:01+0200\n"
-"PO-Revision-Date: 2012-10-12 19:05+0200\n"
+"POT-Creation-Date: 2012-12-16 02:49+0100\n"
+"PO-Revision-Date: 2012-12-16 02:50+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@ -28,21 +28,199 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"

+#: ../src/50-mutter-navigation.xml.in.h:1
+msgid "Navigation"
+msgstr "Nawigacja"
+
+#: ../src/50-mutter-navigation.xml.in.h:2
+msgid "Move window to workspace 1"
+msgstr "Przeniesienie okna na 1. obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:3
+msgid "Move window to workspace 2"
+msgstr "Przeniesienie okna na 2. obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:4
+msgid "Move window to workspace 3"
+msgstr "Przeniesienie okna na 3. obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:5
+msgid "Move window to workspace 4"
+msgstr "Przeniesienie okna na 4. obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:6
+msgid "Move window one workspace to the left"
+msgstr "Przeniesienie okna o obszar roboczy w lewo"
+
+#: ../src/50-mutter-navigation.xml.in.h:7
+msgid "Move window one workspace to the right"
+msgstr "Przeniesienie okna o obszar roboczy w prawo"
+
+#: ../src/50-mutter-navigation.xml.in.h:8
+msgid "Move window one workspace up"
+msgstr "Przeniesienie okna o obszar roboczy w górę"
+
+#: ../src/50-mutter-navigation.xml.in.h:9
+msgid "Move window one workspace down"
+msgstr "Przeniesienie okna o obszar roboczy w dół"
+
+#: ../src/50-mutter-navigation.xml.in.h:10
+msgid "Switch applications"
+msgstr "Przełączenie programów"
+
+#: ../src/50-mutter-navigation.xml.in.h:11
+msgid "Switch windows"
+msgstr "Przełączenie okien"
+
+#: ../src/50-mutter-navigation.xml.in.h:12
+msgid "Switch windows of an application"
+msgstr "Przełączenie między oknami programu"
+
+#: ../src/50-mutter-navigation.xml.in.h:13
+msgid "Switch system controls"
+msgstr "Przełączenie kontroli systemowej"
+
+#: ../src/50-mutter-navigation.xml.in.h:14
+msgid "Switch windows directly"
+msgstr "Bezpośrednie przełączenie między oknami"
+
+#: ../src/50-mutter-navigation.xml.in.h:15
+msgid "Switch windows of an app directly"
+msgstr "Bezpośrednie przełączenie między oknami programu"
+
+#: ../src/50-mutter-navigation.xml.in.h:16
+msgid "Switch system controls directly"
+msgstr "Bezpośrednie przełączenie kontroli systemowej"
+
+#: ../src/50-mutter-navigation.xml.in.h:17
+msgid "Hide all normal windows"
+msgstr "Ukrycie wszystkich zwykłych okien"
+
+#: ../src/50-mutter-navigation.xml.in.h:18
+msgid "Switch to workspace 1"
+msgstr "Przełączenie na 1. obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:19
+msgid "Switch to workspace 2"
+msgstr "Przełączenie na 2. obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:20
+msgid "Switch to workspace 3"
+msgstr "Przełączenie na 3. obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:21
+msgid "Switch to workspace 4"
+msgstr "Przełączenie na 4. obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:22
+msgid "Move to workspace left"
+msgstr "Przeniesienie na lewy obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:23
+msgid "Move to workspace right"
+msgstr "Przeniesienie na prawy obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:24
+msgid "Move to workspace above"
+msgstr "Przeniesienie na górny obszar roboczy"
+
+#: ../src/50-mutter-navigation.xml.in.h:25
+msgid "Move to workspace below"
+msgstr "Przeniesienie na dolny obszar roboczy"
+
+#: ../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 "Wyświetlenie okna wykonania polecenia"
+
+#: ../src/50-mutter-system.xml.in.h:3
+msgid "Show the activities overview"
+msgstr "Wyświetlenie podglądu aktywności"
+
 #: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Okna"

 #: ../src/50-mutter-windows.xml.in.h:2
+msgid "Activate the window menu"
+msgstr "Otwarcie menu okna"
+
+#: ../src/50-mutter-windows.xml.in.h:3
+msgid "Toggle fullscreen mode"
+msgstr "Przełączenie trybu pełnoekranowego"
+
+#: ../src/50-mutter-windows.xml.in.h:4
+msgid "Toggle maximization state"
+msgstr "Przełączenie stanu maksymalizacji"
+
+#: ../src/50-mutter-windows.xml.in.h:5
+msgid "Maximize window"
+msgstr "Maksymalizacja okna"
+
+#: ../src/50-mutter-windows.xml.in.h:6
+msgid "Restore window"
+msgstr "Przywrócenie okna"
+
+#: ../src/50-mutter-windows.xml.in.h:7
+msgid "Toggle shaded state"
+msgstr "Przełączenie trybu zwinięcia"
+
+#: ../src/50-mutter-windows.xml.in.h:8
+msgid "Close window"
+msgstr "Zamknięcie okna"
+
+#: ../src/50-mutter-windows.xml.in.h:9
+msgid "Minimize window"
+msgstr "Minimalizacja okna"
+
+#: ../src/50-mutter-windows.xml.in.h:10
+msgid "Move window"
+msgstr "Przeniesienie okna"
+
+#: ../src/50-mutter-windows.xml.in.h:11
+msgid "Resize window"
+msgstr "Zmiana rozmiaru okna"
+
+#: ../src/50-mutter-windows.xml.in.h:12
+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
+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
+msgid "Raise window above other windows"
+msgstr "Wysunięcie okna przed pozostałe"
+
+#: ../src/50-mutter-windows.xml.in.h:15
+msgid "Lower window below other windows"
+msgstr "Odsunięcie okna pod pozostałe"
+
+#: ../src/50-mutter-windows.xml.in.h:16
+msgid "Maximize window vertically"
+msgstr "Pionowa maksymalizacja okna"
+
+#: ../src/50-mutter-windows.xml.in.h:17
+msgid "Maximize window horizontally"
+msgstr "Pozioma maksymalizacja okna"
+
+#: ../src/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr "Podział widoku po lewej"

-#: ../src/50-mutter-windows.xml.in.h:3
+#: ../src/50-mutter-windows.xml.in.h:19
 msgid "View split on right"
 msgstr "Podział widoku po prawej"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:492
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@ -59,41 +237,41 @@ msgstr "Zdarzenie sygnału dźwiękowego"
 msgid "Unknown window information request: %d"
 msgstr "Żądanie nieznanej informacji okna: %d"

-#: ../src/core/delete.c:113
+#: ../src/core/delete.c:111
 #, c-format
-msgid "%s is not responding."
-msgstr "Okno %s nie odpowiada."
+msgid "“%s” is not responding."
+msgstr "Okno \"%s\" nie odpowiada."

-#: ../src/core/delete.c:117
+#: ../src/core/delete.c:113
 msgid "Application is not responding."
 msgstr "Program nie odpowiada."

-#: ../src/core/delete.c:122
+#: ../src/core/delete.c:118
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "Można poczekać chwilę dłużej lub wymusić zakończenie programu."

-#: ../src/core/delete.c:129
+#: ../src/core/delete.c:125
 msgid "_Wait"
 msgstr "_Czekaj"

-#: ../src/core/delete.c:129
+#: ../src/core/delete.c:125
 msgid "_Force Quit"
 msgstr "_Zakończ"

-#: ../src/core/display.c:396
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Brak rozszerzenia %s, wymaganego przez składanie"

-#: ../src/core/display.c:492
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
 "Otwarcie połączenia z ekranem \"%s\" systemu X Window się nie powiodło\n"

-#: ../src/core/keybindings.c:853
+#: ../src/core/keybindings.c:870
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@ -126,12 +304,12 @@ msgstr "Inicjuje sesję z zapisanego pliku"
 msgid "Make X calls synchronous"
 msgstr "Synchroniczne wywołania X"

-#: ../src/core/main.c:494
+#: ../src/core/main.c:496
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Przejrzenie katalogu z motywami się nie powiodło: %s\n"

-#: ../src/core/main.c:510
+#: ../src/core/main.c:512
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@ -187,7 +365,7 @@ msgstr ""
 "Wartość \"%s\", odnaleziona w bazie danych konfiguracji nie opisuje "
 "prawidłowo modyfikatora przycisku myszy\n"

-#: ../src/core/prefs.c:1747
+#: ../src/core/prefs.c:1757
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@ -196,17 +374,17 @@ msgstr ""
 "Wartość \"%s\", odnaleziona w bazie danych konfiguracji nie opisuje "
 "prawidłowo skrótu klawiszowego \"%s\"\n"

-#: ../src/core/prefs.c:1844
+#: ../src/core/prefs.c:1854
 #, c-format
 msgid "Workspace %d"
 msgstr "Obszar roboczy %d"

-#: ../src/core/screen.c:652
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Podekran %d ekranu \"%s\" jest nieprawidłowy\n"

-#: ../src/core/screen.c:668
+#: ../src/core/screen.c:674
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -215,7 +393,7 @@ msgstr ""
 "Na podekranie %d ekranu \"%s\" działa już menedżer okien. Aby zastąpić "
 "działającego menedżera okien, proszę spróbować użyć opcji --replace.\n"

-#: ../src/core/screen.c:695
+#: ../src/core/screen.c:701
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@ -223,12 +401,12 @@ msgstr ""
 "Nie można uzyskać zaznaczenia menedżera okien na podekranie %d ekranu \"%s"
 "\"\n"

-#: ../src/core/screen.c:750
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Na podekranie %d ekranu \"%s\" działa już menedżer okien\n"

-#: ../src/core/screen.c:935
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nie można zwolnić podekranu %d ekranu \"%s\"\n"
@ -328,7 +506,7 @@ msgid "Window manager error: "
 msgstr "Błąd menedżera okien: "

 #. first time through
-#: ../src/core/window.c:7237
+#: ../src/core/window.c:7253
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -344,7 +522,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7902
+#: ../src/core/window.c:7918
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@ -1630,220 +1808,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"
--- a/po/ta.po
+++ b/po/ta.po
--- a/src/50-mutter-navigation.xml.in
+++ b/src/50-mutter-navigation.xml.in
@ -29,9 +29,12 @@
 	<KeyListEntry name="move-to-workspace-down"
 	              _description="Move window one workspace down" />

-	<KeyListEntry name="switch-windows"
+	<KeyListEntry name="switch-applications"
 	              _description="Switch applications"/>

+	<KeyListEntry name="switch-windows"
+	              _description="Switch windows"/>
+
 	<KeyListEntry name="switch-group"
 	              _description="Switch windows of an application"/>

--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@ -157,23 +157,26 @@ get_output_window (MetaScreen *screen)
  Window       output, xroot;
  XWindowAttributes attr;
  long         event_mask;
+  unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+  XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };

  xroot = meta_screen_get_xroot (screen);
-
-  event_mask = FocusChangeMask |
-               ExposureMask |
-               EnterWindowMask | LeaveWindowMask |
-	       PointerMotionMask |
-               PropertyChangeMask |
-               ButtonPressMask | ButtonReleaseMask |
-               KeyPressMask | KeyReleaseMask;
-
  output = XCompositeGetOverlayWindow (xdisplay, xroot);

+  XISetMask (mask.mask, XI_KeyPress);
+  XISetMask (mask.mask, XI_KeyRelease);
+  XISetMask (mask.mask, XI_ButtonPress);
+  XISetMask (mask.mask, XI_ButtonRelease);
+  XISetMask (mask.mask, XI_Enter);
+  XISetMask (mask.mask, XI_Leave);
+  XISetMask (mask.mask, XI_FocusIn);
+  XISetMask (mask.mask, XI_FocusOut);
+  XISetMask (mask.mask, XI_Motion);
+  XISelectEvents (xdisplay, output, &mask, 1);
+
+  event_mask = ExposureMask | PropertyChangeMask;
  if (XGetWindowAttributes (xdisplay, output, &attr))
-      {
-        event_mask |= attr.your_event_mask;
-      }
+    event_mask |= attr.your_event_mask;

  XSelectInput (xdisplay, output, event_mask);

@ -358,14 +361,23 @@ meta_begin_modal_for_plugin (MetaScreen       *screen,

  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 */
+      unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+      XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+
+      XISetMask (mask.mask, XI_ButtonPress);
+      XISetMask (mask.mask, XI_ButtonRelease);
+      XISetMask (mask.mask, XI_Enter);
+      XISetMask (mask.mask, XI_Leave);
+      XISetMask (mask.mask, XI_Motion);
+
+      result = XIGrabDevice (xdpy,
+                             META_VIRTUAL_CORE_POINTER_ID,
+                             grab_window,
+                             timestamp,
                             cursor,
-                             timestamp);
+                             XIGrabModeAsync, XIGrabModeAsync,
+                             False, /* owner_events */
+                             &mask);
      if (result != Success)
        goto fail;

@ -374,10 +386,20 @@ 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);
+      unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+      XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+
+      XISetMask (mask.mask, XI_KeyPress);
+      XISetMask (mask.mask, XI_KeyRelease);
+
+      result = XIGrabDevice (xdpy,
+                             META_VIRTUAL_CORE_KEYBOARD_ID,
+                             grab_window,
+                             timestamp,
+                             None,
+                             XIGrabModeAsync, XIGrabModeAsync,
+                             False, /* owner_events */
+                             &mask);

      if (result != Success)
        goto fail;
@ -397,9 +419,9 @@ meta_begin_modal_for_plugin (MetaScreen       *screen,

 fail:
  if (pointer_grabbed)
-    XUngrabPointer (xdpy, timestamp);
+    XIUngrabDevice (xdpy, META_VIRTUAL_CORE_POINTER_ID, timestamp);
  if (keyboard_grabbed)
-    XUngrabKeyboard (xdpy, timestamp);
+    XIUngrabDevice (xdpy, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);

  return FALSE;
 }
@ -415,8 +437,8 @@ meta_end_modal_for_plugin (MetaScreen     *screen,

  g_return_if_fail (compositor->modal_plugin == plugin);

-  XUngrabPointer (xdpy, timestamp);
-  XUngrabKeyboard (xdpy, timestamp);
+  XIUngrabDevice (xdpy, META_VIRTUAL_CORE_POINTER_ID, timestamp);
+  XIUngrabDevice (xdpy, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp);

  display->grab_op = META_GRAB_OP_NONE;
  display->grab_window = NULL;
@ -456,8 +478,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;

@ -524,21 +544,29 @@ meta_compositor_manage_screen (MetaCompositor *compositor,

  XResizeWindow (xdisplay, xwin, width, height);

-  event_mask = FocusChangeMask |
-               ExposureMask |
-               EnterWindowMask | LeaveWindowMask |
-               PointerMotionMask |
-               PropertyChangeMask |
-               ButtonPressMask | ButtonReleaseMask |
-               KeyPressMask | KeyReleaseMask |
-               StructureNotifyMask;
+  {
+    long event_mask;
+    unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+    XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+    XWindowAttributes attr;

-  if (XGetWindowAttributes (xdisplay, xwin, &attr))
-      {
-        event_mask |= attr.your_event_mask;
-      }
+    XISetMask (mask.mask, XI_KeyPress);
+    XISetMask (mask.mask, XI_KeyRelease);
+    XISetMask (mask.mask, XI_ButtonPress);
+    XISetMask (mask.mask, XI_ButtonRelease);
+    XISetMask (mask.mask, XI_Enter);
+    XISetMask (mask.mask, XI_Leave);
+    XISetMask (mask.mask, XI_FocusIn);
+    XISetMask (mask.mask, XI_FocusOut);
+    XISetMask (mask.mask, XI_Motion);
+    XISelectEvents (xdisplay, xwin, &mask, 1);

-  XSelectInput (xdisplay, xwin, event_mask);
+    event_mask = ExposureMask | PropertyChangeMask | StructureNotifyMask;
+    if (XGetWindowAttributes (xdisplay, xwin, &attr))
+      event_mask |= attr.your_event_mask;
+
+    XSelectInput (xdisplay, xwin, event_mask);
+  }

  info->window_group = meta_window_group_new (screen);
  info->background_actor = meta_background_actor_new_for_screen (screen);
@ -695,18 +723,23 @@ meta_compositor_set_updates (MetaCompositor *compositor,
 }

 static gboolean
-is_grabbed_event (XEvent *event)
+is_grabbed_event (MetaDisplay *display,
+                  XEvent      *event)
 {
-  switch (event->xany.type)
+  if (event->type == GenericEvent &&
+      event->xcookie.extension == display->xinput_opcode)
    {
-    case ButtonPress:
-    case ButtonRelease:
-    case EnterNotify:
-    case LeaveNotify:
-    case MotionNotify:
-    case KeyPress:
-    case KeyRelease:
-      return TRUE;
+      XIEvent *xev = (XIEvent *) event->xcookie.data;
+
+      switch (xev->evtype)
+        {
+        case XI_Motion:
+        case XI_ButtonPress:
+        case XI_ButtonRelease:
+        case XI_KeyPress:
+        case XI_KeyRelease:
+          return TRUE;
+        }
    }

  return FALSE;
@ -730,7 +763,7 @@ 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);

--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@ -571,6 +571,11 @@ place_window_if_needed(MetaWindow     *window,
                       .083 * info->work_area_monitor.height;
            }

+          /* idle_move_resize() uses the user_rect, so make sure it uses the
+           * placed coordinates (bug #556696).
+           */
+          window->user_rect = info->current;
+
          if (window->maximize_horizontally_after_placement ||
              window->maximize_vertically_after_placement)
            meta_window_maximize_internal (window,   
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@ -211,6 +211,7 @@ struct _MetaDisplay
  GList*      grab_old_window_stacking;
  MetaEdgeResistanceData *grab_edge_resistance_data;
  unsigned int grab_last_user_action_was_snap;
+  guint32     grab_timestamp;

  /* we use property updates as sentinels for certain window focus events
   * to avoid some race conditions on EnterNotify events
@ -283,7 +284,10 @@ struct _MetaDisplay
  int damage_error_base;
  int xfixes_event_base;
  int xfixes_error_base;
-  
+  int xinput_error_base;
+  int xinput_event_base;
+  int xinput_opcode;
+
 #ifdef HAVE_STARTUP_NOTIFICATION
  SnDisplay *sn_display;
 #endif
@ -381,7 +385,6 @@ Cursor         meta_display_create_x_cursor (MetaDisplay *display,
 void     meta_display_set_grab_op_cursor (MetaDisplay *display,
                                          MetaScreen  *screen,
                                          MetaGrabOp   op,
-                                          gboolean     change_pointer,
                                          Window       grab_xwindow,
                                          guint32      timestamp);

@ -429,6 +432,7 @@ int meta_resize_gravity_from_grab_op (MetaGrabOp op);

 gboolean meta_grab_op_is_moving   (MetaGrabOp op);
 gboolean meta_grab_op_is_resizing (MetaGrabOp op);
+gboolean meta_grab_op_is_mouse    (MetaGrabOp op);

 void meta_display_devirtualize_modifiers (MetaDisplay        *display,
                                          MetaVirtualModifier modifiers,
--- a/src/core/display.c
+++ b/src/core/display.c
--- a/src/core/keybindings-private.h
+++ b/src/core/keybindings-private.h
@ -66,9 +66,9 @@ gboolean meta_window_grab_all_keys          (MetaWindow  *window,
                                             guint32      timestamp);
 void     meta_window_ungrab_all_keys        (MetaWindow  *window,
                                             guint32      timestamp);
-gboolean meta_display_process_key_event     (MetaDisplay *display,
-                                             MetaWindow  *window,
-                                             XEvent      *event);
+gboolean meta_display_process_key_event     (MetaDisplay   *display,
+                                             MetaWindow    *window,
+                                             XIDeviceEvent *event);
 void     meta_set_keybindings_disabled      (gboolean     setting);
 void     meta_display_process_mapping_event (MetaDisplay *display,
                                             XEvent      *event);
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
--- a/src/core/main.c
+++ b/src/core/main.c
@ -301,9 +301,11 @@ static GSourceFuncs event_funcs = {
 static void
 meta_clutter_init (void)
 {
+  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));
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@ -2137,13 +2137,13 @@ meta_prefs_get_window_binding (const char          *name,
  g_assert_not_reached ();
 }

-guint
+gint
 meta_prefs_get_mouse_button_resize (void)
 {
  return resize_with_right_button ? 3: 2;
 }

-guint
+gint
 meta_prefs_get_mouse_button_menu (void)
 {
  return resize_with_right_button ? 2: 3;
--- a/src/core/screen.c
+++ b/src/core/screen.c
@ -311,13 +311,20 @@ set_wm_icon_size_hint (MetaScreen *screen)
 #define N_VALS 6
  gulong vals[N_VALS];

+  /* We've bumped the real icon size up to 96x96, but
+   * we really should not add these sorts of constraints
+   * on clients still using the legacy WM_HINTS interface.
+   */
+#define LEGACY_ICON_SIZE 32
+
  /* min width, min height, max w, max h, width inc, height inc */
-  vals[0] = META_ICON_WIDTH;
-  vals[1] = META_ICON_HEIGHT;
-  vals[2] = META_ICON_WIDTH;
-  vals[3] = META_ICON_HEIGHT;
+  vals[0] = LEGACY_ICON_SIZE;
+  vals[1] = LEGACY_ICON_SIZE;
+  vals[2] = LEGACY_ICON_SIZE;
+  vals[3] = LEGACY_ICON_SIZE;
  vals[4] = 0;
  vals[5] = 0;
+#undef LEGACY_ICON_SIZE
  
  XChangeProperty (screen->display->xdisplay, screen->xroot,
                   screen->display->atom_WM_ICON_SIZE,
@ -621,7 +628,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 +742,29 @@ 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);
+  {
+    long event_mask;
+    unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+    XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+    XWindowAttributes attr;
+
+    XISetMask (mask.mask, XI_KeyPress);
+    XISetMask (mask.mask, XI_KeyRelease);
+    XISetMask (mask.mask, XI_Enter);
+    XISetMask (mask.mask, XI_Leave);
+    XISetMask (mask.mask, XI_FocusIn);
+    XISetMask (mask.mask, XI_FocusOut);
+    XISetMask (mask.mask, XI_Motion);
+    XISelectEvents (xdisplay, xroot, &mask, 1);
+
+    event_mask = (SubstructureRedirectMask | SubstructureNotifyMask |
+                  StructureNotifyMask | ColormapChangeMask | PropertyChangeMask);
+    if (XGetWindowAttributes (xdisplay, xroot, &attr))
+      event_mask |= attr.your_event_mask;
+
+    XSelectInput (xdisplay, xroot, event_mask);
+  }
+
  if (meta_error_trap_pop_with_return (display) != Success)
    {
      meta_warning (_("Screen %d on display \"%s\" already has a window manager\n"),
@ -3536,6 +3556,15 @@ meta_screen_get_active_workspace (MetaScreen *screen)
  return screen->active_workspace;
 }

+void
+meta_screen_focus_default_window (MetaScreen *screen,
+                                  guint32     timestamp)
+{
+  meta_workspace_focus_default_window (screen->active_workspace,
+                                       NULL,
+                                       timestamp);
+}
+
 void
 meta_screen_restacked (MetaScreen *screen)
 {
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@ -562,7 +562,8 @@ gboolean meta_window_property_notify   (MetaWindow *window,
 gboolean meta_window_client_message    (MetaWindow *window,
                                        XEvent     *event);
 gboolean meta_window_notify_focus      (MetaWindow *window,
-                                        XEvent     *event);
+                                        XIEnterEvent *event);
+void     meta_window_lost_focus        (MetaWindow *window);

 void     meta_window_set_current_workspace_hint (MetaWindow *window);

@ -580,8 +581,13 @@ void     meta_window_shove_titlebar_onscreen (MetaWindow *window);
 void meta_window_set_gravity (MetaWindow *window,
                              int         gravity);

+#ifdef HAVE_XSYNC
+void meta_window_update_sync_request_counter (MetaWindow *window,
+                                              guint64     new_counter_value);
+#endif /* HAVE_XSYNC */
+
 void meta_window_handle_mouse_grab_op_event (MetaWindow *window,
-                                             XEvent     *event);
+                                             XIDeviceEvent *xev);

 GList* meta_window_get_workspaces (MetaWindow *window);

--- a/src/core/window.c
+++ b/src/core/window.c
@ -366,7 +366,7 @@ meta_window_class_init (MetaWindowClass *klass)
                                   PROP_ICON,
                                   g_param_spec_object ("icon",
                                                        "Icon",
-                                                        "32 pixel sized icon",
+                                                        "96 pixel sized icon",
                                                        GDK_TYPE_PIXBUF,
                                                        G_PARAM_READABLE));

@ -922,9 +922,7 @@ meta_window_new_with_attrs (MetaDisplay       *display,
  XAddToSaveSet (display->xdisplay, xwindow);
  meta_error_trap_pop_with_return (display);

-  event_mask =
-    PropertyChangeMask | EnterWindowMask | LeaveWindowMask |
-    FocusChangeMask | ColormapChangeMask;
+  event_mask = PropertyChangeMask | ColormapChangeMask;
  if (attrs->override_redirect)
    event_mask |= StructureNotifyMask;

@ -934,6 +932,18 @@ meta_window_new_with_attrs (MetaDisplay       *display,
   */
  XSelectInput (display->xdisplay, xwindow, attrs->your_event_mask | event_mask);

+  {
+    unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
+    XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
+
+    XISetMask (mask.mask, XI_Enter);
+    XISetMask (mask.mask, XI_Leave);
+    XISetMask (mask.mask, XI_FocusIn);
+    XISetMask (mask.mask, XI_FocusOut);
+
+    XISelectEvents (display->xdisplay, xwindow, &mask, 1);
+  }
+
  has_shape = FALSE;
 #ifdef HAVE_SHAPE
  if (META_DISPLAY_HAS_SHAPE (display))
@ -6814,9 +6824,45 @@ meta_window_propagate_focus_appearance (MetaWindow *window,
    }
 }

+void
+meta_window_lost_focus (MetaWindow *window)
+{
+  if (window == window->display->focus_window)
+    {
+      meta_topic (META_DEBUG_FOCUS,
+                  "%s is now the previous focus window due to being focused out or unmapped\n",
+                  window->desc);
+
+      meta_topic (META_DEBUG_FOCUS,
+                  "* Focus --> NULL (was %s)\n", window->desc);
+
+      meta_window_propagate_focus_appearance (window, FALSE);
+
+      window->display->focus_window = NULL;
+      g_object_notify (G_OBJECT (window->display), "focus-window");
+      window->has_focus = FALSE;
+
+      if (!window->attached_focus_window)
+        meta_window_appears_focused_changed (window);
+
+      meta_error_trap_push (window->display);
+      XUninstallColormap (window->display->xdisplay,
+                          window->colormap);
+      meta_error_trap_pop (window->display);
+
+      /* move out of FOCUSED_WINDOW layer */
+      meta_window_update_layer (window);
+
+      /* Re-grab for click to focus and raise-on-click, if necessary */
+      if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK ||
+          !meta_prefs_get_raise_on_click ())
+        meta_display_grab_focus_window_button (window->display, window);
+    }
+}
+
 gboolean
-meta_window_notify_focus (MetaWindow *window,
-                          XEvent     *event)
+meta_window_notify_focus (MetaWindow   *window,
+                          XIEnterEvent *event)
 {
  /* note the event can be on either the window or the frame,
   * we focus the frame for shaded windows
@ -6839,20 +6885,17 @@ meta_window_notify_focus (MetaWindow *window,
  meta_topic (META_DEBUG_FOCUS,
              "Focus %s event received on %s 0x%lx (%s) "
              "mode %s detail %s\n",
-              event->type == FocusIn ? "in" :
-              event->type == FocusOut ? "out" :
-              event->type == UnmapNotify ? "unmap" :
+              event->evtype == XI_FocusIn ? "in" :
+              event->evtype == XI_FocusOut ? "out" :
              "???",
-              window->desc, event->xany.window,
-              event->xany.window == window->xwindow ?
+              window->desc, event->event,
+              event->event == window->xwindow ?
              "client window" :
-              (window->frame && event->xany.window == window->frame->xwindow) ?
+              (window->frame && event->event == window->frame->xwindow) ?
              "frame window" :
              "unknown window",
-              event->type != UnmapNotify ?
-              meta_event_mode_to_string (event->xfocus.mode) : "n/a",
-              event->type != UnmapNotify ?
-              meta_event_detail_to_string (event->xfocus.detail) : "n/a");
+              meta_event_mode_to_string (event->mode),
+              meta_event_detail_to_string (event->detail));

  /* FIXME our pointer tracking is broken; see how
   * gtk+/gdk/x11/gdkevents-x11.c or XFree86/xc/programs/xterm/misc.c
@ -6873,19 +6916,19 @@ meta_window_notify_focus (MetaWindow *window,
   * http://bugzilla.gnome.org/show_bug.cgi?id=90382
   */

-  if ((event->type == FocusIn ||
-       event->type == FocusOut) &&
-      (event->xfocus.mode == NotifyGrab ||
-       event->xfocus.mode == NotifyUngrab ||
+  if ((event->evtype == XI_FocusIn ||
+       event->evtype == XI_FocusOut) &&
+      (event->mode == NotifyGrab ||
+       event->mode == NotifyUngrab ||
       /* From WindowMaker, ignore all funky pointer root events */
-       event->xfocus.detail > NotifyNonlinearVirtual))
+       event->detail > NotifyNonlinearVirtual))
    {
      meta_topic (META_DEBUG_FOCUS,
                  "Ignoring focus event generated by a grab or other weirdness\n");
      return TRUE;
    }

-  if (event->type == FocusIn)
+  if (event->evtype == XI_FocusIn)
    {
      if (window->override_redirect)
        {
@ -6965,11 +7008,9 @@ meta_window_notify_focus (MetaWindow *window,
          meta_window_propagate_focus_appearance (window, TRUE);
        }
    }
-  else if (event->type == FocusOut ||
-           event->type == UnmapNotify)
+  else if (event->evtype == XI_FocusOut)
    {
-      if (event->type == FocusOut &&
-          event->xfocus.detail == NotifyInferior)
+      if (event->detail == NotifyInferior)
        {
          /* This event means the client moved focus to a subwindow */
          meta_topic (META_DEBUG_FOCUS,
@ -6977,38 +7018,10 @@ meta_window_notify_focus (MetaWindow *window,
                      window->desc);
          return TRUE;
        }
-
-      if (window == window->display->focus_window)
+      else
        {
-          meta_topic (META_DEBUG_FOCUS,
-                      "%s is now the previous focus window due to being focused out or unmapped\n",
-                      window->desc);
-
-          meta_topic (META_DEBUG_FOCUS,
-                      "* Focus --> NULL (was %s)\n", window->desc);
-
-          meta_window_propagate_focus_appearance (window, FALSE);
-
-          window->display->focus_window = NULL;
-          g_object_notify (G_OBJECT (window->display), "focus-window");
-          window->has_focus = FALSE;
-
-          if (!window->attached_focus_window)
-            meta_window_appears_focused_changed (window);
-
-          meta_error_trap_push (window->display);
-          XUninstallColormap (window->display->xdisplay,
-                              window->colormap);
-          meta_error_trap_pop (window->display);
-
-          /* move out of FOCUSED_WINDOW layer */
-          meta_window_update_layer (window);
-
-          /* Re-grab for click to focus and raise-on-click, if necessary */
-          if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK ||
-              !meta_prefs_get_raise_on_click ())
-            meta_display_grab_focus_window_button (window->display, window);
-       }
+          meta_window_lost_focus (window);
+        }
    }

  /* Now set _NET_ACTIVE_WINDOW hint */
@ -9133,31 +9146,46 @@ update_resize (MetaWindow *window,

 typedef struct
 {
-  const XEvent *current_event;
-  int           count;
-  guint32       last_time;
+  Window  window;
+  int     count;
+  guint32 last_time;
 } EventScannerData;

 static Bool
 find_last_time_predicate (Display  *display,
-                          XEvent   *xevent,
+                          XEvent   *ev,
                          XPointer  arg)
 {
  EventScannerData *esd = (void*) arg;
+  XIEvent *xev;

-  if (esd->current_event->type == xevent->type &&
-      esd->current_event->xany.window == xevent->xany.window)
-    {
-      esd->count += 1;
-      esd->last_time = xevent->xmotion.time;
-    }
+  if (ev->type != GenericEvent)
+    return False;
+
+  /* We are peeking into events not yet handled by GDK,
+   * Allocate cookie events here so we can handle XI2.
+   *
+   * GDK will handle later these events, and eventually
+   * free the cookie data itself.
+   */
+  XGetEventData (display, &ev->xcookie);
+  xev = (XIEvent *) ev->xcookie.data;
+
+  if (xev->evtype != XI_Motion)
+    return False;
+
+  if (esd->window != ((XIDeviceEvent *) xev)->event)
+    return False;
+
+  esd->count += 1;
+  esd->last_time = xev->time;

  return False;
 }

 static gboolean
 check_use_this_motion_notify (MetaWindow *window,
-                              XEvent     *event)
+                              XIDeviceEvent *xev)
 {
  EventScannerData esd;
  XEvent useless;
@ -9168,11 +9196,11 @@ check_use_this_motion_notify (MetaWindow *window,
    {
      /* == is really the right test, but I'm all for paranoia */
      if (window->display->grab_motion_notify_time <=
-          event->xmotion.time)
+          xev->time)
        {
          meta_topic (META_DEBUG_RESIZING,
                      "Arrived at event with time %u (waiting for %u), using it\n",
-                      (unsigned int)event->xmotion.time,
+                      (unsigned int)xev->time,
                      window->display->grab_motion_notify_time);
          window->display->grab_motion_notify_time = 0;
          return TRUE;
@ -9181,7 +9209,7 @@ check_use_this_motion_notify (MetaWindow *window,
        return FALSE; /* haven't reached the saved timestamp yet */
    }

-  esd.current_event = event;
+  esd.window = xev->event;
  esd.count = 0;
  esd.last_time = 0;

@ -9225,13 +9253,16 @@ update_tile_mode (MetaWindow *window)
    }
 }

-void
-meta_window_handle_mouse_grab_op_event (MetaWindow *window,
-                                        XEvent     *event)
-{
 #ifdef HAVE_XSYNC
-  if (event->type == (window->display->xsync_event_base + XSyncAlarmNotify))
+void
+meta_window_update_sync_request_counter (MetaWindow *window,
+                                         guint64     new_counter_value)
+{
+  if (window->display->grab_op != META_GRAB_OP_NONE &&
+      window == window->display->grab_window &&
+      meta_grab_op_is_mouse (window->display->grab_op))
    {
+
      meta_topic (META_DEBUG_RESIZING,
                  "Alarm event received last motion x = %d y = %d\n",
                  window->display->grab_latest_motion_x,
@ -9276,14 +9307,19 @@ meta_window_handle_mouse_grab_op_event (MetaWindow *window,
          break;
        }
    }
+}
 #endif /* HAVE_XSYNC */

-  switch (event->type)
+void
+meta_window_handle_mouse_grab_op_event (MetaWindow *window,
+                                        XIDeviceEvent *xev)
+{
+  switch (xev->evtype)
    {
-    case ButtonRelease:
+    case XI_ButtonRelease:
      meta_display_check_threshold_reached (window->display,
-                                            event->xbutton.x_root,
-                                            event->xbutton.y_root);
+                                            xev->root_x,
+                                            xev->root_y);
      /* If the user was snap moving then ignore the button release
       * because they may have let go of shift before releasing the
       * mouse button and they almost certainly do not want a
@ -9295,17 +9331,19 @@ meta_window_handle_mouse_grab_op_event (MetaWindow *window,
            {
              if (window->tile_mode != META_TILE_NONE)
                meta_window_tile (window);
-              else if (event->xbutton.root == window->screen->xroot)
-                update_move (window, event->xbutton.state & ShiftMask,
-                             event->xbutton.x_root, event->xbutton.y_root);
+              else if (xev->root == window->screen->xroot)
+                update_move (window,
+                             xev->mods.effective & ShiftMask,
+                             xev->root_x,
+                             xev->root_y);
            }
          else if (meta_grab_op_is_resizing (window->display->grab_op))
            {
-              if (event->xbutton.root == window->screen->xroot)
+              if (xev->root == window->screen->xroot)
                update_resize (window,
-                               event->xbutton.state & ShiftMask,
-                               event->xbutton.x_root,
-                               event->xbutton.y_root,
+                               xev->mods.effective & ShiftMask,
+                               xev->root_x,
+                               xev->root_y,
                               TRUE);
 	      if (window->display->compositor)
 		meta_compositor_set_updates (window->display->compositor, window, TRUE);
@ -9321,35 +9359,35 @@ meta_window_handle_mouse_grab_op_event (MetaWindow *window,
            }
        }

-      meta_display_end_grab_op (window->display, event->xbutton.time);
+      meta_display_end_grab_op (window->display, xev->time);
      break;

-    case MotionNotify:
+    case XI_Motion:
      meta_display_check_threshold_reached (window->display,
-                                            event->xmotion.x_root,
-                                            event->xmotion.y_root);
+                                            xev->root_x,
+                                            xev->root_y);
      if (meta_grab_op_is_moving (window->display->grab_op))
        {
-          if (event->xmotion.root == window->screen->xroot)
+          if (xev->root == window->screen->xroot)
            {
              if (check_use_this_motion_notify (window,
-                                                event))
+                                                xev))
                update_move (window,
-                             event->xmotion.state & ShiftMask,
-                             event->xmotion.x_root,
-                             event->xmotion.y_root);
+                             xev->mods.effective & ShiftMask,
+                             xev->root_x,
+                             xev->root_y);
            }
        }
      else if (meta_grab_op_is_resizing (window->display->grab_op))
        {
-          if (event->xmotion.root == window->screen->xroot)
+          if (xev->root == window->screen->xroot)
            {
              if (check_use_this_motion_notify (window,
-                                                event))
+                                                xev))
                update_resize (window,
-                               event->xmotion.state & ShiftMask,
-                               event->xmotion.x_root,
-                               event->xmotion.y_root,
+                               xev->mods.effective & ShiftMask,
+                               xev->root_x,
+                               xev->root_y,
                               FALSE);
            }
        }
@ -9838,15 +9876,11 @@ meta_window_update_keyboard_resize (MetaWindow *window,

  if (update_cursor)
    {
-      guint32 timestamp;
-      /* FIXME: Using CurrentTime is really bad mojo */
-      timestamp = CurrentTime;
      meta_display_set_grab_op_cursor (window->display,
-                                       NULL,
+                                       window->screen,
                                       window->display->grab_op,
-                                       TRUE,
                                       window->display->grab_xwindow,
-                                       timestamp);
+                                       window->display->grab_timestamp);
    }
 }

--- a/src/meta/common.h
+++ b/src/meta/common.h
@ -30,9 +30,15 @@

 /* Don't include core headers here */
 #include <X11/Xlib.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XInput2.h>
 #include <glib.h>
 #include <gtk/gtk.h>

+/* This is set in stone and also hard-coded in GDK. */
+#define META_VIRTUAL_CORE_POINTER_ID 2
+#define META_VIRTUAL_CORE_KEYBOARD_ID 3
+
 typedef struct _MetaResizePopup MetaResizePopup;

 typedef enum
@ -298,8 +304,8 @@ struct _MetaFrameBorders
 void meta_frame_borders_clear (MetaFrameBorders *self);

 /* should investigate changing these to whatever most apps use */
-#define META_ICON_WIDTH 32
-#define META_ICON_HEIGHT 32
+#define META_ICON_WIDTH 96
+#define META_ICON_HEIGHT 96
 #define META_MINI_ICON_WIDTH 16
 #define META_MINI_ICON_HEIGHT 16

--- a/src/meta/display.h
+++ b/src/meta/display.h
@ -127,19 +127,19 @@ void     meta_display_end_grab_op   (MetaDisplay *display,

 MetaGrabOp meta_display_get_grab_op (MetaDisplay *display);

-gboolean meta_display_add_keybinding    (MetaDisplay         *display,
-                                         const char          *name,
-                                         GSettings           *settings,
-                                         MetaKeyBindingFlags  flags,
-                                         MetaKeyHandlerFunc   handler,
-                                         gpointer             user_data,
-                                         GDestroyNotify       free_data);
+guint meta_display_add_keybinding    (MetaDisplay         *display,
+                                      const char          *name,
+                                      GSettings           *settings,
+                                      MetaKeyBindingFlags  flags,
+                                      MetaKeyHandlerFunc   handler,
+                                      gpointer             user_data,
+                                      GDestroyNotify       free_data);
 gboolean meta_display_remove_keybinding (MetaDisplay         *display,
                                         const char          *name);

-MetaKeyBindingAction meta_display_get_keybinding_action (MetaDisplay  *display,
-                                                         unsigned int  keycode,
-                                                         unsigned long mask);
+guint meta_display_get_keybinding_action (MetaDisplay  *display,
+                                          unsigned int  keycode,
+                                          unsigned long mask);

 /* meta_display_set_input_focus_window is like XSetInputFocus, except
 * that (a) it can't detect timestamps later than the current time,
--- a/src/meta/keybindings.h
+++ b/src/meta/keybindings.h
@ -38,7 +38,7 @@ gboolean meta_keybindings_set_custom_handler (const gchar        *name,
 void meta_keybindings_switch_window (MetaDisplay    *display,
 				     MetaScreen     *screen,
 				     MetaWindow     *event_window,
-				     XEvent         *event,
+                                     XIDeviceEvent  *event,
 				     MetaKeyBinding *binding);


--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@ -86,8 +86,8 @@ void meta_prefs_override_preference_schema (const char *key,
 const char* meta_preference_to_string (MetaPreference pref);

 MetaVirtualModifier         meta_prefs_get_mouse_button_mods  (void);
-guint                       meta_prefs_get_mouse_button_resize (void);
-guint                       meta_prefs_get_mouse_button_menu  (void);
+gint                        meta_prefs_get_mouse_button_resize (void);
+gint                        meta_prefs_get_mouse_button_menu  (void);
 GDesktopFocusMode           meta_prefs_get_focus_mode         (void);
 GDesktopFocusNewWindows     meta_prefs_get_focus_new_windows  (void);
 gboolean                    meta_prefs_get_attach_modal_dialogs (void);
@ -160,6 +160,8 @@ typedef enum _MetaKeyBindingAction
  META_KEYBINDING_ACTION_WORKSPACE_RIGHT,
  META_KEYBINDING_ACTION_WORKSPACE_UP,
  META_KEYBINDING_ACTION_WORKSPACE_DOWN,
+  META_KEYBINDING_ACTION_SWITCH_APPLICATIONS,
+  META_KEYBINDING_ACTION_SWITCH_APPLICATIONS_BACKWARD,
  META_KEYBINDING_ACTION_SWITCH_GROUP,
  META_KEYBINDING_ACTION_SWITCH_GROUP_BACKWARD,
  META_KEYBINDING_ACTION_SWITCH_WINDOWS,
@ -252,7 +254,7 @@ typedef struct
 typedef void (* MetaKeyHandlerFunc) (MetaDisplay    *display,
                                     MetaScreen     *screen,
                                     MetaWindow     *window,
-                                     XEvent         *event,
+                                     XIDeviceEvent  *event,
                                     MetaKeyBinding *binding,
                                     gpointer        user_data);

--- a/src/meta/screen.h
+++ b/src/meta/screen.h
@ -81,6 +81,8 @@ int  meta_screen_get_current_monitor  (MetaScreen    *screen);
 void meta_screen_get_monitor_geometry (MetaScreen    *screen,
                                       int            monitor,
                                       MetaRectangle *geometry);
+void meta_screen_focus_default_window (MetaScreen *screen,
+                                       guint32     timestamp);

 typedef enum
 {
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@ -50,7 +50,7 @@ struct _MetaUI
  MetaFrames *frames;

  /* For double-click tracking */
-  guint button_click_number;
+  gint button_click_number;
  Window button_click_window;
  int button_click_x;
  int button_click_y;
@ -60,14 +60,6 @@ struct _MetaUI
 void
 meta_ui_init (void)
 {
-  /* As of 2.91.7, Gdk uses XI2 by default, which conflicts with the
-   * direct X calls we use - in particular, events caused by calls to
-   * XGrabPointer/XGrabKeyboard are no longer understood by GDK, while
-   * GDK will no longer generate the core XEvents we process.
-   * So at least for now, enforce the previous behavior.
-   */
-  gdk_disable_multidevice ();
-
  if (!gtk_init_check (NULL, NULL))
    meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));

@ -86,6 +78,18 @@ meta_ui_get_screen_number (void)
  return gdk_screen_get_number (gdk_screen_get_default ());
 }

+/* For XInput2 */
+#include "display-private.h"
+
+static gboolean
+is_input_event (XEvent *event)
+{
+  MetaDisplay *display = meta_get_display ();
+
+  return (event->type == GenericEvent &&
+          event->xcookie.extension == display->xinput_opcode);
+}
+
 /* We do some of our event handling in frames.c, which expects
 * GDK events delivered by GTK+.  However, since the transition to
 * client side windows, we can't let GDK see button events, since the
@ -111,25 +115,33 @@ maybe_redirect_mouse_event (XEvent *xevent)
  GdkEvent *gevent;
  GdkWindow *gdk_window;
  Window window;
+  XIEvent *xev;
+  XIDeviceEvent *xev_d;
+  XIEnterEvent *xev_e;

-  switch (xevent->type)
+  if (!is_input_event (xevent))
+    return FALSE;
+
+  xev = (XIEvent *) xevent->xcookie.data;
+
+  switch (xev->evtype)
    {
-    case ButtonPress:
-    case ButtonRelease:
-      window = xevent->xbutton.window;
+    case XI_ButtonPress:
+    case XI_ButtonRelease:
+    case XI_Motion:
+      xev_d = (XIDeviceEvent *) xev;
+      window = xev_d->event;
      break;
-    case MotionNotify:
-      window = xevent->xmotion.window;
-      break;
-    case EnterNotify:
-    case LeaveNotify:
-      window = xevent->xcrossing.window;
+    case XI_Enter:
+    case XI_Leave:
+      xev_e = (XIEnterEvent *) xev;
+      window = xev_e->event;
      break;
    default:
      return FALSE;
    }

-  gdisplay = gdk_x11_lookup_xdisplay (xevent->xany.display);
+  gdisplay = gdk_x11_lookup_xdisplay (xev->display);
  ui = g_object_get_data (G_OBJECT (gdisplay), "meta-ui");
  if (!ui)
    return FALSE;
@ -148,11 +160,11 @@ maybe_redirect_mouse_event (XEvent *xevent)
  if (gdk_display_device_is_grabbed (gdisplay, gdevice))
    return FALSE;

-  switch (xevent->type)
+  switch (xev->evtype)
    {
-    case ButtonPress:
-    case ButtonRelease:
-      if (xevent->type == ButtonPress)
+    case XI_ButtonPress:
+    case XI_ButtonRelease:
+      if (xev_d->evtype == XI_ButtonPress)
        {
          GtkSettings *settings = gtk_settings_get_default ();
          int double_click_time;
@ -163,11 +175,11 @@ maybe_redirect_mouse_event (XEvent *xevent)
                        "gtk-double-click-distance", &double_click_distance,
                        NULL);

-          if (xevent->xbutton.button == ui->button_click_number &&
-              xevent->xbutton.window == ui->button_click_window &&
-              xevent->xbutton.time < ui->button_click_time + double_click_time &&
-              ABS (xevent->xbutton.x - ui->button_click_x) <= double_click_distance &&
-              ABS (xevent->xbutton.y - ui->button_click_y) <= double_click_distance)
+          if (xev_d->detail == ui->button_click_number &&
+              xev_d->event == ui->button_click_window &&
+              xev_d->time < ui->button_click_time + double_click_time &&
+              ABS (xev_d->event_x - ui->button_click_x) <= double_click_distance &&
+              ABS (xev_d->event_y - ui->button_click_y) <= double_click_distance)
            {
              gevent = gdk_event_new (GDK_2BUTTON_PRESS);

@ -176,11 +188,11 @@ maybe_redirect_mouse_event (XEvent *xevent)
          else
            {
              gevent = gdk_event_new (GDK_BUTTON_PRESS);
-              ui->button_click_number = xevent->xbutton.button;
-              ui->button_click_window = xevent->xbutton.window;
-              ui->button_click_time = xevent->xbutton.time;
-              ui->button_click_x = xevent->xbutton.x;
-              ui->button_click_y = xevent->xbutton.y;
+              ui->button_click_number = xev_d->detail;
+              ui->button_click_window = xev_d->event;
+              ui->button_click_time = xev_d->time;
+              ui->button_click_x = xev_d->event_x;
+              ui->button_click_y = xev_d->event_y;
            }
        }
      else
@ -189,25 +201,25 @@ maybe_redirect_mouse_event (XEvent *xevent)
        }

      gevent->button.window = g_object_ref (gdk_window);
-      gevent->button.button = xevent->xbutton.button;
-      gevent->button.time = xevent->xbutton.time;
-      gevent->button.x = xevent->xbutton.x;
-      gevent->button.y = xevent->xbutton.y;
-      gevent->button.x_root = xevent->xbutton.x_root;
-      gevent->button.y_root = xevent->xbutton.y_root;
+      gevent->button.button = xev_d->detail;
+      gevent->button.time = xev_d->time;
+      gevent->button.x = xev_d->event_x;
+      gevent->button.y = xev_d->event_y;
+      gevent->button.x_root = xev_d->root_x;
+      gevent->button.y_root = xev_d->root_y;

      break;
-    case MotionNotify:
+    case XI_Motion:
      gevent = gdk_event_new (GDK_MOTION_NOTIFY);
      gevent->motion.type = GDK_MOTION_NOTIFY;
      gevent->motion.window = g_object_ref (gdk_window);
      break;
-    case EnterNotify:
-    case LeaveNotify:
-      gevent = gdk_event_new (xevent->type == EnterNotify ? GDK_ENTER_NOTIFY : GDK_LEAVE_NOTIFY);
+    case XI_Enter:
+    case XI_Leave:
+      gevent = gdk_event_new (xev_e->evtype == XI_Enter ? GDK_ENTER_NOTIFY : GDK_LEAVE_NOTIFY);
      gevent->crossing.window = g_object_ref (gdk_window);
-      gevent->crossing.x = xevent->xcrossing.x;
-      gevent->crossing.y = xevent->xcrossing.y;
+      gevent->crossing.x = xev_e->event_x;
+      gevent->crossing.y = xev_e->event_y;
      break;
    default:
      g_assert_not_reached ();
Author	SHA1	Message	Date
Florian Müllner	6f3ae06362	Bump version to 3.7.3 Update NEWS	2012-12-18 13:31:41 +01:00
Rui Matos	7d7b859b40	Fix 'comparison between signed and unsigned integer' compiler errors	2012-12-17 12:30:01 +00:00
Florian Müllner	d78de379cc	keybindings: Give dynamic keybindings a keybindings action https://bugzilla.gnome.org/show_bug.cgi?id=682315	2012-12-17 12:00:55 +00:00
Piotr Drąg	576384a73b	Updated Polish translation	2012-12-16 02:50:03 +01:00
Jasper St. Pierre	2fcbc467e8	keybindings: Fix whitespace and alignment https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 18:15:23 -05:00
Jasper St. Pierre	6139bc77ec	Remove support for Core Events https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 18:15:23 -05:00
Jasper St. Pierre	c1ac9d1dff	ui: Use XI2 to fake GDK events This removes our final dependency on Core Events, meaning we can remove support code for them soon. This commit is a bit ugly as it requires ui having a dependency on core, but this is already a hack, so this is thus a hack inside a hack, and two hacks make a right or however that goes. https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 18:15:23 -05:00
Jasper St. Pierre	945c530354	display: Add spew for XI2 https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 18:15:22 -05:00
Jasper St. Pierre	774ceec243	Select for XI2 events everywhere else In random places that are not grabs, we selected for events on things like the root window, stage window, COW and more. Switch these over to using the proper XI2 APIs. https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 17:14:06 -05:00
Jasper St. Pierre	7c20621112	keybindings: Grab keys with XI2 https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 17:14:06 -05:00
Jasper St. Pierre	afcdfd158f	keybindings: Grab keyboard with XI2 https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 17:14:06 -05:00
Jasper St. Pierre	8fb9e0072c	display: Grab buttons with XI2 https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 17:14:06 -05:00
Jasper St. Pierre	c1b8e0ac8f	display: Use XInput2 to grab the pointer As calling XIGrabDevice multiple times will change it, just drop the XChangeActivePointerGrab path and just go down the XIGrabPointer path always. https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 17:14:06 -05:00
Jasper St. Pierre	c90765370d	window: Pass the grab timestamp when updating the resize grab Since XChangeActivePointerGrab doesn't have a direct equivalent in XI2, we need to make sure we don't re-grab with a newer tiemstamp.	2012-12-13 17:06:00 -05:00
Jasper St. Pierre	8931b8026e	compositor: Identify XI2 events as grabbed events https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 16:36:43 -05:00
Jasper St. Pierre	55251aa986	compositor: Use XInput2 to grab the pointer/keyboard https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 16:36:42 -05:00
Carlos Garnacho	946a42f13e	core: enable XInput2 by default Enable XI2 support in both Clutter and GDK. https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 14:57:31 -05:00
Jasper St. Pierre	0fd4059927	display: Only care about input events for the VCP/VCK It's unlikely that we'll ever want to support multiple pointer devices. Multiple keyboard devices may become useful in the future, but for now, only care about the core keyboard. https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 14:57:31 -05:00
Jasper St. Pierre	1d827049d6	Port mutter to use XInput2 events instead of Core Events Mechanically transform the event processing of mutter to care about XI2 events instead of Core Events. Core Events will be left in the dust soon, and removed entirely. https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 14:56:25 -05:00
Jasper St. Pierre	881d256ce0	window: Move grab op sync handling code out This removes some duplicate event type checks, and will make the code cleaner in the future when we want to make the grab_op_event handler take an XIDeviceEvent directly. Based on a patch by Owen Taylor <otaylor@fishsoup.net> https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 14:56:24 -05:00
Jasper St. Pierre	6b31bd402a	display: Don't pass an event to a handler that will no-op meta_window_handle_mouse_grab_op_event won't do anything on a EnterNotify/LeaveNotify, so why are we passing something to it? https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 14:56:24 -05:00
Carlos Garnacho	129c729c50	display: separate input/non-input events handling in the event callback In order to make the XI2 handling easier on us in the future, we now split input events from non-input events. This will allow one code path to use XIEvent, and the other to use XEvent in the future. This commit has involved plenty of indenting changes, so it's better seen with git diff -b or &ignorews=1 https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 14:12:56 -05:00
Jasper St. Pierre	8bf8f3ea55	common: Add the XInput2 headers to common.h, which everything uses https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 14:12:56 -05:00
Jasper St. Pierre	f0c1e39fb7	display: Initialize XInput2 Make sure it's the correct version. https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 14:12:56 -05:00
Jasper St. Pierre	dd4e655e2b	Require XInput2 This is going to start becoming necessary for mutter to run. https://bugzilla.gnome.org/show_bug.cgi?id=688779	2012-12-13 14:12:56 -05:00
Shankar Prasad	b3073bc3bc	Updated Kannada Translations	2012-12-13 17:44:11 +05:30
Shankar Prasad	54603f4d95	Updated Kannada Translations	2012-12-13 17:28:28 +05:30
Shankar Prasad	aab65a768e	Updated Kannada Translations	2012-12-13 17:22:56 +05:30
Nilamdyuti Goswami	37c037278c	Assamese translation updated	2012-12-10 18:27:30 +05:30
Jasper St. Pierre	9d904f9a85	Increase typical icon size to 96 Since we want nice alt-tab applications for gnome-shell, we should up the limit to 96. In the future, we probably want to get rid of the icon-cache, and allow looking up a correctly sized icon directly from the window. To prevent app breakage, set the legacy WM_HINTS pixmap size directly to 32x32. https://bugzilla.gnome.org/show_bug.cgi?id=689651	2012-12-09 20:44:13 -05:00
Jasper St. Pierre	8830814d70	screen: Add a convenience method to focus the default window This will be used for gnome-shell so that it can focus a window after a keyboard grab or other things. https://bugzilla.gnome.org/show_bug.cgi?id=689652	2012-12-07 13:01:49 -05:00
ManojKumar Giri	c0958090b4	Updated Odia Translation with FUEL implementation.	2012-12-06 13:53:52 +05:30
ManojKumar Giri	7f9e4e47c5	Updated Odia Translation with FUEL implementation.	2012-12-06 13:50:51 +05:30
Florian Müllner	2282326f30	Add 'switch-applications' keybinding Add an additional "switcher" keybinding for switching between applications rather than windows (like the existing 'switch-windows' and 'switch-group' bindings). The purpose of the new keybinding is to be taken over by gnome-shell's application-based alt-tab popup, so rather than actually implementing an application switcher in mutter, let it duplicate the normal window switcher when run standalone. https://bugzilla.gnome.org/show_bug.cgi?id=688913	2012-12-05 18:45:22 +01:00
Florian Müllner	8703daccbe	display: Make workspace parameter to get_tab_list() optional Currently meta_display_get_tab_list() will only return windows on a single workspace. Make the workspace parameter optional to allow requesting windows from all workspaces. https://bugzilla.gnome.org/show_bug.cgi?id=688913	2012-12-05 18:45:22 +01:00
Florian Müllner	3797ecaa65	display: Clean up meta_display_get_tab_list() https://bugzilla.gnome.org/show_bug.cgi?id=688913	2012-12-05 18:45:22 +01:00
Jasper St. Pierre	c6fcc79e6a	display: Kill a warning at shutdown A small semicolon was causing us to always remove the focus timeout ID.	2012-12-04 16:46:40 -05:00
Dr.T.Vasudevan	d588de635a	Updated Tamil translation	2012-12-02 18:58:51 +05:30
Alban Crequy	e5b46747d6	Initialize window->user_rect in the initial placement The window positioning is delayed in idle_move_resize() in case the application resizes/maximizes its window quickly after its creation. The delayed positioning uses window->user_rect because of bug 426519 comment 3 (see meta_window_move_resize_now()). user_rect was not set in the initial positioning, causing the delayed positioning unable to know which monitor we use for this window. As a consequence, the window could jump spontaneously from one monitor to another. With this patch, the window does not jump anymore. https://bugzilla.gnome.org/show_bug.cgi?id=556696	2012-11-30 13:29:26 +00:00
Yaron Shahrabani	62d85f2e41	Updated Hebrew translation.	2012-11-30 11:53:56 +02:00
Piotr Drąg	5ea6bf3b46	Updated Polish translation	2012-11-27 17:31:03 +01:00
Nilamdyuti Goswami	90d0bb96b4	Assamese translation updated	2012-11-23 21:10:23 +05:30
Jasper St. Pierre	ff64cba616	Rename configure.in to configure.ac configure.in support for autoconf is going to go away at some point. https://bugzilla.gnome.org/show_bug.cgi?id=688777	2012-11-20 21:25:12 -05:00