Bump version for 3.2.3

Not a GNOME Shell release, but it's useful to tag mass-uploads of extensions (expecially for translations).
all: remove all GSettings usage
2011-12-16 22:11:51 +01:00 · 2011-12-16 22:11:12 +01:00 · 2011-12-14 00:07:33 +01:00 · 2011-12-11 15:36:17 +01:00 · 2011-12-08 01:00:50 +01:00 · 2011-12-07 15:07:07 +01:00
26 changed files with 634 additions and 403 deletions
--- a/9
+++ b/9
@@ -1,3 +1,12 @@
+3.2.2
+=====
+* various: fix missing GLib import
+* workspace-indicator: fix when removing the last workspace
+* alternative-status-menu: fix long standing crash without avatar
+* alternate-tab: use GConf binding names
+* all: remove GSettings usage and allow local installation
+* all: update translations
+
 3.2.2
 =====
 * made extensions self-contained with respect to translations
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.2.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+AC_INIT([gnome-shell-extensions],[3.2.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])

 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
--- a/extensions/alternate-tab/Makefile.am
+++ b/extensions/alternate-tab/Makefile.am
@@ -1,14 +1,3 @@
 EXTENSION_ID = alternate-tab

 include ../../extension.mk
-
-gschemas_in = $(gschemabase).alternate-tab.gschema.xml.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
-
-@GSETTINGS_RULES@
-
-CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
-EXTRA_DIST += $(gschemas_in)
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -10,6 +10,7 @@ const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Main = imports.ui.main;
 const Mainloop = imports.mainloop;
@@ -25,9 +26,9 @@ const N_ = function(e) { return e };

 const POPUP_DELAY_TIMEOUT = 150; // milliseconds

-const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.alternate-tab';
-const SETTINGS_BEHAVIOUR_KEY = 'behaviour';
-const SETTINGS_FIRST_TIME_KEY = 'first-time';
+// Settings: choose one of MODES, the description is in MESSAGE
+// (master branch has a nice dialog, but we cannot in gnome 3.2)
+const BEHAVIOUR = 'all_thumbnails';

 const MODES = {
    all_thumbnails: function(shellwm, binding, mask, window, backwards) {
@@ -266,6 +267,8 @@ WindowSwitcher.prototype = {
    }
 };

+/* This object is never instantiated in the current branch, but
+   I don't trust git merge enough to remove it */
 function AltTabSettingsDialog() {
    this._init();
 }
@@ -462,7 +465,6 @@ AltTabPopup2.prototype = {
 	return true
    },

-/*
    _keyPressEvent : function(actor, event) {
        let keysym = event.get_key_symbol();
        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
@@ -508,7 +510,6 @@ AltTabPopup2.prototype = {

        return true;
    },
-*/

    _sortWindows : function(win1,win2) {
        let t1 = win1.get_user_time();
@@ -599,29 +600,22 @@ function init(metadata) {
 }

 function doAltTab(shellwm, binding, mask, window, backwards) {
-    let settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
-
-
-    if(settings.get_boolean(SETTINGS_FIRST_TIME_KEY)) {
-        new AltTabSettingsDialog().open();
-    } else {
-        let behaviour = settings.get_string(SETTINGS_BEHAVIOUR_KEY);
-        if(behaviour in MODES) {
-            MODES[behaviour](shellwm, binding, mask, window, backwards);
-        }
+    let behaviour = BEHAVIOUR;
+    if(behaviour in MODES) {
+        MODES[behaviour](shellwm, binding, mask, window, backwards);
    }
 }

 function enable() {
-    Main.wm.setKeybindingHandler('switch-windows', doAltTab);
-    Main.wm.setKeybindingHandler('switch-group', doAltTab);
-    Main.wm.setKeybindingHandler('switch-windows-backward', doAltTab);
-    Main.wm.setKeybindingHandler('switch-group-backward', doAltTab);
+    Main.wm.setKeybindingHandler('switch_windows', doAltTab);
+    Main.wm.setKeybindingHandler('switch_group', doAltTab);
+    Main.wm.setKeybindingHandler('switch_windows_backward', doAltTab);
+    Main.wm.setKeybindingHandler('switch_group_backward', doAltTab);
 }

 function disable() {
-    Main.wm.setKeybindingHandler('switch-windows', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
-    Main.wm.setKeybindingHandler('switch-group', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
-    Main.wm.setKeybindingHandler('switch-windows-backward', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
-    Main.wm.setKeybindingHandler('switch-group-backward', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    Main.wm.setKeybindingHandler('switch_windows', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    Main.wm.setKeybindingHandler('switch_group', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    Main.wm.setKeybindingHandler('switch_windows_backward', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    Main.wm.setKeybindingHandler('switch_group_backward', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
 }
--- a/extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in
+++ b/extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in
@@ -1,18 +0,0 @@
-<schemalist gettext-domain="gnome-shell-extensions">
-  <enum id="org.gnome.shell.extensions.alternate-tab.BehaviourMode">
-    <value value="1" nick="all_thumbnails"/>
-    <value value="2" nick="workspace_icons"/>
-  </enum>
-  <schema id="org.gnome.shell.extensions.alternate-tab" path="/org/gnome/shell/extensions/alternate-tab/">
-    <key name="behaviour" enum="org.gnome.shell.extensions.alternate-tab.BehaviourMode">
-      <default>'all_thumbnails'</default>
-      <_summary>The alt tab behaviour.</_summary>
-      <_description>Sets the Alt-Tab behaviour. Possible values are: native, all_thumbnails and workspace_icons.</_description>
-    </key>
-    <key type="b" name="first-time">
-      <default>true</default>
-      <_summary>Indicates if Alternate Tab is newly installed</_summary>
-      <_description>Ask the user for a default behaviour if true.</_description>
-    </key>
-  </schema>
-</schemalist>
--- a/extensions/alternative-status-menu/extension.js
+++ b/extensions/alternative-status-menu/extension.js
@@ -103,6 +103,13 @@ function init(metadata) {
    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
 }

+function predestroy(statusMenu) {
+    // HACK! disconnect signals to avoid references to destroyed objects
+    let imstatusitem = statusMenu.menu._getMenuItems()[0];
+    imstatusitem._user.disconnect(imstatusitem._userLoadedId);
+    imstatusitem._user.disconnect(imstatusitem._userChangedId);
+}
+
 function reset(statusMenu) {
    statusMenu._updateSwitchUser();
    statusMenu._updateLogout();
@@ -116,7 +123,10 @@ function reset(statusMenu) {

 function enable() {
    let statusMenu = Main.panel._statusArea.userMenu;
+
+    predestroy(statusMenu);
    statusMenu.menu.removeAll();
+
    createSubMenu.call(statusMenu);
    reset(statusMenu);
 }
@@ -124,7 +134,10 @@ function enable() {
 function disable() {
    // not guarranteed to work, if more extensions operate in the same place
    let statusMenu = Main.panel._statusArea.userMenu;
+
+    predestroy(statusMenu);
    statusMenu.menu.removeAll();
+
    statusMenu._createSubMenu();
    reset(statusMenu);
 }
--- a/extensions/auto-move-windows/Makefile.am
+++ b/extensions/auto-move-windows/Makefile.am
@@ -1,14 +1,3 @@
 EXTENSION_ID = auto-move-windows

 include ../../extension.mk
-
-gschemas_in = $(gschemabase).auto-move-windows.gschema.xml.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
-
-@GSETTINGS_RULES@
-
-CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
-EXTRA_DIST += $(gschemas_in)
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -11,8 +11,9 @@ const St = imports.gi.St;

 const Main = imports.ui.main;

-const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.auto-move-windows';
-const SETTINGS_KEY = 'application-list';
+// list of applications and workspace pairs
+// format: "desktop-file-id.desktop:<num>"
+const APPLICATIONS = [ ];

 function WindowMover() {
    this._init();
@@ -20,7 +21,6 @@ function WindowMover() {

 WindowMover.prototype = {
    _init: function() {
-        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
        this._windowTracker = Shell.WindowTracker.get_default();

        let display = global.screen.get_display();
@@ -46,7 +46,7 @@ WindowMover.prototype = {
        if (!this._windowTracker.is_window_interesting(window))
            return;

-        let spaces = this._settings.get_strv(SETTINGS_KEY);
+        let spaces = APPLICATIONS;

        let app = this._windowTracker.get_window_app(window);
        if (!app) {
@@ -159,4 +159,4 @@ function enable() {
 function disable() {
    Main._checkWorkspaces = prevCheckWorkspaces;
    winMover.destroy();
-}
+}
--- a/extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
+++ b/extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
@@ -1,10 +0,0 @@
-<schemalist gettext-domain="gnome-shell-extensions">
-  <schema id="org.gnome.shell.extensions.auto-move-windows" path="/org/gnome/shell/extensions/auto-move-windows/">
-    <key name="application-list" type="as">
-      <!-- FIXME: should be a(su), when JS supports more of GVariant -->
-      <default>[ ]</default>
-      <_summary>Application and workspace list</_summary>
-      <_description>A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number</_description>
-    </key>
-  </schema>
-</schemalist>
--- a/extensions/dock/Makefile.am
+++ b/extensions/dock/Makefile.am
@@ -1,14 +1,3 @@
 EXTENSION_ID = dock

 include ../../extension.mk
-
-gschemas_in = $(gschemabase).dock.gschema.xml.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
-
-@GSETTINGS_RULES@
-
-CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
-EXTRA_DIST += $(gschemas_in)
--- a/extensions/dock/extension.js
+++ b/extensions/dock/extension.js
@@ -25,15 +25,6 @@ const AltTab = imports.ui.altTab;
 const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;

-// Settings
-const DOCK_SETTINGS_SCHEMA = 'org.gnome.shell.extensions.dock';
-const DOCK_POSITION_KEY = 'position';
-const DOCK_SIZE_KEY = 'size';
-const DOCK_HIDE_KEY = 'autohide';
-const DOCK_EFFECTHIDE_KEY = 'hide-effect';
-const DOCK_AUTOHIDE_ANIMATION_TIME_KEY = 'hide-effect-duration';
-
-
 //hide
 //const autohide_animation_time = 0.3;

@@ -49,6 +40,15 @@ const AutoHideEffect = {
    MOVE: 2
 };

+// Settings
+const DOCK_POSITION = PositionMode.RIGHT;
+const DOCK_SIZE = 48;
+const DOCK_AUTOHIDE = true;
+const DOCK_EFFECTHIDE = AutoHideEffect.MOVE;
+const DOCK_AUTOHIDE_ANIMATION_TIME = 0.3;
+// Do not change anything below this line (it is intentionally duplicate to keep in
+// sync with master branch)
+
 let position = PositionMode.RIGHT;
 let dockicon_size = 48;
 let hideable = true;
@@ -340,15 +340,11 @@ Dock.prototype = {
        this._favorites = [];

        // Load Settings
-        this._settings = new Gio.Settings({ schema: DOCK_SETTINGS_SCHEMA });
-        position = this._settings.get_enum(DOCK_POSITION_KEY);
-        dockicon_size = this._settings.get_int(DOCK_SIZE_KEY);
-        hideDock = hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
-        hideEffect = this._settings.get_enum(DOCK_EFFECTHIDE_KEY);
-        autohide_animation_time = this._settings.get_double(DOCK_AUTOHIDE_ANIMATION_TIME_KEY);
-        //global.log("POSITION: " + position);
-        //global.log("dockicon_size: " + dockicon_size);
-
+        position = DOCK_POSITION;
+        dockicon_size = DOCK_SIZE;
+        hideDock = hideable = DOCK_AUTOHIDE;
+        hideEffect = DOCK_EFFECTHIDE;
+        autohide_animation_time = DOCK_AUTOHIDE_ANIMATION_TIME;

        this._spacing = 4;
        this._item_size = dockicon_size;
@@ -382,72 +378,6 @@ Dock.prototype = {
        }));
        Main.layoutManager.addChrome(this.actor);

-        //hidden
-        this._settings.connect('changed::'+DOCK_POSITION_KEY, Lang.bind(this, function (){
-                if (!this._settings)
-                    return;
-
-                let primary = Main.layoutManager.primaryMonitor;
-                position = this._settings.get_enum(DOCK_POSITION_KEY);
-                this.actor.y=primary.y;
-                this._redisplay();
-        }));
-
-        this._settings.connect('changed::'+DOCK_SIZE_KEY, Lang.bind(this, function (){
-                if (!this._settings)
-                    return;
-
-                dockicon_size = this._settings.get_int(DOCK_SIZE_KEY);
-                this._redisplay();
-        }));
-
-        this._settings.connect('changed::'+DOCK_HIDE_KEY, Lang.bind(this, function (){
-                if (!this._settings)
-                    return;
-
-                hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
-                if (hideable){
-                        hideDock=false;
-                        this._hideDock();
-                } else {
-                        hideDock=true;
-                        this._showDock();
-                }
-        }));
-
-        this._settings.connect('changed::'+DOCK_EFFECTHIDE_KEY, Lang.bind(this, function () {
-                if (!this._settings)
-                    return;
-
-                hideEffect = this._settings.get_enum(DOCK_EFFECTHIDE_KEY);
-
-                switch (hideEffect) {
-                        case AutoHideEffect.RESCALE:
-                           this._item_size=dockicon_size;
-                           break;
-                        case AutoHideEffect.RESIZE:
-                           this.actor.set_scale (1,1);
-                           break;
-                        case AutoHideEffect.MOVE:
-                           ;
-                }
-                this.actor.disconnect(this._leave_event);
-                this.actor.disconnect(this._enter_event);
-
-                this._selectFunctionsHide ();
-
-                this._leave_event = this.actor.connect('leave-event', Lang.bind(this, this._hideDock));
-                this._enter_event = this.actor.connect('enter-event', Lang.bind(this, this._showDock));
-                this._redisplay();
-        }));
-
-        this._settings.connect('changed::'+DOCK_AUTOHIDE_ANIMATION_TIME_KEY, Lang.bind(this,function (){
-                if (!this._settings)
-                    return;
-
-                autohide_animation_time = this._settings.get_double(DOCK_AUTOHIDE_ANIMATION_TIME_KEY);
-        }));
-
        this._leave_event = this.actor.connect('leave-event', Lang.bind(this, this._hideDock));
        this._enter_event = this.actor.connect('enter-event', Lang.bind(this, this._showDock));

@@ -483,14 +413,13 @@ Dock.prototype = {
        this.actor.destroy();

        // Break reference cycles
-        this._settings = null;
        this._appSystem = null;
        this._tracker = null;
    },

    // fuctions hide
    _restoreHideDock: function(){
-        hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
+        hideable = DOCK_AUTOHIDE;
    },

    _disableHideDock: function (){
@@ -935,7 +864,7 @@ DockIconMenu.prototype = {
 }

 function init(extensionMeta) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
+    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([extensionMeta.path, 'locale']));
 }

 let dock;
--- a/extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
+++ b/extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
@@ -1,38 +0,0 @@
-<schemalist gettext-domain="gnome-shell-extensions">
-  <enum id='org.gnome.shell.extensions.dock.PositionMode'>
-    <value nick='left' value='0'/>
-    <value nick='right' value='1'/>
-  </enum>
-  <enum id='org.gnome.shell.extensions.dock.AutoHideEffect'>
-    <value nick='resize' value='0'/>
-    <value nick='rescale' value='1'/>
-    <value nick='move' value='2'/>
-  </enum>
-
-  <schema id="org.gnome.shell.extensions.dock" path="/org/gnome/shell/extensions/dock/">
-    <key name="position" enum="org.gnome.shell.extensions.dock.PositionMode">
-      <default>'right'</default>
-      <_summary>Position of the dock</_summary>
-      <_description>Sets the position of the dock in the screen. Allowed values are 'right' or 'left'</_description>
-    </key>
-    <key name="size" type="i">
-      <default>48</default>
-      <_summary>Icon size</_summary>
-      <_description>Sets icon size of the dock.</_description>
-    </key>
-    <key name="autohide" type="b">
-      <default>true</default>
-      <_summary>Enable/disable autohide</_summary>
-    </key>
-    <key name="hide-effect" enum="org.gnome.shell.extensions.dock.AutoHideEffect">
-      <default>'resize'</default>
-      <_summary>Autohide effect</_summary>
-      <_description>Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'</_description>
-    </key>
-    <key name="hide-effect-duration" type="d">
-      <default>0.3</default>
-      <_summary>Autohide duration</_summary>
-      <_description>Sets the time duration of the autohide effect.</_description>
-    </key>
-  </schema>
-</schemalist>
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -1,4 +1,5 @@
 // Drive menu extension
+const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const St = imports.gi.St;
--- a/extensions/example/extension.js
+++ b/extensions/example/extension.js
@@ -1,4 +1,5 @@
 // Sample extension code, makes clicking on the panel show a message
+const GLib = imports.gi.GLib;
 const St = imports.gi.St;
 const Mainloop = imports.mainloop;

--- a/extensions/native-window-placement/Makefile.am
+++ b/extensions/native-window-placement/Makefile.am
@@ -1,14 +1,3 @@
 EXTENSION_ID = native-window-placement

 include ../../extension.mk
-
-gschemas_in = $(gschemabase).native-window-placement.gschema.xml.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
-
-@GSETTINGS_RULES@
-
-CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
-EXTRA_DIST += $(gschemas_in)
--- a/extensions/native-window-placement/extension.js
+++ b/extensions/native-window-placement/extension.js
@@ -25,6 +25,12 @@ const WindowPlacementStrategy = {
    GRID: 1,
 };

+/* Begin user settings */
+const PLACEMENT_STRATEGY = WindowPlacementStrategy.NATURAL;
+const USE_MORE_SCREEN = true;
+const WINDOW_CAPTIONS_ON_TOP = true;
+/* End user settings - do not change anything below this line */
+
 // testing settings for natural window placement strategy:
 const WINDOW_PLACEMENT_NATURAL_FILLGAPS = true;                     // enlarge windows at the end to fill gaps         // not implemented yet
 const WINDOW_PLACEMENT_NATURAL_GRID_FALLBACK = true;                // fallback to grid mode if all windows have the same size and positions.     // not implemented yet
@@ -117,19 +123,8 @@ function resetState() {
 function enable() {
    resetState();

-    let settings = new Gio.Settings({ schema: 'org.gnome.shell.extensions.native-window-placement' });
-    let placementStrategy = settings.get_enum('strategy');
-    let signalId = settings.connect('changed::strategy', function() {
-        placementStrategy = settings.get_enum('strategy');
-        // we don't update immediately, we wait for a relayout
-        // (and hope for the best)
-    });
-    connectedSignals.push({ obj: settings, id: signalId });
-    let useMoreScreen = settings.get_boolean('use-more-screen');
-    signalId = settings.connect('changed::use-more-screen', function() {
-        useMoreScreen = settings.get_boolean('use-more-screen');
-    });
-    connectedSignals.push({ obj: settings, id: signalId });
+    let placementStrategy = PLACEMENT_STRATEGY;
+    let useMoreScreen = USE_MORE_SCREEN;

    /**
     * _calculateWindowTransformationsNatural:
@@ -415,7 +410,7 @@ function enable() {
    }

    /// position window titles on top of windows in overlay ////
-    if (settings.get_boolean('window-captions-on-top'))  {
+    if (WINDOW_CAPTIONS_ON_TOP)  {
        winInjections['_init'] = Workspace.WindowOverlay.prototype._init;
 	Workspace.WindowOverlay.prototype._init = function(windowClone, parentActor) {
            let metaWindow = windowClone.metaWindow;
@@ -529,4 +524,4 @@ function disable() {

 function init() {
    /* do nothing */
-}
+}
--- a/extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
+++ b/extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
@@ -1,26 +0,0 @@
-<schemalist gettext-domain="gnome-shell-extensions">
-  <enum id="org.gnome.shell.extensions.native-window-placement.strategy">
-    <value nick="natural" value="0" />
-    <value nick="grid" value="1" />
-  </enum>
-  <schema id="org.gnome.shell.extensions.native-window-placement" path="/org/gnome/shell/extensions/native-window-placement/">
-    <key name="strategy" enum="org.gnome.shell.extensions.native-window-placement.strategy">
-      <default>'natural'</default>
-      <_summary>Window placement strategy</_summary>
-      <_description>The algorithm used to layout thumbnails in the overview. 'grid' to use the default grid based algorithm,
-      'natural' to use another one that reflects more the position and size of the actual window</_description>
-    </key>
-    <key name="use-more-screen" type="b">
-      <default>true</default>
-      <_summary>Use more screen for windows</_summary>
-      <_description>Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating
-      them further to reduce the bounding box. This setting applies only with the natural placement strategy.</_description>
-    </key>
-    <key name="window-captions-on-top" type="b">
-      <default>true</default>
-      <_summary>Place window captions on top</_summary>
-      <_description>If true, place window captions on top the respective thumbnail, overriding shell default of placing it at
-      the bottom. Changing this setting requires restarting the shell to have any effect.</_description>
-    </key>
-  </schema>
-</schemalist>
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -127,15 +127,21 @@ function enable() {
    workViewInjections['_hideWorkspacesTooltips'] = undefined;

    WorkspacesView.WorkspacesView.prototype._onKeyRelease = function(s, o) {
-        if (this._pickWindow && o.get_key_symbol() == Clutter.KEY_Alt_L)
+        if (this._pickWindow && 
+            (o.get_key_symbol() == Clutter.KEY_Alt_L ||
+             o.get_key_symbol() == Clutter.KEY_Alt_R))
            this._hideTooltips();
-        if (this._pickWorkspace && o.get_key_symbol() == Clutter.KEY_Control_L)
+        if (this._pickWorkspace && 
+            (o.get_key_symbol() == Clutter.KEY_Control_L ||
+             o.get_key_symbol() == Clutter.KEY_Control_R))
            this._hideWorkspacesTooltips();
    }
    workViewInjections['_onKeyRelease'] = undefined;

    WorkspacesView.WorkspacesView.prototype._onKeyPress = function(s, o) {
-        if (o.get_key_symbol() == Clutter.KEY_Alt_L && !this._pickWorkspace) {
+        if ((o.get_key_symbol() == Clutter.KEY_Alt_L ||
+             o.get_key_symbol() == Clutter.KEY_Alt_R)
+            && !this._pickWorkspace) {
            this._prevFocusActor = global.stage.get_key_focus();
            global.stage.set_key_focus(null);
            this._active = global.screen.get_active_workspace_index();
@@ -143,7 +149,9 @@ function enable() {
            this._workspaces[global.screen.get_active_workspace_index()].showWindowsTooltips();
            return true;
        }
-        if (o.get_key_symbol() == Clutter.KEY_Control_L && !this._pickWindow) {
+        if ((o.get_key_symbol() == Clutter.KEY_Control_L ||
+             o.get_key_symbol() == Clutter.KEY_Control_R)
+            && !this._pickWindow) {
            this._prevFocusActor = global.stage.get_key_focus();
            global.stage.set_key_focus(null);
            this._pickWorkspace = true;
@@ -155,6 +163,12 @@ function enable() {
        if (global.stage.get_key_focus() != global.stage)
            return false;

+        // ignore shift presses, they're required to get numerals in azerty keyboards
+        if ((this._pickWindow || this._pickWorkspace) &&
+            (o.get_key_symbol() == Clutter.KEY_Shift_L ||
+             o.get_key_symbol() == Clutter.KEY_Shift_R))
+            return true;
+
        if (this._pickWindow) {
            if (this._active != global.screen.get_active_workspace_index()) {
                this._hideTooltips();
@@ -280,4 +294,4 @@ function disable() {

 function init() {
    /* do nothing */
-}
+}
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -37,6 +37,7 @@ WorkspaceIndicator.prototype = {

 		//styling
 		this.menu.actor.add_style_class_name('workspace-indicator-shorter');
+		this.statusLabel.add_style_class_name('panel-workspace-indicator');
 	},

 	_updateIndicator: function() {
@@ -50,27 +51,32 @@ WorkspaceIndicator.prototype = {
 	_labelText : function(workspaceIndex) {
 	    if(workspaceIndex == undefined) {
 		workspaceIndex = this._currentWorkspace;
+		return (workspaceIndex + 1).toString();
 	    }
 	    return Meta.prefs_get_workspace_name(workspaceIndex);
 	},

 	_createWorkspacesSection : function() {
-		this._workspaceSection.removeAll();
-		this.workspacesItems = [];
+	    this._workspaceSection.removeAll();
+	    this.workspacesItems = [];
+	    this._currentWorkspace = global.screen.get_active_workspace().index();

-		let i = 0;
-		for(; i < global.screen.n_workspaces; i++) {
-			this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
-			this._workspaceSection.addMenuItem(this.workspacesItems[i]);
-			this.workspacesItems[i].workspaceId = i;
-			this.workspacesItems[i].label_actor = this.statusLabel;
-			let self = this;
-			this.workspacesItems[i].connect('activate', Lang.bind(this, function(actor, event) {
-				this._activate(actor.workspaceId);
-			}));
-		}
+	    let i = 0;
+	    for(; i < global.screen.n_workspaces; i++) {
+		this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
+		this._workspaceSection.addMenuItem(this.workspacesItems[i]);
+		this.workspacesItems[i].workspaceId = i;
+		this.workspacesItems[i].label_actor = this.statusLabel;
+		let self = this;
+		this.workspacesItems[i].connect('activate', Lang.bind(this, function(actor, event) {
+		    this._activate(actor.workspaceId);
+		}));

-	    this._updateIndicator();
+		if (i == this._currentWorkspace)
+		    this.workspacesItems[i].setShowDot(true);
+	    }
+
+	    this.statusLabel.set_text(this._labelText());
 	},

 	_activate : function (index) {
--- a/extensions/workspace-indicator/stylesheet.css
+++ b/extensions/workspace-indicator/stylesheet.css
@@ -2,3 +2,8 @@
 	min-width: 25px;
 	font-size: 10pt;
 }
+.panel-workspace-indicator {
+	padding: 0 8px;
+	background-color: rgba(200, 200, 200, .5);
+	border: 1px solid #cccccc;
+}
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -7,6 +7,7 @@ en_GB
 es
 eu
 fa
+fi
 fr
 gl
 he
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,13 +1,9 @@
 extensions/alternative-status-menu/extension.js
 extensions/alternate-tab/extension.js
-extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in
 extensions/auto-move-windows/extension.js
-extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
 extensions/dock/extension.js
-extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
 extensions/example/extension.js
 extensions/gajim/extension.js
-extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
 extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in
 extensions/windowsNavigator/extension.js
 extensions/xrandr-indicator/extension.js
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,67 +1,61 @@
 # Czech translation for gnome-shell-extensions.
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
+#
 # Marek Černocký <marek@manet.cz>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell-extensions master\n"
+"Project-Id-Version: gnome-shell-extensions 3.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2011-11-22 10:40+0000\n"
+"POT-Creation-Date: 2011-11-28 19:18+0000\n"
 "PO-Revision-Date: 2011-11-22 11:43+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

-#: ../extensions/alternative-status-menu/extension.js:23
-#: ../extensions/alternative-status-menu/extension.js:27
-#: ../extensions/alternative-status-menu/extension.js:93
-msgid "Hibernate"
-msgstr "Uspat na disk"
+#: ../extensions/alternative-status-menu/extension.js:45
+msgid "Notifications"
+msgstr "Oznamování"

-#: ../extensions/alternative-status-menu/extension.js:26
-#: ../extensions/alternative-status-menu/extension.js:92
-msgid "Suspend"
-msgstr "Uspat do paměti"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "Available"
-msgstr "Dostupný"
+#: ../extensions/alternative-status-menu/extension.js:53
+msgid "Online Accounts"
+msgstr "Účty on-line"

 #: ../extensions/alternative-status-menu/extension.js:57
-msgid "Busy"
-msgstr "Zaneprázdněný"
-
-#: ../extensions/alternative-status-menu/extension.js:65
-msgid "My Account"
-msgstr "Můj účet"
-
-#: ../extensions/alternative-status-menu/extension.js:69
 msgid "System Settings"
 msgstr "Nastavení systému"

-#: ../extensions/alternative-status-menu/extension.js:76
+#: ../extensions/alternative-status-menu/extension.js:64
 msgid "Lock Screen"
 msgstr "Zamknout obrazovku"

-#: ../extensions/alternative-status-menu/extension.js:80
+#: ../extensions/alternative-status-menu/extension.js:69
 msgid "Switch User"
 msgstr "Přepnout uživatele"

-#: ../extensions/alternative-status-menu/extension.js:85
+#: ../extensions/alternative-status-menu/extension.js:74
 msgid "Log Out..."
 msgstr "Odhlásit se…"

-#: ../extensions/alternative-status-menu/extension.js:100
+#: ../extensions/alternative-status-menu/extension.js:82
+msgid "Suspend"
+msgstr "Uspat do paměti"
+
+#: ../extensions/alternative-status-menu/extension.js:88
+msgid "Hibernate"
+msgstr "Uspat na disk"
+
+#: ../extensions/alternative-status-menu/extension.js:94
 msgid "Power Off..."
 msgstr "Vypnout…"

-#: ../extensions/alternate-tab/extension.js:54
+#: ../extensions/alternate-tab/extension.js:50
 msgid ""
 "This is the first time you use the Alternate Tab extension. \n"
 "Please choose your preferred behaviour:\n"
@@ -109,19 +103,19 @@ msgstr ""
 "rozšíření\n"
 "zakažte v extensions.gnome.org nebo v aplikaci Pokročilá nastavení."

-#: ../extensions/alternate-tab/extension.js:295
+#: ../extensions/alternate-tab/extension.js:291
 msgid "Alt Tab Behaviour"
 msgstr "Chování Alt Tab"

-#: ../extensions/alternate-tab/extension.js:311
+#: ../extensions/alternate-tab/extension.js:307
 msgid "All & Thumbnails"
 msgstr "Vše a náhledy"

-#: ../extensions/alternate-tab/extension.js:318
+#: ../extensions/alternate-tab/extension.js:314
 msgid "Workspace & Icons"
 msgstr "Pracovní plocha a ikony"

-#: ../extensions/alternate-tab/extension.js:325
+#: ../extensions/alternate-tab/extension.js:321
 msgid "Cancel"
 msgstr "Zrušit"

@@ -158,50 +152,135 @@ msgstr ""
 msgid "Application and workspace list"
 msgstr "Seznam aplikací a pracovních ploch"

-#: ../extensions/dock/extension.js:570
+#: ../extensions/dock/extension.js:569
 msgid "Drag here to add favorites"
 msgstr "Přetažením sem přidáte do oblíbených"

-#: ../extensions/dock/extension.js:903
+#: ../extensions/dock/extension.js:902
 msgid "New Window"
 msgstr "Nové okno"

-#: ../extensions/dock/extension.js:905
+#: ../extensions/dock/extension.js:904
 msgid "Quit Application"
 msgstr "Ukončit aplikaci"

-#: ../extensions/dock/extension.js:910
+#: ../extensions/dock/extension.js:909
 msgid "Remove from Favorites"
 msgstr "Odebrat z oblíbených"

-#: ../extensions/dock/extension.js:911
+#: ../extensions/dock/extension.js:910
 msgid "Add to Favorites"
 msgstr "Přidat do oblíbených"

+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:1
+msgid "Autohide duration"
+msgstr "Čas automatického skrývání"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:2
+msgid "Autohide effect"
+msgstr "Efekt automatického skrývání"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:3
+msgid "Enable/disable autohide"
+msgstr "Zapnout/vypnout automatické skrývání"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:4
+msgid "Icon size"
+msgstr "Velikost ikony"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:5
+msgid "Position of the dock"
+msgstr "Poloha doku"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:6
+msgid "Sets icon size of the dock."
+msgstr "Nastavuje velikost ikon v doku."
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:7
+msgid ""
+"Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'"
+msgstr ""
+"Nastavuje efekt skrývání doku. Povolené hodnoty jsou „resize“ (změna "
+"velikosti) a „rescale“ (změna měřítka)"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:8
+msgid ""
+"Sets the position of the dock in the screen. Allowed values are 'right' or "
+"'left'"
+msgstr ""
+"Nastavuje polohu doku na obrazovce. Povolené hodnoty jsou „right“ (vpravo) "
+"nebo „left“ (vlevo)."
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:9
+msgid "Sets the time duration of the autohide effect."
+msgstr "Nastavuje čas trvání efektu automatického skrývání."
+
 #: ../extensions/example/extension.js:11
 msgid "Hello, world!"
 msgstr "Ahoj světe!"

-#: ../extensions/gajim/extension.js:219
+#: ../extensions/gajim/extension.js:227
 #, c-format
 msgid "%s is away."
 msgstr "%s je pryč."

-#: ../extensions/gajim/extension.js:222
+#: ../extensions/gajim/extension.js:230
 #, c-format
 msgid "%s is offline."
 msgstr "%s je odpojen."

-#: ../extensions/gajim/extension.js:225
+#: ../extensions/gajim/extension.js:233
 #, c-format
 msgid "%s is online."
 msgstr "%s je připojen."

-#: ../extensions/gajim/extension.js:228
+#: ../extensions/gajim/extension.js:236
 #, c-format
 msgid "%s is busy."
 msgstr "%s je zaneprázdněn."

+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+msgid ""
+"If true, place window captions on top the respective thumbnail, overriding "
+"shell default of placing it at the bottom. Changing this setting requires "
+"restarting the shell to have any effect."
+msgstr ""
+"Pokud je zapnuto, umisťuje se název okna nad případný náhled, čímž se "
+"přepíše výchozí chování shellu, který jej umisťuje dolů. Změna tohoto "
+"nastavení vyžaduje restart shellu, aby se projevila."
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+msgid "Place window captions on top"
+msgstr "Umístit název okna nahoru"
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+msgid ""
+"The algorithm used to layout thumbnails in the overview. 'grid' to use the "
+"default grid based algorithm, 'natural' to use another one that reflects "
+"more the position and size of the actual window"
+msgstr ""
+"Algoritmus použitý k rozvržení náhledů v přehledu. „grid“ použijte pro "
+"výchozí algoritmus založený na pravidelné mřížce, „natural“ pro jiný "
+"algoritmus, který se snaží brát v úvahu polohu a velikost aktuálního okna"
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+msgid ""
+"Try to use more screen for placing window thumbnails by adapting to screen "
+"aspect ratio, and consolidating them further to reduce the bounding box. "
+"This setting applies only with the natural placement strategy."
+msgstr ""
+"Pomocí přizpůsobení měřítka obrazovky spolu se zmenšením ohraničení zkusit "
+"využít větší část obrazovky pro umístění náhledů oken. Toto nastavení se "
+"použije pouze dohromady se strategií umisťování „natural“."
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:5
+msgid "Use more screen for windows"
+msgstr "Použít větší část obrazovky pro okna"
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:6
+msgid "Window placement strategy"
+msgstr "Strategie umisťování oken"
+
 #: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Název motivu, který se má načíst z ~/.themes/name/gnome-shell"
@@ -229,3 +308,9 @@ msgstr "Vzhůru nohama"
 #: ../extensions/xrandr-indicator/extension.js:78
 msgid "Configure display settings..."
 msgstr "Upravit nastavení zobrazení…"
+
+msgid "Available"
+msgstr "Dostupný"
+
+msgid "Busy"
+msgstr "Zaneprázdněný"
--- a/po/es.po
+++ b/po/es.po
@@ -1,60 +1,85 @@
 # Spanish translation for gnome-shell-extensions.
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Jorge González <jorgegonz@svn.gnome.org>, 2011.
 # Daniel Mustieles <daniel.mustieles@gmail.com>, 2011.
+# Jorge González <jorgegonz@svn.gnome.org>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2011-09-18 17:08+0000\n"
-"PO-Revision-Date: 2011-11-14 10:44+0100\n"
-"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"POT-Creation-Date: 2011-12-02 15:47+0000\n"
+"PO-Revision-Date: 2011-12-03 12:21+0100\n"
+"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
+"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"

-#: ../extensions/alternative-status-menu/extension.js:44
+#: ../extensions/alternative-status-menu/extension.js:45
 msgid "Notifications"
 msgstr "Notificaciones"

-#: ../extensions/alternative-status-menu/extension.js:52
+#: ../extensions/alternative-status-menu/extension.js:53
 msgid "Online Accounts"
 msgstr "Cuentas en línea"

-#: ../extensions/alternative-status-menu/extension.js:56
+#: ../extensions/alternative-status-menu/extension.js:57
 msgid "System Settings"
 msgstr "Configuración del sistema"

-#: ../extensions/alternative-status-menu/extension.js:63
+#: ../extensions/alternative-status-menu/extension.js:64
 msgid "Lock Screen"
 msgstr "Bloquear la pantalla"

-#: ../extensions/alternative-status-menu/extension.js:68
+#: ../extensions/alternative-status-menu/extension.js:69
 msgid "Switch User"
 msgstr "Cambiar de usuario"

-#: ../extensions/alternative-status-menu/extension.js:73
+#: ../extensions/alternative-status-menu/extension.js:74
 msgid "Log Out..."
 msgstr "Cerrar la sesión…"

-#: ../extensions/alternative-status-menu/extension.js:81
+#: ../extensions/alternative-status-menu/extension.js:82
 msgid "Suspend"
 msgstr "Suspender"

-#: ../extensions/alternative-status-menu/extension.js:87
+#: ../extensions/alternative-status-menu/extension.js:88
 msgid "Hibernate"
 msgstr "Hibernar"

-#: ../extensions/alternative-status-menu/extension.js:93
+#: ../extensions/alternative-status-menu/extension.js:94
 msgid "Power Off..."
 msgstr "Apagar…"

-#: ../extensions/alternate-tab/extension.js:44
+#: ../extensions/alternate-tab/extension.js:50
+#| msgid ""
+#| "This is the first time you use the Alternate Tab extension. \n"
+#| "Please choose your preferred behaviour:\n"
+#| "\n"
+#| "All & Thumbnails:\n"
+#| "    This mode presents all applications from all workspaces in one "
+#| "selection \n"
+#| "    list. Instead of using the application icon of every window, it uses "
+#| "small \n"
+#| "    thumbnails resembling the window itself. \n"
+#| "\n"
+#| "Workspace & Icons:\n"
+#| "    This mode let's you switch between the applications of your current \n"
+#| "    workspace and gives you additionally the option to switch to the last "
+#| "used \n"
+#| "    application of your previous workspace. This is always the last "
+#| "symbol in \n"
+#| "    the list and is segregated by a separator/vertical line if "
+#| "available. \n"
+#| "    Every window is represented by its application icon.  \n"
+#| "\n"
+#| "Native:\n"
+#| "    This mode is the native GNOME 3 behaviour or in other words: "
+#| "Clicking \n"
+#| "    native switches the Alternate Tab extension off. \n"
 msgid ""
 "This is the first time you use the Alternate Tab extension. \n"
 "Please choose your preferred behaviour:\n"
@@ -75,9 +100,10 @@ msgid ""
 "    the list and is segregated by a separator/vertical line if available. \n"
 "    Every window is represented by its application icon.  \n"
 "\n"
-"Native:\n"
-"    This mode is the native GNOME 3 behaviour or in other words: Clicking \n"
-"    native switches the Alternate Tab extension off. \n"
+"If you whish to revert to the default behavior for the Alt-Tab switcher, "
+"just\n"
+"disable the extension from extensions.gnome.org or the Advanced Settings "
+"application."
 msgstr ""
 "Esta es la primera vez que usa la extensión Alt+Tab. \n"
 "Seleccione el comportamiento preferido:\n"
@@ -99,28 +125,24 @@ msgstr ""
 "    disponible. \n"
 "    Cada ventana se representa con el icono de la aplicación.  \n"
 "\n"
-"Nativo:\n"
-"    Este modo es el comportamiento nativo de GNOME 3 o, en otras palabras, "
-"este \n"
-"    modo desactiva la extensión Alt+Tab. \n"
+"Si quiere volver al comportamiento predeterminado para el cambiador Alt-"
+"Tab,\n"
+"simplemente desactive la extensión desde extensions.gnome.org o desde la\n"
+"aplicación de Configuración avanzada."

-#: ../extensions/alternate-tab/extension.js:269
+#: ../extensions/alternate-tab/extension.js:291
 msgid "Alt Tab Behaviour"
 msgstr "Comportamiento de Alt+Tab"

-#: ../extensions/alternate-tab/extension.js:285
+#: ../extensions/alternate-tab/extension.js:307
 msgid "All & Thumbnails"
 msgstr "Todo y miniaturas"

-#: ../extensions/alternate-tab/extension.js:292
+#: ../extensions/alternate-tab/extension.js:314
 msgid "Workspace & Icons"
 msgstr "Espacio de trabajo e iconos"

-#: ../extensions/alternate-tab/extension.js:299
-msgid "Native"
-msgstr "Nativo"
-
-#: ../extensions/alternate-tab/extension.js:306
+#: ../extensions/alternate-tab/extension.js:321
 msgid "Cancel"
 msgstr "Cancelar"

@@ -158,23 +180,23 @@ msgstr ""
 msgid "Application and workspace list"
 msgstr "Lista de aplicaciones y espacios de trabajo"

-#: ../extensions/dock/extension.js:486
+#: ../extensions/dock/extension.js:569
 msgid "Drag here to add favorites"
 msgstr "Arrastrar aquí para añadir a favoritos"

-#: ../extensions/dock/extension.js:820
+#: ../extensions/dock/extension.js:902
 msgid "New Window"
 msgstr "Ventana nueva"

-#: ../extensions/dock/extension.js:822
+#: ../extensions/dock/extension.js:904
 msgid "Quit Application"
 msgstr "Salir de la aplicación"

-#: ../extensions/dock/extension.js:827
+#: ../extensions/dock/extension.js:909
 msgid "Remove from Favorites"
 msgstr "Quitar de favoritos"

-#: ../extensions/dock/extension.js:828
+#: ../extensions/dock/extension.js:910
 msgid "Add to Favorites"
 msgstr "Añadir a favoritos"

@@ -268,8 +290,8 @@ msgid ""
 msgstr ""
 "El algoritmo usado para situar las miniaturas en la vista previa. "
 "«grid» (tabla) para usar el algoritmo predeterminado basado en una tabla, "
-"«natural» para usar otro que refleja mejor la posición y tamaño de la ventana "
-"representada."
+"«natural» para usar otro que refleja mejor la posición y tamaño de la "
+"ventana representada."

 #: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
 msgid ""
@@ -317,6 +339,9 @@ msgstr "Hacia abajo"
 msgid "Configure display settings..."
 msgstr "Configurar las opciones de pantalla…"

+#~ msgid "Native"
+#~ msgstr "Nativo"
+
 #~ msgid "Available"
 #~ msgstr "Disponible"

--- a/po/fi.po
+++ b/po/fi.po
@@ -0,0 +1,271 @@
+# Finnish translation of gnome-shell-extensions.
+# Copyright (C) 2011 Ville-Pekka Vainio
+# This file is distributed under the same license as the gnome-shell-extensions package.
+# Ville-Pekka Vainio <vpvainio@iki.fi>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-shell-extensions\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2011-12-03 11:25+0000\n"
+"PO-Revision-Date: 2011-12-04 00:46+0200\n"
+"Last-Translator: Ville-Pekka Vainio <vpvainio@iki.fi>\n"
+"Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1-rc1\n"
+"X-Project-Style: gnome\n"
+
+#: ../extensions/alternative-status-menu/extension.js:45
+msgid "Notifications"
+msgstr "Ilmoitukset"
+
+#: ../extensions/alternative-status-menu/extension.js:53
+msgid "Online Accounts"
+msgstr "Verkkotilit"
+
+#: ../extensions/alternative-status-menu/extension.js:57
+msgid "System Settings"
+msgstr "Järjestelmän asetukset"
+
+#: ../extensions/alternative-status-menu/extension.js:64
+msgid "Lock Screen"
+msgstr "Lukitse näyttö"
+
+#: ../extensions/alternative-status-menu/extension.js:69
+msgid "Switch User"
+msgstr "Vaihda käyttäjää"
+
+#: ../extensions/alternative-status-menu/extension.js:74
+msgid "Log Out..."
+msgstr "Kirjaudu ulos…"
+
+#: ../extensions/alternative-status-menu/extension.js:82
+msgid "Suspend"
+msgstr "Valmiustila"
+
+#: ../extensions/alternative-status-menu/extension.js:88
+msgid "Hibernate"
+msgstr "Lepotila"
+
+#: ../extensions/alternative-status-menu/extension.js:94
+msgid "Power Off..."
+msgstr "Sammuta…"
+
+#: ../extensions/alternate-tab/extension.js:50
+msgid ""
+"This is the first time you use the Alternate Tab extension. \n"
+"Please choose your preferred behaviour:\n"
+"\n"
+"All & Thumbnails:\n"
+"    This mode presents all applications from all workspaces in one "
+"selection \n"
+"    list. Instead of using the application icon of every window, it uses "
+"small \n"
+"    thumbnails resembling the window itself. \n"
+"\n"
+"Workspace & Icons:\n"
+"    This mode let's you switch between the applications of your current \n"
+"    workspace and gives you additionally the option to switch to the last "
+"used \n"
+"    application of your previous workspace. This is always the last symbol "
+"in \n"
+"    the list and is segregated by a separator/vertical line if available. \n"
+"    Every window is represented by its application icon.  \n"
+"\n"
+"If you whish to revert to the default behavior for the Alt-Tab switcher, "
+"just\n"
+"disable the extension from extensions.gnome.org or the Advanced Settings "
+"application."
+msgstr ""
+
+#: ../extensions/alternate-tab/extension.js:291
+msgid "Alt Tab Behaviour"
+msgstr ""
+
+#: ../extensions/alternate-tab/extension.js:307
+msgid "All & Thumbnails"
+msgstr ""
+
+#: ../extensions/alternate-tab/extension.js:314
+msgid "Workspace & Icons"
+msgstr ""
+
+#: ../extensions/alternate-tab/extension.js:321
+msgid "Cancel"
+msgstr "Peru"
+
+#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:1
+msgid "Ask the user for a default behaviour if true."
+msgstr ""
+
+#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:2
+msgid "Indicates if Alternate Tab is newly installed"
+msgstr ""
+
+#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:3
+msgid ""
+"Sets the Alt-Tab behaviour. Possible values are: native, all_thumbnails and "
+"workspace_icons."
+msgstr ""
+
+#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:4
+msgid "The alt tab behaviour."
+msgstr ""
+
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
+msgid ""
+"A list of strings, each containing an application id (desktop file name), "
+"followed by a colon and the workspace number"
+msgstr ""
+
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+msgid "Application and workspace list"
+msgstr ""
+
+#: ../extensions/dock/extension.js:569
+msgid "Drag here to add favorites"
+msgstr "Raahaa tähän lisätäksesi suosikkeihin"
+
+#: ../extensions/dock/extension.js:902
+msgid "New Window"
+msgstr "Uusi ikkuna"
+
+#: ../extensions/dock/extension.js:904
+msgid "Quit Application"
+msgstr "Lopeta ohjelma"
+
+#: ../extensions/dock/extension.js:909
+msgid "Remove from Favorites"
+msgstr "Poista suosikeista"
+
+#: ../extensions/dock/extension.js:910
+msgid "Add to Favorites"
+msgstr "Lisää suosikkeihin"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:1
+msgid "Autohide duration"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:2
+msgid "Autohide effect"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:3
+msgid "Enable/disable autohide"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:4
+msgid "Icon size"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:5
+msgid "Position of the dock"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:6
+msgid "Sets icon size of the dock."
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:7
+msgid ""
+"Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:8
+msgid ""
+"Sets the position of the dock in the screen. Allowed values are 'right' or "
+"'left'"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:9
+msgid "Sets the time duration of the autohide effect."
+msgstr ""
+
+#: ../extensions/example/extension.js:11
+msgid "Hello, world!"
+msgstr "Hei, maailma!"
+
+#: ../extensions/gajim/extension.js:227
+#, c-format
+msgid "%s is away."
+msgstr "%s on poissa."
+
+#: ../extensions/gajim/extension.js:230
+#, c-format
+msgid "%s is offline."
+msgstr "%s on poissa linjoilta."
+
+#: ../extensions/gajim/extension.js:233
+#, c-format
+msgid "%s is online."
+msgstr "%s on linjoilla."
+
+#: ../extensions/gajim/extension.js:236
+#, c-format
+msgid "%s is busy."
+msgstr "%s on kiireinen."
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+msgid ""
+"If true, place window captions on top the respective thumbnail, overriding "
+"shell default of placing it at the bottom. Changing this setting requires "
+"restarting the shell to have any effect."
+msgstr ""
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+msgid "Place window captions on top"
+msgstr ""
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+msgid ""
+"The algorithm used to layout thumbnails in the overview. 'grid' to use the "
+"default grid based algorithm, 'natural' to use another one that reflects "
+"more the position and size of the actual window"
+msgstr ""
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+msgid ""
+"Try to use more screen for placing window thumbnails by adapting to screen "
+"aspect ratio, and consolidating them further to reduce the bounding box. "
+"This setting applies only with the natural placement strategy."
+msgstr ""
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:5
+msgid "Use more screen for windows"
+msgstr ""
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:6
+msgid "Window placement strategy"
+msgstr ""
+
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
+msgstr ""
+
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+msgid "Theme name"
+msgstr ""
+
+#: ../extensions/xrandr-indicator/extension.js:26
+msgid "Normal"
+msgstr "Tavallinen"
+
+#: ../extensions/xrandr-indicator/extension.js:27
+msgid "Left"
+msgstr "Vasen"
+
+#: ../extensions/xrandr-indicator/extension.js:28
+msgid "Right"
+msgstr "Oikea"
+
+#: ../extensions/xrandr-indicator/extension.js:29
+msgid "Upside-down"
+msgstr "Ylösalaisin"
+
+#: ../extensions/xrandr-indicator/extension.js:78
+msgid "Configure display settings..."
+msgstr "Määritä näytön asetukset…"
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,56 +7,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2011-09-17 09:54+0000\n"
-"PO-Revision-Date: 2011-09-17 17:14+0100\n"
+"POT-Creation-Date: 2011-11-28 19:18+0000\n"
+"PO-Revision-Date: 2011-12-02 16:26+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"

-#: ../extensions/alternative-status-menu/extension.js:44
+#: ../extensions/alternative-status-menu/extension.js:45
 msgid "Notifications"
 msgstr "Obvestila"

-#: ../extensions/alternative-status-menu/extension.js:52
+#: ../extensions/alternative-status-menu/extension.js:53
 msgid "Online Accounts"
 msgstr "Spletni računi"

-#: ../extensions/alternative-status-menu/extension.js:56
+#: ../extensions/alternative-status-menu/extension.js:57
 msgid "System Settings"
 msgstr "Sistemske nastavitve"

-#: ../extensions/alternative-status-menu/extension.js:63
+#: ../extensions/alternative-status-menu/extension.js:64
 msgid "Lock Screen"
 msgstr "Zakleni zaslon"

-#: ../extensions/alternative-status-menu/extension.js:68
+#: ../extensions/alternative-status-menu/extension.js:69
 msgid "Switch User"
 msgstr "Preklopi uporabnika"

-#: ../extensions/alternative-status-menu/extension.js:73
+#: ../extensions/alternative-status-menu/extension.js:74
 msgid "Log Out..."
 msgstr "Odjava ..."

-#: ../extensions/alternative-status-menu/extension.js:81
+#: ../extensions/alternative-status-menu/extension.js:82
 msgid "Suspend"
 msgstr "V pripravljenost"

-#: ../extensions/alternative-status-menu/extension.js:87
+#: ../extensions/alternative-status-menu/extension.js:88
 msgid "Hibernate"
 msgstr "V mirovanje"

-#: ../extensions/alternative-status-menu/extension.js:93
+#: ../extensions/alternative-status-menu/extension.js:94
 msgid "Power Off..."
 msgstr "Izklopi ..."

-#: ../extensions/alternate-tab/extension.js:44
+#: ../extensions/alternate-tab/extension.js:50
+#| msgid ""
+#| "This is the first time you use the Alternate Tab extension. \n"
+#| "Please choose your preferred behaviour:\n"
+#| "\n"
+#| "All & Thumbnails:\n"
+#| "    This mode presents all applications from all workspaces in one "
+#| "selection \n"
+#| "    list. Instead of using the application icon of every window, it uses "
+#| "small \n"
+#| "    thumbnails resembling the window itself. \n"
+#| "\n"
+#| "Workspace & Icons:\n"
+#| "    This mode let's you switch between the applications of your current \n"
+#| "    workspace and gives you additionally the option to switch to the last "
+#| "used \n"
+#| "    application of your previous workspace. This is always the last "
+#| "symbol in \n"
+#| "    the list and is segregated by a separator/vertical line if "
+#| "available. \n"
+#| "    Every window is represented by its application icon.  \n"
+#| "\n"
+#| "Native:\n"
+#| "    This mode is the native GNOME 3 behaviour or in other words: "
+#| "Clicking \n"
+#| "    native switches the Alternate Tab extension off. \n"
 msgid ""
 "This is the first time you use the Alternate Tab extension. \n"
 "Please choose your preferred behaviour:\n"
@@ -73,12 +98,11 @@ msgid ""
 "    the list and is segregated by a separator/vertical line if available. \n"
 "    Every window is represented by its application icon.  \n"
 "\n"
-"Native:\n"
-"    This mode is the native GNOME 3 behaviour or in other words: Clicking \n"
-"    native switches the Alternate Tab extension off. \n"
+"If you whish to revert to the default behavior for the Alt-Tab switcher, just\n"
+"disable the extension from extensions.gnome.org or the Advanced Settings application."
 msgstr ""
 "To je prvi zagon razširitve Alternate Tab. \n"
-"Izberite prednostno obnašanje:\n"
+"Izberite želen način delovanja:\n"
 "\n"
 "Vse in sličice:\n"
 "    Ta način prikazuje vse programe vseh delovnih površin ne enem izbirnem\n"
@@ -92,27 +116,22 @@ msgstr ""
 "    vodoravno črto. \n"
 "    Vsako okno je prikazano z ikono programa.  \n"
 "\n"
-"Lastni:\n"
-"    Ta način je lasten načinu obnašanja namizja GNOME 3: Izbor te možnosti \n"
-"    onemogoči razširitev Alternate Tab. \n"
+"V kolikor želite povrniti delovanje na privzeti način preklopnika Alt+Tab,\n"
+"enostavno onemogočite to razširitev med naprednimi nastavitvami."

-#: ../extensions/alternate-tab/extension.js:269
+#: ../extensions/alternate-tab/extension.js:291
 msgid "Alt Tab Behaviour"
 msgstr "Obnašanje tipk Alt-Tab"

-#: ../extensions/alternate-tab/extension.js:285
+#: ../extensions/alternate-tab/extension.js:307
 msgid "All & Thumbnails"
 msgstr "Vse in sličice"

-#: ../extensions/alternate-tab/extension.js:292
+#: ../extensions/alternate-tab/extension.js:314
 msgid "Workspace & Icons"
 msgstr "Delovne površine in ikone"

-#: ../extensions/alternate-tab/extension.js:299
-msgid "Native"
-msgstr "Lastni"
-
-#: ../extensions/alternate-tab/extension.js:306
+#: ../extensions/alternate-tab/extension.js:321
 msgid "Cancel"
 msgstr "Prekliči"

@@ -140,23 +159,23 @@ msgstr "Seznam nizov z določilom ID programa (namizno ime programa), ki mu sled
 msgid "Application and workspace list"
 msgstr "Seznam programov in delovnih površin"

-#: ../extensions/dock/extension.js:486
+#: ../extensions/dock/extension.js:569
 msgid "Drag here to add favorites"
 msgstr "Potegnite sem, za dodajanje med priljubljene"

-#: ../extensions/dock/extension.js:820
+#: ../extensions/dock/extension.js:902
 msgid "New Window"
 msgstr "Novo okno"

-#: ../extensions/dock/extension.js:822
+#: ../extensions/dock/extension.js:904
 msgid "Quit Application"
 msgstr "Končaj program"

-#: ../extensions/dock/extension.js:827
+#: ../extensions/dock/extension.js:909
 msgid "Remove from Favorites"
 msgstr "Odstrani iz priljubljenih"

-#: ../extensions/dock/extension.js:828
+#: ../extensions/dock/extension.js:910
 msgid "Add to Favorites"
 msgstr "Dodaj med priljubljene"

@@ -272,6 +291,9 @@ msgstr "Zgoraj-navzdol"
 msgid "Configure display settings..."
 msgstr "Nastavitve zaslona ..."

+#~ msgid "Native"
+#~ msgstr "Lastni"
+
 #~ msgid "Available"
 #~ msgstr "Na voljo"
Author	SHA1	Message	Date
Giovanni Campagna	8349925139	Bump version for 3.2.3 Not a GNOME Shell release, but it's useful to tag mass-uploads of extensions (expecially for translations).	2011-12-16 22:11:51 +01:00
Giovanni Campagna	374abed8a1	all: remove all GSettings usage Since GSettings is not supported in extensions in 3.2, all settings have been replaced by constants in JS files (except for user-theme, whose only purpose is to actually bridge GSettings to the shell). Customizations are still supported in master, and distributions packaging these extensions for system-wide install may consider reverting this bug.	2011-12-16 22:11:12 +01:00
Norman L. Smith	dd6b0dc7a9	Changed workspace indicator to use less panel space by displaying only high-lighted workspace number on panel. Signed-off-by: Norman L. Smith <nls1729@gmail.com>	2011-12-14 00:07:33 +01:00
Giovanni Campagna	85620c0adb	alternate-tab: use 3.2 binding names In 3.2 branch, the GSettings migration hasn't happened yet, so we need to use underscores in binding names. Also, uncomment some code that handles keyPressEvent, as the core shell code causes crashes in all_thumbnails, sometimes.	2011-12-11 15:36:17 +01:00
Giovanni Campagna	a585fa111a	alternative-status-menu: disconnect signals on enable() too We need to disconnect the signals every time we destroy the IMStatusChooserItem, that is, both at enable() and at disable(). (In particular, disconnecting at disable() doesn't matter much, since those signals are emitted only very early after login - which is why enabling in the middle of session worked before)	2011-12-08 01:00:50 +01:00
Bastien Durel	0d15e68904	correct init() function https://bugzilla.gnome.org/show_bug.cgi?id=665691	2011-12-07 15:07:07 +01:00
Giovanni Campagna	a6c379f5ed	alternative-status-menu: disconnect signals for IMStatusChooserItem In master shell, calling destroy does this automatically, but the patch was not backported, so we need to hack around this here.	2011-12-07 15:07:07 +01:00
Giovanni Campagna	60efccc4ad	windowsNavigator: fix switching with azerty keyboards Some keyboard layouts (in particular, azerty / french) require pressing shift to obtain numerals. Therefore we should not cancel the switch when shift is pressed. Also, we should accept indifferently left or right modifiers.	2011-12-07 15:07:07 +01:00
Giovanni Campagna	6f4e615999	workspace-indicator: fix removing the last workspace When closing the last workspace, we could access an invalid item, causing a TypeError and therefore leaving a stale "Workspace 2" label.	2011-12-07 15:07:07 +01:00
Giovanni Campagna	2794d9d9d7	drive-menu, example: import GLib before referencing it	2011-12-07 15:07:07 +01:00
Ville-Pekka Vainio	10d4458ef2	Add Finnish translation and fi to LINGUAS	2011-12-04 00:47:34 +02:00
Jorge González	7900ed69c4	Updated Spanish translation	2011-12-03 12:25:19 +01:00
Matej Urbančič	96a79e87f2	Updated Slovenian translation	2011-12-02 16:46:55 +01:00
Marek Černocký	aad6bad1a6	Updated Czech translation	2011-12-01 13:20:48 +01:00