Bump version to 3.3.2

To go with GNOME Shell 3.3.2, bump configure.ac, update NEWS and mark all extensions to be only compatible with the unstable release.
alternate-tab: update for mutter API change
2011-11-22 09:11:46 +01:00 · 2011-11-22 09:11:22 +01:00 · 2011-11-22 08:50:25 +01:00 · 2011-11-20 00:41:51 +01:00 · 2011-11-20 00:40:20 +01:00 · 2011-11-19 16:54:20 +01:00
47 changed files with 496 additions and 777 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

 SUBDIRS = extensions po

+EXTRA_DIST = lib/convenience.js
+
 DISTCHECK_CONFIGURE_FLAGS = --enable-extensions=all

 include include.mk
--- a/20
+++ b/20
@@ -1,18 +1,10 @@
-3.2.2
+3.3.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
-  (for schema files gnome-shell master is needed)
-* cherry-picked some bug fixes
-* cherry-picked translations
+* all extensions are now self-contained, including l10n and settings
+* introduce a convenience module that can be shared among all extensions
+* you can know build an installable zip file with make zip-file
+* apps-menu no longer shows NoDisplay apps
+* alternative-status-menu, alternate-tab: fix for master shell

 3.2.1
 =====
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.2.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+AC_INIT([gnome-shell-extensions],[3.3.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])

 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
--- a/extension.mk
+++ b/extension.mk
@@ -1,7 +1,7 @@
 include $(top_srcdir)/include.mk

 dist_extension_DATA = extension.js stylesheet.css
-nodist_extension_DATA = metadata.json $(EXTRA_EXTENSION)
+nodist_extension_DATA = metadata.json $(top_srcdir)/lib/convenience.js $(EXTRA_EXTENSION)

 EXTRA_DIST = metadata.json.in

--- a/extensions/alternate-tab/Makefile.am
+++ b/extensions/alternate-tab/Makefile.am
@@ -1,3 +1,14 @@
 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
@@ -5,18 +5,19 @@
 * of the gnome-shell source code
 */

-const AltTab = imports.ui.altTab;
 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;
-const ModalDialog = imports.ui.modalDialog;
+const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
+
+const AltTab = imports.ui.altTab;
+const Main = imports.ui.main;
+const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
 const WindowManager = imports.ui.windowManager;

@@ -24,23 +25,25 @@ const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = function(e) { return e };

+let settings;
+
 const POPUP_DELAY_TIMEOUT = 150; // milliseconds

-// 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 SETTINGS_SCHEMA = 'org.gnome.shell.extensions.alternate-tab';
+const SETTINGS_BEHAVIOUR_KEY = 'behaviour';
+const SETTINGS_FIRST_TIME_KEY = 'first-time';

 const MODES = {
-    all_thumbnails: function(shellwm, binding, mask, window, backwards) {
+    all_thumbnails: function(display, binding, mask, window, backwards) {
        let tabPopup = new AltTabPopup2();

        if (!tabPopup.show(backwards, binding, mask))
            tabPopup.destroy();
    },

-    workspace_icons: function(shellwm, binding, mask, window, backwards) {
-        if (shellwm._workspaceSwitcherPopup != null)
-            shellwm._workspaceSwitcherPopup.actor.hide();
+    workspace_icons: function(display, binding, mask, window, backwards) {
+        if (Main.wm._workspaceSwitcherPopup)
+            Main.wm._workspaceSwitcherPopup.actor.hide();

        let tabPopup = new AltTabPopupW();
        if (!tabPopup.show(backwards, binding, mask))
@@ -267,8 +270,6 @@ 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();
 }
@@ -331,9 +332,8 @@ AltTabSettingsDialog.prototype = {
    },

    setBehaviour: function(behaviour) {
-           this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
-           this._settings.set_string(SETTINGS_BEHAVIOUR_KEY, behaviour);
-           this._settings.set_boolean(SETTINGS_FIRST_TIME_KEY, false);
+           settings.set_string(SETTINGS_BEHAVIOUR_KEY, behaviour);
+           settings.set_boolean(SETTINGS_FIRST_TIME_KEY, false);
    }
 };

@@ -465,6 +465,7 @@ 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);
@@ -510,6 +511,7 @@ AltTabPopup2.prototype = {

        return true;
    },
+*/

    _sortWindows : function(win1,win2) {
        let t1 = win1.get_user_time();
@@ -596,26 +598,34 @@ WindowList.prototype = {
 };

 function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
+    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
+    me.convenience.initTranslations(metadata);
+    settings = me.convenience.getSettings(metadata, 'alternate-tab');
 }

-function doAltTab(shellwm, binding, mask, window, backwards) {
-    let behaviour = BEHAVIOUR;
-    if(behaviour in MODES) {
-        MODES[behaviour](shellwm, binding, mask, window, backwards);
+function doAltTab(display, screen, window, binding) {
+    if(settings.get_boolean(SETTINGS_FIRST_TIME_KEY)) {
+        new AltTabSettingsDialog().open();
+    } else {
+        let behaviour = settings.get_string(SETTINGS_BEHAVIOUR_KEY);
+        if(behaviour in MODES) {
+            let modifiers = binding.get_modifiers()
+            let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
+            MODES[behaviour](display, binding.get_name(), binding.get_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);
+    Meta.keybindings_set_custom_handler('switch-windows', doAltTab);
+    Meta.keybindings_set_custom_handler('switch-group', doAltTab);
+    Meta.keybindings_set_custom_handler('switch-windows-backward', doAltTab);
+    Meta.keybindings_set_custom_handler('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));
+    Meta.keybindings_set_custom_handler('switch-windows', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    Meta.keybindings_set_custom_handler('switch-group', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    Meta.keybindings_set_custom_handler('switch-windows-backward', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    Meta.keybindings_set_custom_handler('switch-group-backward', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
 }
--- a/extensions/alternate-tab/metadata.json.in
+++ b/extensions/alternate-tab/metadata.json.in
@@ -3,6 +3,6 @@
 "name": "AlternateTab",
 "description": "A replacement for Alt-Tab, allows to cycle between windows and does not group by application",
 "original-authors": [  "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
-"shell-version": [ "@shell_current@", "3.2" ],
+"shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- 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
@@ -0,0 +1,18 @@
+<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
@@ -1,5 +1,4 @@
 /* -*- mode: js2 - indent-tabs-mode: nil - js2-basic-offset: 4 -*- */
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;

@@ -100,14 +99,8 @@ function createSubMenu() {

 // Put your extension initialization code here
 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);
+    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
+    me.convenience.initTranslations(metadata);
 }

 function reset(statusMenu) {
@@ -115,18 +108,12 @@ function reset(statusMenu) {
    statusMenu._updateLogout();
    statusMenu._updateLockScreen();

-    statusMenu._presence.getStatus(Lang.bind(statusMenu, statusMenu._updateSwitch));
-
-    // HACK! Obtain the IMStatusChooserItem and force a _updateUser
-    statusMenu.menu._getMenuItems()[0]._updateUser();
+    statusMenu._updateSwitch(statusMenu._presence.status);
 }

 function enable() {
    let statusMenu = Main.panel._statusArea.userMenu;
-
-    predestroy(statusMenu);
    statusMenu.menu.removeAll();
-
    createSubMenu.call(statusMenu);
    reset(statusMenu);
 }
@@ -134,10 +121,7 @@ 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/alternative-status-menu/metadata.json.in
+++ b/extensions/alternative-status-menu/metadata.json.in
@@ -2,6 +2,6 @@
 "uuid": "@uuid@",
 "name": "Alternative Status Menu",
 "description": "Replaces GNOME Shell Status Menu with one showing Suspend/Hibernate and Power Off as separate items",
- "shell-version": [ "@shell_current@", "3.2" ],
+ "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/apps-menu/metadata.json.in
+++ b/extensions/apps-menu/metadata.json.in
@@ -2,6 +2,6 @@
 "uuid": "@uuid@",
 "name": "Applications Menu",
 "description": "Add a gnome 2.x style menu for applications",
-"shell-version": [ "@shell_current@", "3.2" ],
+"shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/auto-move-windows/Makefile.am
+++ b/extensions/auto-move-windows/Makefile.am
@@ -1,3 +1,14 @@
 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,9 +11,10 @@ const St = imports.gi.St;

 const Main = imports.ui.main;

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

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

 WindowMover.prototype = {
    _init: function() {
+        this._settings = settings;
        this._windowTracker = Shell.WindowTracker.get_default();

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

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

        let app = this._windowTracker.get_window_app(window);
        if (!app) {
@@ -79,8 +81,10 @@ WindowMover.prototype = {
 let prevCheckWorkspaces;
 let winMover;

-function init(extensionMeta) {
-    // do nothing here
+function init(metadata) {
+    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
+    me.convenience.initTranslations(metadata);
+    settings = me.convenience.getSettings(metadata, 'auto-move-windows');
 }

 function enable() {
--- a/extensions/auto-move-windows/metadata.json.in
+++ b/extensions/auto-move-windows/metadata.json.in
@@ -2,7 +2,7 @@
 "uuid": "@uuid@",
 "name": "Auto Move Windows",
 "description": "Move applications to specific workspaces when they create windows",
- "shell-version": [ "@shell_current@", "3.2" ],
+ "shell-version": [ "@shell_current@" ],
 "original-authors": [ "alessandro.crismani@gmail.com", "thomas.bouffon@gmail.com" ],
 "url": "@url@"
 }
--- 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
@@ -0,0 +1,10 @@
+<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,3 +1,14 @@
 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,6 +25,16 @@ 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';
+
+let _me, _metadata;
+
 //hide
 //const autohide_animation_time = 0.3;

@@ -40,15 +50,6 @@ 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,11 +341,15 @@ Dock.prototype = {
        this._favorites = [];

        // Load Settings
-        position = DOCK_POSITION;
-        dockicon_size = DOCK_SIZE;
-        hideDock = hideable = DOCK_AUTOHIDE;
-        hideEffect = DOCK_EFFECTHIDE;
-        autohide_animation_time = DOCK_AUTOHIDE_ANIMATION_TIME;
+        this._settings = _me.convenience.getSettings(_metadata, 'dock');
+        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);
+

        this._spacing = 4;
        this._item_size = dockicon_size;
@@ -378,6 +383,72 @@ 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));

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

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

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

    _disableHideDock: function (){
@@ -863,8 +935,10 @@ DockIconMenu.prototype = {
    }
 }

-function init(extensionMeta) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([extensionMeta.path, 'locale']));
+function init(metadata) {
+    _metadata = metadata;
+    _me = imports.ui.extensionSystem.extensions[metadata.uuid];
+    _me.convenience.initTranslations(metadata);
 }

 let dock;
--- a/extensions/dock/metadata.json.in
+++ b/extensions/dock/metadata.json.in
@@ -3,6 +3,6 @@
 "name": "Dock",
 "description": "A dock for the GNOME Shell -- displays favorite and running applications",
 "original-author": "tclaesson@gmail.com",
-"shell-version": [ "@shell_current@", "3.2" ],
+"shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
+++ b/extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
@@ -0,0 +1,38 @@
+<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,5 +1,4 @@
 // Drive menu extension
-const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const St = imports.gi.St;
@@ -92,7 +91,8 @@ DriveMenu.prototype = {

 // Put your extension initialization code here
 function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
+    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
+    me.convenience.initTranslations(metadata);
 }

 let _indicator;
--- a/extensions/drive-menu/metadata.json.in
+++ b/extensions/drive-menu/metadata.json.in
@@ -2,6 +2,6 @@
 "uuid": "@uuid@",
 "name": "Removable Drive Menu",
 "description": "A status menu for accessing and unmounting removable devices",
- "shell-version": [ "@shell_current@", "3.2" ],
+ "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/example/extension.js
+++ b/extensions/example/extension.js
@@ -1,5 +1,4 @@
 // 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;

@@ -20,7 +19,8 @@ function _showHello() {
 function init(metadata) {
    log ('Example extension initalized');

-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
+    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
+    me.convenience.initTranslations(metadata);
 }

 let signalId;
--- a/extensions/example/metadata.json.in
+++ b/extensions/example/metadata.json.in
@@ -2,6 +2,6 @@
 "uuid": "@uuid@",
 "name": "Hello, World!",
 "description": "An example extension to show how it works. Shows Hello, world when clicking on the top panel.",
- "shell-version": [ "@shell_current@", "3.2" ],
+ "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/gajim/metadata.json.in
+++ b/extensions/gajim/metadata.json.in
@@ -2,6 +2,6 @@
 "uuid": "@uuid@",
 "name": "Gajim IM integration",
 "description": "Display Gajim incoming chats as notifications in the Shell message tray.",
- "shell-version": [ "@shell_current@", "3.2" ],
+ "shell-version": [ "@shell_current@" ],
 "url": "http://base-art.net"
 }
--- a/extensions/native-window-placement/Makefile.am
+++ b/extensions/native-window-placement/Makefile.am
@@ -1,3 +1,14 @@
 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,11 +25,7 @@ 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 */
+let _me, _metadata;

 // testing settings for natural window placement strategy:
 const WINDOW_PLACEMENT_NATURAL_FILLGAPS = true;                     // enlarge windows at the end to fill gaps         // not implemented yet
@@ -123,8 +119,19 @@ function resetState() {
 function enable() {
    resetState();

-    let placementStrategy = PLACEMENT_STRATEGY;
-    let useMoreScreen = USE_MORE_SCREEN;
+    let settings = _me.convenience.getSettings(_metadata, '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 });

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

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

-function init() {
-    /* do nothing */
+function init(metadata) {
+    _metadata = metadata;
+    _me = imports.ui.extensionSystem.extensions[metadata.uuid];
 }
--- a/extensions/native-window-placement/metadata.json.in
+++ b/extensions/native-window-placement/metadata.json.in
@@ -2,7 +2,7 @@
 "uuid": "@uuid@",
 "name": "Native Window Placement",
 "description": "Arrange windows in overview in a more native way",
- "shell-version": [ "@shell_current@", "3.2" ],
+ "shell-version": [ "@shell_current@" ],
 "url": "@url@",
 "original-authors": [ "wepmaschda@gmx.de" ]
 }
--- 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
@@ -0,0 +1,26 @@
+<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/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -114,7 +114,8 @@ PlacesMenu.prototype = {


 function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
+    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
+    me.convenience.initTranslations(metadata);
 }

 let _indicator;
--- a/extensions/places-menu/metadata.json.in
+++ b/extensions/places-menu/metadata.json.in
@@ -2,6 +2,6 @@
 "uuid": "@uuid@",
 "name": "Places Status Indicator",
 "description": "Add a systems status menu for quickly navigating places in the system",
-"shell-version": [ "@shell_current@", "3.2" ],
+"shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/systemMonitor/metadata.json.in
+++ b/extensions/systemMonitor/metadata.json.in
@@ -1,5 +1,5 @@
 {
-    "shell-version": ["@shell_current@", "3.2" ],
+    "shell-version": ["@shell_current@" ],
    "uuid": "@uuid@",
    "original-author": "zaspire@rambler.ru",
    "name": "SystemMonitor",
--- a/extensions/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -10,15 +10,16 @@ const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.user-theme';
 const SETTINGS_KEY = 'name';

 function ThemeManager() {
-    this._init();
+    this._init.apply(this, arguments);
 }

 ThemeManager.prototype = {
-    _init: function() {
+    _init: function(metadata) {
+        let me = imports.ui.extensionSystem.extensions[metadata.uuid];
+        this._settings = me.convenience.getSettings(metadata, 'user-theme');
    },

    enable: function() {
-        this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
        this._changedId = this._settings.connect('changed::'+SETTINGS_KEY, Lang.bind(this, this._changeTheme));
        this._changeTheme();
    },
@@ -68,5 +69,5 @@ ThemeManager.prototype = {


 function init(metadata) {
-    return new ThemeManager();
+    return new ThemeManager(metadata);
 }
--- a/extensions/user-theme/metadata.json.in
+++ b/extensions/user-theme/metadata.json.in
@@ -2,8 +2,7 @@
 "uuid": "@uuid@",
 "name": "User Themes",
 "description": "Load shell themes from user directory",
- "shell-version": [ "@shell_current@", "3.2" ],
- "localedir": "@LOCALEDIR@",
+ "shell-version": [ "@shell_current@" ],
 "original-authors": [ "john.stowers@gmail.com" ],
 "url": "@url@"
 }
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -127,21 +127,15 @@ function enable() {
    workViewInjections['_hideWorkspacesTooltips'] = undefined;

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

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

 function init() {
    /* do nothing */
-}
+}
--- a/extensions/windowsNavigator/metadata.json.in
+++ b/extensions/windowsNavigator/metadata.json.in
@@ -1,5 +1,5 @@
 {
-    "shell-version": ["@shell_current@", "3.2" ],
+    "shell-version": ["@shell_current@" ],
    "uuid": "@uuid@",
    "original-author": "zaspire@rambler.ru",
    "name": "windowNavigator",
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -37,7 +37,6 @@ WorkspaceIndicator.prototype = {

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

 	_updateIndicator: function() {
@@ -51,32 +50,27 @@ 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._currentWorkspace = global.screen.get_active_workspace().index();
+		this._workspaceSection.removeAll();
+		this.workspacesItems = [];

-	    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);
+			}));
+		}

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

 	_activate : function (index) {
--- a/extensions/workspace-indicator/metadata.json.in
+++ b/extensions/workspace-indicator/metadata.json.in
@@ -2,7 +2,7 @@
    "uuid": "@uuid@",
    "name": "Workspace Indicator",
    "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one",
-    "shell-version": [ "@shell_current@", "3.2" ],
+    "shell-version": [ "@shell_current@" ],
    "original-authors": [ "erick.red@gmail.com" ],
    "url": "@url@"
 }
--- a/extensions/workspace-indicator/stylesheet.css
+++ b/extensions/workspace-indicator/stylesheet.css
@@ -2,8 +2,3 @@
 	min-width: 25px;
 	font-size: 10pt;
 }
-.panel-workspace-indicator {
-	padding: 0 8px;
-	background-color: rgba(200, 200, 200, .5);
-	border: 1px solid #cccccc;
-}
--- a/extensions/xrandr-indicator/extension.js
+++ b/extensions/xrandr-indicator/extension.js
@@ -137,7 +137,8 @@ Indicator.prototype = {


 function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', GLib.build_filenamev([metadata.path, 'locale']));
+    let me = imports.ui.extensionSystem.extensions[metadata.uuid];
+    me.convenience.initTranslations(metadata);
 }

 let _indicator;
--- a/extensions/xrandr-indicator/metadata.json.in
+++ b/extensions/xrandr-indicator/metadata.json.in
@@ -2,6 +2,6 @@
 "uuid": "@uuid@",
 "name": "Monitor Status Indicator",
 "description": "Add a systems status menu for rotating monitors (overrides what is currently provided by gnome-settings-daemon)",
-"shell-version": [ "@shell_current@", "3.2" ],
+"shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/lib/convenience.js
+++ b/lib/convenience.js
@@ -0,0 +1,17 @@
+const Gettext = imports.gettext;
+const Gio = imports.gi.Gio;
+
+function initTranslations(metadata) {
+    let localeDir = metadata.dir.get_child('locale').get_path();
+    Gettext.bindtextdomain('gnome-shell-extensions', localeDir);
+}
+
+function getSettings(metadata, extension_id) {
+    let schemaDir = metadata.dir.get_child('schemas').get_path();
+    let schemaSource = Gio.SettingsSchemaSource.new_from_directory(schemaDir,
+								  Gio.SettingsSchemaSource.get_default(),
+								  false);
+    let schema = schemaSource.lookup('org.gnome.shell.extensions.' + extension_id, false);
+    return new Gio.Settings({ settings_schema: schema });
+}
+								  
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -7,7 +7,6 @@ en_GB
 es
 eu
 fa
-fi
 fr
 gl
 he
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,13 @@
 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,145 +1,66 @@
 # 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 3.2\n"
+"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-11-28 19:18+0000\n"
-"PO-Revision-Date: 2011-11-22 11:43+0100\n"
+"POT-Creation-Date: 2011-04-16 16:32+0000\n"
+"PO-Revision-Date: 2011-04-17 11:10+0200\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:45
-msgid "Notifications"
-msgstr "Oznamování"
-
-#: ../extensions/alternative-status-menu/extension.js:53
-msgid "Online Accounts"
-msgstr "Účty on-line"
-
-#: ../extensions/alternative-status-menu/extension.js:57
-msgid "System Settings"
-msgstr "Nastavení systému"
-
-#: ../extensions/alternative-status-menu/extension.js:64
-msgid "Lock Screen"
-msgstr "Zamknout obrazovku"
-
-#: ../extensions/alternative-status-menu/extension.js:69
-msgid "Switch User"
-msgstr "Přepnout uživatele"
-
-#: ../extensions/alternative-status-menu/extension.js:74
-msgid "Log Out..."
-msgstr "Odhlásit se…"
-
-#: ../extensions/alternative-status-menu/extension.js:82
-msgid "Suspend"
-msgstr "Uspat do paměti"
-
-#: ../extensions/alternative-status-menu/extension.js:88
+#: ../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:94
+#: ../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: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
+msgid "Lock Screen"
+msgstr "Zamknout obrazovku"
+
+#: ../extensions/alternative-status-menu/extension.js:80
+msgid "Switch User"
+msgstr "Přepnout uživatele"
+
+#: ../extensions/alternative-status-menu/extension.js:85
+msgid "Log Out..."
+msgstr "Odhlásit se…"
+
+#: ../extensions/alternative-status-menu/extension.js:100
 msgid "Power Off..."
 msgstr "Vypnout…"

-#: ../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 ""
-"Právě jste poprvé použili rozšíření Alternate Tab.\n"
-"Vyberte si vámi upřednostňované chování:\n"
-"\n"
-"Vše a náhledy:\n"
-"    Tento režim předkládá všechny aplikace ze všech pracovních ploch\n"
-"    v jediném výběrovém seznamu. Místo ikon aplikací pro každé z oken\n"
-"    používá malé náhledy vytvořené přímo podle oken.\n"
-"\n"
-"Pracovní plocha a ikony:\n"
-"    Tento režim vám umožňuje přepínat mezi aplikacemi vaší aktuální "
-"pracovní\n"
-"    plochy a poskytuje vám navíc možnost přepnout se na naposledy použitou\n"
-"    aplikaci vaší předchozí pracovní plochy. Jde vždy o poslední symbol v "
-"seznamu\n"
-"    a pokud je k dispozici, je oddělen oddělovačem/svislou čárou. Každé z "
-"oken\n"
-"    je prezentováno ikonou příslušné aplikace.\n"
-"\n"
-"Jestliže si přejete vrátit výchozí chování přepínače Alt-Tab, jednoduše "
-"rozšíření\n"
-"zakažte v extensions.gnome.org nebo v aplikaci Pokročilá nastavení."
-
-#: ../extensions/alternate-tab/extension.js:291
-msgid "Alt Tab Behaviour"
-msgstr "Chování Alt Tab"
-
-#: ../extensions/alternate-tab/extension.js:307
-msgid "All & Thumbnails"
-msgstr "Vše a náhledy"
-
-#: ../extensions/alternate-tab/extension.js:314
-msgid "Workspace & Icons"
-msgstr "Pracovní plocha a ikony"
-
-#: ../extensions/alternate-tab/extension.js:321
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: ../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 "Když je zapnuto, dotázat se uživatele na výchozí chování."
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:2
-msgid "Indicates if Alternate Tab is newly installed"
-msgstr "Signalizuje, když je rozšíření Alternate Tab nově nainstalováno"
-
-#: ../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 ""
-"Nastavuje chování klávesové zkratky Alt-Tab. Možné hodnoty jsou: native "
-"(přirozené), all_thumbnails (vše a náhledy) a workspace_icons (pracovní "
-"plocha a ikony)."
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:4
-msgid "The alt tab behaviour."
-msgstr "Chování klávesové zkratky alt tab."
-
 #: ../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), "
@@ -152,135 +73,50 @@ msgstr ""
 msgid "Application and workspace list"
 msgstr "Seznam aplikací a pracovních ploch"

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

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

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

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

-#: ../extensions/dock/extension.js:910
+#: ../extensions/dock/extension.js:425
 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:227
+#: ../extensions/gajim/extension.js:219
 #, c-format
 msgid "%s is away."
 msgstr "%s je pryč."

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

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

-#: ../extensions/gajim/extension.js:236
+#: ../extensions/gajim/extension.js:228
 #, 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"
@@ -308,9 +144,3 @@ 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,85 +1,60 @@
 # 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.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011.
 # Jorge González <jorgegonz@svn.gnome.org>, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 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-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"
+"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"
 "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:45
+#: ../extensions/alternative-status-menu/extension.js:44
 msgid "Notifications"
 msgstr "Notificaciones"

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

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

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

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

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

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

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

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

-#: ../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"
+#: ../extensions/alternate-tab/extension.js:44
 msgid ""
 "This is the first time you use the Alternate Tab extension. \n"
 "Please choose your preferred behaviour:\n"
@@ -100,10 +75,9 @@ msgid ""
 "    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."
+"Native:\n"
+"    This mode is the native GNOME 3 behaviour or in other words: Clicking \n"
+"    native switches the Alternate Tab extension off. \n"
 msgstr ""
 "Esta es la primera vez que usa la extensión Alt+Tab. \n"
 "Seleccione el comportamiento preferido:\n"
@@ -125,24 +99,28 @@ msgstr ""
 "    disponible. \n"
 "    Cada ventana se representa con el icono de la aplicación.  \n"
 "\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."
+"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"

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

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

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

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

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

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

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

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

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

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

@@ -290,8 +268,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 ""
@@ -339,9 +317,6 @@ 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
@@ -1,271 +0,0 @@
-# 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,81 +7,56 @@ 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-11-28 19:18+0000\n"
-"PO-Revision-Date: 2011-12-02 16:26+0100\n"
+"POT-Creation-Date: 2011-09-17 09:54+0000\n"
+"PO-Revision-Date: 2011-09-17 17:14+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:45
+#: ../extensions/alternative-status-menu/extension.js:44
 msgid "Notifications"
 msgstr "Obvestila"

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

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

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

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

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

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

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

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

-#: ../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"
+#: ../extensions/alternate-tab/extension.js:44
 msgid ""
 "This is the first time you use the Alternate Tab extension. \n"
 "Please choose your preferred behaviour:\n"
@@ -98,11 +73,12 @@ msgid ""
 "    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."
+"Native:\n"
+"    This mode is the native GNOME 3 behaviour or in other words: Clicking \n"
+"    native switches the Alternate Tab extension off. \n"
 msgstr ""
 "To je prvi zagon razširitve Alternate Tab. \n"
-"Izberite želen način delovanja:\n"
+"Izberite prednostno obnašanje:\n"
 "\n"
 "Vse in sličice:\n"
 "    Ta način prikazuje vse programe vseh delovnih površin ne enem izbirnem\n"
@@ -116,22 +92,27 @@ msgstr ""
 "    vodoravno črto. \n"
 "    Vsako okno je prikazano z ikono programa.  \n"
 "\n"
-"V kolikor želite povrniti delovanje na privzeti način preklopnika Alt+Tab,\n"
-"enostavno onemogočite to razširitev med naprednimi nastavitvami."
+"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"

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

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

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

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

@@ -159,23 +140,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:569
+#: ../extensions/dock/extension.js:486
 msgid "Drag here to add favorites"
 msgstr "Potegnite sem, za dodajanje med priljubljene"

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

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

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

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

@@ -291,9 +272,6 @@ 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	10aec91ebb	Bump version to 3.3.2 To go with GNOME Shell 3.3.2, bump configure.ac, update NEWS and mark all extensions to be only compatible with the unstable release.	2011-11-22 09:11:46 +01:00
Giovanni Campagna	1d22e73a44	alternate-tab: update for mutter API change Main.wm.setKeybindingHandler has been replaced by Meta.keybindings_set_custom_handler, which has also a different signature.	2011-11-22 09:11:22 +01:00
Giovanni Campagna	3981d066e5	apps-menu: skip NoDisplay entries	2011-11-22 08:50:25 +01:00
Giovanni Campagna	fc47063c73	[l10n] Updated Italian translation	2011-11-20 00:41:51 +01:00
Giovanni Campagna	7a6777f703	Remove all references to localedir from metadata.json It is not used anymore, now that translations are bundled with the extension. Also, in the zip files it ended up with my home folder, which is not nice.	2011-11-20 00:40:20 +01:00
Giovanni Campagna	c5d79240fd	Introduce a convenience module for initialization Common code for retrieving translations and GSettings schemas has been factored out into lib/convenience.js, which is part of every extension installation. Since that code relies on renames done at zip file creation time, extensions can no longer be installed with "make install". Instead, one should create the zip file and install it with the tweak-tool. There is also a bash script, local-install.sh, that will install everything in zip-files. Also, since the GSettingsSchemaSource code is not yet in a stable GLib release, extensions using GSettings have seen their stable shell version removed.	2011-11-19 16:54:20 +01:00
Giovanni Campagna	9e4156a706	Add capability to build extension zip-files Now, typing "make zip-file" will create a standard zip-file for each extension, with everything necessary, including translations and GSettings schemas. These files can then be installed with the tweak-tool or uploaded at extensions.gnome.org Based on an earlier patch by Jasper St. Pierre.	2011-11-19 15:42:27 +01:00
Giovanni Campagna	f61af132e7	alternative-status-menu: fix for gnome-shell master gnome-shell has been ported to GDBus, and this changed some of its internal API. Of course, this means that alternative-status-menu no longer works with 3.2.0.	2011-11-19 13:58:28 +01:00