Bump version to 3.4.1

Update NEWS
display: Cancel overlay key presses on mouse button events
2012-04-17 17:58:59 -04:00 · 2012-04-17 23:53:36 +02:00 · 2012-04-16 20:31:45 -04:00 · 2012-04-16 15:21:40 +08:00 · 2012-04-15 17:55:13 +02:00 · 2012-04-14 12:24:08 +09:00
31 changed files with 8839 additions and 10185 deletions
--- a/34
+++ b/34
@@ -1,3 +1,37 @@
+3.4.1
+=====
+* API change: the meta_display_add_keybinding() function added in 3.4
+  wasn't usable from a GNOME Shell extension, so has been changed to take
+  a GSettings object rather than the name of a schema [Jasper; #673014]
+* Don't try to auto-maximize not-maximizable windows; this fixes the problem
+  with the Nautilus desktop window being mis-positioned when enabled
+  [Owen; #673566]
+* Fix a crash in the default plugin (not used in GNOME) [Giovanni; #673809]
+* Make the <Super> key work when set as the mouse button modifier
+  [Florian; #662476]
+
+Contributors:
+ Giovanni Campagna, Florian Muellner, Jasper St. Pierre, Owen Taylor
+
+Translations:
+ Khaled Hosny [ar], Jordi Serratosa [ca], Carles Ferrando [ca@valencia],
+ Christian Kirbach [de], Kristjan Schmidt [eo], Arash Mousavi [fa],
+ Jiro Matsuzawa [ja], Shankar Prasad [kn], Aurimas Černius [lt],
+ Yinghua Wang [zh_CN]
+
+3.4.0
+=====
+* Fix crash when a full-screen window is opened [Jasper; #672797]
+* Fix memory leaks [Pavel; #672640]
+
+Contributors:
+ Jasper St. Pierre, Pavel Vasin
+
+Translations:
+ Marek Černocký, Petr Kovar [cz], Bruno Brouard [fr], Sweta Kothari [gu],
+ Yaron Shahrabani [he], Changwoo Ryu [kr], Enrico Nicoletto [pt_BR],
+ Yuri Myasoedov [ru], Muhammet Kara [tr], Nguyễn Thái Ngọc Duy [vi]
+
 3.3.92
 ======
 * Automaximize large windows on map [Adel; #671677]
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 AC_PREREQ(2.50)

 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [3])
-m4_define([mutter_micro_version], [92])
+m4_define([mutter_minor_version], [4])
+m4_define([mutter_micro_version], [1])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,19 +5,21 @@
 # Jesús Moreno <jmmolas@wanadoo.es>, 2002.
 # Jordi Mallach <jordi@sindominio.net>, 2003, 2004, 2005, 2006, 2007, 2008.
 # David Planella <david.planella@gmail.com>, 2008, 2009, 2011, 2012.
+# Jordi Serratosa <jordis@softcatala.cat>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.24\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-15 23:16+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-03-15 22:18+0000\n"
 "PO-Revision-Date: 2012-03-15 23:17+0100\n"
 "Last-Translator: David Planella <david.planella@gmail.com>\n"
 "Language-Team: Softcatalà <tradgnome@softcatala.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"

 #: ../src/50-mutter-windows.xml.in.h:1
@@ -282,8 +284,8 @@ msgid ""
 "These windows do not support &quot;save current setup&quot; and will have to "
 "be restarted manually next time you log in."
 msgstr ""
-"Aquestes finestres no implementen «desa la configuració actual» i s'hauran "
-"de reiniciar manualment la pròxima vegada que entreu."
+"Aquestes finestres no implementen «desa la configuració actual» i s'hauran de "
+"reiniciar manualment la pròxima vegada que entreu."

 #: ../src/core/util.c:111
 #, c-format
@@ -341,8 +343,8 @@ msgstr ""
 #: ../src/core/window.c:7932
 #, 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"
+"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 ""
 "La finestra %s estableix un consell MWM que indica que no és "
 "redimensionable, però estableix una mida mínima %d x %d i una mida màxima %d "
@@ -460,7 +462,7 @@ msgid ""
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
-"So s'habilita, es maximitzaran les finestres verticalment i es "
+"Si s'habilita, es maximitzaran les finestres verticalment i es "
 "redimensionaran horitzontalment per cobrir la meitat de l'àrea disponible en "
 "deixar-les anar a les vores verticals de la pantalla. Si es deixen anar a la "
 "vora superior de la pantalla es maximitzaran completament."
@@ -752,8 +754,7 @@ msgstr "la geometria del marc no especifica la dimensió «%s»"
 #: ../src/ui/theme.c:305
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
-msgstr ""
-"la geometria del marc no especifica la dimensió «%s» per al contorn «%s»"
+msgstr "la geometria del marc no especifica la dimensió «%s» per al contorn «%s»"

 #: ../src/ui/theme.c:342
 #, c-format
@@ -786,8 +787,8 @@ msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
 "_ are valid"
 msgstr ""
-"El caràcter «%c» no és vàlid en el paràmetre color_name de gtk:"
-"personalitzat, només són vàlids A-Za-z0-9-_"
+"El caràcter «%c» no és vàlid en el paràmetre color_name de gtk:personalitzat, "
+"només són vàlids A-Za-z0-9-_"

 #: ../src/ui/theme.c:1249
 #, c-format
@@ -795,8 +796,8 @@ msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
 "fit the format"
 msgstr ""
-"El format de Gtk:personalitzat és «gtk:personalitzat(color_name,"
-"alternatiu)», «%s» no s'ajusta al format"
+"El format de Gtk:personalitzat és «gtk:personalitzat(color_name,alternatiu)», "
+"«%s» no s'ajusta al format"

 #: ../src/ui/theme.c:1294
 #, c-format
@@ -938,8 +939,8 @@ msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr ""
-"L'expressió coordinada té un operador «%c» seguit de l'operador «%c» sense "
-"cap operand enmig"
+"L'expressió coordinada té un operador «%c» seguit de l'operador «%c» sense cap "
+"operand enmig"

 #: ../src/ui/theme.c:2407 ../src/ui/theme.c:2452
 #, c-format
@@ -1015,8 +1016,8 @@ msgstr ""
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
-"Les constants de la definició d'usuari han de començar per una majúscula; "
-"«%s» no ho és"
+"Les constants de la definició d'usuari han de començar per una majúscula; «%"
+"s» no ho és"

 #: ../src/ui/theme.c:5717 ../src/ui/theme.c:5779 ../src/ui/theme.c:5842
 #, c-format
@@ -1085,8 +1086,8 @@ msgstr "L'angle ha d'estar entre 0.0 i 360.0, era %g\n"
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
-"L'opacitat ha d'estar entre 0.0 (invisible) i 1.0 (totalment opac), era a "
-"%g\n"
+"L'opacitat ha d'estar entre 0.0 (invisible) i 1.0 (totalment opac), era a %"
+"g\n"

 #: ../src/ui/theme-parser.c:863
 #, c-format
@@ -1901,8 +1902,8 @@ msgstr ""

 #~ msgid "%d stored in GConf key %s is out of range %d to %d\n"
 #~ msgstr ""
-#~ "%d, emmagatzemat a la clau %s del GConf, està fora de l'interval de %d a "
-#~ "%d\n"
+#~ "%d, emmagatzemat a la clau %s del GConf, està fora de l'interval de %d a %"
+#~ "d\n"

 #~ msgid "GConf key \"%s\" is set to an invalid type\n"
 #~ msgstr "La clau «%s» del GConf està establerta a un tipus no vàlid\n"
@@ -1921,8 +1922,8 @@ msgstr ""

 #~ msgid "Error setting name for workspace %d to \"%s\": %s\n"
 #~ msgstr ""
-#~ "S'ha produït un error en establir el nom de l'espai de treball %d a «%s»: "
-#~ "%s\n"
+#~ "S'ha produït un error en establir el nom de l'espai de treball %d a «%s»: %"
+#~ "s\n"

 #~ msgid "Error setting live hidden windows status status: %s\n"
 #~ msgstr ""
@@ -1953,8 +1954,8 @@ msgstr ""

 #~ msgid "Error setting clutter plugin list: %s\n"
 #~ msgstr ""
-#~ "S'ha produït un error en establir la llista de connectors del Clutter: "
-#~ "%s\n"
+#~ "S'ha produït un error en establir la llista de connectors del Clutter: %"
+#~ "s\n"

 #~ msgid "Clutter Plugins"
 #~ msgstr "Connectors del Clutter"
@@ -2113,8 +2114,8 @@ msgstr ""
 #~ "premuda, es mourà la finestra (botó esquerre), redimensionarà la finestra "
 #~ "(botó central) o mostrarà el menú de la finestra (botó dret). Les "
 #~ "operacions de la dreta i de l'esquerra es poden intercanviar amb la clau "
-#~ "«mouse_button_resize». El modificador s'expressa com a «&lt;Alt;&gt;» o "
-#~ "com a «&lt;Super&gt;», per exemple."
+#~ "«mouse_button_resize». El modificador s'expressa com a «&lt;Alt;&gt;» o com "
+#~ "a «&lt;Super&gt;», per exemple."

 #~ msgid "Commands to run in response to keybindings"
 #~ msgstr "Ordres a executar en resposta a vinculacions de tecles"
@@ -2268,8 +2269,8 @@ msgstr ""
 #~ "sol·licituds d'activació des de les miniaplicacions de la llista de "
 #~ "finestres. Aquesta opció està inhabilitada en el mode d'alçar les "
 #~ "finestres amb clic. Fixeu-vos que les diverses maneres d'alçar les "
-#~ "finestres quan «raise_on_click» és fals no inclouen les peticions "
-#~ "programades de les aplicacions per a alçar finestres; aquestes peticions "
+#~ "finestres quan «raise_on_click» és fals no inclouen les sol·licituds "
+#~ "programades de les aplicacions per a alçar finestres; aquestes sol·licituds "
 #~ "s'ignoraran sigui quin sigui el motiu. Si desenvolupeu aplicacions i un "
 #~ "usuari es queixa que l'aplicació no funciona quan aquest paràmetre està "
 #~ "inhabilitat, digueu-li que es culpa _seva_ per haver trencat el gestor de "
@@ -2302,8 +2303,8 @@ msgstr ""
 #~ msgstr ""
 #~ "Li diu al Metacity com implementar la indicació visual de que s'ha tocat "
 #~ "la campana del sistema, o l'indicador de campana d'un altra aplicació. "
-#~ "Actualment, hi ha dos valors vàlids, «fullscreen», que fa un flaix blanc "
-#~ "i negre en tota la pantalla, i «frame_flash», que causa que la barra del "
+#~ "Actualment, hi ha dos valors vàlids, «fullscreen», que fa un flaix blanc i "
+#~ "negre en tota la pantalla, i «frame_flash», que causa que la barra del "
 #~ "títol de l'aplicació que ha enviat el senyal de campana faci un flaix. Si "
 #~ "no se sap quina aplicació ha enviat el senyal de campana, com sol pasar "
 #~ "per als «sons del sistema» per defecte, la barra del títol de la finestra "
@@ -2407,8 +2408,8 @@ msgstr ""
 #~ "vertical), que només commutaran l'estat de maximització en la direcció "
 #~ "indicada, «minimize» (minimitza), que minimitzarà la finestra, "
 #~ "«shade» (persiana), que enrotllarà la finestra cap amunt, «menu», que "
-#~ "mostrarà el menú de la finestra, «lower» (abaixa), que situarà la "
-#~ "finestra darrere de totes les altres, i «none» (res), que no farà res."
+#~ "mostrarà el menú de la finestra, «lower» (abaixa), que situarà la finestra "
+#~ "darrere de totes les altres, i «none» (res), que no farà res."

 #~ msgid ""
 #~ "This option determines the effects of middle-clicking on the title bar. "
@@ -2429,8 +2430,8 @@ msgstr ""
 #~ "vertical), que només commutaran l'estat de maximització en la direcció "
 #~ "indicada, «minimize» (minimitza), que minimitzarà la finestra, "
 #~ "«shade» (persiana), que enrotllarà la finestra cap amunt, «menu», que "
-#~ "mostrarà el menú de la finestra, «lower» (abaixa), que situarà la "
-#~ "finestra darrere de totes les altres, i «none» (res), que no farà res."
+#~ "mostrarà el menú de la finestra, «lower» (abaixa), que situarà la finestra "
+#~ "darrere de totes les altres, i «none» (res), que no farà res."

 #~ msgid ""
 #~ "This option determines the effects of right-clicking on the title bar. "
@@ -2448,8 +2449,8 @@ msgstr ""
 #~ "d'ombrejat de la finestra, «toggle_maximize» (commuta la maximització), "
 #~ "que en commutarà l'estat de maximització, "
 #~ "«toggle_maximize_horizontally» (commuta la maximització horitzontal) i "
-#~ "«toggle_maximize_vertically» (commuta la maximització vertical), que "
-#~ "només commutaran l'estat de maximització en la direcció indicada, "
+#~ "«toggle_maximize_vertically» (commuta la maximització vertical), que només "
+#~ "commutaran l'estat de maximització en la direcció indicada, "
 #~ "«minimize» (minimitza), que minimitzarà la finestra, «shade» (persiana), "
 #~ "que enrotllarà la finestra cap amunt, «menu», que mostrarà el menú de la "
 #~ "finestra, «lower» (abaixa), que situarà la finestra darrere de totes les "
@@ -2472,8 +2473,8 @@ msgstr ""
 #~ "environments."
 #~ msgstr ""
 #~ "Activa una indicació visual quan una aplicació o el sistema envia un "
-#~ "senyal de «campana» o «sons»; és útil per als durs d'orella i per a l'ús "
-#~ "en ambients amb soroll."
+#~ "senyal de «campana» o «sons»; és útil per als durs d'orella i per a l'ús en "
+#~ "ambients amb soroll."

 #~ msgid "Use standard system font in window titles"
 #~ msgstr ""
@@ -2540,7 +2541,7 @@ msgstr ""
 #~ msgid ""
 #~ "Error launching metacity-dialog to print an error about a command: %s\n"
 #~ msgstr ""
-#~ "S'ha produït un error en executar el metacity-dialog per a mostrar un "
+#~ "S'ha produït un error en executar el metacity-dialog per mostrar un "
 #~ "error quant a una ordre: %s\n"

 #~ msgid "Unknown attribute %s on <metacity_session> element"
@@ -2582,11 +2583,11 @@ msgstr ""
 #~ "will be no keybinding for this action."
 #~ msgstr ""
 #~ "La vinculació de tecles que canvia a l'espai de treball a sobre de "
-#~ "l'espai de treball actual. El format és «&lt;Control&gt;a» o «&lt;"
-#~ "Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i permet "
-#~ "minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;"
-#~ "Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no hi "
-#~ "haurà cap vinculació per a aquesta acció."
+#~ "l'espai de treball actual. El format és «&lt;Control&gt;a» o «&lt;Shift&gt;"
+#~ "&lt;Alt&gt;F1». L'analitzador és prou flexible i permet minúscules i "
+#~ "majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si "
+#~ "establiu l'opció a la cadena especial «disabled», no hi haurà cap "
+#~ "vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding that switches to the workspace below the current "
@@ -2597,11 +2598,11 @@ msgstr ""
 #~ "will be no keybinding for this action."
 #~ msgstr ""
 #~ "La vinculació de tecles que canvia a l'espai de treball sota l'espai de "
-#~ "treball actual. El format és «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;"
-#~ "Alt&gt;F1». L'analitzador és prou flexible i permet minúscules i "
-#~ "majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si "
-#~ "establiu l'opció a la cadena especial «disabled», no hi haurà cap "
-#~ "vinculació per a aquesta acció."
+#~ "treball actual. El format és «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
+#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
+#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció "
+#~ "a la cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
+#~ "acció."

 #~ msgid ""
 #~ "The keybinding that switches to the workspace on the left of the current "
@@ -2612,11 +2613,11 @@ msgstr ""
 #~ "will be no keybinding for this action."
 #~ msgstr ""
 #~ "La vinculació de tecles que canvia a l'espai de treball a l'esquerra de "
-#~ "l'espai de treball actual. El format és «&lt;Control&gt;a» o «&lt;"
-#~ "Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i permet "
-#~ "minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;"
-#~ "Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no hi "
-#~ "haurà cap vinculació per a aquesta acció."
+#~ "l'espai de treball actual. El format és «&lt;Control&gt;a» o «&lt;Shift&gt;"
+#~ "&lt;Alt&gt;F1». L'analitzador és prou flexible i permet minúscules i "
+#~ "majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si "
+#~ "establiu l'opció a la cadena especial «disabled», no hi haurà cap "
+#~ "vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding that switches to the workspace on the right of the current "
@@ -2627,11 +2628,11 @@ msgstr ""
 #~ "will be no keybinding for this action."
 #~ msgstr ""
 #~ "La vinculació de tecles que canvia a l'espai de treball a la dreta de "
-#~ "l'espai de treball actual. El format és «&lt;Control&gt;a» o «&lt;"
-#~ "Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i permet "
-#~ "minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;"
-#~ "Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no hi "
-#~ "haurà cap vinculació per a aquesta acció."
+#~ "l'espai de treball actual. El format és «&lt;Control&gt;a» o «&lt;Shift&gt;"
+#~ "&lt;Alt&gt;F1». L'analitzador és prou flexible i permet minúscules i "
+#~ "majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si "
+#~ "establiu l'opció a la cadena especial «disabled», no hi haurà cap "
+#~ "vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding that switches to workspace 1. The format looks like \"&lt;"
@@ -2868,11 +2869,11 @@ msgstr ""
 #~ "then there will be no keybinding for this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a amagar totes les finestres normals i "
-#~ "establir el focus al fons de l'escriptori. El format és «&lt;Control&gt;"
-#~ "a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i "
-#~ "permet minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i "
-#~ "«&lt;Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no "
-#~ "hi haurà cap vinculació per a aquesta acció."
+#~ "establir el focus al fons de l'escriptori. El format és «&lt;Control&gt;a» "
+#~ "o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i permet "
+#~ "minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;"
+#~ "Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no hi "
+#~ "haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to maximize a window. The format looks like \"&lt;"
@@ -2883,11 +2884,10 @@ msgstr ""
 #~ "action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a maximitzar una finestra. El format és "
-#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
-#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
-#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-#~ "acció."
+#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador "
+#~ "és prou flexible i permet minúscules i majúscules, i també abreviacions "
+#~ "com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la cadena "
+#~ "especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to minimize a window. The format looks like \"&lt;"
@@ -2915,8 +2915,7 @@ msgstr ""
 #~ "avall. El format és «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
 #~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
 #~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-#~ "acció."
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window one workspace to the left. The "
@@ -2927,8 +2926,8 @@ msgstr ""
 #~ "keybinding for this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra un espai de treball a "
-#~ "l'esquerra. El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;"
-#~ "&lt;Alt&gt;F1». L'analitzador és prou flexible i permet minúscules i "
+#~ "l'esquerra. El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;"
+#~ "Alt&gt;F1». L'analitzador és prou flexible i permet minúscules i "
 #~ "majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si "
 #~ "establiu l'opció a la cadena especial «disabled», no hi haurà cap "
 #~ "vinculació per a aquesta acció."
@@ -2972,11 +2971,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 1. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 10. The format looks "
@@ -2987,11 +2985,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 10. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 11. The format looks "
@@ -3002,11 +2999,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 11. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 12. The format looks "
@@ -3017,11 +3013,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 12. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 2. The format looks "
@@ -3032,11 +3027,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 2. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 3. The format looks "
@@ -3047,11 +3041,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 3. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 4. The format looks "
@@ -3062,11 +3055,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 4. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 5. The format looks "
@@ -3077,11 +3069,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 5. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 6. The format looks "
@@ -3092,11 +3083,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 6. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 7. The format looks "
@@ -3107,11 +3097,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 7. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 8. The format looks "
@@ -3122,11 +3111,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 8. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move a window to workspace 9. The format looks "
@@ -3137,11 +3125,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a moure una finestra a l'espai de treball 9. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move focus backwards between panels and the "
@@ -3168,11 +3155,10 @@ msgstr ""
 #~ msgstr ""
 #~ "La vinculació de tecles que mou el focus cap enrere entre els quadres i "
 #~ "l'escriptori, sense utilitzar una finestra emergent. El format és "
-#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
-#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
-#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-#~ "acció."
+#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador "
+#~ "és prou flexible i permet minúscules i majúscules, i també abreviacions "
+#~ "com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la cadena "
+#~ "especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move focus backwards between windows of an "
@@ -3187,11 +3173,11 @@ msgstr ""
 #~ "La vinculació de tecles que mou el focus cap enrere entre finestres d'una "
 #~ "aplicació, sense utilitzar una finestra emergent. Mantenint premuda la "
 #~ "techa de «majúscules» juntament amb aquesta convinació de tecles, fa que "
-#~ "es vagi enrere. El format és semblant a «&lt;Control&gt;a» o «&lt;"
-#~ "Shift&gt;&lt;Alt&gt;F1». L'analitzador és força flexible i permet "
-#~ "minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;"
-#~ "Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no hi "
-#~ "haurà cap vinculació per a aquesta acció."
+#~ "es vagi enrere. El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;"
+#~ "&lt;Alt&gt;F1». L'analitzador és força flexible i permet minúscules i "
+#~ "majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si "
+#~ "establiu l'opció a la cadena especial «disabled», no hi haurà cap "
+#~ "vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move focus backwards between windows of an "
@@ -3209,8 +3195,8 @@ msgstr ""
 #~ "format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
 #~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
 #~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled» (inhabilitat), no hi haurà cap vinculació per "
-#~ "a aquesta acció."
+#~ "cadena especial «disabled» (inhabilitat), no hi haurà cap vinculació per a "
+#~ "aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move focus backwards between windows without a "
@@ -3239,10 +3225,10 @@ msgstr ""
 #~ msgstr ""
 #~ "La vinculació de tecles que mou el focus cap enrere entre finestres, "
 #~ "utilitzant una finestra emergent. El format és semblant a «&lt;Control&gt;"
-#~ "a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i "
-#~ "permet minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i "
-#~ "«&lt;Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no "
-#~ "hi haurà cap vinculació per a aquesta acció."
+#~ "a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i permet "
+#~ "minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;"
+#~ "Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no hi "
+#~ "haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move focus between panels and the desktop, using a "
@@ -3269,11 +3255,10 @@ msgstr ""
 #~ msgstr ""
 #~ "La vinculació de tecles que mou el focus entre els quadres i "
 #~ "l'escriptori, sense utilitzar una finestra emergent. El format és "
-#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
-#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
-#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-#~ "acció."
+#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador "
+#~ "és prou flexible i permet minúscules i majúscules, i també abreviacions "
+#~ "com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la cadena "
+#~ "especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move focus between windows of an application "
@@ -3288,11 +3273,10 @@ msgstr ""
 #~ "La vinculació de tecles que mou el focus entre finestres d'una aplicació, "
 #~ "sense utilitzar una finestra emergent. Prement la tecla de majúscules "
 #~ "aquesta vinculació fa que la direcció sigui cap enrere. El format és "
-#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
-#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
-#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-#~ "acció."
+#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador "
+#~ "és prou flexible i permet minúscules i majúscules, i també abreviacions "
+#~ "com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la cadena "
+#~ "especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to move focus between windows of an application, "
@@ -3356,10 +3340,10 @@ msgstr ""
 #~ "the option to the special string \"disabled\", then there will be no "
 #~ "keybinding for this action."
 #~ msgstr ""
-#~ "La vinculació de tecles per a seleccionar si una finestra està sempre per "
+#~ "La vinculació de tecles per seleccionar si una finestra està sempre per "
 #~ "damunt. Una finestra que estiga sempre per damunt serà visible per damunt "
-#~ "de les altres finestres que s'interseccionen. El format és semblant a "
-#~ "«&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou "
+#~ "de les altres finestres que s'interseccionen. El format és semblant a «&lt;"
+#~ "Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou "
 #~ "flexible i permet minúscules i majúscules, i també abreviacions com «&lt;"
 #~ "Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la cadena especial "
 #~ "«disabled», no hi haurà cap vinculació per a aquesta acció."
@@ -3391,8 +3375,7 @@ msgstr ""
 #~ "format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
 #~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
 #~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-#~ "acció."
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to toggle shaded/unshaded state. The format looks "
@@ -3405,9 +3388,9 @@ msgstr ""
 #~ "La vinculació de tecles per a canviar entre l'estat ombrejat i "
 #~ "desombrejat. El format és «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
 #~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció "
+#~ "a la cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
+#~ "acció."

 #~ msgid ""
 #~ "The keybinding used to toggle whether the window is on all workspaces or "
@@ -3417,7 +3400,7 @@ msgstr ""
 #~ "\". If you set the option to the special string \"disabled\", then there "
 #~ "will be no keybinding for this action."
 #~ msgstr ""
-#~ "La vinculació de tecles per a seleccionar si una finestra està en tots "
+#~ "La vinculació de tecles per seleccionar si una finestra està en tots "
 #~ "els espais de treball o només en un. El format és semblant a «&lt;"
 #~ "Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou "
 #~ "flexible i permet minúscules i majúscules, i també abreviacions com «&lt;"
@@ -3433,11 +3416,10 @@ msgstr ""
 #~ "action."
 #~ msgstr ""
 #~ "La vinculació de tecles per a desmaximitzar una finestra. El format és "
-#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
-#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
-#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-#~ "acció."
+#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador "
+#~ "és prou flexible i permet minúscules i majúscules, i també abreviacions "
+#~ "com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la cadena "
+#~ "especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding which display's the panel's \"Run Application\" dialog "
@@ -3478,11 +3460,10 @@ msgstr ""
 #~ msgstr ""
 #~ "La vinculació de tecles que invoca la utilitat de captures de pantalla "
 #~ "del quadre per a prendre una captura d'una finestra. El format és "
-#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
-#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
-#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-#~ "acció."
+#~ "semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador "
+#~ "és prou flexible i permet minúscules i majúscules, i també abreviacions "
+#~ "com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la cadena "
+#~ "especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding which invokes the panel's screenshot utility. The format "
@@ -3493,8 +3474,8 @@ msgstr ""
 #~ "keybinding for this action."
 #~ msgstr ""
 #~ "La vinculació de tecles que invoca la utilitat de captures de pantalla "
-#~ "del quadre. El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;"
-#~ "&lt;Alt&gt;F1». L'analitzador és prou flexible i permet minúscules i "
+#~ "del quadre. El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;"
+#~ "Alt&gt;F1». L'analitzador és prou flexible i permet minúscules i "
 #~ "majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si "
 #~ "establiu l'opció a la cadena especial «disabled», no hi haurà cap "
 #~ "vinculació per a aquesta acció."
@@ -3511,8 +3492,7 @@ msgstr ""
 #~ "format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
 #~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
 #~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-#~ "acció."
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "This keybinding changes whether a window is above or below other windows. "
@@ -3527,11 +3507,11 @@ msgstr ""
 #~ "Aquesta vinculació de tecles canvia si una finestra és per damunt o per "
 #~ "sota d'altres finestres. Si la finestra està coberta per una altra "
 #~ "finestra, s'alça la finestra per damunt de les altres, quedant totalment "
-#~ "visible, i posa a sota les altres. El format és semblant a «&lt;"
-#~ "Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou "
-#~ "flexible i permet minúscules i majúscules, i també abreviacions com «&lt;"
-#~ "Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la cadena especial "
-#~ "«disabled», no hi haurà cap vinculació per a aquesta acció."
+#~ "visible, i posa a sota les altres. El format és semblant a «&lt;Control&gt;"
+#~ "a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i permet "
+#~ "minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;"
+#~ "Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no hi "
+#~ "haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "This keybinding lowers a window below other windows. The format looks "
@@ -3545,8 +3525,7 @@ msgstr ""
 #~ "és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
 #~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
 #~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
-#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta "
-#~ "acció."
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "This keybinding moves a window against the north (top) side of the "
@@ -3565,18 +3544,18 @@ msgstr ""

 #~ msgid ""
 #~ "This keybinding moves a window into the east (right) side of the screen. "
-#~ "The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1\". The parser is fairly liberal and allows lower or upper case, and "
-#~ "also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you "
-#~ "set the option to the special string \"disabled\", then there will be no "
+#~ "The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1"
+#~ "\". The parser is fairly liberal and allows lower or upper case, and also "
+#~ "abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+#~ "the option to the special string \"disabled\", then there will be no "
 #~ "keybinding for this action."
 #~ msgstr ""
 #~ "Aquesta vinculació de tecles mou una finestra cap a la part est (dreta) "
-#~ "de la pantalla. El format és semblant a «&lt;Control&gt;a» o «&lt;"
-#~ "Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i permet "
-#~ "minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;"
-#~ "Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no hi "
-#~ "haurà cap vinculació per a aquesta acció."
+#~ "de la pantalla. El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;"
+#~ "&lt;Alt&gt;F1». L'analitzador és prou flexible i permet minúscules i "
+#~ "majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si "
+#~ "establiu l'opció a la cadena especial «disabled», no hi haurà cap "
+#~ "vinculació per a aquesta acció."

 #~ msgid ""
 #~ "This keybinding moves a window into the north-east (top right) corner of "
@@ -3655,10 +3634,10 @@ msgstr ""

 #~ msgid ""
 #~ "This keybinding moves a window into the west (left) side of the screen. "
-#~ "The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1\". The parser is fairly liberal and allows lower or upper case, and "
-#~ "also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you "
-#~ "set the option to the special string \"disabled\", then there will be no "
+#~ "The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1"
+#~ "\". The parser is fairly liberal and allows lower or upper case, and also "
+#~ "abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+#~ "the option to the special string \"disabled\", then there will be no "
 #~ "keybinding for this action."
 #~ msgstr ""
 #~ "Aquesta vinculació de tecles mou una finestra cap a la part l'oest "
@@ -3677,11 +3656,10 @@ msgstr ""
 #~ "this action."
 #~ msgstr ""
 #~ "Aquesta vinculació de tecles eleva la finestra per damunt de les altres. "
-#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1». L'analitzador és prou flexible i permet minúscules i majúscules, i "
-#~ "també abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu "
-#~ "l'opció a la cadena especial «disabled», no hi haurà cap vinculació per a "
-#~ "aquesta acció."
+#~ "El format és semblant a «&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». "
+#~ "L'analitzador és prou flexible i permet minúscules i majúscules, i també "
+#~ "abreviacions com «&lt;Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la "
+#~ "cadena especial «disabled», no hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "This keybinding resizes a window to fill available horizontal space. The "
@@ -3708,10 +3686,10 @@ msgstr ""
 #~ msgstr ""
 #~ "Aquesta vinculació de tecles redimensiona una finestra per a que plene "
 #~ "tot l'espai vertical disponible. El format és semblant a «&lt;Control&gt;"
-#~ "a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i "
-#~ "permet minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i "
-#~ "«&lt;Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no "
-#~ "hi haurà cap vinculació per a aquesta acció."
+#~ "a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i permet "
+#~ "minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i «&lt;"
+#~ "Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no hi "
+#~ "haurà cap vinculació per a aquesta acció."

 #~ msgid "Unmaximize Window"
 #~ msgstr "Desmaximitza la finestra"
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -5,12 +5,13 @@
 # Jesús Moreno <jmmolas@wanadoo.es>, 2002.
 # Jordi Mallach <jordi@sindominio.net>, 2003, 2004, 2005, 2006, 2007, 2008.
 # David Planella <david.planella@gmail.com>, 2008, 2009, 2011, 2012.
+# Jordi Serratosa <jordis@softcatala.cat>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-15 23:18+0100\n"
+"POT-Creation-Date: 2012-04-10 21:09+0200\n"
 "PO-Revision-Date: 2012-03-15 23:17+0100\n"
 "Last-Translator: David Planella <david.planella@gmail.com>\n"
 "Language-Team: Softcatalà <tradgnome@softcatala.org>\n"
@@ -321,7 +322,7 @@ msgid "Window manager error: "
 msgstr "Error del gestor de finestres: "

 #. first time through
-#: ../src/core/window.c:7269
+#: ../src/core/window.c:7266
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -337,7 +338,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7932
+#: ../src/core/window.c:7931
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -458,7 +459,7 @@ msgid ""
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
-"So s'habilita, es maximitzaran les finestres verticalment i es "
+"Si s'habilita, es maximitzaran les finestres verticalment i es "
 "redimensionaran horitzontalment per cobrir la meitat de l'àrea disponible en "
 "deixar-les anar a les vores verticals de la pantalla. Si es deixen anar a la "
 "vora superior de la pantalla es maximitzaran completament."
@@ -2266,13 +2267,13 @@ msgstr ""
 #~ "sol·licituds d'activació des de les miniaplicacions de la llista de "
 #~ "finestres. Aquesta opció està inhabilitada en el mode d'alçar les "
 #~ "finestres amb clic. Fixeu-vos que les diverses maneres d'alçar les "
-#~ "finestres quan «raise_on_click» és fals no inclouen les peticions "
-#~ "programades de les aplicacions per a alçar finestres; aquestes peticions "
-#~ "s'ignoraran sigui quin sigui el motiu. Si desenvolupeu aplicacions i un "
-#~ "usuari es queixa que l'aplicació no funciona quan aquest paràmetre està "
-#~ "inhabilitat, digueu-li que es culpa _seva_ per haver trencat el gestor de "
-#~ "finestres, i que ha de tornar a canviar aquesta opció a «true» o conviure "
-#~ "amb l'error."
+#~ "finestres quan «raise_on_click» és fals no inclouen les sol·licituds "
+#~ "programades de les aplicacions per a alçar finestres; aquestes "
+#~ "sol·licituds s'ignoraran sigui quin sigui el motiu. Si desenvolupeu "
+#~ "aplicacions i un usuari es queixa que l'aplicació no funciona quan aquest "
+#~ "paràmetre està inhabilitat, digueu-li que es culpa _seva_ per haver "
+#~ "trencat el gestor de finestres, i que ha de tornar a canviar aquesta "
+#~ "opció a «true» o conviure amb l'error."

 #~ msgid ""
 #~ "Some applications disregard specifications in ways that result in window "
@@ -2538,8 +2539,8 @@ msgstr ""
 #~ msgid ""
 #~ "Error launching metacity-dialog to print an error about a command: %s\n"
 #~ msgstr ""
-#~ "S'ha produït un error en executar el metacity-dialog per a mostrar un "
-#~ "error quant a una ordre: %s\n"
+#~ "S'ha produït un error en executar el metacity-dialog per mostrar un error "
+#~ "quant a una ordre: %s\n"

 #~ msgid "Unknown attribute %s on <metacity_session> element"
 #~ msgstr "Atribut %s desconegut a l'element <metacity_session>"
@@ -3354,7 +3355,7 @@ msgstr ""
 #~ "the option to the special string \"disabled\", then there will be no "
 #~ "keybinding for this action."
 #~ msgstr ""
-#~ "La vinculació de tecles per a seleccionar si una finestra està sempre per "
+#~ "La vinculació de tecles per seleccionar si una finestra està sempre per "
 #~ "damunt. Una finestra que estiga sempre per damunt serà visible per damunt "
 #~ "de les altres finestres que s'interseccionen. El format és semblant a "
 #~ "«&lt;Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou "
@@ -3415,12 +3416,12 @@ msgstr ""
 #~ "\". If you set the option to the special string \"disabled\", then there "
 #~ "will be no keybinding for this action."
 #~ msgstr ""
-#~ "La vinculació de tecles per a seleccionar si una finestra està en tots "
-#~ "els espais de treball o només en un. El format és semblant a «&lt;"
-#~ "Control&gt;a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou "
-#~ "flexible i permet minúscules i majúscules, i també abreviacions com «&lt;"
-#~ "Ctl&gt;» i «&lt;Ctrl&gt;». Si establiu l'opció a la cadena especial "
-#~ "«disabled», no hi haurà cap vinculació per a aquesta acció."
+#~ "La vinculació de tecles per seleccionar si una finestra està en tots els "
+#~ "espais de treball o només en un. El format és semblant a «&lt;Control&gt;"
+#~ "a» o «&lt;Shift&gt;&lt;Alt&gt;F1». L'analitzador és prou flexible i "
+#~ "permet minúscules i majúscules, i també abreviacions com «&lt;Ctl&gt;» i "
+#~ "«&lt;Ctrl&gt;». Si establiu l'opció a la cadena especial «disabled», no "
+#~ "hi haurà cap vinculació per a aquesta acció."

 #~ msgid ""
 #~ "The keybinding used to unmaximize a window. The format looks like \"&lt;"
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/gu.po
+++ b/po/gu.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: 2011-12-30 10:48+0200\n"
-"PO-Revision-Date: 2011-12-30 10:49+0200\n"
+"POT-Creation-Date: 2012-03-24 19:08+0200\n"
+"PO-Revision-Date: 2012-03-24 19:08+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@@ -68,12 +68,12 @@ msgstr "ה_מתנה"
 msgid "_Force Quit"
 msgstr "_אילוץ סגירה"

-#: ../src/core/display.c:361
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Missing %s extension required for compositing"

-#: ../src/core/display.c:427
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"
@@ -138,26 +138,26 @@ msgstr "Print version"
 msgid "Comma-separated list of compositor plugins"
 msgstr "Comma-separated list of compositor plugins"

-#: ../src/core/prefs.c:1069
+#: ../src/core/prefs.c:1077
 msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 msgstr "Workarounds for broken applications disabled. Some applications may not behave properly.\n"

-#: ../src/core/prefs.c:1144
+#: ../src/core/prefs.c:1152
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Could not parse font description \"%s\" from GSettings key %s\n"

-#: ../src/core/prefs.c:1210
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 msgstr "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"

-#: ../src/core/prefs.c:1722
+#: ../src/core/prefs.c:1739
 #, 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:1819
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "סביבת עבודה %d"
@@ -279,7 +279,7 @@ msgid "Window manager error: "
 msgstr "Window manager error: "

 #. first time through
-#: ../src/core/window.c:7180
+#: ../src/core/window.c:7266
 #, c-format
 msgid "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
 msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
@@ -291,7 +291,7 @@ msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADE
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7843
+#: ../src/core/window.c:7931
 #, c-format
 msgid "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
@@ -367,46 +367,54 @@ msgid "Determines whether workspace switching should happen for windows on all m
 msgstr "Determines whether workspace switching should happen for windows on all monitors or only for windows on the primary monitor."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:6
+msgid "Determines whether workspaces are managed dynamically or whether there's a static number of workspaces (determined by the num-workspaces key in org.gnome.desktop.wm.preferences)."
+msgstr "Determines whether workspaces are managed dynamically or whether there's a static number of workspaces (determined by the num-workspaces key in org.gnome.desktop.wm.preferences)."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Draggable border width"
 msgstr "Draggable border width"

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

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

-#: ../src/org.gnome.mutter.gschema.xml.in.h:9
+#: ../src/org.gnome.mutter.gschema.xml.in.h:10
 msgid "Live Hidden Windows"
 msgstr "Live Hidden Windows"

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

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

-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Select window from tab popup"
 msgstr "Select window from tab popup"

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

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

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

-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Workspaces are managed dynamically"
+msgstr "Workspaces are managed dynamically"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Workspaces only on primary"
 msgstr "Workspaces only on primary"

@@ -415,50 +423,6 @@ msgstr "Workspaces only on primary"
 msgid "Usage: %s\n"
 msgstr "שימוש: %s\n"

-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "סגור חלון"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "תפריט חלון"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "מזער חלון"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "הגדל חלון"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "שחזר חלון"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "גלול חלון מעלה"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "בטל גלילה"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "שמור על החלון גלוי"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "בטל שמירת החלון גלוי"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "הראה בכל סביבות העבודה"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "הראה את החלון על סביבת עבודה אחת בלבד"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -1468,6 +1432,39 @@ 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"

+#~ msgid "Close Window"
+#~ msgstr "סגור חלון"
+
+#~ msgid "Window Menu"
+#~ msgstr "תפריט חלון"
+
+#~ msgid "Minimize Window"
+#~ msgstr "מזער חלון"
+
+#~ msgid "Maximize Window"
+#~ msgstr "הגדל חלון"
+
+#~ msgid "Restore Window"
+#~ msgstr "שחזר חלון"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "גלול חלון מעלה"
+
+#~ msgid "Unroll Window"
+#~ msgstr "בטל גלילה"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "שמור על החלון גלוי"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "בטל שמירת החלון גלוי"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "הראה בכל סביבות העבודה"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "הראה את החלון על סביבת עבודה אחת בלבד"
+
 #~ msgid "Switch to workspace 1"
 #~ msgstr "מעבר למרחב עבודה 1"

--- a/po/ja.po
+++ b/po/ja.po
--- a/po/kn.po
+++ b/po/kn.po
--- a/po/ko.po
+++ b/po/ko.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-13 13:41+0000\n"
-"PO-Revision-Date: 2012-03-10 23:40+0900\n"
+"POT-Creation-Date: 2012-03-15 21:29+0000\n"
+"PO-Revision-Date: 2012-03-27 01:25+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -29,17 +29,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"

 #: ../src/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "창"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "왼쪽 절반 뷰"

-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "오른쪽 절반 뷰"

-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Windows"
-msgstr "창"
-
 #. 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
@@ -83,12 +83,12 @@ msgstr "기다리기(_W)"
 msgid "_Force Quit"
 msgstr "강제로 끝내기(_F)"

-#: ../src/core/display.c:365
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "콤포짓에 필요한 %s 확장 기능이 없습니다"

-#: ../src/core/display.c:431
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X 윈도 시스템 디스플레이 '%s'을(를) 여는데 실패하였습니다\n"
@@ -139,7 +139,7 @@ msgstr ""
 "테마를 찾을 수 없습니다! %s이(가) 있고 올바른 테마가 들어 있는지 확인하십시"
 "오.\n"

-#: ../src/core/mutter.c:42
+#: ../src/core/mutter.c:40
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -154,15 +154,15 @@ msgstr ""
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"

-#: ../src/core/mutter.c:56
+#: ../src/core/mutter.c:54
 msgid "Print version"
 msgstr "버전을 출력합니다"

-#: ../src/core/mutter.c:62
+#: ../src/core/mutter.c:60
 msgid "Comma-separated list of compositor plugins"
 msgstr "컴포짓 플러그인의 목록, 쉼표로 구분"

-#: ../src/core/prefs.c:1067
+#: ../src/core/prefs.c:1077
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -170,12 +170,12 @@ msgstr ""
 "응용 프로그램에 대한 임시 방편을 막았습니다. 몇몇 응용프로그램들이 제대로 동"
 "작하지 않을것입니다.\n"

-#: ../src/core/prefs.c:1142
+#: ../src/core/prefs.c:1152
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "GSettings 키 %2$s에서 글꼴 지정 \"%1$s\"을(를) 분석할 수 없습니다\n"

-#: ../src/core/prefs.c:1208
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -184,7 +184,7 @@ msgstr ""
 "설정 데이터베이스에서 찾은 \"%s\"이(가) 마우스 단추 변경 키의 올바른 값이 아"
 "닙니다\n"

-#: ../src/core/prefs.c:1720
+#: ../src/core/prefs.c:1739
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -193,17 +193,17 @@ msgstr ""
 "설정 데이터베이스에서 찾은 \"%s\"이(가) 단축키 \"%s\"에 대한 올바른 값이 아닙"
 "니다\n"

-#: ../src/core/prefs.c:1817
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "작업 공간 %d"

-#: ../src/core/screen.c:741
+#: ../src/core/screen.c:730
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "디스플레이 '%2$s'의 화면 %1$d은(는) 잘못되었습니다\n"

-#: ../src/core/screen.c:757
+#: ../src/core/screen.c:746
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -212,19 +212,19 @@ msgstr ""
 "디스플레이 \"%2$s\"의 화면 %1$d에 이미 창 관리자가 실행되고 있습니다. 현재 "
 "창 관리자를 무시하는 --replace 옵션을 써보십시오.\n"

-#: ../src/core/screen.c:784
+#: ../src/core/screen.c:773
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "디스플레이 \"%2$s\"의 화면 %1$d에 창 관리 선택을 가질 수 없습니다\n"

-#: ../src/core/screen.c:839
+#: ../src/core/screen.c:828
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "디스플레이 \"%2$s\"의 화면 %1$d은(는) 이미 창 관리자가 실행되고 있습니다\n"

-#: ../src/core/screen.c:1024
+#: ../src/core/screen.c:1013
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "디스플레이 \"%2$s\"의 화면 %1$d을(를) 떼어 놓을수 없습니다\n"
@@ -321,7 +321,7 @@ msgid "Window manager error: "
 msgstr "장 관리자 오류: "

 #. first time through
-#: ../src/core/window.c:7145
+#: ../src/core/window.c:7269
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -337,7 +337,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7808
+#: ../src/core/window.c:7932
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -400,75 +400,10 @@ msgid "Mutter"
 msgstr "머터"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
-msgid "Attach modal dialogs"
-msgstr "모달 대화 상자 부착"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "탭 팝업 취소"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
-msgid ""
-"Determines whether hidden windows (i.e., minimized windows and windows on "
-"other workspaces than the current one) should be kept alive."
-msgstr ""
-"숨긴 창을 (예를 들어 최소화한 창과 현재가 아닌 다른 작업 공간의 창) 실행 상태"
-"로 두어야 할지 지정합니다."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:4
-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:5
-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:6
-msgid "Draggable border width"
-msgstr "마우스로 끌 수 있는 가장자리의 너비"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:7
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "창을 화면 가장자리에 끌어 놓을 때 가장자리에 맞춰 격자로 만들기"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:8
-msgid ""
-"If enabled, dropping windows on vertical screen edges maximizes them "
-"vertically and resizes them horizontally to cover half of the available "
-"area. Dropping windows on the top screen edge maximizes them completely."
-msgstr "참이면, 세로 방향 화면 가장자리에 창을 놓았을 때 세로 방향으로 최대화하고 가로 방향으로 화면을 절반을 차지하도록 크기를 바꿉니다. 화면 위 가장자리에 창을 놓으면 전체 화면으로 만듭니다."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid "Live Hidden Windows"
-msgstr "실행 중인 숨긴 창"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:10
 msgid "Modifier to use for extended window management operations"
 msgstr "창 관리 작업을 할 때 사용할 변경 키"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:11
-msgid "No tab popup"
-msgstr "탭 팝업 없음"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
-msgid "Select window from tab popup"
-msgstr "탭 팝업에서 창 선택"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
-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:14
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
 "This key will initiate the \"overlay\", which is a combination window "
 "overview and application launching system. The default is intended to be the "
@@ -480,7 +415,11 @@ msgstr ""
 "기본값은 \"윈도우 키\"입니다. 보통 이 키 바인딩은 기본값이거나 빈 문자열입니"
 "다."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
+msgid "Attach modal dialogs"
+msgstr "모달 대화 상자 부착"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -489,59 +428,91 @@ msgstr ""
 "참이면 모달 대화 상자에서 별도의 제목 표시줄을 표시하지 않고 상위 창의 제목 "
 "표시줄에 붙어서 상위 창과 함께 움직입니다."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Live Hidden Windows"
+msgstr "실행 중인 숨긴 창"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:6
+msgid ""
+"Determines whether hidden windows (i.e., minimized windows and windows on "
+"other workspaces than the current one) should be kept alive."
+msgstr ""
+"숨긴 창을 (예를 들어 최소화한 창과 현재가 아닌 다른 작업 공간의 창) 실행 상태"
+"로 두어야 할지 지정합니다."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:7
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "창을 화면 가장자리에 끌어 놓을 때 가장자리에 맞춰 격자로 만들기"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:8
+msgid ""
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
+msgstr ""
+"참이면, 세로 방향 화면 가장자리에 창을 놓았을 때 세로 방향으로 최대화하고 가"
+"로 방향으로 화면을 절반을 차지하도록 크기를 바꿉니다. 화면 위 가장자리에 창"
+"을 놓으면 전체 화면으로 만듭니다."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:9
+msgid "Workspaces are managed dynamically"
+msgstr "작업 공간을 동적으로 관리"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:10
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr "작업 공간을 동적으로 관리할지 아니면 작업 공간이 고정된 개수인지 지정합니다. (고정된 개수는 org.gnome.desktop.wm.preferences의 num-workspaces 키로 지정합니다.)"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:11
 msgid "Workspaces only on primary"
 msgstr "주 모니터에서만 작업 공간"

+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+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:13
+msgid "No tab popup"
+msgstr "탭 팝업 없음"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+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: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:17
+msgid "Select window from tab popup"
+msgstr "탭 팝업에서 창 선택"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
+msgid "Cancel tab popup"
+msgstr "탭 팝업 취소"
+
 #: ../src/tools/mutter-message.c:123
 #, c-format
 msgid "Usage: %s\n"
 msgstr "사용법: %s\n"

-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "창 닫기"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "창 메뉴"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "창 최소화"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "창 최대화"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "창 복귀"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "창 말아올리기"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "창 펼치기"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "창을 맨 위에 두기"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "창을 맨 위에서 빼기"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "항상 현재 작업 공간에 놓기"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "창을 한 개 작업 공간에만 두기"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -1603,3 +1574,36 @@ msgstr "세로값이 %d입니다. 와야 하는 값은 %d입니다"
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d개의 좌표 표현식을 %g초에 파싱했습니다 (평균 %g초)\n"
+
+#~ msgid "Close Window"
+#~ msgstr "창 닫기"
+
+#~ msgid "Window Menu"
+#~ msgstr "창 메뉴"
+
+#~ msgid "Minimize Window"
+#~ msgstr "창 최소화"
+
+#~ msgid "Maximize Window"
+#~ msgstr "창 최대화"
+
+#~ msgid "Restore Window"
+#~ msgstr "창 복귀"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "창 말아올리기"
+
+#~ msgid "Unroll Window"
+#~ msgstr "창 펼치기"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "창을 맨 위에 두기"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "창을 맨 위에서 빼기"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "항상 현재 작업 공간에 놓기"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "창을 한 개 작업 공간에만 두기"
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity ru\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-13 13:41+0000\n"
-"PO-Revision-Date: 2012-03-11 20:40+0300\n"
+"POT-Creation-Date: 2012-03-15 21:29+0000\n"
+"PO-Revision-Date: 2012-03-21 22:26+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,18 +22,17 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"

 #: ../src/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "Окна"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "Разделитель слева"

-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "Разделитель справа"

-#: ../src/50-mutter-windows.xml.in.h:3
-#| msgid "_Windows"
-msgid "Windows"
-msgstr "Окна"
-
 #. 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
@@ -71,12 +70,12 @@ msgstr "_Подождать"
 msgid "_Force Quit"
 msgstr "Завер_шить"

-#: ../src/core/display.c:365
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Отсутствует расширение %s, требуемое для композиции"

-#: ../src/core/display.c:431
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Не удалось открыть дисплей «%s» системы X Window\n"
@@ -120,7 +119,7 @@ msgstr "Не удалось прочитать каталог тем: %s\n"
 msgid "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
 msgstr "Не удалось найти тему! Убедитесь, что «%s» существует и содержит обычные темы.\n"

-#: ../src/core/mutter.c:42
+#: ../src/core/mutter.c:40
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -133,60 +132,59 @@ msgstr ""
 "Это — свободное программное обеспечение; условия копирования указаны в исходном тексте.\n"
 "Распространяется без каких-либо гарантий, в том числе и БЕЗ гарантий потребительской стоимости и пригодности для выполнения каких бы то ни было определённых задач.\n"

-#: ../src/core/mutter.c:56
+#: ../src/core/mutter.c:54
 msgid "Print version"
 msgstr "Вывести версию"

-#: ../src/core/mutter.c:62
+#: ../src/core/mutter.c:60
 msgid "Comma-separated list of compositor plugins"
 msgstr "Список модулей, разделённых запятыми"

-#: ../src/core/prefs.c:1067
+#: ../src/core/prefs.c:1077
 msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 msgstr "Устранение недоделок для сломанных приложений отключено. Некоторые приложения могут работать неправильно.\n"

-#: ../src/core/prefs.c:1142
+#: ../src/core/prefs.c:1152
 #, c-format
-#| msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Не удалось разобрать описание шрифта «%s» из ключа GSettings %s\n"

-#: ../src/core/prefs.c:1208
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 msgstr "Значение «%s» из базы данных настроек является недопустимым значением для модификатора кнопки мыши\n"

-#: ../src/core/prefs.c:1720
+#: ../src/core/prefs.c:1739
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 msgstr "Значение «%s» из базы данных настроек является недопустимым значением для комбинации клавиш «%s»\n"

-#: ../src/core/prefs.c:1817
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "Рабочее место %d"

-#: ../src/core/screen.c:741
+#: ../src/core/screen.c:730
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Недопустимый экран %d дисплея «%s»\n"

-#: ../src/core/screen.c:757
+#: ../src/core/screen.c:746
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n"
 msgstr "У экрана %d дисплея «%s» уже есть менеджер окон. Попробуйте использовать параметр --replace, чтобы заместить текущий менеджер окон.\n"

-#: ../src/core/screen.c:784
+#: ../src/core/screen.c:773
 #, c-format
 msgid "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Не удалось выбрать менеджер окон на экране %d дисплея «%s»\n"

-#: ../src/core/screen.c:839
+#: ../src/core/screen.c:828
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "У экрана %d дисплея «%s» уже есть менеджер окон\n"

-#: ../src/core/screen.c:1024
+#: ../src/core/screen.c:1013
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Не удалось освободить экран %d дисплея «%s»\n"
@@ -283,7 +281,7 @@ msgid "Window manager error: "
 msgstr "Ошибка менеджера окон: "

 #. first time through
-#: ../src/core/window.c:7145
+#: ../src/core/window.c:7269
 #, 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 "Окно %s установило на себя значение SM_CLIENT_ID вместо окна с значением WM_CLIENT_LEADER, как это определено в ICCCM.\n"
@@ -295,7 +293,7 @@ msgstr "Окно %s установило на себя значение SM_CLIEN
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7808
+#: ../src/core/window.c:7932
 #, 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, определяющую, что его размер не меняется, но установило минимальный размер %d × %d и максимальный размер %d × %d, что не имеет смысла.\n"
@@ -351,28 +349,28 @@ msgid "Mutter"
 msgstr "Mutter"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
+msgid "Modifier to use for extended window management operations"
+msgstr "Модификатор для использования дополнительных действий управления окнами"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
+msgid "This key will initiate the \"overlay\", which is a combination window overview and application launching system. The default is intended to be the \"Windows key\" on PC hardware. It's expected that this binding either the default or set to the empty string."
+msgstr "Этот ключ инициирует перекрытие (обзор окон и система запуска приложений). Для обычных ПК используется клавиша «Windows». Ожидается, что значение этой привязки будет иметь значение по умолчанию или будет пустой строкой."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Прикреплять модальные диалоговые окна"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "Отменить всплывающую табуляцию"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
-msgid "Determines whether hidden windows (i.e., minimized windows and windows on other workspaces than the current one) should be kept alive."
-msgstr "Определяет, должны ли существовать скрытые окна (например, минимизированные окна и окна, находящиеся на другом рабочем месте)."
-
 #: ../src/org.gnome.mutter.gschema.xml.in.h:4
-msgid "Determines whether the use of popup and highlight frame should be disabled for window cycling."
-msgstr "Определяет, нужно ли отключить использование всплывающей области для циклического переключения окон."
+msgid "When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window."
+msgstr "Если установлено, вместо независимых заголовков окон модальные диалоговые окна будут прикрепляться к заголовку родительского окна и перемещаться вместе с родительским окном."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid "Determines whether workspace switching should happen for windows on all monitors or only for windows on the primary monitor."
-msgstr "Определяет, должно ли переключение рабочего места происходить для окон на всех мониторах или только для окон на главном мониторе."
+msgid "Live Hidden Windows"
+msgstr "Существование скрытых окон"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid "Draggable border width"
-msgstr "Ширина рамки перетаскивания"
+msgid "Determines whether hidden windows (i.e., minimized windows and windows on other workspaces than the current one) should be kept alive."
+msgstr "Определяет, должны ли существовать скрытые окна (например, минимизированные окна и окна, находящиеся на другом рабочем месте)."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -383,87 +381,50 @@ msgid "If enabled, dropping windows on vertical screen edges maximizes them vert
 msgstr "Если включено, то перемещение окна к вертикальным границам экрана разворачивает окно по вертикали и изменяет горизонтальный размер окна, покрывая половину доступного места. Перемещение окна к верхней части экрана полностью разворачивает окно."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid "Live Hidden Windows"
-msgstr "Существование скрытых окон"
+msgid "Workspaces are managed dynamically"
+msgstr "Рабочие места управляются динамически"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:10
-msgid "Modifier to use for extended window management operations"
-msgstr "Модификатор для использования дополнительных действий управления окнами"
+msgid "Determines whether workspaces are managed dynamically or whether there's a static number of workspaces (determined by the num-workspaces key in org.gnome.desktop.wm.preferences)."
+msgstr "Определяет, управляются ли рабочие места автоматически или количество рабочих место постоянно (количество задаётся ключом в org.gnome.desktop.wm.preferences)."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
+msgid "Workspaces only on primary"
+msgstr "Рабочие места только на главном окне"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+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:13
 msgid "No tab popup"
 msgstr "Без всплывающей табуляции"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
-#| msgid "Remove Window From Top"
-msgid "Select window from tab popup"
-msgstr "Выбор окна из всплывающей табуляции"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+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
+#: ../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:14
-msgid "This key will initiate the \"overlay\", which is a combination window overview and application launching system. The default is intended to be the \"Windows key\" on PC hardware. It's expected that this binding either the default or set to the empty string."
-msgstr "Этот ключ инициирует перекрытие (обзор окон и система запуска приложений). Для обычных ПК используется клавиша «Windows». Ожидается, что значение этой привязки будет иметь значение по умолчанию или будет пустой строкой."
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Select window from tab popup"
+msgstr "Выбор окна из всплывающей табуляции"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
-msgid "When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window."
-msgstr "Если установлено, вместо независимых заголовков окон модальные диалоговые окна будут прикрепляться к заголовку родительского окна и перемещаться вместе с родительским окном."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
-msgid "Workspaces only on primary"
-msgstr "Рабочие места только на главном окне"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
+msgid "Cancel tab popup"
+msgstr "Отменить всплывающую табуляцию"

 #: ../src/tools/mutter-message.c:123
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Применение: %s\n"

-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "Закрыть окно"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "Меню окна"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "Свернуть окно"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "Развернуть окно на весь экран"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "Восстановить окно"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "Скрутить окно в полоску"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "Раскатать окно"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "Сохранять окно на переднем плане"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "Убрать с переднего плана"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "Всегда на видимом рабочем месте"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "Помещать только на одно рабочее место"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -1473,6 +1434,39 @@ msgstr "значение y было %d, а ожидалось %d"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d координатных выражений разобрано за %g секунд (в среднем %g c)\n"

+#~ msgid "Close Window"
+#~ msgstr "Закрыть окно"
+
+#~ msgid "Window Menu"
+#~ msgstr "Меню окна"
+
+#~ msgid "Minimize Window"
+#~ msgstr "Свернуть окно"
+
+#~ msgid "Maximize Window"
+#~ msgstr "Развернуть окно на весь экран"
+
+#~ msgid "Restore Window"
+#~ msgstr "Восстановить окно"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "Скрутить окно в полоску"
+
+#~ msgid "Unroll Window"
+#~ msgstr "Раскатать окно"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "Сохранять окно на переднем плане"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "Убрать с переднего плана"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "Всегда на видимом рабочем месте"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "Помещать только на одно рабочее место"
+
 #~ msgid "Switch to workspace 1"
 #~ msgstr "Переключиться на рабочее место 1"

--- a/po/tr.po
+++ b/po/tr.po
@@ -6,14 +6,14 @@
 # Baris Cicek <baris@teamforce.name.tr>, 2004, 2005, 2008, 2009.
 # İlker DAĞLI <ilker@ilkerdagli.info>, 2011.
 # Muhammed EKEN <gnome@m-eken.com>, 2011.
-# Muhammet Kara <muhammet.k@gmail.com>, 2011.
+# Muhammet Kara <muhammet.k@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-13 13:41+0000\n"
-"PO-Revision-Date: 2011-12-24 16:54+0200\n"
+"POT-Creation-Date: 2012-03-15 21:29+0000\n"
+"PO-Revision-Date: 2012-03-23 21:56+0000\n"
 "Last-Translator: Muhammet Kara <muhammet.k@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,18 +24,17 @@ msgstr ""
 "Language: tr\n"

 #: ../src/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "Pencereler"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "Solda bölünmüş olarak göster"

-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "Sağda bölünmüş olarak göster"

-#: ../src/50-mutter-windows.xml.in.h:3
-#| msgid "_Windows"
-msgid "Windows"
-msgstr "Pencereler"
-
 #. 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
@@ -81,12 +80,12 @@ msgstr "_Bekle"
 msgid "_Force Quit"
 msgstr "_Sonlandır"

-#: ../src/core/display.c:365
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Kompozisyon için gerekli olan %s eklentisi eksik"

-#: ../src/core/display.c:431
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X Pencere Sistemi '%s' ekranı açılamadı\n"
@@ -137,7 +136,7 @@ msgstr ""
 "Hiç tema bulunamadı! %s varlığından ve bildiğimiz temaları içerdiğinden emin "
 "olun.\n"

-#: ../src/core/mutter.c:42
+#: ../src/core/mutter.c:40
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -151,15 +150,15 @@ msgstr ""
 "Bu bir özgür yazılımdır; telif koşullarını öğrenmek için kaynak koda bakın.\n"
 "Hiç bir garantisi, BELİRLİ BİR AMACA UYGUNLUĞU için dahi, YOKTUR.\n"

-#: ../src/core/mutter.c:56
+#: ../src/core/mutter.c:54
 msgid "Print version"
 msgstr "Sürümü yazdır"

-#: ../src/core/mutter.c:62
+#: ../src/core/mutter.c:60
 msgid "Comma-separated list of compositor plugins"
 msgstr "Kompozisyon eklentilerinin listesi (virgül ile ayrılmış)"

-#: ../src/core/prefs.c:1067
+#: ../src/core/prefs.c:1077
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -167,14 +166,13 @@ msgstr ""
 "Hatalı uygulamalara yönelik çözümler devre dışı. Bazı uygulamalar düzgün "
 "işlemeyebilir.\n"

-#: ../src/core/prefs.c:1142
+#: ../src/core/prefs.c:1152
 #, c-format
-#| msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "\"%s\" yazıtipi tanımlaması, %s GSettings anahtarından ayrıştırılamadı\n"

-#: ../src/core/prefs.c:1208
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -183,7 +181,7 @@ msgstr ""
 "Yapılandırma veritabanında bulunan \"%s\", fare düğme düzenleyicisi olarak "
 "geçerli bir değer değil\n"

-#: ../src/core/prefs.c:1720
+#: ../src/core/prefs.c:1739
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -192,17 +190,17 @@ msgstr ""
 "Yapılandırma veritabanında bulunan \"%s\", \"%s\" tuş bağı olarak geçerli "
 "bir değer değil\n"

-#: ../src/core/prefs.c:1817
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "Çalışma Alanı %d"

-#: ../src/core/screen.c:741
+#: ../src/core/screen.c:730
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "'%2$s' X oturumundaki ekran %1$d geçersiz\n"

-#: ../src/core/screen.c:757
+#: ../src/core/screen.c:746
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -212,7 +210,7 @@ msgstr ""
 "geçerli pencere yöneticisinin yerine bir başkasını koymak için --replace "
 "seçeneğini kullanmayı deneyin.\n"

-#: ../src/core/screen.c:784
+#: ../src/core/screen.c:773
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -220,13 +218,13 @@ msgstr ""
 "\"%2$s\" X oturumundaki ekran %1$d hangi pencere yöneticisine "
 "sahipöğrenilemedi\n"

-#: ../src/core/screen.c:839
+#: ../src/core/screen.c:828
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "\"%2$s\" X oturumundaki ekran %1$d bir pencere yöneticisine zaten sahip\n"

-#: ../src/core/screen.c:1024
+#: ../src/core/screen.c:1013
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "\"%2$s\" X oturumundaki ekran %1$d serberst bırakılamadı\"\n"
@@ -325,7 +323,7 @@ msgid "Window manager error: "
 msgstr "Pencere yöneticisi hatası: "

 #. first time through
-#: ../src/core/window.c:7145
+#: ../src/core/window.c:7269
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -341,7 +339,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7808
+#: ../src/core/window.c:7932
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -404,14 +402,40 @@ msgid "Mutter"
 msgstr "Mutter"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
+msgid "Modifier to use for extended window management operations"
+msgstr "Genişletilmiş pencere yönetimi işlemleri için kullanılacak değiştirici"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
+msgid ""
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
+msgstr ""
+"Bu anahtar, pencere genel görünümü ve uygulama başlatma sisteminin bir "
+"birleşimi olan \"bindirme\" işlemini başlatır. Öntanımlı olarak PC "
+"donanımındaki \"windows tuşu\" olması tasarlanmıştır. Bağlayıcı varsayılan "
+"olarak veya boş dize olarak ayarlanması beklenir."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Yardımcı diyalogları ekle"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "Sekmeyi yeni pencerede açmayı iptal et"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:4
+msgid ""
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr ""
+"Eğer \"doğru\" ise, bağımsız başlık çubuklarına sahip olduğundan, yardım "
+"diyalogları üst pencerenin başlık çubuğunda ekli gözükür ve üst pencere ile "
+"birlikte hareket eder."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
+#: ../src/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Live Hidden Windows"
+msgstr "Çalışır Durumdaki Gizli Pencereler"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "Determines whether hidden windows (i.e., minimized windows and windows on "
 "other workspaces than the current one) should be kept alive."
@@ -419,27 +443,6 @@ msgstr ""
 "Gizli pencerelerin (ö.r. küçültülmüş pencereler ve diğer çalışma alanındaki "
 "pencereler) çalışır bırakılıp bırakılmayacağını belirler."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:4
-msgid ""
-"Determines whether the use of popup and highlight frame should be disabled "
-"for window cycling."
-msgstr ""
-"Pencere geçişinde çerçeve vurgulanması ve açılır pencere kullanımının "
-"kapatılıp "
-"kapatılmayacağını belirler."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid ""
-"Determines whether workspace switching should happen for windows on all "
-"monitors or only for windows on the primary monitor."
-msgstr ""
-"Çalışma alanı değiştirilmesinin, tüm monitörlerdeki pencerelerde mi yoksa "
-"sadece birincil monitördekilerde mi gerçekleşeceğini belirler."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid "Draggable border width"
-msgstr "Sürüklenebilir kenarlık genişliği"
-
 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
@@ -452,30 +455,54 @@ msgid ""
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
 "Eğer etkinleştirilirse, dikey ekran kenarlarına bırakılan pencereler dikey "
-"olarak "
-"ekranı kaplar ve yatayda kullanılabilir alanın yarısını kaplayacak şekilde "
-"yeniden "
-"boyutlandırılır. Ekranın tepedeki kenarına bırakılan pencereler ekranı "
-"tamamen kaplar."
+"olarak ekranı kaplar ve yatayda kullanılabilir alanın yarısını kaplayacak "
+"şekilde yeniden boyutlandırılır. Ekranın tepedeki kenarına bırakılan "
+"pencereler ekranı tamamen kaplar."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid "Live Hidden Windows"
-msgstr "Çalışır Durumdaki Gizli Pencereler"
+msgid "Workspaces are managed dynamically"
+msgstr "Çalışma alanları dinamik olarak yönetilir"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:10
-msgid "Modifier to use for extended window management operations"
-msgstr "Genişletilmiş pencere yönetimi işlemleri için kullanılacak değiştirici"
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr ""
+"Çalışma alanlarının dinamik olarak mı yönetileceğini yoksa sabit sayıda "
+"çalışma alanı mı olacağını "
+"belirler (org.gnome.desktop.wm.preferences içindeki num-workspaces değişkeni "
+"tarafından belirlenir)."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
+msgid "Workspaces only on primary"
+msgstr "Sadece birincil monitördeki çalışma alanları"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+"Çalışma alanı değiştirilmesinin, tüm monitörlerdeki pencerelerde mi yoksa "
+"sadece birincil monitördekilerde mi gerçekleşeceğini belirler."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
 msgid "No tab popup"
 msgstr "Sekme açılır penceresi yok"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
-#| msgid "Remove Window From Top"
-msgid "Select window from tab popup"
-msgstr "Pencereyi, sekme açılır penceresinden seç"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+"Pencere geçişinde çerçeve vurgulanması ve açılır pencere kullanımının "
+"kapatılıp kapatılmayacağını belirler."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Draggable border width"
+msgstr "Sürüklenebilir kenarlık genişliği"
+
+#: ../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."
@@ -484,81 +511,19 @@ msgstr ""
 "kenarlıkları yetersiz gelirse, bu değere ulaşmak için görünmez kenarlıklar "
 "eklenir."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
-msgid ""
-"This key will initiate the \"overlay\", which is a combination window "
-"overview and application launching system. The default is intended to be the "
-"\"Windows key\" on PC hardware. It's expected that this binding either the "
-"default or set to the empty string."
-msgstr ""
-"Bu anahtar, pencere genel görünümü ve uygulama başlatma sisteminin bir "
-"birleşimi olan \"bindirme\" işlemini başlatır. Öntanımlı olarak PC "
-"donanımındaki \"windows tuşu\" olması tasarlanmıştır. Bağlayıcı varsayılan "
-"olarak veya boş dize olarak ayarlanması beklenir."
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Select window from tab popup"
+msgstr "Pencereyi, sekme açılır penceresinden seç"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
-msgid ""
-"When true, instead of having independent titlebars, modal dialogs appear "
-"attached to the titlebar of the parent window and are moved together with "
-"the parent window."
-msgstr ""
-"Eğer \"doğru\" ise, bağımsız başlık çubuklarına sahip olduğundan, yardım "
-"diyalogları üst pencerenin başlık çubuğunda ekli gözükür ve üst pencere ile "
-"birlikte hareket eder."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
-msgid "Workspaces only on primary"
-msgstr "Sadece birincil monitördeki çalışma alanları"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
+msgid "Cancel tab popup"
+msgstr "Sekmeyi yeni pencerede açmayı iptal et"

 #: ../src/tools/mutter-message.c:123
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Kullanım: %s\n"

-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "Pencereyi Kapat"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "Pencere Menüsü"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "Pencereyi Küçült"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "Pencereyi Büyült"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "Pencere Geri Getir"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "Pencereyi Yukarı Sar"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "Pencereyi Geri Sar"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "Pencereyi Üstte Tut"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "Pencereyi Üstten Kaldır"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "Her Zaman Görünen Çalışma Alanında"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "Pencereyi Sadece Bir Çalışma Alanına Yerleştir"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -1629,6 +1594,39 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d kordinat ifadesi %g saniye içinde ayrıştırıldı (%g saniye ortalama ile)\n"

+#~ msgid "Close Window"
+#~ msgstr "Pencereyi Kapat"
+
+#~ msgid "Window Menu"
+#~ msgstr "Pencere Menüsü"
+
+#~ msgid "Minimize Window"
+#~ msgstr "Pencereyi Küçült"
+
+#~ msgid "Maximize Window"
+#~ msgstr "Pencereyi Büyült"
+
+#~ msgid "Restore Window"
+#~ msgstr "Pencere Geri Getir"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "Pencereyi Yukarı Sar"
+
+#~ msgid "Unroll Window"
+#~ msgstr "Pencereyi Geri Sar"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "Pencereyi Üstte Tut"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "Pencereyi Üstten Kaldır"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "Her Zaman Görünen Çalışma Alanında"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "Pencereyi Sadece Bir Çalışma Alanına Yerleştir"
+
 #~ msgid "Switch to workspace 1"
 #~ msgstr "Çalışma alanı 1'e geç"

--- a/po/vi.po
+++ b/po/vi.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: metacity GNOME 2.26\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-13 13:41+0000\n"
-"PO-Revision-Date: 2012-03-04 11:34+0700\n"
+"POT-Creation-Date: 2012-03-15 21:29+0000\n"
+"PO-Revision-Date: 2012-03-22 10:45+0700\n"
 "Last-Translator: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,17 @@ msgstr ""
 "X-Generator: LocFactoryEditor 1.8\n"

 #: ../src/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "Cửa sổ"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "Phân đôi bên trái"

-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "Phân đôi bên phải"

-#: ../src/50-mutter-windows.xml.in.h:3
-#| msgid "_Windows"
-msgid "Windows"
-msgstr "Cửa sổ"
-
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
 #: ../src/compositor/compositor.c:492
@@ -74,12 +73,12 @@ msgstr "_Chờ"
 msgid "_Force Quit"
 msgstr "_Buộc thoát"

-#: ../src/core/display.c:365
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Thiếu phần mở rộng %s cần thiết để tổng hợp"

-#: ../src/core/display.c:431
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Lỗi mở bộ trình bày Hệ thống Cửa sổ X \"%s\".\n"
@@ -130,7 +129,7 @@ msgstr ""
 "Không tìm thấy sắc thái. Hãy bảo đảm %s tồn tại và chứa những sắc thái bình "
 "thường.\n"

-#: ../src/core/mutter.c:42
+#: ../src/core/mutter.c:40
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -146,15 +145,15 @@ msgstr ""
 "KHÔNG CÓ BẢO HÀNH GÌ CẢ, THẬM CHÍ KHÔNG CÓ BẢO ĐẢM ĐƯỢC NGỤ Ý KHẢ NĂNG BÁN "
 "HAY KHẢ NĂNG LÀM ĐƯỢC VIỆC DỨT KHOÁT.\n"

-#: ../src/core/mutter.c:56
+#: ../src/core/mutter.c:54
 msgid "Print version"
 msgstr "In phiên bản"

-#: ../src/core/mutter.c:62
+#: ../src/core/mutter.c:60
 msgid "Comma-separated list of compositor plugins"
 msgstr "Danh sách phần bổ sung tổng hợp cách nhau bằng dấu phẩy"

-#: ../src/core/prefs.c:1067
+#: ../src/core/prefs.c:1077
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -162,13 +161,12 @@ msgstr ""
 "Khả năng chỉnh sửa cho các ứng dụng không theo chuẩn đã đã tắt. Vài ứng dụng "
 "có thể sẽ xử sự không đúng.\n"

-#: ../src/core/prefs.c:1142
+#: ../src/core/prefs.c:1152
 #, c-format
-#| msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Không thể phân tích mô tả phông \"%s\" từ khóa GSettings \"%s\"\n"

-#: ../src/core/prefs.c:1208
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -177,7 +175,7 @@ msgstr ""
 "Tìm thấy « %s » trong cơ sở dữ liệu cấu hình không phải giá trị hợp lệ cho "
 "bộ biến đổi nút chuột.\n"

-#: ../src/core/prefs.c:1720
+#: ../src/core/prefs.c:1739
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -186,17 +184,17 @@ msgstr ""
 "Tìm thấy « %s » trong cơ sở dữ liệu cấu hình không phải giá trị hợp lệ cho "
 "tổ hợp phím « %s ».\n"

-#: ../src/core/prefs.c:1817
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "Vùng làm việc %d"

-#: ../src/core/screen.c:741
+#: ../src/core/screen.c:730
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Màn hình %d trên bộ trình bày « %s » không hợp lệ.\n"

-#: ../src/core/screen.c:757
+#: ../src/core/screen.c:746
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -205,7 +203,7 @@ msgstr ""
 "Màn hình %d trên bộ trình bày « %s » đã có bộ quản lý cửa sổ rồi; hãy thử "
 "dùng tùy chọn «--replace» để _thay thế_ bộ quản lý cửa sổ đang dùng.\n"

-#: ../src/core/screen.c:784
+#: ../src/core/screen.c:773
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -213,12 +211,12 @@ msgstr ""
 "Không thể lấy vùng chọn bộ quản lý cửa sổ trên Màn hình %d trên bộ trình bày "
 "« %s ».\n"

-#: ../src/core/screen.c:839
+#: ../src/core/screen.c:828
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Màn hình %d trên bộ trình bày « %s » đã có bộ quản lý cửa sổ.\n"

-#: ../src/core/screen.c:1024
+#: ../src/core/screen.c:1013
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Không thể giải phóng Màn hình %d trên bộ trình bày « %s ».\n"
@@ -315,7 +313,7 @@ msgid "Window manager error: "
 msgstr "Lỗi bộ quản lý cửa sổ: "

 #. first time through
-#: ../src/core/window.c:7145
+#: ../src/core/window.c:7269
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -331,7 +329,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7808
+#: ../src/core/window.c:7932
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -393,14 +391,39 @@ msgid "Mutter"
 msgstr "Mutter"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
+msgid "Modifier to use for extended window management operations"
+msgstr "Phím bổ trợ dùng cho chức năng quản lý cửa sổ mở rộng"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
+msgid ""
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
+msgstr ""
+"Phím này kích hoạt \"overlay\", một tổ hợp tổng quát cửa sổ và hệ thống chạy "
+"ứng dụng. Mặc định là \"phím Windows\" trên phần cứng PC. Chứa một tổ hợp "
+"phím, hoặc mặc định, hoặc chuỗi rỗng."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Gắn hộp thoại cách thức"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "Huỷ tab popup"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:4
+msgid ""
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr ""
+"Nếu đúng (true), thay vì hiện thanh tiêu đề độc lập, hộp thoại cách thức sẽ "
+"xuất hiện gắn với thanh tiêu đề của cửa sổ cha và được di chuyển cùng với "
+"cửa sổ cha."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
+#: ../src/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Live Hidden Windows"
+msgstr "Cửa sổ ẩn sống"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "Determines whether hidden windows (i.e., minimized windows and windows on "
 "other workspaces than the current one) should be kept alive."
@@ -408,24 +431,6 @@ msgstr ""
 "Xác định có giữ cửa sổ ẩn (ví dụ cửa sổ thu nhỏ, và cửa sổ ở vùng làm việc "
 "khác) không."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:4
-msgid ""
-"Determines whether the use of popup and highlight frame should be disabled "
-"for window cycling."
-msgstr "Xác định có bỏ qua popup và khung tô sáng khi xoay vòng cửa sổ không."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid ""
-"Determines whether workspace switching should happen for windows on all "
-"monitors or only for windows on the primary monitor."
-msgstr ""
-"Xác định chuyển vùng làm việc cho cửa sổ trên mọi màn hình hay chỉ trên màn "
-"hình chính."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid "Draggable border width"
-msgstr "Độ rông biên có thể kéo"
-
 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Bật lợp cạnh khi thả cửa sổ trên cạnh màn hình"
@@ -441,23 +446,45 @@ msgstr ""
 "hình sẽ phóng to toàn màn hình."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid "Live Hidden Windows"
-msgstr "Cửa sổ ẩn sống"
+msgid "Workspaces are managed dynamically"
+msgstr "Vùng làm việc được quản lý động"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:10
-msgid "Modifier to use for extended window management operations"
-msgstr "Phím bổ trợ dùng cho chức năng quản lý cửa sổ mở rộng"
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr ""
+"Xác định vùng làm việc được quản lý động, hay cố định số vùng làm việc, xác "
+"định bởi khoá num-workspaces trong org.gnome.desktop.wm.preferences."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
+msgid "Workspaces only on primary"
+msgstr "Vùng làm việc chỉ trên màn hình chính"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+"Xác định chuyển vùng làm việc cho cửa sổ trên mọi màn hình hay chỉ trên màn "
+"hình chính."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
 msgid "No tab popup"
 msgstr "Không tab popup"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
-#| msgid "Move between windows with popup"
-msgid "Select window from tab popup"
-msgstr "Chọn cửa sổ từ tab popup"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr "Xác định có bỏ qua popup và khung tô sáng khi xoay vòng cửa sổ không."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Draggable border width"
+msgstr "Độ rông biên có thể kéo"
+
+#: ../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."
@@ -465,80 +492,19 @@ msgstr ""
 "Kích thước biên có thể kéo. Nếu biên thấy được của sắc thái không đủ, biên "
 "vô hình sẽ được thêm vào để thoả mãn giá trị này."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
-msgid ""
-"This key will initiate the \"overlay\", which is a combination window "
-"overview and application launching system. The default is intended to be the "
-"\"Windows key\" on PC hardware. It's expected that this binding either the "
-"default or set to the empty string."
-msgstr ""
-"Phím này kích hoạt \"overlay\", một tổ hợp tổng quát cửa sổ và hệ thống chạy "
-"ứng dụng. Mặc định là \"phím Windows\" trên phần cứng PC. Chứa một tổ hợp "
-"phím, hoặc mặc định, hoặc chuỗi rỗng."
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Select window from tab popup"
+msgstr "Chọn cửa sổ từ tab popup"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
-msgid ""
-"When true, instead of having independent titlebars, modal dialogs appear "
-"attached to the titlebar of the parent window and are moved together with "
-"the parent window."
-msgstr ""
-"Nếu đúng (true), thay vì hiện thanh tiêu đề độc lập, hộp thoại cách thức sẽ "
-"xuất hiện gắn với thanh tiêu đề của cửa sổ cha và được di chuyển cùng với "
-"cửa sổ cha."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
-msgid "Workspaces only on primary"
-msgstr "Vùng làm việc chỉ trên màn hình chính"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
+msgid "Cancel tab popup"
+msgstr "Huỷ tab popup"

 #: ../src/tools/mutter-message.c:123
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Cách dùng: %s\n"

-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "Đóng cửa sổ"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "Trình đơn cửa sổ"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "Thu nhỏ cửa sổ"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "Phóng to cửa sổ"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "Phục hồi Cửa sổ"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "Cuộn cửa sổ lên"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "Thả cửa sổ xuống"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "Giữ cửa sổ ở trên cùng"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "Thôi giữ cửa sổ ở trên cùng"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "Luôn nằm trong vùng làm việc có thể thấy"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "Đặt cửa sổ trên chỉ một vùng làm việc"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -1625,6 +1591,39 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "phân tích \"%d\" biểu thức tọa độ trong vòng %g giây (%g giây trung bình).\n"

+#~ msgid "Close Window"
+#~ msgstr "Đóng cửa sổ"
+
+#~ msgid "Window Menu"
+#~ msgstr "Trình đơn cửa sổ"
+
+#~ msgid "Minimize Window"
+#~ msgstr "Thu nhỏ cửa sổ"
+
+#~ msgid "Maximize Window"
+#~ msgstr "Phóng to cửa sổ"
+
+#~ msgid "Restore Window"
+#~ msgstr "Phục hồi Cửa sổ"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "Cuộn cửa sổ lên"
+
+#~ msgid "Unroll Window"
+#~ msgstr "Thả cửa sổ xuống"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "Giữ cửa sổ ở trên cùng"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "Thôi giữ cửa sổ ở trên cùng"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "Luôn nằm trong vùng làm việc có thể thấy"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "Đặt cửa sổ trên chỉ một vùng làm việc"
+
 #~ msgid "Switch to workspace 1"
 #~ msgstr "Chuyển sang vùng làm việc 1"

--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,9 +16,9 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-19 15:55+0000\n"
+"POT-Creation-Date: 2012-04-14 03:24+0000\n"
 "PO-Revision-Date: 2012-03-20 17:10+0000\n"
-"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,12 +30,14 @@ msgid "Windows"
 msgstr "窗口"

 #: ../src/50-mutter-windows.xml.in.h:2
+#, fuzzy
 msgid "View split on left"
-msgstr ""
+msgstr "分割到左侧"

 #: ../src/50-mutter-windows.xml.in.h:3
+#, fuzzy
 msgid "View split on right"
-msgstr ""
+msgstr "分割到右侧"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
@@ -426,6 +428,8 @@ 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:9
 msgid "Workspaces are managed dynamically"
@@ -453,14 +457,16 @@ msgid ""
 msgstr "决定工作区切换对所有显示器上的窗口还是只对主显示器上的有效。"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
+#, fuzzy
 msgid "No tab popup"
-msgstr ""
+msgstr "无切换弹出"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:14
+#, fuzzy
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
-msgstr ""
+msgstr "决定窗口轮换时是否禁用缩略图弹出和高亮边框。"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
@@ -477,11 +483,12 @@ msgstr ""
 #, fuzzy
 #| msgid "Remove Window From Top"
 msgid "Select window from tab popup"
-msgstr "取消窗口常居顶端"
+msgstr "从切换弹出界面选择窗口"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:18
+#, fuzzy
 msgid "Cancel tab popup"
-msgstr ""
+msgstr "取消切换弹出"

 #: ../src/tools/mutter-message.c:123
 #, c-format
--- a/src/compositor/plugins/Makefile.am
+++ b/src/compositor/plugins/Makefile.am
@@ -16,3 +16,9 @@ pkglib_LTLIBRARIES = default.la
 install-exec-hook:
 	-rm $(DESTDIR)$(pkglibdir)/*.a
 	-rm $(DESTDIR)$(pkglibdir)/*.la
+
+# Since we removed the .la file, 'make uninstall' doesn't work properly,
+# since it counts on libtool to remove the .la files, so just kill the
+# .so file manually.
+uninstall-local:
+	-rm -f $(DESTDIR)$(pkglibdir)/default.so
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@@ -479,8 +479,8 @@ minimize (MetaPlugin *plugin, MetaWindowActor *window_actor)
                                         MINIMIZE_TIMEOUT,
                                         "scale-x", 0.0,
                                         "scale-y", 0.0,
-                                         "x", icon_geometry.x,
-                                         "y", icon_geometry.y,
+                                         "x", (double)icon_geometry.x,
+                                         "y", (double)icon_geometry.y,
                                         NULL);
      apriv->tml_minimize = clutter_animation_get_timeline (animation);
      data->plugin = plugin;
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1799,6 +1799,8 @@ event_callback (XEvent   *event,
      if (display->grab_op == META_GRAB_OP_COMPOSITOR)
        break;

+      display->overlay_key_only_pressed = FALSE;
+
      if (event->xbutton.button == 4 || event->xbutton.button == 5)
        /* Scrollwheel event, do nothing and deliver event to compositor below */
        break;
@@ -1996,6 +1998,8 @@ event_callback (XEvent   *event,
      if (display->grab_op == META_GRAB_OP_COMPOSITOR)
        break;

+      display->overlay_key_only_pressed = FALSE;
+
      if (display->grab_window == window &&
          grab_op_is_mouse (display->grab_op))
        meta_window_handle_mouse_grab_op_event (window, event);
@@ -4654,12 +4658,13 @@ meta_display_get_tab_list (MetaDisplay   *display,
  tab_list = g_list_reverse (tab_list);

  {
-    GSList *tmp;
+    GSList *windows, *tmp;
    MetaWindow *l_window;

-    tmp = meta_display_list_windows (display, META_LIST_DEFAULT);
+    windows = meta_display_list_windows (display, META_LIST_DEFAULT);

    /* Go through all windows */
+    tmp = windows;
    while (tmp != NULL)
      {
        l_window=tmp->data;
@@ -4675,6 +4680,8 @@ meta_display_get_tab_list (MetaDisplay   *display,

        tmp = tmp->next;
      } /* End while tmp!=NULL */
+
+    g_slist_free (windows);
  }
  
  return tab_list;
--- a/src/core/keybindings-private.h
+++ b/src/core/keybindings-private.h
@@ -29,6 +29,7 @@
 #ifndef META_KEYBINDINGS_PRIVATE_H
 #define META_KEYBINDINGS_PRIVATE_H

+#include <gio/gio.h>
 #include <meta/keybindings.h>

 struct _MetaKeyHandler
@@ -73,7 +74,7 @@ void     meta_display_process_mapping_event (MetaDisplay *display,
                                             XEvent      *event);

 gboolean meta_prefs_add_keybinding          (const char           *name,
-                                             const char           *schema,
+                                             GSettings            *settings,
                                             MetaKeyBindingAction  action,
                                             MetaKeyBindingFlags   flags);

--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -53,7 +53,7 @@ static gboolean all_bindings_disabled = FALSE;

 static gboolean add_builtin_keybinding (MetaDisplay          *display,
                                        const char           *name,
-                                        const char           *schema,
+                                        GSettings            *settings,
                                        MetaKeyBindingFlags   flags,
                                        MetaKeyBindingAction  action,
                                        MetaKeyHandlerFunc    handler,
@@ -546,7 +546,7 @@ display_get_keybinding (MetaDisplay  *display,
 static gboolean
 add_keybinding_internal (MetaDisplay          *display,
                         const char           *name,
-                         const char           *schema,
+                         GSettings            *settings,
                         MetaKeyBindingFlags   flags,
                         MetaKeyBindingAction  action,
                         MetaKeyHandlerFunc    func,
@@ -556,7 +556,7 @@ add_keybinding_internal (MetaDisplay          *display,
 {
  MetaKeyHandler *handler;

-  if (!meta_prefs_add_keybinding (name, schema, action, flags))
+  if (!meta_prefs_add_keybinding (name, settings, action, flags))
    return FALSE;

  handler = g_new0 (MetaKeyHandler, 1);
@@ -576,13 +576,13 @@ add_keybinding_internal (MetaDisplay          *display,
 static gboolean
 add_builtin_keybinding (MetaDisplay          *display,
                        const char           *name,
-                        const char           *schema,
+                        GSettings            *settings,
                        MetaKeyBindingFlags   flags,
                        MetaKeyBindingAction  action,
                        MetaKeyHandlerFunc    handler,
                        int                   handler_arg)
 {
-  return add_keybinding_internal (display, name, schema,
+  return add_keybinding_internal (display, name, settings,
                                  flags | META_KEY_BINDING_BUILTIN,
                                  action, handler, handler_arg, NULL, NULL);
 }
@@ -591,7 +591,7 @@ add_builtin_keybinding (MetaDisplay          *display,
 * meta_display_add_keybinding:
 * @display: a #MetaDisplay
 * @name: the binding's name
- * @schema: the #GSettings schema where @name is stored
+ * @settings: the #GSettings object where @name is stored
 * @flags: flags to specify binding details
 * @handler: function to run when the keybinding is invoked
 * @user_data: the data to pass to @handler
@@ -617,13 +617,13 @@ add_builtin_keybinding (MetaDisplay          *display,
 gboolean
 meta_display_add_keybinding (MetaDisplay         *display,
                             const char          *name,
-                             const char          *schema,
+                             GSettings           *settings,
                             MetaKeyBindingFlags  flags,
                             MetaKeyHandlerFunc   handler,
                             gpointer             user_data,
                             GDestroyNotify       free_data)
 {
-  return add_keybinding_internal (display, name, schema, flags,
+  return add_keybinding_internal (display, name, settings, flags,
                                  META_KEYBINDING_ACTION_NONE,
                                  handler, 0, user_data, free_data);
 }
@@ -3644,104 +3644,106 @@ init_builtin_key_bindings (MetaDisplay *display)
 {
 #define REVERSES_AND_REVERSED (META_KEY_BINDING_REVERSES | \
                               META_KEY_BINDING_IS_REVERSED)
+  GSettings *common_keybindings = g_settings_new (SCHEMA_COMMON_KEYBINDINGS);
+  GSettings *mutter_keybindings = g_settings_new (SCHEMA_MUTTER_KEYBINDINGS);

  add_builtin_keybinding (display,
                          "switch-to-workspace-1",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_1,
                          handle_switch_to_workspace, 0);
  add_builtin_keybinding (display,
                          "switch-to-workspace-2",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_2,
                          handle_switch_to_workspace, 1);
  add_builtin_keybinding (display,
                          "switch-to-workspace-3",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_3,
                          handle_switch_to_workspace, 2);
  add_builtin_keybinding (display,
                          "switch-to-workspace-4",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_4,
                          handle_switch_to_workspace, 3);
  add_builtin_keybinding (display,
                          "switch-to-workspace-5",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_5,
                          handle_switch_to_workspace, 4);
  add_builtin_keybinding (display,
                          "switch-to-workspace-6",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_6,
                          handle_switch_to_workspace, 5);
  add_builtin_keybinding (display,
                          "switch-to-workspace-7",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_7,
                          handle_switch_to_workspace, 6);
  add_builtin_keybinding (display,
                          "switch-to-workspace-8",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_8,
                          handle_switch_to_workspace, 7);
  add_builtin_keybinding (display,
                          "switch-to-workspace-9",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_9,
                          handle_switch_to_workspace, 8);
  add_builtin_keybinding (display,
                          "switch-to-workspace-10",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_10,
                          handle_switch_to_workspace, 9);
  add_builtin_keybinding (display,
                          "switch-to-workspace-11",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_11,
                          handle_switch_to_workspace, 10);
  add_builtin_keybinding (display,
                          "switch-to-workspace-12",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_12,
                          handle_switch_to_workspace, 11);

  add_builtin_keybinding (display,
                          "switch-to-workspace-left",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_LEFT,
                          handle_switch_to_workspace, META_MOTION_LEFT);

  add_builtin_keybinding (display,
                          "switch-to-workspace-right",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_RIGHT,
                          handle_switch_to_workspace, META_MOTION_RIGHT);

  add_builtin_keybinding (display,
                          "switch-to-workspace-up",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_UP,
                          handle_switch_to_workspace, META_MOTION_UP);

  add_builtin_keybinding (display,
                          "switch-to-workspace-down",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_WORKSPACE_DOWN,
                          handle_switch_to_workspace, META_MOTION_DOWN);
@@ -3759,84 +3761,84 @@ init_builtin_key_bindings (MetaDisplay *display)

  add_builtin_keybinding (display,
                          "switch-group",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_REVERSES,
                          META_KEYBINDING_ACTION_SWITCH_GROUP,
                          handle_switch, META_TAB_LIST_GROUP);

  add_builtin_keybinding (display,
                          "switch-group-backward",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          REVERSES_AND_REVERSED,
                          META_KEYBINDING_ACTION_SWITCH_GROUP_BACKWARD,
                          handle_switch, META_TAB_LIST_GROUP);

  add_builtin_keybinding (display,
                          "switch-windows",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_REVERSES,
                          META_KEYBINDING_ACTION_SWITCH_WINDOWS,
                          handle_switch, META_TAB_LIST_NORMAL);

  add_builtin_keybinding (display,
                          "switch-windows-backward",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          REVERSES_AND_REVERSED,
                          META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD,
                          handle_switch, META_TAB_LIST_NORMAL);

  add_builtin_keybinding (display,
                          "switch-panels",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_REVERSES,
                          META_KEYBINDING_ACTION_SWITCH_PANELS,
                          handle_switch, META_TAB_LIST_DOCKS);

  add_builtin_keybinding (display,
                          "switch-panels-backward",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          REVERSES_AND_REVERSED,
                          META_KEYBINDING_ACTION_SWITCH_PANELS_BACKWARD,
                          handle_switch, META_TAB_LIST_DOCKS);

  add_builtin_keybinding (display,
                          "cycle-group",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_REVERSES,
                          META_KEYBINDING_ACTION_CYCLE_GROUP,
                          handle_cycle, META_TAB_LIST_GROUP);

  add_builtin_keybinding (display,
                          "cycle-group-backward",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          REVERSES_AND_REVERSED,
                          META_KEYBINDING_ACTION_CYCLE_GROUP_BACKWARD,
                          handle_cycle, META_TAB_LIST_GROUP);

  add_builtin_keybinding (display,
                          "cycle-windows",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_REVERSES,
                          META_KEYBINDING_ACTION_CYCLE_WINDOWS,
                          handle_cycle, META_TAB_LIST_NORMAL);

  add_builtin_keybinding (display,
                          "cycle-windows-backward",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          REVERSES_AND_REVERSED,
                          META_KEYBINDING_ACTION_CYCLE_WINDOWS_BACKWARD,
                          handle_cycle, META_TAB_LIST_NORMAL);

  add_builtin_keybinding (display,
                          "cycle-panels",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_REVERSES,
                          META_KEYBINDING_ACTION_CYCLE_PANELS,
                          handle_cycle, META_TAB_LIST_DOCKS);

  add_builtin_keybinding (display,
                          "cycle-panels-backward",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          REVERSES_AND_REVERSED,
                          META_KEYBINDING_ACTION_CYCLE_PANELS_BACKWARD,
                          handle_cycle, META_TAB_LIST_DOCKS);
@@ -3849,14 +3851,14 @@ init_builtin_key_bindings (MetaDisplay *display)
 */
  add_builtin_keybinding (display,
                          "tab-popup-select",
-                          SCHEMA_MUTTER_KEYBINDINGS,
+                          mutter_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_TAB_POPUP_SELECT,
                          handle_tab_popup_select, 0);

  add_builtin_keybinding (display,
                          "tab-popup-cancel",
-                          SCHEMA_MUTTER_KEYBINDINGS,
+                          mutter_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_TAB_POPUP_CANCEL,
                          handle_tab_popup_cancel, 0);
@@ -3865,35 +3867,35 @@ init_builtin_key_bindings (MetaDisplay *display)

  add_builtin_keybinding (display,
                          "show-desktop",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_SHOW_DESKTOP,
                          handle_show_desktop, 0);

  add_builtin_keybinding (display,
                          "panel-main-menu",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_PANEL_MAIN_MENU,
                          handle_panel, META_KEYBINDING_ACTION_PANEL_MAIN_MENU);

  add_builtin_keybinding (display,
                          "panel-run-dialog",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_PANEL_RUN_DIALOG,
                          handle_panel, META_KEYBINDING_ACTION_PANEL_RUN_DIALOG);

  add_builtin_keybinding (display,
                          "toggle-recording",
-                          SCHEMA_MUTTER_KEYBINDINGS,
+                          mutter_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_TOGGLE_RECORDING,
                          handle_toggle_recording, 0);

  add_builtin_keybinding (display,
                          "set-spew-mark",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_NONE,
                          META_KEYBINDING_ACTION_SET_SPEW_MARK,
                          handle_set_spew_mark, 0);
@@ -3908,311 +3910,314 @@ init_builtin_key_bindings (MetaDisplay *display)

  add_builtin_keybinding (display,
                          "activate-window-menu",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_ACTIVATE_WINDOW_MENU,
                          handle_activate_window_menu, 0);

  add_builtin_keybinding (display,
                          "toggle-fullscreen",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_TOGGLE_FULLSCREEN,
                          handle_toggle_fullscreen, 0);

  add_builtin_keybinding (display,
                          "toggle-maximized",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_TOGGLE_MAXIMIZED,
                          handle_toggle_maximized, 0);

  add_builtin_keybinding (display,
                          "toggle-tiled-left",
-                          SCHEMA_MUTTER_KEYBINDINGS,
+                          mutter_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_TOGGLE_TILED_LEFT,
                          handle_toggle_tiled, META_TILE_LEFT);

  add_builtin_keybinding (display,
                          "toggle-tiled-right",
-                          SCHEMA_MUTTER_KEYBINDINGS,
+                          mutter_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_TOGGLE_TILED_RIGHT,
                          handle_toggle_tiled, META_TILE_RIGHT);

  add_builtin_keybinding (display,
                          "toggle-above",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_TOGGLE_ABOVE,
                          handle_toggle_above, 0);

  add_builtin_keybinding (display,
                          "maximize",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MAXIMIZE,
                          handle_maximize, 0);

  add_builtin_keybinding (display,
                          "unmaximize",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_UNMAXIMIZE,
                          handle_unmaximize, 0);

  add_builtin_keybinding (display,
                          "toggle-shaded",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_TOGGLE_SHADED,
                          handle_toggle_shaded, 0);

  add_builtin_keybinding (display,
                          "minimize",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MINIMIZE,
                          handle_minimize, 0);

  add_builtin_keybinding (display,
                          "close",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_CLOSE,
                          handle_close, 0);

  add_builtin_keybinding (display,
                          "begin-move",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_BEGIN_MOVE,
                          handle_begin_move, 0);

  add_builtin_keybinding (display,
                          "begin-resize",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_BEGIN_RESIZE,
                          handle_begin_resize, 0);

  add_builtin_keybinding (display,
                          "toggle-on-all-workspaces",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_TOGGLE_ON_ALL_WORKSPACES,
                          handle_toggle_on_all_workspaces, 0);

  add_builtin_keybinding (display,
                          "move-to-workspace-1",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_1,
                          handle_move_to_workspace, 0);

  add_builtin_keybinding (display,
                          "move-to-workspace-2",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_2,
                          handle_move_to_workspace, 1);

  add_builtin_keybinding (display,
                          "move-to-workspace-3",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_3,
                          handle_move_to_workspace, 2);

  add_builtin_keybinding (display,
                          "move-to-workspace-4",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_4,
                          handle_move_to_workspace, 3);

  add_builtin_keybinding (display,
                          "move-to-workspace-5",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_5,
                          handle_move_to_workspace, 4);

  add_builtin_keybinding (display,
                          "move-to-workspace-6",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_6,
                          handle_move_to_workspace, 5);

  add_builtin_keybinding (display,
                          "move-to-workspace-7",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_7,
                          handle_move_to_workspace, 6);

  add_builtin_keybinding (display,
                          "move-to-workspace-8",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_8,
                          handle_move_to_workspace, 7);

  add_builtin_keybinding (display,
                          "move-to-workspace-9",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_9,
                          handle_move_to_workspace, 8);

  add_builtin_keybinding (display,
                          "move-to-workspace-10",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_10,
                          handle_move_to_workspace, 9);

  add_builtin_keybinding (display,
                          "move-to-workspace-11",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_11,
                          handle_move_to_workspace, 10);

  add_builtin_keybinding (display,
                          "move-to-workspace-12",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_12,
                          handle_move_to_workspace, 11);

  add_builtin_keybinding (display,
                          "move-to-workspace-left",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_LEFT,
                          handle_move_to_workspace, META_MOTION_LEFT);

  add_builtin_keybinding (display,
                          "move-to-workspace-right",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_RIGHT,
                          handle_move_to_workspace, META_MOTION_RIGHT);

  add_builtin_keybinding (display,
                          "move-to-workspace-up",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_UP,
                          handle_move_to_workspace, META_MOTION_UP);

  add_builtin_keybinding (display,
                          "move-to-workspace-down",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_DOWN,
                          handle_move_to_workspace, META_MOTION_DOWN);

  add_builtin_keybinding (display,
                          "raise-or-lower",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_RAISE_OR_LOWER,
                          handle_raise_or_lower, 0);

  add_builtin_keybinding (display,
                          "raise",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_RAISE,
                          handle_raise, 0);

  add_builtin_keybinding (display,
                          "lower",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_LOWER,
                          handle_lower, 0);

  add_builtin_keybinding (display,
                          "maximize-vertically",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MAXIMIZE_VERTICALLY,
                          handle_maximize_vertically, 0);

  add_builtin_keybinding (display,
                          "maximize-horizontally",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MAXIMIZE_HORIZONTALLY,
                          handle_maximize_horizontally, 0);

  add_builtin_keybinding (display,
                          "move-to-corner-nw",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_CORNER_NW,
                          handle_move_to_corner_nw, 0);

  add_builtin_keybinding (display,
                          "move-to-corner-ne",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_CORNER_NE,
                          handle_move_to_corner_ne, 0);

  add_builtin_keybinding (display,
                          "move-to-corner-sw",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_CORNER_SW,
                          handle_move_to_corner_sw, 0);

  add_builtin_keybinding (display,
                          "move-to-corner-se",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_CORNER_SE,
                          handle_move_to_corner_se, 0);

  add_builtin_keybinding (display,
                          "move-to-side-n",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_SIDE_N,
                          handle_move_to_side_n, 0);

  add_builtin_keybinding (display,
                          "move-to-side-s",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_SIDE_S,
                          handle_move_to_side_s, 0);

  add_builtin_keybinding (display,
                          "move-to-side-e",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_SIDE_E,
                          handle_move_to_side_e, 0);

  add_builtin_keybinding (display,
                          "move-to-side-w",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_SIDE_W,
                          handle_move_to_side_w, 0);

  add_builtin_keybinding (display,
                          "move-to-center",
-                          SCHEMA_COMMON_KEYBINDINGS,
+                          common_keybindings,
                          META_KEY_BINDING_PER_WINDOW,
                          META_KEYBINDING_ACTION_MOVE_TO_CENTER,
                          handle_move_to_center, 0);
+
+  g_object_unref (common_keybindings);
+  g_object_unref (mutter_keybindings);
 }

 void
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -1660,7 +1660,7 @@ meta_key_pref_free (MetaKeyPref *pref)
  update_binding (pref, NULL);

  g_free (pref->name);
-  g_free (pref->schema);
+  g_object_unref (pref->settings);

  g_free (pref);
 }
@@ -1920,13 +1920,13 @@ meta_prefs_get_visual_bell_type (void)

 gboolean
 meta_prefs_add_keybinding (const char           *name,
-                           const char           *schema,
+                           GSettings            *settings,
                           MetaKeyBindingAction  action,
                           MetaKeyBindingFlags   flags)
 {
  MetaKeyPref  *pref;
-  GSettings    *settings;
  char        **strokes;
+  guint         id;

  if (g_hash_table_lookup (key_bindings, name))
    {
@@ -1934,19 +1934,9 @@ meta_prefs_add_keybinding (const char           *name,
      return FALSE;
    }

-  settings = SETTINGS (schema);
-  if (settings == NULL)
-    {
-      settings = g_settings_new (schema);
-      if ((flags & META_KEY_BINDING_BUILTIN) != 0)
-        g_signal_connect (settings, "changed",
-                          G_CALLBACK (bindings_changed), NULL);
-      g_hash_table_insert (settings_schemas, g_strdup (schema), settings);
-    }
-
  pref = g_new0 (MetaKeyPref, 1);
  pref->name = g_strdup (name);
-  pref->schema = g_strdup (schema);
+  pref->settings = g_object_ref (settings);
  pref->action = action;
  pref->bindings = NULL;
  pref->add_shift = (flags & META_KEY_BINDING_REVERSES) != 0;
@@ -1959,9 +1949,17 @@ meta_prefs_add_keybinding (const char           *name,

  g_hash_table_insert (key_bindings, g_strdup (name), pref);

-  if (!pref->builtin)
+  if (pref->builtin)
+    {
+      if (g_object_get_data (G_OBJECT (settings), "changed-signal") == NULL)
+        {
+          id = g_signal_connect (settings, "changed",
+                                 G_CALLBACK (bindings_changed), NULL);
+          g_object_set_data (G_OBJECT (settings), "changed-signal", GUINT_TO_POINTER (id));
+        }
+    }
+  else
    {
-      guint id;
      char *changed_signal = g_strdup_printf ("changed::%s", name);
      id = g_signal_connect (settings, changed_signal,
                             G_CALLBACK (bindings_changed), NULL);
@@ -1979,7 +1977,6 @@ gboolean
 meta_prefs_remove_keybinding (const char *name)
 {
  MetaKeyPref *pref;
-  GSettings   *settings;
  guint        id;

  pref = g_hash_table_lookup (key_bindings, name);
@@ -1995,9 +1992,8 @@ meta_prefs_remove_keybinding (const char *name)
      return FALSE;
    }

-  settings = SETTINGS (pref->schema);
-  id = GPOINTER_TO_UINT (g_object_steal_data (G_OBJECT (settings), name));
-  g_signal_handler_disconnect (settings, id);
+  id = GPOINTER_TO_UINT (g_object_steal_data (G_OBJECT (pref->settings), name));
+  g_signal_handler_disconnect (pref->settings, id);

  g_hash_table_remove (key_bindings, name);

--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -189,7 +189,7 @@ meta_stack_raise (MetaStack  *stack,
  int max_stack_position = window->stack_position;
  MetaWorkspace *workspace;

-  g_assert (stack->added == NULL);
+  stack_ensure_sorted (stack);

  workspace = meta_window_get_workspace (window);
  for (l = stack->sorted; l; l = l->next)
@@ -217,7 +217,7 @@ meta_stack_lower (MetaStack  *stack,
  int min_stack_position = window->stack_position;
  MetaWorkspace *workspace;

-  g_assert (stack->added == NULL);
+  stack_ensure_sorted (stack);

  workspace = meta_window_get_workspace (window);
  for (l = stack->sorted; l; l = l->next)
@@ -257,16 +257,17 @@ void
 meta_stack_update_window_tile_matches (MetaStack     *stack,
                                       MetaWorkspace *workspace)
 {
-  GList *windows;
+  GList *windows, *tmp;

  if (stack->freeze_count > 0)
    return;

  windows = meta_stack_list_windows (stack, workspace);
-  while (windows)
+  tmp = windows;
+  while (tmp)
    {
-      meta_window_compute_tile_match ((MetaWindow *) windows->data);
-      windows = windows->next;
+      meta_window_compute_tile_match ((MetaWindow *) tmp->data);
+      tmp = tmp->next;
    }

  g_list_free (windows);
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -3018,7 +3018,7 @@ meta_window_show (MetaWindow *window)

  if (!window->placed)
    {
-      if (window->showing_for_first_time)
+      if (window->showing_for_first_time && window->has_maximize_func)
        {
          MetaRectangle work_area;
          meta_window_get_work_area_for_monitor (window, window->monitor->number, &work_area);
--- a/src/meta/display.h
+++ b/src/meta/display.h
@@ -129,7 +129,7 @@ MetaGrabOp meta_display_get_grab_op (MetaDisplay *display);

 gboolean meta_display_add_keybinding    (MetaDisplay         *display,
                                         const char          *name,
-                                         const char          *schema,
+                                         GSettings           *settings,
                                         MetaKeyBindingFlags  flags,
                                         MetaKeyHandlerFunc   handler,
                                         gpointer             user_data,
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -30,6 +30,7 @@
 #include <meta/types.h>
 #include <pango/pango-font.h>
 #include <gdesktop-enums.h>
+#include <gio/gio.h>

 /* Keep in sync with GSettings schemas! */
 typedef enum
@@ -271,7 +272,7 @@ typedef struct _MetaKeyHandler MetaKeyHandler;
 typedef struct
 {
  char *name;
-  char *schema;
+  GSettings *settings;

  MetaKeyBindingAction action;
Author	SHA1	Message	Date
Owen W. Taylor	e97b38b38e	Bump version to 3.4.1 Update NEWS	2012-04-17 17:58:59 -04:00
Florian Müllner	8809673a74	display: Cancel overlay key presses on mouse button events Currently pressing the overlay key only triggers the overview if no other key is pressed between KeyPress and KeyRelease. Extend this logic to pointer events, so that KeyPress + ButtonPress actions are treated explicitly different from "pure" overlay key presses. In particular, this change allows to re-use the overlay key as mouse button modifier. https://bugzilla.gnome.org/show_bug.cgi?id=662476	2012-04-17 23:53:36 +02:00
Jasper St. Pierre	68321d9bf4	keybindings: Use a GSettings object rather than a schema, to support extensions If we want to support keybindings from extensions installed in the user's directory, we can't take a schema, as the GSettings object needs to have a special GSettingsSchemaSource. https://bugzilla.gnome.org/show_bug.cgi?id=673014	2012-04-16 20:31:45 -04:00
Yinghua Wang	65390e50a4	update Simplified Chinese (zh_CN) translation	2012-04-16 15:21:40 +08:00
Christian Kirbach	f8d32661b5	Updated German translation	2012-04-15 17:55:13 +02:00
Jiro Matsuzawa	d84911fdf9	[l10n] Update Japanese translation	2012-04-14 12:24:08 +09:00
Carles Ferrando	4147ea4660	[l10n]Updated Catalan (Valencian) translation	2012-04-10 21:09:06 +02:00
Jordi Serratosa	2dd7c98641	[l10n] Fixes on Catalan translation	2012-04-10 21:09:01 +02:00
Giovanni Campagna	3aad30143c	default plugin: use the right type for varargs Coordinates in Clutter are double, so twice the size of an int, and if not correctly casted memory corruption occurs. https://bugzilla.gnome.org/show_bug.cgi?id=673809	2012-04-10 03:45:25 +02:00
Owen W. Taylor	93d06d4368	Don't try to auto-maximize not-maximizable windows Starting the auto-maximize process on a window like a META_WINDOW_DESKTOP window that is not maximizable gets placement into a confused state and eventually results in the window being positioned at the wrong position (the position that an auto-maximized window would be restored to.) https://bugzilla.gnome.org/show_bug.cgi?id=673566	2012-04-05 14:53:11 -04:00
Shankar Prasad	b19c061db5	Updated Kannada Translation	2012-04-03 15:43:40 +05:30
Shankar Prasad	497258f6e5	Updated Kannada Translation	2012-04-02 14:43:08 +05:30
Kristjan SCHMIDT	977e6388ad	Updated Esperanto translation	2012-04-01 17:37:37 +02:00
Arash Mousavi	0879cf0d8d	Updated Persian Translations	2012-04-01 00:10:27 +04:30
Khaled Hosny	4aab7fb7b9	Updated Arabic translation	2012-03-30 05:25:06 +02:00
Aurimas Černius	839fee19ef	Updated Lithuanian translation	2012-03-26 23:35:29 +03:00
Owen W. Taylor	46a56bafbd	Bump version to 3.4.0 Update NEWS	2012-03-26 14:23:20 -04:00
Owen W. Taylor	c8b4939c7e	Fix uninstalling default.so We need a clean uninstall for 'make distcheck' to pass; libtool hijinks leave a left-over plugins/default.so - remove it manually.	2012-03-26 14:23:19 -04:00
Changwoo Ryu	fc3e82421a	Updated Korean translation	2012-03-27 01:26:09 +09:00
Jasper St. Pierre	23046f6e28	stack: Fix crash when opening a full-screen window When mutter recognizes a full-screen window, it tries to raise it to the top of the stack. Unfortunately, a recent rewrite of the stack code didn't do well with raising a window to the top of the stack if the stack wasn't in a consistent state -- it would crash. Ensure that the stack is in a consistent state at the top of meta_stack_raise/meta_stack_lower. https://bugzilla.redhat.com/show_bug.cgi?id=806437 https://bugzilla.gnome.org/show_bug.cgi?id=672797	2012-03-26 08:15:21 -03:00
Sweta Kothari	823208120d	Updated Gujarati Translations	2012-03-26 14:08:50 +05:30
Petr Kovar	d12c507b12	Updated Czech translation	2012-03-26 02:24:42 +02:00
Marek Černocký	2157c238b6	Updated Czech translation	2012-03-25 22:11:19 +02:00
Pavel Vasin	423bda908e	meta_display_get_tab_list(): Fix leaked GSList https://bugzilla.gnome.org/show_bug.cgi?id=672640	2012-03-24 19:30:00 +01:00
Pavel Vasin	98d427ddba	meta_stack_update_window_tile_matches(): Fix leaked GList https://bugzilla.gnome.org/show_bug.cgi?id=672640	2012-03-24 19:19:17 +01:00
Yaron Shahrabani	7a35579c3f	Updated Hebrew translation.	2012-03-24 19:08:23 +02:00
Bruno Brouard	adc89fbb2c	Updated French translation	2012-03-24 12:51:37 +01:00
Muhammet Kara	a6ca3f768f	[l10n]Updated Turkish translation	2012-03-23 23:01:08 +02:00
Nguyễn Thái Ngọc Duy	9362fbdcde	Updated Vietnamese translation	2012-03-22 10:45:51 +07:00
Nguyễn Thái Ngọc Duy	47099f4a87	po/vi: import from Damned Lies	2012-03-22 10:44:46 +07:00
Yuri Myasoedov	2e6e5b068c	Updated Russian translation	2012-03-21 22:26:24 +04:00
Enrico Nicoletto	ee840bc832	Updated Brazilian Portuguese translation	2012-03-21 14:54:09 -03:00