Bump version to 3.0.2

Bump package version to 3.0.2, and at the same time write out all extensions' version explicitly (in case gnome-shell does not release 3.0.2)
Support globally installed themes
2011-05-20 15:48:08 +02:00 · 2011-05-20 15:47:54 +02:00 · 2011-05-20 15:47:54 +02:00 · 2011-05-20 15:43:51 +02:00 · 2011-04-26 01:20:23 +02:00
69 changed files with 224 additions and 4918 deletions
--- a/3
+++ b/3
@@ -1,7 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc. <http://fsf.org>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

--- a/47
+++ b/47
@@ -1,47 +0,0 @@
-3.1.90
-======
-* All extensions have been ported to the new extension
-  system (including live enable/disable)
-* Updated translations
-* xrandr-indicator no longer requires a specific gjs version
-* windowsNavigator fixed for more than 2 workspaces
-
-3.1.4
-=====
-
-* New extension: a menu for changing workspace (workspace-indicator)
-* systemMonitor: lower the requirement on libgtop
-* auto-move-windows: open overview when last window on
-  last workspace is closed
-* dock: implement autohiding, with various configurable
-  effects
-* alternate-tab: more configurable implementations available
-* native-window-placement: don't rearrange the windows when
-  the workspace switcher is shown/hidden
-* update for gnome-shell 3.1.4 API changes
-
-3.1.3
-=====
-
-* New extension: a menu for removable drives (drive-menu
-* New extensions: GNOME 2 like menus for apps and places
-  (apps-menu, places-menu)
-* New extension: additional configurability for the window
-  layout in the overview, including a mechanism similar to
-  KDE4 (native-window-placement)
-* New extension: a message tray indicator for CPU and memory
-  usage (uses libgtop) (systemMonitor)
-* user-theme: fixed resetting theme
-* user-theme: support themes installed in /usr/share/themes
-* alternative-status-menu: ported to gnome-shell master
-* dock: ported to gnome-shell master
-* dock: make position configurable (can be left or right)
-* Updated translations
-
-3.0.2
-=====
-
-* Updated translations.
-* Fixed bug #647386 (reverting of user-theme to default)
-* Fixed bug #647599 (support globally installed themes)
-* Added license and README
--- a/21
+++ b/21
@@ -30,10 +30,6 @@ alternative-status-menu
 status menu with one featuring separate Suspend and Power Off. Adds the ability to
 hibernate as well.

-apps-menu
-
-  Lets you reach an application using gnome 2.x style menu on the panel.
-
 auto-move-windows

  Lets you manage your workspaces more easily, assigning a specific workspace to
@@ -44,10 +40,6 @@ dock

  Shows a dock-style task switcher on the right side of the screen.

-drive-menu
-  Shows a status menu for rapid unmount and power off of external storage devices
-  (i.e. pendrives)
-
 example

  A minimal example illustrating how to write extensions.
@@ -56,19 +48,6 @@ gajim

  Integration with Gajim, a Jabber/XMPP instant messaging client.

-native-window-placement
-
-  An alternative algorithm for layouting the thumbnails in the windows overview, that
-  more closely reflects the actual positions and sizes.
-
-places-menu
-
-  Shows a status Indicator for navigating to Places.
-
-systemMonitor
-
-  An message tray indicator showing CPU and memory loads.
-
 user-theme

  Loads a shell theme from ~/.themes/<name>/gnome-shell.
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.1.90],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+AC_INIT([gnome-shell-extensions],[3.0.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])

 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
@@ -18,13 +18,11 @@ PKG_PROG_PKG_CONFIG([0.22])

 GLIB_GSETTINGS

-dnl keep this in alphabetic order
-dnl by default, install only extensions that do not change completely the shell experience,
-dnl that don't require GSettings and that don't require external packages for typelibs
-dnl (so basically only menus, status icons, search providers, overview tabs, message tray sources, etc.)
-DEFAULT_EXTENSIONS="alternative-status-menu apps-menu dock drive-menu gajim places-menu windowsNavigator workspace-indicator"
-ALL_EXTENSIONS="$DEFAULT_EXTENSIONS alternate-tab auto-move-windows example native-window-placement systemMonitor user-theme xrandr-indicator"
-AC_SUBST(ALL_EXTENSIONS, [$ALL_EXTENSIONS])
+ADDITIONAL_PACKAGES=
+
+dnl keep this in sync with extensions/Makefile.am
+ALL_EXTENSIONS="example alternate-tab xrandr-indicator windowsNavigator auto-move-windows dock user-theme alternative-status-menu gajim"
+DEFAULT_EXTENSIONS="alternate-tab windowsNavigator dock alternative-status-menu"
 AC_ARG_ENABLE([extensions],
 	[AS_HELP_STRING([--enable-extensions],[Space separated list of extensions to enable.
 	The default is to build all extensions that can be installed in the home directory and have no external depedencies.
@@ -36,21 +34,15 @@ if test x$enable_extensions = xall; then
   enable_extensions="$ALL_EXTENSIONS"
 fi

+ADDITIONAL_PACKAGES=
 ENABLED_EXTENSIONS=
 for e in $enable_extensions; do
 	case $e in
-		systemMonitor)
-			PKG_CHECK_MODULES(GTOP, libgtop-2.0 >= 2.28.3,
-					[ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"],
-					[AC_MSG_WARN([libgtop-2.0 not found, disabling systemMonitor])])
-			;;
 		xrandr-indicator)
-			PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= 2.91.6,
-					[ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"],
-					[AC_MSG_WARN([gnome-desktop-3.0 not found, disabling xrandr-indicator])])
+			ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"
+			ADDITIONAL_PACKAGES="$ADDITIONAL_PAGKAGES gnome-desktop-3.0 >= 2.91.6"
 			;;
-dnl		keep this in alphabetic order
-		alternate-tab|alternative-status-menu|apps-menu|auto-move-windows|dock|drive-menu|example|gajim|native-window-placement|places-menu|user-theme|windowsNavigator|workspace-indicator)
+		alternate-tab|example|windowsNavigator|auto-move-windows|dock|user-theme|alternative-status-menu|gajim)
 			ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"
 			;;
 		*)
@@ -60,23 +52,24 @@ done

 AC_SUBST(ENABLED_EXTENSIONS, [$ENABLED_EXTENSIONS])

+dnl We don't really need cflags or libdirs, we just check
+dnl to ensure we don't fail at runtime.
+
+if test "x$ADDITIONAL_PACKAGES" != x; then
+	PKG_CHECK_MODULES(ADDITIONAL, [$ADDITIONAL_PACKAGES])
+fi
+
 dnl Please keep this sorted alphabetically
 AC_CONFIG_FILES([
  extensions/alternate-tab/Makefile
  extensions/alternative-status-menu/Makefile
-  extensions/apps-menu/Makefile
  extensions/auto-move-windows/Makefile
  extensions/dock/Makefile
-  extensions/drive-menu/Makefile
  extensions/example/Makefile
-  extensions/gajim/Makefile
-  extensions/native-window-placement/Makefile
-  extensions/places-menu/Makefile
-  extensions/systemMonitor/Makefile
-  extensions/user-theme/Makefile
  extensions/windowsNavigator/Makefile
-  extensions/workspace-indicator/Makefile
+  extensions/gajim/Makefile
  extensions/xrandr-indicator/Makefile
+  extensions/user-theme/Makefile
  extensions/Makefile
  Makefile
  po/Makefile.in
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,3 +1,3 @@
-DIST_SUBDIRS = $(ALL_EXTENSIONS)
+DIST_SUBDIRS = example alternate-tab xrandr-indicator windowsNavigator auto-move-windows dock user-theme alternative-status-menu gajim

 SUBDIRS = $(ENABLED_EXTENSIONS)
--- 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 = org.gnome.shell.extensions.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
@@ -1,324 +1,16 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-/* most of the code is borrowed from
- * > js/ui/altTab.js <
- * 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 Lang = imports.lang;
-const Main = imports.ui.main;
 const Mainloop = imports.mainloop;
-const ModalDialog = imports.ui.modalDialog;
-const Shell = imports.gi.Shell;
+const Shell= imports.gi.Shell;
 const St = imports.gi.St;
+
+const AltTab=imports.ui.altTab;
+const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 const WindowManager = imports.ui.windowManager;

-const Gettext = imports.gettext.domain('gnome-shell-extensions');
-const _ = Gettext.gettext;
-const N_ = function(e) { return e };
-
-const POPUP_FADE_TIME = 0.1; // seconds
-
-const SETTINGS_SCHEMA = 'org.gnome.shell.extensions.alternate-tab';
-const SETTINGS_BEHAVIOUR_KEY = 'behaviour';
-const SETTINGS_FIRST_TIME_KEY = 'first-time';
-
-const MODES = {
-    native: function() {
-            Main.wm._startAppSwitcher();
-    },
-    all_thumbnails: function() {
-            new AltTabPopup2();
-    },
-    workspace_icons: function() {
-            new AltTabPopupW().show();
-    }
-};
-
-const MESSAGE = N_("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\
-");
-
-function AltTabPopupW() {
-    this._init();
-}
-
-AltTabPopupW.prototype = {
-    __proto__ : AltTab.AltTabPopup.prototype,
-
-    show : function(backward, switch_group) {
-        let tracker = Shell.WindowTracker.get_default();
-        let apps = tracker.get_running_apps ('');
-
-        if (!apps.length)
-            return false;
-
-        if (!Main.pushModal(this.actor))
-            return false;
-        this._haveModal = true;
-
-        this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
-        this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
-
-        this.actor.connect('button-press-event', Lang.bind(this, this._clickedOutside));
-        this.actor.connect('scroll-event', Lang.bind(this, this._onScroll));
-
-        this._appSwitcher = new WindowSwitcher(apps, this);
-        this.actor.add_actor(this._appSwitcher.actor);
-        this._appSwitcher.connect('item-activated', Lang.bind(this, this._appActivated));
-        this._appSwitcher.connect('item-entered', Lang.bind(this, this._appEntered));
-
-        this._appIcons = this._appSwitcher.icons;
-
-        // Make the initial selection
-        if (switch_group) {
-            if (backward) {
-                this._select(0, this._appIcons[0].cachedWindows.length - 1);
-            } else {
-                if (this._appIcons[0].cachedWindows.length > 1)
-                    this._select(0, 1);
-                else
-                    this._select(0, 0);
-            }
-        } else if (this._appIcons.length == 1) {
-            this._select(0);
-        } else if (backward) {
-            this._select(this._appIcons.length - 1);
-        } else {
-            this._select(1);
-        }
-
-        // There's a race condition; if the user released Alt before
-        // we got the grab, then we won't be notified. (See
-        // https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
-        // details.) So we check now. (Have to do this after updating
-        // selection.)
-        let [x, y, mods] = global.get_pointer();
-        if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
-            this._finish();
-            return false;
-        }
-
-        this.actor.opacity = 0;
-        this.actor.show();
-        Tweener.addTween(this.actor,
-                         { opacity: 255,
-                           time: POPUP_FADE_TIME,
-                           transition: 'easeOutQuad'
-                         });
-
-        return true;
-    },
-
-
-    _finish : function() {
-        let app = this._appIcons[this._currentApp];
-        Main.activateWindow(app.cachedWindows[0]);
-        this.destroy();
-    }
-
-};
-
-function AppIcon(app, window) {
-    this._init(app, window);
-}
-
-AppIcon.prototype = {
-    __proto__ : AltTab.AppIcon.prototype,
-
-    _init: function(app, window) {
-        this.app = app;
-
-        this.cachedWindows = [];
-        this.cachedWindows.push(window);
-
-        this.actor = new St.BoxLayout({ style_class: 'alt-tab-app',
-                                         vertical: true });
-        this.icon = null;
-        this._iconBin = new St.Bin({ x_fill: true, y_fill: true });
-
-        this.actor.add(this._iconBin, { x_fill: false, y_fill: false } );
-
-        let title = window.get_title();
-        if (title) {
-            this.label = new St.Label({ text: title });
-            let bin = new St.Bin({ x_align: St.Align.MIDDLE });
-            bin.add_actor(this.label);
-            this.actor.add(bin);
-        }
-        else {
-            this.label = new St.Label({ text: this.app.get_name() });
-            this.actor.add(this.label, { x_fill: false });
-        }
-    }
-};
-
-function WindowSwitcher(apps, altTabPopup) {
-    this._init(apps, altTabPopup);
-}
-
-WindowSwitcher.prototype = {
-    __proto__ : AltTab.AppSwitcher.prototype,
-
-    _init : function(apps, altTabPopup) {
-        AltTab.SwitcherList.prototype._init.call(this, true);
-
-        // Construct the AppIcons, sort by time, add to the popup
-        let activeWorkspace = global.screen.get_active_workspace();
-        let workspaceIcons = [];
-        let otherIcons = [];
-        for (let i = 0; i < apps.length; i++) {
-            // Cache the window list now; we don't handle dynamic changes here,
-            // and we don't want to be continually retrieving it
-            let windows = apps[i].get_windows();
-
-            for(let j = 0; j < windows.length; j++) {
-                let appIcon = new AppIcon(apps[i], windows[j]);
-                if (this._isWindowOnWorkspace(windows[j], activeWorkspace)) {
-                  workspaceIcons.push(appIcon);
-                }
-                else {
-                  otherIcons.push(appIcon);
-                }
-            }
-        }
-
-        workspaceIcons.sort(Lang.bind(this, this._sortAppIcon));
-        otherIcons.sort(Lang.bind(this, this._sortAppIcon));
-
-        if(otherIcons.length > 0) {
-            let mostRecentOtherIcon = otherIcons[0];
-            otherIcons = [];
-            otherIcons.push(mostRecentOtherIcon);
-        }
-
-        this.icons = [];
-        this._arrows = [];
-        for (let i = 0; i < workspaceIcons.length; i++)
-            this._addIcon(workspaceIcons[i]);
-        if (workspaceIcons.length > 0 && otherIcons.length > 0)
-            this.addSeparator();
-        for (let i = 0; i < otherIcons.length; i++)
-            this._addIcon(otherIcons[i]);
-
-        this._curApp = -1;
-        this._iconSize = 0;
-        this._altTabPopup = altTabPopup;
-        this._mouseTimeOutId = 0;
-    },
-
-
-    _isWindowOnWorkspace: function(w, workspace) {
-            if (w.get_workspace() == workspace)
-                return true;
-        return false;
-    },
-
-    _sortAppIcon : function(appIcon1, appIcon2) {
-        let t1 = appIcon1.cachedWindows[0].get_user_time();
-        let t2 = appIcon2.cachedWindows[0].get_user_time();
-        if (t2 > t1) return 1;
-        else return -1;
-    }
-};
-
-function AltTabSettingsDialog() {
-    this._init();
-}
-
-AltTabSettingsDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
-
-    _init : function() {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: null });
-
-        let mainContentBox = new St.BoxLayout({ style_class: 'polkit-dialog-main-layout',
-                                                vertical: false });
-        this.contentLayout.add(mainContentBox,
-                               { x_fill: true,
-                                 y_fill: true });
-
-        let messageBox = new St.BoxLayout({ style_class: 'polkit-dialog-message-layout',
-                                            vertical: true });
-        mainContentBox.add(messageBox,
-                           { y_align: St.Align.START });
-
-        this._subjectLabel = new St.Label({ style_class: 'polkit-dialog-headline',
-                                            text: _("Alt Tab Behaviour") });
-
-        messageBox.add(this._subjectLabel,
-                       { y_fill:  false,
-                         y_align: St.Align.START });
-
-        this._descriptionLabel = new St.Label({ style_class: 'polkit-dialog-description',
-                                                text: Gettext.gettext(MESSAGE) });
-
-        messageBox.add(this._descriptionLabel,
-                       { y_fill:  true,
-                         y_align: St.Align.START });
-
-
-        this.setButtons([
-            {
-                label: _("All & Thumbnails"),
-                action: Lang.bind(this, function() {
-                    this.setBehaviour('all_thumbnails');
-                    this.close();
-                })
-            },
-            {
-                label: _("Workspace & Icons"),
-                action: Lang.bind(this, function() {
-                    this.setBehaviour('workspace_icons');
-                    this.close();
-                })
-            },
-            {
-                label: _("Native"),
-                action: Lang.bind(this, function() {
-                    this.setBehaviour('native');
-                    this.close();
-                })
-            },
-            {
-                label: _("Cancel"),
-                action: Lang.bind(this, function() {
-                    this.close();
-                }),
-                key: Clutter.Escape
-            }
-        ]);
-    },
-
-    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);
-    }
-};
-
 function AltTabPopup2() {
    this._init();
 }
@@ -349,7 +41,6 @@ AltTabPopup2.prototype = {

 	this.show();
        Main.uiGroup.add_actor(this.actor);
-        this._select(0);
    },

    show : function(backward) {
@@ -363,7 +54,9 @@ AltTabPopup2.prototype = {

 	for (let w = windows.length-1; w >= 0; w--) {
 	    let win = windows[w].get_meta_window();
+	    if (win.window_type == 0) {
 	        normal_windows.push(win);
+	    }
 	}
 	normal_windows.sort(Lang.bind(this, this._sortWindows));

@@ -381,10 +74,8 @@ AltTabPopup2.prototype = {
 		        ap1 = new AltTab.AppIcon(apps[i]);
 	        }
 	    }
-	    if (ap1 != null) {
-              ap1.cachedWindows = [win];
-	      appIcons.push(ap1);
-            }
+	    ap1.cachedWindows = [win];
+	    appIcons.push(ap1); 
 	}

        if (!windows.length)
@@ -402,13 +93,13 @@ AltTabPopup2.prototype = {

        this._appSwitcher = new WindowList(windows);
 	this._appSwitcher._altTabPopup=this;
+	this._appSwitcher.highlight(0,false);
        this.actor.add_actor(this._appSwitcher.actor);
        this._appSwitcher.connect('item-activated', Lang.bind(this, this._appActivated));
        this._appSwitcher.connect('item-entered', Lang.bind(this, this._appEntered));

        this._appIcons = appIcons;

-
 	return true
    },

@@ -529,10 +220,8 @@ WindowList.prototype = {
 	            }
 	        }
  	    }
-            if (ap1 != null) {
 	    ap1.cachedWindows = [win];
            this._addIcon(ap1);
-            }
 	}
    },

@@ -541,33 +230,8 @@ WindowList.prototype = {
    }
 };

-function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+function main() {
+    Main.wm.setKeybindingHandler('switch_windows', function() {
+        let alpopup = new AltTabPopup2();
+    });
 }
-
-function doAltTab(shellwm, binding, 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](binding, 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);
-}
-
-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));
-}
--- a/extensions/alternate-tab/metadata.json.in
+++ b/extensions/alternate-tab/metadata.json.in
@@ -2,8 +2,8 @@
 "uuid": "@uuid@",
 "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@" ],
+"original-author": "thomas.bouffon@gmail.com",
+"shell-version": [ "3.0" ],
 "localedir": "@LOCALEDIR@",
 "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
@@ -1,19 +0,0 @@
-<schemalist gettext-domain="gnome-shell-extensions">
-  <enum id="org.gnome.shell.extensions.alternate-tab.BehaviourMode">
-    <value value="0" nick="native"/>
-    <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>'native'</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
@@ -2,55 +2,68 @@
 const Lang = imports.lang;
 const St = imports.gi.St;

+
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const GnomeSession = imports.misc.gnomeSession;
-const UserMenu = imports.ui.userMenu;

-const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

-function updateSuspend(object, pspec, item) {
-    item.actor.visible = object.get_can_suspend();
+function updateSuspendOrHibernate(object, pspec, item) {
+    let canSuspend = this._upClient.get_can_suspend();
+    let canHibernate = this._upClient.get_can_hibernate();
+
+    if (!canSuspend && !canHibernate) {
+	item.actor.hide();
+	return;
+    } else
+	item.actor.show();
+    if (!canSuspend && canHibernate) {
+	item.updateText(_("Hibernate"), null);
+	return;
+    }
+    let suspendText = _("Suspend");
+    let hibernateText = canHibernate ? _("Hibernate") : null;
+    item.updateText(suspendText, hibernateText);
 }

-function updateHibernate(object, pspec, item) {
-    item.actor.visible = object.get_can_hibernate();
-}
-
-function onSuspendActivate(item) {
+function onSuspendOrHibernateActivate(item) {
    Main.overview.hide();

-    this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
-        this._upClient.suspend_sync(null);
-    }));
-}
+    let haveSuspend = this._upClient.get_can_suspend();
+    let haveHibernate = this._upClient.get_can_hibernate();

-function onHibernateActivate(item) {
-    Main.overview.hide();
-
-    this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
-        this._upClient.hibernate_sync(null);
-    }));
+    if (haveSuspend &&
+        item.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
+        this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
+            this._upClient.suspend_sync(null);
+        }));
+    } else {
+        this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
+            this._upClient.hibernate_sync(null);
+        }));
+    }
 }

 function createSubMenu() {
    let item;

-    item = new UserMenu.IMStatusChooserItem();
-    item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
+    item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available');
+    item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.AVAILABLE));
    this.menu.addMenuItem(item);
+    this._presenceItems[GnomeSession.PresenceStatus.AVAILABLE] = item;

-    item = new PopupMenu.PopupSwitchMenuItem(_("Do Not Disturb"));
-    item.connect('activate', Lang.bind(this, this._updatePresenceStatus));
+    item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy');
+    item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.BUSY));
    this.menu.addMenuItem(item);
-    this._dontDisturbSwitch = item;
+    this._presenceItems[GnomeSession.PresenceStatus.BUSY] = item;

    item = new PopupMenu.PopupSeparatorMenuItem();
    this.menu.addMenuItem(item);

-    item = new PopupMenu.PopupMenuItem(_("Online Accounts"));
-    item.connect('activate', Lang.bind(this, this._onOnlineAccountsActivate));
+    item = new PopupMenu.PopupMenuItem(_("My Account"));
+    item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
    this.menu.addMenuItem(item);

    item = new PopupMenu.PopupMenuItem(_("System Settings"));
@@ -63,7 +76,6 @@ function createSubMenu() {
    item = new PopupMenu.PopupMenuItem(_("Lock Screen"));
    item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
    this.menu.addMenuItem(item);
-    this._lockScreenItem = item;

    item = new PopupMenu.PopupMenuItem(_("Switch User"));
    item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
@@ -73,22 +85,17 @@ function createSubMenu() {
    item = new PopupMenu.PopupMenuItem(_("Log Out..."));
    item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
    this.menu.addMenuItem(item);
-    this._logoutItem = item;

    item = new PopupMenu.PopupSeparatorMenuItem();
    this.menu.addMenuItem(item);

-    item = new PopupMenu.PopupMenuItem(_("Suspend"));
-    item.connect('activate', Lang.bind(this, onSuspendActivate));
-    this._upClient.connect('notify::can-suspend', Lang.bind(this, updateSuspend, item));
-    updateSuspend(this._upClient, null, item);
-    this.menu.addMenuItem(item);
-
-    item = new PopupMenu.PopupMenuItem(_("Hibernate"));
-    item.connect('activate', Lang.bind(this, onHibernateActivate));
-    this._upClient.connect('notify::can-hibernate', Lang.bind(this, updateHibernate, item));
-    updateHibernate(this._upClient, null, item);
+    item = new PopupMenu.PopupAlternatingMenuItem(_("Suspend"),
+                                                  _("Hibernate"));
    this.menu.addMenuItem(item);
+    item.connect('activate', Lang.bind(this, onSuspendOrHibernateActivate));
+    this._upClient.connect('notify::can-suspend', Lang.bind(this, updateSuspendOrHibernate, item));
+    this._upClient.connect('notify::can-hibernate', Lang.bind(this, updateSuspendOrHibernate, item));
+    updateSuspendOrHibernate.call(this, null, null, item);

    item = new PopupMenu.PopupMenuItem(_("Power Off..."));
    item.connect('activate', Lang.bind(this, function() {
@@ -98,28 +105,8 @@ function createSubMenu() {
 }

 // Put your extension initialization code here
-function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
-}
-
-function reset(statusMenu) {
-    statusMenu._updateSwitchUser();
-    statusMenu._updateLogout();
-    statusMenu._updateLockScreen();
-    statusMenu._presence.getStatus(Lang.bind(statusMenu, statusMenu._updatePresenceIcon));
-}
-
-function enable() {
-    let statusMenu = Main.panel._userMenu;
+function main(metadata) {
+    let statusMenu = Main.panel._statusmenu;
    statusMenu.menu.removeAll();
    createSubMenu.call(statusMenu);
-    reset(statusMenu);
 }
-
-function disable() {
-    // not guarranteed to work, if more extensions operate in the same place
-    let statusMenu = Main.panel._userMenu;
-    statusMenu.menu.removeAll();
-    statusMenu._createSubMenu();
-    reset(statusMenu);
-}
--- a/extensions/alternative-status-menu/metadata.json.in
+++ b/extensions/alternative-status-menu/metadata.json.in
@@ -2,7 +2,7 @@
 "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@" ],
+ "shell-version": [ "3.0" ],
 "localedir": "@LOCALEDIR@",
 "url": "@url@"
 }
--- a/extensions/apps-menu/Makefile.am
+++ b/extensions/apps-menu/Makefile.am
@@ -1,3 +0,0 @@
-EXTENSION_ID = apps-menu
-
-include ../../extension.mk
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -1,110 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const GMenu = imports.gi.GMenu;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-
-const Main = imports.ui.main;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-
-const ICON_SIZE = 28;
-let appsys = Shell.AppSystem.get_default();
-
-function AppMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-AppMenuItem.prototype = {
-    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
-
-    _init: function (app, params) {
-        PopupMenu.PopupBaseMenuItem.prototype._init.call(this, params);
-
-        this._app = app;
-        this.label = new St.Label({ text: app.get_name() });
-        this.addActor(this.label);
-        this._icon = app.create_icon_texture(ICON_SIZE);
-        this.addActor(this._icon, { expand: false });
-    },
-
-    activate: function (event) {
-        this._app.activate_full(-1, event.get_time());
-
-        PopupMenu.PopupBaseMenuItem.prototype.activate.call(this, event);
-    }
-
-};
-
-function ApplicationsButton() {
-    this._init();
-}
-
-ApplicationsButton.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
-
-    _init: function() {
-        PanelMenu.SystemStatusButton.prototype._init.call(this, 'start-here');
-        this._display();
-        appsys.connect('installed-changed', Lang.bind(this, this.reDisplay));
-    },
-
-    reDisplay : function() {
-        this._clearAll();
-        this._display();
-    },
-
-    _clearAll : function() {
-        this.menu.removeAll();
-    },
-
-    // Recursively load a GMenuTreeDirectory; we could put this in ShellAppSystem too
-    // (taken from js/ui/appDisplay.js in core shell)
-    _loadCategory: function(dir, menu) {
-        var iter = dir.iter();
-        var nextType;
-        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
-            if (nextType == GMenu.TreeItemType.ENTRY) {
-                var entry = iter.get_entry();
-                var app = appsys.lookup_app_by_tree_entry(entry);
-                menu.addMenuItem(new AppMenuItem(app));
-            } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
-                this._loadCategory(iter.get_directory(), appList);
-            }
-        }
-    },
-
-    _display : function() {
-        let tree = appsys.get_tree();
-        let root = tree.get_root_directory();
-
-        let iter = root.iter();
-        let nextType;
-        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
-            if (nextType == GMenu.TreeItemType.DIRECTORY) {
-                let dir = iter.get_directory();
-                let item = new PopupMenu.PopupSubMenuMenuItem(dir.get_name());
-                this._loadCategory(dir, item.menu);
-                this.menu.addMenuItem(item);
-            }
-        }
-    }
-};
-
-let appsMenuButton;
-
-function enable() {
-    appsMenuButton = new ApplicationsButton();
-    Main.panel._leftBox.insert_actor(appsMenuButton.actor, 1);
-    Main.panel._leftBox.child_set(appsMenuButton.actor, { y_fill : true } );
-    Main.panel._menus.addMenu(appsMenuButton.menu);
-}
-
-function disable() {
-    appsMenuButton.destroy();
-}
-
-function init() {
-    /* do nothing */
-}
--- a/extensions/apps-menu/metadata.json.in
+++ b/extensions/apps-menu/metadata.json.in
@@ -1,8 +0,0 @@
-{
-"uuid": "@uuid@",
-"name": "Applications Menu",
-"description": "Add a gnome 2.x style menu for applications",
-"shell-version": [ "@shell_current@" ],
-"localedir": "@LOCALEDIR@",
-"url": "@url@"
-}
--- a/extensions/apps-menu/stylesheet.css
+++ b/extensions/apps-menu/stylesheet.css
@@ -1 +0,0 @@
-/* none used*/
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -5,7 +5,6 @@ const Glib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;

@@ -25,14 +24,7 @@ WindowMover.prototype = {

        let display = global.screen.get_display();
        // Connect after so the handler from ShellWindowTracker has already run
-        this._windowCreatedId = display.connect_after('window-created', Lang.bind(this, this._findAndMove));
-    },
-
-    destroy: function() {
-        if (this._windowCreatedId) {
-            global.screen.get_display().disconnect(this._windowCreatedId);
-            this._windowCreatedId = 0;
-        }
+        display.connect_after('window-created', Lang.bind(this, this._findAndMove));
    },

    _ensureAtLeastWorkspaces: function(num, window) {
@@ -76,30 +68,13 @@ WindowMover.prototype = {
    }
 }

-let prevCheckWorkspaces;
-let winMover;
-
-function init(extensionMeta) {
-    // do nothing here
-}
-
-function enable() {
-    prevCheckWorkspaces = Main._checkWorkspaces;
+function main(extensionMeta) {
    Main._checkWorkspaces = function() {
        let i;
        let emptyWorkspaces = new Array(Main._workspaces.length);

-        for (i = 0; i < Main._workspaces.length; i++) {
-            let lastRemoved = Main._workspaces[i]._lastRemovedWindow;
-            if (lastRemoved &&
-                (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
-                 lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
-                 lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG))
-                    emptyWorkspaces[i] = false;
-            else
-                emptyWorkspaces[i] = true;
-        }
-
+        for (i = 0; i < Main._workspaces.length; i++)
+            emptyWorkspaces[i] = true;

        let windows = global.get_window_actors();
        for (i = 0; i < windows.length; i++) {
@@ -118,19 +93,6 @@ function enable() {
            emptyWorkspaces.push(false);
        }

-        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        let activeIsLast = activeWorkspaceIndex == global.screen.n_workspaces - 2;
-        let removingTrailWorkspaces = (emptyWorkspaces[activeWorkspaceIndex] &&
-                                        activeIsLast);
-        // Don't enter the overview when removing multiple empty workspaces at startup
-        let showOverview  = (removingTrailWorkspaces &&
-                             !emptyWorkspaces.every(function(x) { return x; }));
-
-        if (removingTrailWorkspaces) {
-            // "Merge" the empty workspace we are removing with the one at the end
-            Main.wm.blockAnimations();
-        }
-
        // Delete other empty workspaces; do it from the end to avoid index changes
        for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
            if (emptyWorkspaces[i])
@@ -138,25 +100,10 @@ function enable() {
            else
                break;
        }
-
-        if (removingTrailWorkspaces) {
-            global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
-
-            Main.wm.unblockAnimations();
-
-            if (!Main.overview.visible && showOverview)
-                Main.overview.show();
-        }
-
        Main._checkWorkspacesId = 0;
        return false;

    };

-    winMover = new WindowMover();
+    new WindowMover();
 }
-
-function disable() {
-    Main._checkWorkspaces = prevCheckWorkspaces;
-    winMover.destroy();
-}
--- 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@" ],
+ "shell-version": [ "3.0.0", "3.0.1", "3.0.2" ],
 "localedir": "@LOCALEDIR@",
 "original-authors": [ "alessandro.crismani@gmail.com", "thomas.bouffon@gmail.com" ],
 "url": "@url@"
--- a/extensions/dock/Makefile.am
+++ b/extensions/dock/Makefile.am
@@ -1,14 +1,3 @@
 EXTENSION_ID = dock

 include ../../extension.mk
-
-gschemas_in = org.gnome.shell.extensions.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,231 +25,9 @@ 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;
-
-// Keep enums in sync with GSettings schemas
-const PositionMode = {
-    LEFT: 0,
-    RIGHT: 1
-};
-
-const AutoHideEffect = {
-    RESIZE: 0,
-    RESCALE: 1
-};
-
-let position = PositionMode.RIGHT;
-let dockicon_size = 48;
-let hideable = true;
-let hideDock = true;
-let hideEffect = AutoHideEffect.RESIZE;
-let autohide_animation_time = 0.3;
+const DOCKICON_SIZE = 48;
 const DND_RAISE_APP_TIMEOUT = 500;

-/*************************************************************************************/
-/**** start resize's Dock functions                                  *****************/
-/*************************************************************************************/
-function hideDock_size () {
-    if (hideable){
-       let monitor = Main.layoutManager.primaryMonitor
-       let position_x = monitor.x;
-       let height = (this._nicons)*(this._item_size + this._spacing) + 2*this._spacing;
-       let width = this._item_size + 4*this._spacing;
-
-       Tweener.addTween(this,{
-              _item_size: 1,
-              time: autohide_animation_time,
-              transition: 'easeOutQuad',
-              onUpdate: function () {
-                   height = (this._nicons)*(this._item_size + this._spacing) + 2*this._spacing;
-                   width = this._item_size + 4*this._spacing;
-                   switch (position) {
-                       case PositionMode.LEFT:
-                              position_x=monitor.x-2*this._spacing;
-                              break;
-                       case PositionMode.RIGHT:
-                       default:
-                              position_x = monitor.x + (monitor.width-1-this._item_size-2*this._spacing);
-                   }
-                   this.actor.set_position (position_x,monitor.y+(monitor.height-height)/2);
-                   this.actor.set_size(width,height);
-              },
-       });
-       hideDock=true;
-    }
-}
-
-function showDock_size () {
-     let monitor = Main.layoutManager.primaryMonitor;
-     let height = (this._nicons)*(this._item_size + this._spacing) + 2*this._spacing;
-     let width = this._item_size + 4*this._spacing;
-     let position_x = monitor.x;
-
-     Tweener.addTween(this,{
-             _item_size: dockicon_size,
-             time: autohide_animation_time,
-             transition: 'easeOutQuad',
-             onUpdate: function () {
-                height = (this._nicons)*(this._item_size + this._spacing) + 2*this._spacing;
-                width = this._item_size + 4*this._spacing;
-                switch (position) {
-                   case PositionMode.LEFT:
-                      position_x=monitor.x-2*this._spacing;
-                      break;
-                   case PositionMode.RIGHT:
-                   default:
-                      position_x=monitor.x + (monitor.width-this._item_size-2*this._spacing);
-                }
-                this.actor.set_position (position_x, monitor.y+(monitor.height-height)/2);
-                this.actor.set_size(width,height);
-             }
-     });
-     hideDock=false;
-}
-
-function initShowDock_size () {
-        this._item_size=1;
-        this._showDock();
-}
-
-function showEffectAddItem_size () {
-        let primary = Main.layoutManager.primaryMonitor;
-        let height = (this._nicons)*(this._item_size + this._spacing) + 2*this._spacing;
-        let width = this._item_size + 4*this._spacing;
-
-        Tweener.addTween(this.actor, {
-                y: primary.y + (primary.height-height)/2,
-                height: height,
-                width: width,
-                time: autohide_animation_time,
-                transition: 'easeOutQuad'
-        });
-}
-
-/**************************************************************************************/
-/**** start rescale's Dock functions                                  *****************/
-/**************************************************************************************/
-function hideDock_scale () {
-       this._item_size = dockicon_size;
-       let monitor = Main.layoutManager.primaryMonitor;
-       let cornerX = 0;
-       let height = this._nicons*(this._item_size + this._spacing) + 2*this._spacing;
-       let width = this._item_size + 4*this._spacing;
-
-       switch (position) {
-            case PositionMode.LEFT:
-                cornerX=monitor.x;
-                break;
-            case PositionMode.RIGHT:
-            default:
-                cornerX = monitor.x + monitor.width-1;
-        }
-
-        if (hideable) {
-               Tweener.addTween(this.actor,{
-                       y: monitor.y + (monitor.height-height)/2,
-                       x: cornerX,
-                       height:height,
-                       width: width,
-                       scale_x: 0.025,
-                       time: autohide_animation_time,
-                       transition: 'easeOutQuad'
-                     });
-               hideDock=true;
-        }
-}
-
-function showDock_scale () {
-        this._item_size = dockicon_size;
-        let monitor = Main.layoutManager.primaryMonitor;
-        let position_x = monitor.x;
-        let height = this._nicons*(this._item_size + this._spacing) + 2*this._spacing;
-        let width = this._item_size + 4*this._spacing;
-
-        switch (position) {
-            case PositionMode.LEFT:
-                position_x=monitor.x-2*this._spacing;
-                break;
-            case PositionMode.RIGHT:
-            default:
-                 position_x=monitor.x + (monitor.width-this._item_size-2*this._spacing);
-        }
-        Tweener.addTween(this.actor, {
-                y: monitor.y + (monitor.height-height)/2,
-                x: monitor.x + position_x,
-                height: height,
-                width: width,
-                scale_x: 1,
-                time: autohide_animation_time,
-                transition: 'easeOutQuad'
-        });
-        hideDock=false;
-}
-
-function initShowDock_scale () {
-        let primary = Main.layoutManager.primaryMonitor;
-        let height = this._nicons*(this._item_size + this._spacing) + 2*this._spacing;
-        let width = this._item_size + 4*this._spacing;
-
-        this.actor.set_scale (0,0);
-        this.actor.set_size (width,height);
-
-        // set the position of the dock
-        switch (position) {
-                case PositionMode.LEFT:
-                   this.actor.x = 0;
-                   // effect of creation of the dock
-                   Tweener.addTween(this.actor, {
-                       x: primary.x-2*this._spacing,
-                       y: primary.y + (primary.height-height)/2,
-                       time: autohide_animation_time * 3,
-                       transition: 'easeOutQuad'
-                   });
-                   break;
-                case PositionMode.RIGHT:
-                   default:
-                   this.actor.x = primary.width-1;
-                   // effect of creation of the dock
-                   Tweener.addTween(this.actor, {
-                      x: primary.x + primary.width-this._item_size- 2*this._spacing,
-                      y: primary.y + (primary.height-height)/2,
-                      time: autohide_animation_time * 3,
-                      transition: 'easeOutQuad'
-                   });
-        }
-        Tweener.addTween(this.actor,{
-           scale_x: 1,
-           scale_y: 1,
-           time: autohide_animation_time * 3,
-           transition: 'easeOutQuad'
-        });
-        hideDock=false;
-}
-
-function showEffectAddItem_scale () {
-        let monitor = Main.layoutManager.primaryMonitor;
-        let height = this._nicons*(this._item_size + this._spacing) + 2*this._spacing;
-        let width = this._item_size + 4*this._spacing;
-
-        Tweener.addTween(this.actor, {
-                y: monitor.y + (monitor.height-height)/2,
-                height: height,
-                width: width,
-                time: autohide_animation_time,
-                transition: 'easeOutQuad'
-        });
-}
-
 function Dock() {
    this._init();
 }
@@ -262,21 +40,8 @@ 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);
-
-
        this._spacing = 4;
-        this._item_size = dockicon_size;
-        this._nicons = 0;
-        this._selectFunctionsHide ();
+        this._item_size = DOCKICON_SIZE;

        this.actor = new St.BoxLayout({ name: 'dock', vertical: true, reactive: true });

@@ -293,145 +58,12 @@ Dock.prototype = {
        this._tracker = Shell.WindowTracker.get_default();
        this._appSystem = Shell.AppSystem.get_default();

-        this._installedChangedId = this._appSystem.connect('installed-changed', Lang.bind(this, this._queueRedisplay));
-        this._appFavoritesChangedId = AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._queueRedisplay));
-        this._appStateChangedId = this._tracker.connect('app-state-changed', Lang.bind(this, this._queueRedisplay));
+        this._appSystem.connect('installed-changed', Lang.bind(this, this._queueRedisplay));
+        AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._queueRedisplay));
+        this._tracker.connect('app-state-changed', Lang.bind(this, this._queueRedisplay));

-        this._overviewShowingId = Main.overview.connect('showing', Lang.bind(this, function() {
-            this.actor.hide();
-        }));
-        this._overviewHiddenId = Main.overview.connect('hidden', Lang.bind(this, function() {
-            this.actor.show();
-        }));
-        Main.layoutManager.addChrome(this.actor);
+        Main.chrome.addActor(this.actor, { visibleInOverview: false });
        this.actor.lower_bottom();
-
-        //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);
-                this.actor.y=0;
-
-                switch (hideEffect) {
-                        case AutoHideEffect.RESCALE:
-                           this._item_size=dockicon_size;
-                           break;
-                        case AutoHideEffect.RESIZE:
-                           this.actor.set_scale (1,1);
-                }
-                this.actor.disconnect(leave_event);
-                this.actor.disconnect(enter_event);
-
-                this._selectFunctionsHide ();
-
-                leave_event = this.actor.connect('leave-event', Lang.bind(this, this._hideDock));
-                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.actor.connect('leave-event', Lang.bind(this, this._hideDock));
-        this.actor.connect('enter-event', Lang.bind(this, this._showDock));
-    },
-
-    destroy: function() {
-        if (this._installedChangedId) {
-            this._appSystem.disconnect(this._installedChangedId);
-            this._installedChangedId = 0;
-        }
-
-        if (this._appFavoritesChangedId) {
-            AppFavorites.getAppFavorites().disconnect(this._appFavoritesChangedId);
-            this._appFavoritesChangedId = 0;
-        }
-
-        if (this._appStateChangedId) {
-            this._tracker.disconnect(this._appStateChangedId);
-            this._appStateChangedId = 0;
-        }
-
-        if (this._overviewShowingId) {
-            Main.overview.disconnect(this._overviewShowingId);
-            this._overviewShowingId = 0;
-        }
-
-        if (this._overviewHiddenId) {
-            Main.overview.disconnect(this._overviewHiddenId);
-            this._overviewHiddenId = 0;
-        }
-
-        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);
-    },
-
-    _disableHideDock: function (){
-        hideable = false;
-    },
-
-    _selectFunctionsHide: function () {
-        switch (hideEffect) {
-        case AutoHideEffect.RESCALE:
-            this._hideDock = hideDock_scale;
-            this._showDock = showDock_scale;
-            this._initShowDock = initShowDock_scale;
-            this._showEffectAddItem = showEffectAddItem_scale;
-            break;
-        case AutoHideEffect.RESIZE:
-        default:
-            this._hideDock = hideDock_size;
-            this._showDock = showDock_size;
-            this._initShowDock = initShowDock_size;
-            this._showEffectAddItem = showEffectAddItem_size;
-        }
    },

    _appIdListToHash: function(apps) {
@@ -461,7 +93,7 @@ Dock.prototype = {
        let nFavorites = 0;
        for (let id in favorites) {
            let app = favorites[id];
-            let display = new DockIcon(app,this);
+            let display = new DockIcon(app);
            this.addItem(display.actor);
            nFavorites++;
            icons++;
@@ -471,12 +103,10 @@ Dock.prototype = {
            let app = running[i];
            if (app.get_id() in favorites)
                continue;
-            let display = new DockIcon(app,this);
+            let display = new DockIcon(app);
            icons++;
            this.addItem(display.actor);
        }
-        this._nicons=icons;
-
        if (this._placeholderText) {
            this._placeholderText.destroy();
            this._placeholderText = null;
@@ -487,26 +117,10 @@ Dock.prototype = {
            this.actor.add_actor(this._placeholderText);
        }

-        let primary = Main.layoutManager.primaryMonitor;
+        let primary = global.get_primary_monitor();
        let height = (icons)*(this._item_size + this._spacing) + 2*this._spacing;
-        let width = this._item_size + 4*this._spacing;
-
-        if (this.actor.y != primary.y) {
-                if (hideable && hideDock) {
-                        this._hideDock();
-                } else {
-                   if (dockicon_size == this._item_size) {
-                        // only add/delete icon
-                        this._showEffectAddItem ();
-                    } else {
-                        // change size icon
-                        this._showDock ();
-                    }
-                }
-        } else {
-                // effect of creation
-                this._initShowDock ();
-        }
+        this.actor.set_size(this._item_size + 4*this._spacing, height);
+        this.actor.set_position(primary.width-this._item_size-this._spacing-2, (primary.height-height)/2);
    },

    _getPreferredWidth: function (grid, forHeight, alloc) {
@@ -527,8 +141,6 @@ Dock.prototype = {
        let children = this._grid.get_children();

        let x = box.x1 + this._spacing;
-        if (position == PositionMode.LEFT)
-            x = box.x1 + 2*this._spacing;
        let y = box.y1 + this._spacing;

        for (let i = 0; i < children.length; i++) {
@@ -566,12 +178,12 @@ Dock.prototype = {
 };
 Signals.addSignalMethods(Dock.prototype);

-function DockIcon(app, dock) {
-    this._init(app, dock);
+function DockIcon(app) {
+    this._init(app);
 }

 DockIcon.prototype = {
-    _init : function(app, dock) {
+    _init : function(app) {
        this.app = app;
        this.actor = new St.Button({ style_class: 'dock-app',
                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO,
@@ -579,9 +191,9 @@ DockIcon.prototype = {
                                     x_fill: true,
                                     y_fill: true });
        this.actor._delegate = this;
-        this.actor.set_size(dockicon_size, dockicon_size);
+        this.actor.set_size(DOCKICON_SIZE, DOCKICON_SIZE);

-        this._icon = this.app.create_icon_texture(dockicon_size);
+        this._icon = this.app.create_icon_texture(DOCKICON_SIZE);
        this.actor.set_child(this._icon);

        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
@@ -602,7 +214,6 @@ DockIcon.prototype = {
        this._stateChangedId = this.app.connect('notify::state',
                                                Lang.bind(this, this._onStateChanged));
        this._onStateChanged();
-        this._dock=dock;
    },

    _onDestroy: function() {
@@ -678,21 +289,14 @@ DockIcon.prototype = {
        this._removeMenuTimeout();
        this.actor.fake_release();

-        this._dock._disableHideDock();
-
        if (!this._menu) {
            this._menu = new DockIconMenu(this);
            this._menu.connect('activate-window', Lang.bind(this, function (menu, window) {
                this.activateWindow(window);
            }));
            this._menu.connect('popup', Lang.bind(this, function (menu, isPoppedUp) {
-                if (!isPoppedUp){
-                    //Restore value of autohidedock
-                    this._dock._restoreHideDock();
-                    this._dock._hideDock();
-
+                if (!isPoppedUp)
                    this._onMenuPoppedDown();
-                }
            }));

            this._menuManager.addMenu(this._menu, true);
@@ -767,14 +371,7 @@ DockIconMenu.prototype = {
    __proto__: AppDisplay.AppIconMenu.prototype,

    _init: function(source) {
-        switch (position) {
-            case PositionMode.LEFT:
-                PopupMenu.PopupMenu.prototype._init.call(this, source.actor, St.Align.MIDDLE, St.Side.LEFT, 0);
-                break;
-            case PositionMode.RIGHT:
-            default:
-                PopupMenu.PopupMenu.prototype._init.call(this, source.actor, St.Align.MIDDLE, St.Side.RIGHT, 0);
-        }
+        PopupMenu.PopupMenu.prototype._init.call(this, source.actor, St.Align.MIDDLE, St.Side.RIGHT, 0);

        this._source = source;

@@ -790,7 +387,7 @@ DockIconMenu.prototype = {
        }));
        source.actor.connect('destroy', Lang.bind(this, function () { this.actor.destroy(); }));

-        Main.layoutManager.addChrome(this.actor);
+        Main.chrome.addActor(this.actor);
    },

    _redisplay: function() {
@@ -852,17 +449,8 @@ DockIconMenu.prototype = {
    }
 }

-function init(extensionMeta) {
+function main(extensionMeta) {
    imports.gettext.bindtextdomain('gnome-shell-extensions', extensionMeta.localedir);
+
+    let dock = new Dock();
 }
-
-let dock;
-
-function enable() {
-    dock = new Dock();
-}
-
-function disable() {
-    dock.destroy();
-    dock = null;
-}
--- a/extensions/dock/metadata.json.in
+++ b/extensions/dock/metadata.json.in
@@ -3,7 +3,7 @@
 "name": "Dock",
 "description": "A dock for the GNOME Shell -- displays favorite and running applications",
 "original-author": "tclaesson@gmail.com",
-"shell-version": [ "@shell_current@" ],
+"shell-version": [ "3.0" ],
 "localedir": "@LOCALEDIR@",
 "url": "@url@"
 }
--- a/extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
+++ b/extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in
@@ -1,37 +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.AutoHideEfect'>
-    <value nick='resize' value='0'/>
-    <value nick='rescale' value='1'/>
-  </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.AutoHideEfect">
-      <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/Makefile.am
+++ b/extensions/drive-menu/Makefile.am
@@ -1,3 +0,0 @@
-EXTENSION_ID = drive-menu
-
-include ../../extension.mk
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -1,106 +0,0 @@
-// Drive menu extension
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
-const _ = Gettext.gettext;
-
-const Main = imports.ui.main;
-const Panel = imports.ui.panel;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-
-function DriveMenuItem(place) {
-    this._init(place);
-}
-
-DriveMenuItem.prototype = {
-    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
-
-    _init: function(place) {
-	PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
-
-	this.place = place;
-
-	this.label = new St.Label({ text: place.name });
-	this.addActor(this.label);
-
-	let ejectIcon = new St.Icon({ icon_name: 'media-eject',
-				      icon_type: St.IconType.SYMBOLIC,
-				      style_class: 'popup-menu-icon ' });
-	let ejectButton = new St.Button({ child: ejectIcon });
-	ejectButton.connect('clicked', Lang.bind(this, this._eject));
-	this.addActor(ejectButton);
-    },
-
-    _eject: function() {
-	this.place.remove();
-    },
-
-    activate: function(event) {
-	this.place.launch({ timestamp: event.get_time() });
-
-	PopupMenu.PopupBaseMenuItem.prototype.activate.call(this, event);
-    }
-};
-
-function DriveMenu() {
-    this._init();
-}
-
-DriveMenu.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
-
-    _init: function() {
-	// is 'media-eject' better?
-	PanelMenu.SystemStatusButton.prototype._init.call(this, 'media-optical');
-
-	this._manager = Main.placesManager;
-	this._manager.connect('mounts-updated', Lang.bind(this, this._update));
-
-	this._contentSection = new PopupMenu.PopupMenuSection();
-	this.menu.addMenuItem(this._contentSection);
-
-	this._update();
-
-	this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-	this.menu.addAction(_("Open file manager"), function(event) {
-	    let appSystem = Shell.AppSystem.get_default();
-	    let app = appSystem.lookup_app('nautilus.desktop');
-	    app.activate_full(-1, event.get_time());
-	});
-    },
-
-    _update: function() {
-	this._contentSection.removeAll();
-
-	let mounts = this._manager.getMounts();
-	let any = false;
-	for (let i = 0; i < mounts.length; i++) {
-	    if (mounts[i].isRemovable()) {
-		this._contentSection.addMenuItem(new DriveMenuItem(mounts[i]));
-		any = true;
-	    }
-	}
-
-	this.actor.visible = any;
-    },
-}
-
-// Put your extension initialization code here
-function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
-}
-
-let _indicator;
-
-function enable() {
-    _indicator = new DriveMenu;
-    Main.panel.addToStatusArea('drive-menu', _indicator);
-}
-
-function disable() {
-    _indicator.destroy();
-}
--- a/extensions/drive-menu/metadata.json.in
+++ b/extensions/drive-menu/metadata.json.in
@@ -1,8 +0,0 @@
-{
- "uuid": "@uuid@",
- "name": "Removable Drive Menu",
- "description": "A status menu for accessing and unmounting removable devices",
- "shell-version": [ "@shell_current@" ],
- "localedir": "@LOCALEDIR@",
- "url": "@url@"
-}
--- a/extensions/drive-menu/stylesheet.css
+++ b/extensions/drive-menu/stylesheet.css
@@ -1 +0,0 @@
-/* This extensions requires no custom styling */
--- a/extensions/example/extension.js
+++ b/extensions/example/extension.js
@@ -9,33 +9,16 @@ const Main = imports.ui.main;

 function _showHello() {
    let text = new St.Label({ style_class: 'helloworld-label', text: _("Hello, world!") });
-    let monitor = Main.layoutManager.primaryMonitor;
+    let monitor = global.get_primary_monitor();
    global.stage.add_actor(text);
    text.set_position(Math.floor (monitor.width / 2 - text.width / 2), Math.floor(monitor.height / 2 - text.height / 2));
    Mainloop.timeout_add(3000, function () { text.destroy(); });
 }

 // Put your extension initialization code here
-function init(metadata) {
-    log ('Example extension initalized');
-
+function main(metadata) {
    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
-}
-
-let signalId;
-
-function enable() {
-    log ('Example extension enabled');

    Main.panel.actor.reactive = true;
-    signalId = Main.panel.actor.connect('button-release-event', _showHello);
+    Main.panel.actor.connect('button-release-event', _showHello);
 }
-
-function disable() {
-    log ('Example extension disabled');
-
-    if (signalId) {
-	Main.panel.actor.disconnect(signalId);
-	signalId = 0;
-    }
-}
--- a/extensions/example/metadata.json.in
+++ b/extensions/example/metadata.json.in
@@ -2,7 +2,7 @@
 "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@" ],
+ "shell-version": [ "3.0" ],
 "localedir": "@LOCALEDIR@",
 "url": "@url@"
 }
--- a/extensions/gajim/extension.js
+++ b/extensions/gajim/extension.js
@@ -160,8 +160,8 @@ Source.prototype = {
            }
        }

-        let app = Shell.AppSystem.get_default().lookup_app('gajim.desktop');
-        app.activate(-1);
+        let app = Shell.AppSystem.get_default().get_app('gajim.desktop');
+        app.activate_window(null, global.get_current_time());
    },

    _onChatState: function(emitter, data) {
@@ -263,31 +263,15 @@ function GajimClient() {
 GajimClient.prototype = {
    _init: function() {
        this._sources = {};
-    },
-
-    proxy : function() {
-        return this._proxy;
-    },
-
-    enable: function() {
        this._cacheDir = GLib.get_user_cache_dir() + '/gnome-shell/gajim-avatars';
        GLib.mkdir_with_parents(this._cacheDir, 0x1c0); // 0x1c0 = octal 0700

        this._proxy = new Gajim(DBus.session, 'org.gajim.dbus', '/org/gajim/dbus/RemoteObject');
-        this._newMessageId = this._proxy.connect('NewMessage', Lang.bind(this, this._messageReceived));
+        this._proxy.connect('NewMessage', Lang.bind(this, this._messageReceived));
    },

-    disable: function() {
-        if (this._newMessageId) {
-            this._proxy.disconnect(this._newMessageId);
-            this._newMessageId = 0;
-        }
-        this._proxy = null;
-
-        for (let id in this._sources)
-            this._sources[id].destroy();
-
-        this._sources = { };
+    proxy : function() {
+        return this._proxy;
    },

    _messageReceived : function(emitter, data) {
@@ -324,6 +308,6 @@ GajimClient.prototype = {

 };

-function init() {
-    return new GajimClient();
+function main() {
+    let client = new GajimClient();
 }
--- a/extensions/gajim/metadata.json.in
+++ b/extensions/gajim/metadata.json.in
@@ -2,7 +2,7 @@
 "uuid": "@uuid@",
 "name": "Gajim IM integration",
 "description": "Display Gajim incoming chats as notifications in the Shell message tray.",
- "shell-version": [ "@shell_current@" ],
+ "shell-version": [ "3.0" ],
 "localedir": "@LOCALEDIR@",
 "url": "http://base-art.net"
 }
--- a/extensions/gajim/stylesheet.css
+++ b/extensions/gajim/stylesheet.css
@@ -1 +0,0 @@
-/* none used */
--- a/extensions/native-window-placement/Makefile.am
+++ b/extensions/native-window-placement/Makefile.am
@@ -1,14 +0,0 @@
-EXTENSION_ID = native-window-placement
-
-include ../../extension.mk
-
-gschemas_in = org.gnome.shell.extensions.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
@@ -1,532 +0,0 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-// import just everything from workspace.js:
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Signals = imports.signals;
-
-const DND = imports.ui.dnd;
-const Lightbox = imports.ui.lightbox;
-const Main = imports.ui.main;
-const Overview = imports.ui.overview;
-const Panel = imports.ui.panel;
-const Tweener = imports.ui.tweener;
-
-const Workspace = imports.ui.workspace;
-const WindowPositionFlags = Workspace.WindowPositionFlags;
-
-const WindowPlacementStrategy = {
-    NATURAL: 0,
-    GRID: 1,
-};
-
-// 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
-const WINDOW_PLACEMENT_NATURAL_ACCURACY = 20;                       // accuracy of window translate moves  (KDE-default: 20)
-const WINDOW_PLACEMENT_NATURAL_GAPS = 5;                            // half of the minimum gap between windows
-const WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS = 5000;             // safety limit for preventing endless loop if something is wrong in the algorithm
-
-const PLACE_WINDOW_CAPTIONS_ON_TOP = true;                          // place window titles in overview on top of windows with overlap parameter
-
-function injectToFunction(parent, name, func) {
-    let origin = parent[name];
-    parent[name] = function() {
-        let ret;
-        ret = origin.apply(this, arguments);
-        if (ret === undefined)
-            ret = func.apply(this, arguments);
-        return ret;
-    }
-}
-const WORKSPACE_BORDER_GAP = 10;                                    // gap between the workspace area and the workspace selector
-
-function Rect(x, y, width, height) {
-    [this.x, this.y, this.width, this.height] = arguments;
-}
-
-Rect.prototype = {
-    /**
-     * used in _calculateWindowTransformationsNatural to replace Meta.Rectangle that is too slow.
-     */
-
-    copy: function() {
-        return new Rect(this.x, this.y, this.width, this.height);
-    },
-
-    union: function(rect2) {
-        let dest = this.copy();
-        if (rect2.x < dest.x)
-          {
-            dest.width += dest.x - rect2.x;
-            dest.x = rect2.x;
-          }
-        if (rect2.y < dest.y)
-          {
-            dest.height += dest.y - rect2.y;
-            dest.y = rect2.y;
-          }
-        if (rect2.x + rect2.width > dest.x + dest.width)
-          dest.width = rect2.x + rect2.width - dest.x;
-        if (rect2.y + rect2.height > dest.y + dest.height)
-          dest.height = rect2.y + rect2.height - dest.y;
-
-        return dest;
-    },
-
-    adjusted: function(dx, dy, dx2, dy2) {
-        let dest = this.copy();
-        dest.x += dx;
-        dest.y += dy;
-        dest.width += -dx + dx2;
-        dest.height += -dy + dy2;
-        return dest;
-    },
-
-    overlap: function(rect2) {
-        return !((this.x + this.width    <= rect2.x) ||
-                 (rect2.x + rect2.width  <= this.x) ||
-                 (this.y + this.height   <= rect2.y) ||
-                 (rect2.y + rect2.height <= this.y));
-    },
-
-    center: function() {
-        return [this.x + this.width / 2, this.y + this.height / 2];
-    },
-
-    translate: function(dx, dy) {
-        this.x += dx;
-        this.y += dy;
-    }
-};
-
-let winInjections, workspaceInjections, connectedSignals;
-
-function resetState() {
-    winInjections = { };
-    workspaceInjections = { };
-    workViewInjections = { };
-    connectedSignals = [ ];
-}
-
-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 });
-
-    /**
-     * _calculateWindowTransformationsNatural:
-     * @clones: Array of #MetaWindow
-     *
-     * Returns clones with matching target coordinates and scales to arrange windows in a natural way that no overlap exists and relative window size is preserved.
-     * This function is almost a 1:1 copy of the function
-     * PresentWindowsEffect::calculateWindowTransformationsNatural() from KDE, see:
-     * https://projects.kde.org/projects/kde/kdebase/kde-workspace/repository/revisions/master/entry/kwin/effects/presentwindows/presentwindows.cpp
-     */
-    Workspace.Workspace.prototype._calculateWindowTransformationsNatural = function(clones) {
-        // As we are using pseudo-random movement (See "slot") we need to make sure the list
-        // is always sorted the same way no matter which window is currently active.
-        clones = clones.sort(function (win1, win2) {
-            return win2.metaWindow.get_stable_sequence() - win1.metaWindow.get_stable_sequence();
-        });
-
-        // Put a gap on the right edge of the workspace to separe it from the workspace selector
-        let x_gap = WORKSPACE_BORDER_GAP;
-        let y_gap = WORKSPACE_BORDER_GAP * this._height / this._width
-        let area = new Rect(this._x, this._y, this._width - x_gap, this._height - y_gap);
-
-        let bounds = area.copy();
-
-        let direction = 0;
-        let directions = [];
-        let rects = [];
-        for (let i = 0; i < clones.length; i++) {
-            // save rectangles into 4-dimensional arrays representing two corners of the rectangular: [left_x, top_y, right_x, bottom_y]
-            let rect = clones[i].metaWindow.get_outer_rect();
-            rects[i] = new Rect(rect.x, rect.y, rect.width, rect.height);
-            bounds = bounds.union(rects[i]);
-
-            // This is used when the window is on the edge of the screen to try to use as much screen real estate as possible.
-            directions[i] = direction;
-            direction++;
-            if (direction == 4) {
-                direction = 0;
-            }
-        }
-
-        let loop_counter = 0;
-        let overlap;
-        do {
-            overlap = false;
-            for (let i = 0; i < rects.length; i++) {
-                for (let j = 0; j < rects.length; j++) {
-                    if (i != j && rects[i].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
-                                                    WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS).overlap(
-                                                     rects[j].adjusted(-WINDOW_PLACEMENT_NATURAL_GAPS, -WINDOW_PLACEMENT_NATURAL_GAPS,
-                                                                       WINDOW_PLACEMENT_NATURAL_GAPS, WINDOW_PLACEMENT_NATURAL_GAPS))) {
-                        loop_counter++;
-                        overlap = true;
-
-                        // TODO: something like a Point2D would be nicer here:
-
-                        // Determine pushing direction
-                        let i_center = rects[i].center();
-                        let j_center = rects[j].center();
-                        let diff = [j_center[0] - i_center[0], j_center[1] - i_center[1]];
-
-                        // Prevent dividing by zero and non-movement
-                        if (diff[0] == 0 && diff[1] == 0)
-                            diff[0] = 1;
-                        // Try to keep screen/workspace aspect ratio
-                        if ( bounds.height / bounds.width > area.height / area.width )
-                            diff[0] *= 2;
-                        else
-                            diff[1] *= 2;
-
-                        // Approximate a vector of between 10px and 20px in magnitude in the same direction
-                        let length = Math.sqrt(diff[0] * diff[0] + diff[1] * diff[1]);
-                        diff[0] = diff[0] * WINDOW_PLACEMENT_NATURAL_ACCURACY / length;
-                        diff[1] = diff[1] * WINDOW_PLACEMENT_NATURAL_ACCURACY / length;
-
-                        // Move both windows apart
-                        rects[i].translate(-diff[0], -diff[1]);
-                        rects[j].translate(diff[0], diff[1]);
-
-
-                        if (useMoreScreen) {
-                            // Try to keep the bounding rect the same aspect as the screen so that more
-                            // screen real estate is utilised. We do this by splitting the screen into nine
-                            // equal sections, if the window center is in any of the corner sections pull the
-                            // window towards the outer corner. If it is in any of the other edge sections
-                            // alternate between each corner on that edge. We don't want to determine it
-                            // randomly as it will not produce consistant locations when using the filter.
-                            // Only move one window so we don't cause large amounts of unnecessary zooming
-                            // in some situations. We need to do this even when expanding later just in case
-                            // all windows are the same size.
-                            // (We are using an old bounding rect for this, hopefully it doesn't matter)
-                            let xSection = Math.round((rects[i].x - bounds.x) / (bounds.width / 3));
-                            let ySection = Math.round((rects[i].y - bounds.y) / (bounds.height / 3));
-
-                            let i_center = rects[i].center();
-                            diff[0] = 0;
-                            diff[1] = 0;
-                            if (xSection != 1 || ySection != 1) { // Remove this if you want the center to pull as well
-                                if (xSection == 1)
-                                    xSection = (directions[i] / 2 ? 2 : 0);
-                                if (ySection == 1)
-                                    ySection = (directions[i] % 2 ? 2 : 0);
-                            }
-                            if (xSection == 0 && ySection == 0) {
-                                diff[0] = bounds.x - i_center[0];
-                                diff[1] = bounds.y - i_center[1];
-                            }
-                            if (xSection == 2 && ySection == 0) {
-                                diff[0] = bounds.x + bounds.width - i_center[0];
-                                diff[1] = bounds.y - i_center[1];
-                            }
-                            if (xSection == 2 && ySection == 2) {
-                                diff[0] = bounds.x + bounds.width - i_center[0];
-                                diff[1] = bounds.y + bounds.height - i_center[1];
-                            }
-                            if (xSection == 0 && ySection == 2) {
-                                diff[0] = bounds.x - i_center[0];
-                                diff[1] = bounds.y + bounds.height - i_center[1];
-                            }
-                            if (diff[0] != 0 || diff[1] != 0) {
-                                let length = Math.sqrt(diff[0]*diff[0] + diff[1]*diff[1]);
-                                diff[0] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;   // /2 to make it less influencing than the normal center-move above
-                                diff[1] *= WINDOW_PLACEMENT_NATURAL_ACCURACY / length / 2;
-                                rects[i].translate(diff[0], diff[1]);
-                            }
-                        }
-
-                        // Update bounding rect
-                        bounds = bounds.union(rects[i]);
-                        bounds = bounds.union(rects[j]);
-                    }
-                }
-            }
-        } while (overlap && loop_counter < WINDOW_PLACEMENT_NATURAL_MAX_TRANSLATIONS);
-
-        // Work out scaling by getting the most top-left and most bottom-right window coords.
-        let scale;
-        scale = Math.min(area.width / bounds.width,
-                         area.height / bounds.height,
-                         1.0);
-
-        // Make bounding rect fill the screen size for later steps
-        bounds.x = bounds.x - (area.width - bounds.width * scale) / 2;
-        bounds.y = bounds.y - (area.height - bounds.height * scale) / 2;
-        bounds.width = area.width / scale;
-        bounds.height = area.height / scale;
-
-        // Move all windows back onto the screen and set their scale
-        for (let i = 0; i < rects.length; i++) {
-            rects[i].translate(-bounds.x, -bounds.y);
-        }
-
-        // TODO: Implement the KDE part "Try to fill the gaps by enlarging windows if they have the space" here. (If this is wanted)
-
-        // rescale to workspace
-        let scales = [];
-
-        let buttonOuterHeight, captionHeight;
-        let buttonOuterWidth = 0;
-
-        let targets = [];
-        for (let i = 0; i < rects.length; i++) {
-            rects[i].x = rects[i].x * scale + this._x;
-            rects[i].y = rects[i].y * scale + this._y;
-
-            targets[i] = [rects[i].x, rects[i].y, scale];
-        }
-
-        return [clones, targets];
-    }
-    workspaceInjections['_calculateWindowTransformationsNatural'] = undefined;
-
-    /**
-     * _calculateWindowTransformationsGrid:
-     * @clones: Array of #MetaWindow
-     *
-     * Returns clones with matching target coordinates and scales to arrange windows in a grid.
-     */
-    Workspace.Workspace.prototype._calculateWindowTransformationsGrid = function(clones) {
-        let slots = this._computeAllWindowSlots(clones.length);
-        clones = this._orderWindowsByMotionAndStartup(clones, slots);
-        let targets = [];
-
-        for (let i = 0; i < clones.length; i++) {
-            targets[i] = this._computeWindowLayout(clones[i].metaWindow, slots[i]);
-        }
-
-        return [clones, targets];
-    }
-    workspaceInjections['_calculateWindowTransformationsGrid'] = undefined;
-
-    /**
-     * positionWindows:
-     * @flags:
-     *  INITIAL - this is the initial positioning of the windows.
-     *  ANIMATE - Indicates that we need animate changing position.
-     */
-    workspaceInjections['positionWindows'] = Workspace.Workspace.prototype.positionWindows;
-    Workspace.Workspace.prototype.positionWindows = function(flags) {
-        if (this._repositionWindowsId > 0) {
-            Mainloop.source_remove(this._repositionWindowsId);
-            this._repositionWindowsId = 0;
-        }
-
-        let clones = this._windows.slice();
-        if (this._reservedSlot)
-            clones.push(this._reservedSlot);
-
-        let initialPositioning = flags & WindowPositionFlags.INITIAL;
-        let animate = flags & WindowPositionFlags.ANIMATE;
-
-        // Start the animations
-	let targets = [];
-        let scales = [];
-
-        switch (placementStrategy) {
-        case WindowPlacementStrategy.NATURAL:
-            [clones, targets] = this._calculateWindowTransformationsNatural(clones);
-            break;
-        default:
-            log ('Invalid window placement strategy');
-            placementStrategy = WindowPlacementStrategy.GRID;
-        case WindowPlacementStrategy.GRID:
-            [clones, targets] = this._calculateWindowTransformationsGrid(clones);
-            break;
-        }
-
-	let currentWorkspace = global.screen.get_active_workspace();
-        let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
-
-        for (let i = 0; i < clones.length; i++) {
-            let clone = clones[i];
-	    let [x, y , scale] = targets[i];
-            let metaWindow = clone.metaWindow;
-            let mainIndex = this._lookupIndex(metaWindow);
-            let overlay = this._windowOverlays[mainIndex];
-
-            // Positioning a window currently being dragged must be avoided;
-            // we'll just leave a blank spot in the layout for it.
-            if (clone.inDrag)
-                continue;
-
-            if (overlay)
-                overlay.hide();
-            if (animate && isOnCurrentWorkspace) {
-                if (!metaWindow.showing_on_its_workspace()) {
-                    /* Hidden windows should fade in and grow
-                     * therefore we need to resize them now so they
-                     * can be scaled up later */
-                    if (initialPositioning) {
-                        clone.actor.opacity = 0;
-                        clone.actor.scale_x = 0;
-                        clone.actor.scale_y = 0;
-                        clone.actor.x = x;
-                        clone.actor.y = y;
-                    }
-
-                    // Make the window slightly transparent to indicate it's hidden
-                    Tweener.addTween(clone.actor,
-                                     { opacity: 255,
-                                       time: Overview.ANIMATION_TIME,
-                                       transition: 'easeInQuad'
-                                     });
-                }
-
-                Tweener.addTween(clone.actor,
-                                 { x: x,
-                                   y: y,
-                                   scale_x: scale,
-                                   scale_y: scale,
-                                   time: Overview.ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
-                                   onComplete: Lang.bind(this, function() {
-				       this._showWindowOverlay(clone, overlay, true);
-                                   })
-                                 });
-            } else {
-                clone.actor.set_position(x, y);
-                clone.actor.set_scale(scale, scale);
-                this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
-            }
-        }
-    }
-
-    /// position window titles on top of windows in overlay ////
-    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;
-
-            this._windowClone = windowClone;
-            this._parentActor = parentActor;
-            this._hidden = false;
-
-            let title = new St.Label({ style_class: 'window-caption',
-                                       text: metaWindow.title });
-            title.clutter_text.ellipsize = Pango.EllipsizeMode.END;
-            title._spacing = 0;
-            title._overlap = 0;
-
-            this._updateCaptionId = metaWindow.connect('notify::title', Lang.bind(this, function(w) {
-		this.title.text = w.title;
-	    }));
-
-            let button = new St.Button({ style_class: 'window-close' });
-            button._overlap = 0;
-
-            this._idleToggleCloseId = 0;
-            button.connect('clicked', Lang.bind(this, this._closeWindow));
-
-            windowClone.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-            windowClone.actor.connect('enter-event', Lang.bind(this, this._onEnter));
-            windowClone.actor.connect('leave-event', Lang.bind(this, this._onLeave));
-
-            this._windowAddedId = 0;
-            windowClone.connect('zoom-start', Lang.bind(this, this.hide));
-            windowClone.connect('zoom-end', Lang.bind(this, this.show));
-
-            button.hide();
-
-            this.title = title;
-            this.closeButton = button;
-
-            parentActor.add_actor(this.title);
-            parentActor.add_actor(this.closeButton);
-            title.connect('style-changed', Lang.bind(this, this._onStyleChanged));
-            button.connect('style-changed', Lang.bind(this, this._onStyleChanged));
-
-            // force a style change if we are already on a stage - otherwise
-            // the signal will be emitted normally when we are added
-            if (parentActor.get_stage())
-		this._onStyleChanged();
-	},
-
-        winInjections['chromeHeights'] = Workspace.WindowOverlay.prototype.chromeHeights;
-	Workspace.WindowOverlay.prototype.chromeHeights = function () {
-            return [Math.max( this.closeButton.height - this.closeButton._overlap, this.title.height - this.title._overlap),
-		    0];
-	},
-
-        winInjections['updatePositions'] = Workspace.WindowOverlay.prototype.updatePositions;
-	Workspace.WindowOverlay.prototype.updatePositions = function(cloneX, cloneY, cloneWidth, cloneHeight) {
-            let button = this.closeButton;
-            let title = this.title;
-
-            let buttonX;
-            let buttonY = cloneY - (button.height - button._overlap);
-            if (St.Widget.get_default_direction() == St.TextDirection.RTL)
-		buttonX = cloneX - (button.width - button._overlap);
-            else
-		buttonX = cloneX + (cloneWidth - button._overlap);
-
-            button.set_position(Math.floor(buttonX), Math.floor(buttonY));
-
-            if (!title.fullWidth)
-		title.fullWidth = title.width;
-            title.width = Math.min(title.fullWidth, cloneWidth);
-
-            let titleX = cloneX + (cloneWidth - title.width) / 2;
-	    let titleY = cloneY - title.height + title._overlap;
-            title.set_position(Math.floor(titleX), Math.floor(titleY));
-	},
-
-        winInjections['_onStyleChanged'] = Workspace.WindowOverlay.prototype._onStyleChanged;
-	Workspace.WindowOverlay.prototype._onStyleChanged = function() {
-            let titleNode = this.title.get_theme_node();
-            this.title._spacing = titleNode.get_length('-shell-caption-spacing');
-	    this.title._overlap = titleNode.get_length('-shell-caption-overlap');
-
-            let closeNode = this.closeButton.get_theme_node();
-            this.closeButton._overlap = closeNode.get_length('-shell-close-overlap');
-
-            this._parentActor.queue_relayout();
-	}
-    }
-}
-
-function removeInjection(object, injection, name) {
-    if (injection[name] === undefined)
-        delete object[name];
-    else
-        object[name] = injection[name];
-}
-
-function disable() {
-    for (i in workspaceInjections)
-        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
-    for (i in winInjections)
-        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
-
-    for each (i in connectedSignals)
-        i.obj.disconnect(i.id);
-
-    global.stage.queue_relayout();
-    resetState();
-}
-
-function init() {
-    /* do nothing */
-}
--- a/extensions/native-window-placement/metadata.json.in
+++ b/extensions/native-window-placement/metadata.json.in
@@ -1,9 +0,0 @@
-{
- "uuid": "@uuid@",
- "name": "Native Window Placement",
- "description": "Arrange windows in overview in a more native way",
- "shell-version": [ "@shell_current@" ],
- "localedir": "@LOCALEDIR@",
- "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
@@ -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/native-window-placement/stylesheet.css
+++ b/extensions/native-window-placement/stylesheet.css
@@ -1,4 +0,0 @@
-.window-caption {
-    color: red;
-    -shell-caption-overlap: 10px;
-}
--- a/extensions/places-menu/Makefile.am
+++ b/extensions/places-menu/Makefile.am
@@ -1,3 +0,0 @@
-EXTENSION_ID = places-menu
-
-include ../../extension.mk
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -1,129 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Gdk = imports.gi.Gdk;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-
-const Main = imports.ui.main;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-const Panel = imports.ui.panel;
-
-const Gettext = imports.gettext.domain('gnome-shell-extensions');
-const _ = Gettext.gettext;
-
-const PLACE_ICON_SIZE = 22;
-
-function PlacesMenu() {
-    this._init.apply(this, arguments);
-}
-
-PlacesMenu.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
-
-    _init: function() {
-        PanelMenu.SystemStatusButton.prototype._init.call(this, 'folder');
-
-        this.defaultItems = [];
-        this.bookmarkItems = [];
-        this.deviceItems = [];
-        this._createDefaultPlaces();
-        this._bookmarksSection = new PopupMenu.PopupMenuSection();
-        this.menu.addMenuItem(this._bookmarksSection);
-        this._createBookmarks();
-        this._devicesMenuItem = new PopupMenu.PopupSubMenuMenuItem('Removable Devices');
-        this.menu.addMenuItem(this._devicesMenuItem);
-        this._createDevices();
-        Main.placesManager.connect('bookmarks-updated',Lang.bind(this,this._redisplayBookmarks));
-        Main.placesManager.connect('mounts-updated',Lang.bind(this,this._redisplayDevices));
-    },
-
-    _redisplayBookmarks: function(){
-        this._clearBookmarks();
-        this._createBookmarks();
-    },
-
-    _redisplayDevices: function(){
-        this._clearDevices();
-        this._createDevices();
-    },
-
-    _createDefaultPlaces : function() {
-        this.defaultPlaces = Main.placesManager.getDefaultPlaces();
-
-        for (let placeid = 0; placeid < this.defaultPlaces.length; placeid++) {
-            this.defaultItems[placeid] = new PopupMenu.PopupMenuItem(_(this.defaultPlaces[placeid].name));
-            let icon = this.defaultPlaces[placeid].iconFactory(PLACE_ICON_SIZE);
-            this.defaultItems[placeid].addActor(icon, { align: St.Align.END});
-            this.defaultItems[placeid].place = this.defaultPlaces[placeid];
-            this.menu.addMenuItem(this.defaultItems[placeid]);
-            this.defaultItems[placeid].connect('activate', function(actor,event) {
-                actor.place.launch();
-            });
-
-        }
-    },
-
-    _createBookmarks : function() {
-        this.bookmarks = Main.placesManager.getBookmarks();
-
-        for (let bookmarkid = 0; bookmarkid < this.bookmarks.length; bookmarkid++) {
-            this.bookmarkItems[bookmarkid] = new PopupMenu.PopupMenuItem(_(this.bookmarks[bookmarkid].name));
-            let icon = this.bookmarks[bookmarkid].iconFactory(PLACE_ICON_SIZE);
-            this.bookmarkItems[bookmarkid].addActor(icon, { align: St.Align.END});
-            this.bookmarkItems[bookmarkid].place = this.bookmarks[bookmarkid];
-            this._bookmarksSection.addMenuItem(this.bookmarkItems[bookmarkid]);
-            this.bookmarkItems[bookmarkid].connect('activate', function(actor,event) {
-                actor.place.launch();
-            });
-        }
-    },
-
-    _createDevices : function() {
-        this.devices = Main.placesManager.getMounts();
-
-        for (let devid = 0; devid < this.devices.length; devid++) {
-            this.deviceItems[devid] = new PopupMenu.PopupMenuItem(_(this.devices[devid].name));
-            let icon = this.devices[devid].iconFactory(PLACE_ICON_SIZE);
-            this.deviceItems[devid].addActor(icon, { align: St.Align.END});
-            this.deviceItems[devid].place = this.devices[devid];
-            this._devicesMenuItem.menu.addMenuItem(this.deviceItems[devid]);
-            this.deviceItems[devid].connect('activate', function(actor,event) {
-                actor.place.launch();
-            });
-        }
-
-        if (this.devices.length == 0)
-            this._devicesMenuItem.actor.hide();
-        else
-            this._devicesMenuItem.actor.show();
-    },
-
-    _clearBookmarks : function(){
-        this._bookmarksSection.removeAll();
-        this.bookmarkItems = [];
-    },
-
-    _clearDevices : function(){
-        this._devicesMenuItem.menu.removeAll();
-        this.DeviceItems = [];
-    },
-};
-
-
-function init(metadata) {
-    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
-}
-
-let _indicator;
-
-function enable() {
-    _indicator = new PlacesMenu;
-    Main.panel.addToStatusArea('places-menu', _indicator);
-}
-
-function disable() {
-    _indicator.destroy();
-}
--- a/extensions/places-menu/metadata.json.in
+++ b/extensions/places-menu/metadata.json.in
@@ -1,8 +0,0 @@
-{
-"uuid": "@uuid@",
-"name": "Places Status Indicator",
-"description": "Add a systems status menu for quickly navigating places in the system",
-"shell-version": [ "@shell_current@" ],
-"localedir": "@LOCALEDIR@",
-"url": "@url@"
-}
--- a/extensions/places-menu/stylesheet.css
+++ b/extensions/places-menu/stylesheet.css
@@ -1 +0,0 @@
-/* none used*/
--- a/extensions/systemMonitor/Makefile.am
+++ b/extensions/systemMonitor/Makefile.am
@@ -1,3 +0,0 @@
-EXTENSION_ID = systemMonitor
-
-include ../../extension.mk
--- a/extensions/systemMonitor/extension.js
+++ b/extensions/systemMonitor/extension.js
@@ -1,158 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const GTop = imports.gi.GTop;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-
-const Main = imports.ui.main;
-
-let _cpuIndicator;
-let _memIndicator;
-let _box;
-
-function Indicator() {
-    this._init();
-}
-
-Indicator.prototype = {
-    _init: function() {
-	this._initValues();
-        this.actor = new St.DrawingArea({ style_class: "extension-systemMonitor-indicator-area",
-                                          reactive: true});
-        this.actor.connect('repaint', Lang.bind(this, this._draw));
-        this.actor.connect('button-press-event', function() {
-            let app = Shell.AppSystem.get_default().lookup_app('gnome-system-monitor.desktop');
-            app.open_new_window(-1);
-        });
-
-	this._timeoutId = Mainloop.timeout_add(250, Lang.bind(this, function () {
-	    this._updateValues();
-            this.actor.queue_repaint();
-            return true;
-	}));
-    },
-
-    destroy: function() {
-        if (this._timeoutId) {
-            Mainloop.source_remove(this._timeoutId);
-            this._timeoutId = 0;
-        }
-
-        this.actor.destroy();
-    },
-
-    _initValues: function() {
-    },
-
-    _updateValues: function() {
-    },
-
-    _draw: function(area) {
-        let [width, height] = area.get_surface_size();
-        let themeNode = this.actor.get_theme_node();
-        let cr = area.get_context();
-        for (let i = this.values.length - 1; i >= 0; i--) {
-            let color = themeNode.get_color(this.values[i].color);
-            cr.moveTo(0, height);
-            let k;
-            for (k = 0; k < this.values[i].values.length; k++) {
-                cr.lineTo(k, (1 - this.values[i].values[k]) * height);
-            }
-            if (k > width)
-                this.values[i].values.shift();
-            cr.lineTo(k, height);
-            cr.lineTo(0, height);
-            cr.closePath();
-            Clutter.cairo_set_source_color(cr, color);
-
-	    cr.fill();
-        }
-    }
-};
-
-function CpuIndicator() {
-    this._init();
-}
-
-CpuIndicator.prototype = {
-    __proto__: Indicator.prototype,
-
-    _initValues: function() {
-        this._prev = new GTop.glibtop_cpu;
-        GTop.glibtop_get_cpu(this._prev);
-
-	this.values = [];
-	this.values.push({color: "-cpu-user-color", values: []});
-	this.values.push({color: "-cpu-sys-color", values: []});
-	this.values.push({color: "-cpu-iowait-color", values: []});
-    },
-
-    _updateValues: function() {
-        let cpu = new GTop.glibtop_cpu;
-        let t = 0.0;
-        GTop.glibtop_get_cpu(cpu);
-        let total = cpu.total - this._prev.total;
-        let user = cpu.user - this._prev.user;
-        let sys = cpu.sys - this._prev.sys;
-        let iowait = cpu.iowait - this._prev.iowait;
-
-        t = user / total;
-        this.values[0].values.push(t);
-
-        t += sys / total;
-        this.values[1].values.push(t);
-        t += iowait / total;
-        this.values[2].values.push(t);
-
-        this._prev = cpu;
-    }
-};
-
-function MemoryIndicator() {
-    this._init();
-}
-
-MemoryIndicator.prototype = {
-    __proto__: Indicator.prototype,
-
-    _initValues: function() {
-        this.mem = new GTop.glibtop_mem;
-	this.values = [];
-        this.values.push({ color: "-mem-user-color", values: [] });
-        this.values.push({ color: "-mem-other-color", values: [] });
-        this.values.push({ color: "-mem-cached-color", values: [] });
-    },
-
-    _updateValues: function() {
-        GTop.glibtop_get_mem(this.mem);
-
-        let t = this.mem.user / this.mem.total;
-        this.values[0].values.push(t);
-        t += (this.mem.used - this.mem.user - this.mem.cached) / this.mem.total;
-        this.values[1].values.push(t);
-        t += this.mem.cached / this.mem.total;
-        this.values[2].values.push(t);
-    }
-};
-
-function init() {
-    // nothing to do here
-}
-
-function enable() {
-    _cpuIndicator = new CpuIndicator(); 
-    _memIndicator = new MemoryIndicator();
-    _box = new St.BoxLayout({ style_class: 'extension-systemMonitor-container' });
-    _box.add(_cpuIndicator.actor);
-    _box.add(_memIndicator.actor);
-    Main.messageTray.actor.add_actor(_box);
-}
-
-function disable() {
-    _cpuIndicator.destroy();
-    _memIndicator.destroy();
-    _box.destroy();
-}
--- a/extensions/systemMonitor/metadata.json.in
+++ b/extensions/systemMonitor/metadata.json.in
@@ -1,9 +0,0 @@
-{
-    "shell-version": ["@shell_current@"],
-    "uuid": "@uuid@",
-    "localedir": "@LOCALEDIR@",
-    "original-author": "zaspire@rambler.ru",
-    "name": "SystemMonitor",
-    "description": "System Monitor",
-    "url": "@url@"
-}
--- a/extensions/systemMonitor/stylesheet.css
+++ b/extensions/systemMonitor/stylesheet.css
@@ -1,16 +0,0 @@
-.extension-systemMonitor-container {
-    spacing: 5px;
-}
-
-.extension-systemMonitor-indicator-area {
-    border: 1px solid #000;
-    width: 100px;
-    height: 34px;
-    -cpu-user-color: #f00;
-    -cpu-sys-color: #0f0;
-    -cpu-iowait-color: #00f;
-    -mem-user-color: #ff0;
-    -mem-cached-color: #0ff;
-    -mem-other-color: #111;
-    background-color: #fff;
-}
--- a/extensions/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -15,40 +15,25 @@ function ThemeManager() {

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

-    disable: function() {
-        if (this._changedId) {
-            this._settings.disconnect(this._changedId);
-            this._changedId = 0;
-        }
-
-        this._settings = null;
-
-        Main.setThemeStylesheet(null);
-        Main.loadTheme();
-    },
-
    _changeTheme: function() {
        let _stylesheet = null;
        let _themeName = this._settings.get_string(SETTINGS_KEY);

        if (_themeName) {
            let _userCssStylesheet = GLib.get_home_dir() + '/.themes/' + _themeName + '/gnome-shell/gnome-shell.css';
-            let file = Gio.file_new_for_path(_userCssStylesheet);
+            file = Gio.file_new_for_path(_userCssStylesheet);
            if (file.query_exists(null))
                _stylesheet = _userCssStylesheet;
            else {
                let sysdirs = GLib.get_system_data_dirs();
                for (let i = 0; i < sysdirs.length; i++) {
                    _userCssStylesheet = sysdirs[i] + '/themes/' + _themeName + '/gnome-shell/gnome-shell.css';
-                    let file = Gio.file_new_for_path(_userCssStylesheet);
+                    file = Gio.file_new_for_path(_userCssStylesheet);
                    if (file.query_exists(null)) {
                        _stylesheet = _userCssStylesheet;
                        break;
@@ -67,6 +52,6 @@ ThemeManager.prototype = {
 }


-function init(metadata) {
-    return new ThemeManager();
+function main(metadata) {
+    new ThemeManager();
 }
--- a/extensions/user-theme/metadata.json.in
+++ b/extensions/user-theme/metadata.json.in
@@ -2,7 +2,7 @@
 "uuid": "@uuid@",
 "name": "User Themes",
 "description": "Load shell themes from user directory",
- "shell-version": [ "@shell_current@" ],
+ "shell-version": [ "3.0" ],
 "localedir": "@LOCALEDIR@",
 "original-authors": [ "john.stowers@gmail.com" ],
 "url": "@url@"
--- a/extensions/user-theme/stylesheet.css
+++ b/extensions/user-theme/stylesheet.css
@@ -1 +0,0 @@
-/* none used */
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -17,22 +17,9 @@ function injectToFunction(parent, name, func) {
            ret = func.apply(this, arguments);
        return ret;
    }
-    return origin;
 }

-let winInjections, workspaceInjections, workViewInjections, createdActors, connectedSignals;
-
-function resetState() {
-    winInjections = { };
-    workspaceInjections = { };
-    workViewInjections = { };
-    createdActors = [ ];
-    connectedSignals = [ ];
-}
-
-function enable() {
-    resetState();
-
+function main() {
    Workspace.WindowOverlay.prototype.setId = function(id) {
        if (this._text.visible && id == null)
            this._text.hide();
@@ -40,13 +27,9 @@ function enable() {
        if (id != null)
            this._text.text = this._id.toString();
    }
-    winInjections['setId'] = undefined;
-
    Workspace.WindowOverlay.prototype.getId = function() {
        return this._id;
    }
-    winInjections['getId'] = undefined;
-
    Workspace.WindowOverlay.prototype.showTooltip = function() {
        if (this._id === null)
            return;
@@ -54,13 +37,10 @@ function enable() {
        this._text.show();
        this._text.text = this._id.toString();
    }
-    winInjections['showTooltip'] = undefined;
-
    Workspace.WindowOverlay.prototype.hideTooltip = function() {
        if (this._text.visible)
            this._text.hide();
    }
-    winInjections['hideTooltip'] = undefined;

    Workspace.Workspace.prototype.showTooltip = function() {
        if (this._tip == null)
@@ -71,8 +51,6 @@ function enable() {
        this._tip.show();
        this._tip.raise_top();
    }
-    workspaceInjections['showTooltip'] = undefined;
-
    Workspace.Workspace.prototype.hideTooltip = function() {
        if (this._tip == null)
            return;
@@ -80,8 +58,6 @@ function enable() {
            return;
        this._tip.hide();
    }
-    workspaceInjections['hideTooltip'] = undefined;
-
    Workspace.Workspace.prototype.getWindowWithTooltip = function(id) {
        for (let i in this._windowOverlays) {
            if (this._windowOverlays[i] == null)
@@ -91,23 +67,18 @@ function enable() {
        }
        return null;
    }
-    workspaceInjections['getWindowWithTooltip'] = undefined;
-
    Workspace.Workspace.prototype.showWindowsTooltips = function() {
        for (let i in this._windowOverlays) {
            if (this._windowOverlays[i] != null)
                this._windowOverlays[i].showTooltip();
        }
    }
-    workspaceInjections['showWindowsTooltips'] = undefined;
-
    Workspace.Workspace.prototype.hideWindowsTooltips = function() {
        for (let i in this._windowOverlays) {
            if (this._windowOverlays[i] != null)
                this._windowOverlays[i].hideTooltip();
        }
    }
-    workspaceInjections['hideWindowsTooltips'] = undefined;

    WorkspacesView.WorkspacesView.prototype._hideTooltips = function() {
        if (global.stage.get_key_focus() == global.stage)
@@ -116,7 +87,6 @@ function enable() {
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].hideWindowsTooltips();
    }
-    workViewInjections['_hideTooltips'] = undefined;

    WorkspacesView.WorkspacesView.prototype._hideWorkspacesTooltips = function() {
        global.stage.set_key_focus(this._prevFocusActor);
@@ -124,18 +94,15 @@ function enable() {
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].hideTooltip();
    }
-    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.Alt_L)
            this._hideTooltips();
-        if (this._pickWorkspace && o.get_key_symbol() == Clutter.KEY_Control_L)
+        if (this._pickWorkspace && o.get_key_symbol() == Clutter.Control_L)
            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.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();
@@ -143,7 +110,7 @@ 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.Control_L && !this._pickWindow) {
            this._prevFocusActor = global.stage.get_key_focus();
            global.stage.set_key_focus(null);
            this._pickWorkspace = true;
@@ -160,68 +127,57 @@ function enable() {
                this._hideTooltips();
                return false;
            }
-
-            let c = o.get_key_symbol() - Clutter.KEY_0;
-            if (c > 9 || c <= 0) {
+            let c = o.get_key_unicode();
+            if (c > '9'.charCodeAt(0) || c < '0'.charCodeAt(0)) {
                this._hideTooltips();
                return false;
            }
-
-            let win = this._workspaces[this._active].getWindowWithTooltip(c);
+            let win = this._workspaces[this._active].getWindowWithTooltip(c - '0'.charCodeAt(0));
            this._hideTooltips();
-
            if (win)
                Main.activateWindow(win, global.get_current_time());
-
            return true;
        }
        if (this._pickWorkspace) {
-            let c = o.get_key_symbol() - Clutter.KEY_0;
-            if (c > 9 || c <= 0) {
+            let c = o.get_key_unicode();
+            if (c > '9'.charCodeAt(0) || c < '0'.charCodeAt(0)) {
                this._hideWorkspacesTooltips();
                return false;
            }
-
-            let workspace = this._workspaces[c - 1];
+            let workspace = this._workspaces[c - '0'.charCodeAt(0) - 1];
            if (workspace !== undefined)
                workspace.metaWorkspace.activate(global.get_current_time());
-
            this._hideWorkspacesTooltips();
            return true;
        }
        return false;
    }
-    workViewInjections['_onKeyPress'] = undefined;

-    winInjections['_init'] = injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
+    injectToFunction(Workspace.WindowOverlay.prototype, '_init', function(windowClone, parentActor) {
        this._id = null;
-        createdActors.push(this._text = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip' }));
+        this._text = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip' });
        this._text.hide();
        parentActor.add_actor(this._text);
    });
-
-    winInjections['updatePositions'] = injectToFunction(Workspace.WindowOverlay.prototype, 'updatePositions', function(cloneX, cloneY, cloneWidth, cloneHeight) {
+    injectToFunction(Workspace.WindowOverlay.prototype, 'updatePositions', function(cloneX, cloneY, cloneWidth, cloneHeight) {
        let textX = cloneX - 2;
        let textY = cloneY - 2;
        this._text.set_position(Math.floor(textX), Math.floor(textY));
        this._text.raise_top();
    });
-
-    workspaceInjections['_init'] = injectToFunction(Workspace.Workspace.prototype, '_init', function(metaWorkspace) {
+    injectToFunction(Workspace.Workspace.prototype, '_init', function(metaWorkspace) {
        if (metaWorkspace && metaWorkspace.index() < 9) {
-            createdActors.push(this._tip = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip',
-                                                          visible: false }));
+            this._tip = new St.Label({ style_class: 'extension-windowsNavigator-window-tooltip',
+                                       visible: false });

            this.actor.add_actor(this._tip);
-            let signalId = this.actor.connect('notify::scale-x', Lang.bind(this, function() {
+            this.actor.connect('notify::scale-x', Lang.bind(this, function() {
                this._tip.set_scale(1 / this.actor.scale_x, 1 / this.actor.scale_x);
            }));
-            connectedSignals.push({ obj: this.actor, id: signalId });
        } else
            this._tip = null;
    });
-
-    workspaceInjections['positionWindows'] = injectToFunction(Workspace.Workspace.prototype, 'positionWindows', function(flags) {
+    injectToFunction(Workspace.Workspace.prototype, 'positionWindows', function(flags) {
        let visibleClones = this._windows.slice();
        if (this._reservedSlot)
            visibleClones.push(this._reservedSlot);
@@ -238,46 +194,14 @@ function enable() {
        }
    });

-    workViewInjections['_init'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(width, height, x, y, workspaces) {
+    injectToFunction(WorkspacesView.WorkspacesView.prototype, '_init', function(width, height, x, y, workspaces) {
        this._pickWorkspace = false;
        this._pickWindow = false;
        this._keyPressEventId = global.stage.connect('key-press-event', Lang.bind(this, this._onKeyPress));
        this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._onKeyRelease));
-        connectedSignals.push({ obj: global.stage, id: this._keyPressEventId });
-        connectedSignals.push({ obj: global.stage, id: this._keyReleaseEventId });
    });
-
-    workViewInjections['_onDestroy'] = injectToFunction(WorkspacesView.WorkspacesView.prototype, '_onDestroy', function() {
+    injectToFunction(WorkspacesView.WorkspacesView.prototype, '_onDestroy', function() {
        global.stage.disconnect(this._keyPressEventId);
        global.stage.disconnect(this._keyReleaseEventId);
-        connectedSignals = [ ];
    });
 }
-
-function removeInjection(object, injection, name) {
-    if (injection[name] === undefined)
-        delete object[name];
-    else
-        object[name] = injection[name];
-}
-
-function disable() {
-    for (i in workspaceInjections)
-        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
-    for (i in winInjections)
-        removeInjection(Workspace.WindowOverlay.prototype, winInjections, i);
-    for (i in workViewInjections)
-        removeInjection(WorkspacesView.WorkspacesView.prototype, workViewInjections, i);
-
-    for each (i in connectedSignals)
-        i.obj.disconnect(i.id);
-
-    for each (i in createdActors)
-        i.destroy();
-
-    resetState();
-}
-
-function init() {
-    /* do nothing */
-}
--- a/extensions/windowsNavigator/metadata.json.in
+++ b/extensions/windowsNavigator/metadata.json.in
@@ -1,5 +1,5 @@
 {
-    "shell-version": ["@shell_current@"],
+    "shell-version": ["3.0.0", "3.0.1", "3.0.2"],
    "uuid": "@uuid@",
    "localedir": "@LOCALEDIR@",
    "original-author": "zaspire@rambler.ru",
--- a/extensions/workspace-indicator/Makefile.am
+++ b/extensions/workspace-indicator/Makefile.am
@@ -1,3 +0,0 @@
-EXTENSION_ID = workspace-indicator
-
-include ../../extension.mk
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -1,109 +0,0 @@
-const Meta = imports.gi.Meta;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-const Panel = imports.ui.panel;
-
-const Main = imports.ui.main;
-
-function WorkspaceIndicator() {
-	this._init.apply(this, arguments);
-}
-
-WorkspaceIndicator.prototype = {
-	__proto__: PanelMenu.SystemStatusButton.prototype,
-
-	_init: function(){
-		PanelMenu.SystemStatusButton.prototype._init.call(this, 'folder');
-
-	        this._currentWorkspace = global.screen.get_active_workspace().index();
-		this.statusLabel = new St.Label({ text: this._labelText() });
-		this.actor.set_child(this.statusLabel);
-
-		this.workspacesItems = [];
-		this._workspaceSection = new PopupMenu.PopupMenuSection();
-		this.menu.addMenuItem(this._workspaceSection);
-		global.screen.connect_after('workspace-added', Lang.bind(this,this._createWorkspacesSection));
-		global.screen.connect_after('workspace-removed', Lang.bind(this,this._createWorkspacesSection));
-		global.screen.connect_after('workspace-switched', Lang.bind(this,this._updateIndicator));
-		this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
-		this._createWorkspacesSection();
-
-		//styling
-		this.menu.actor.add_style_class_name('workspace-indicator-shorter');
-	},
-
-	_updateIndicator: function() {
-	    this.workspacesItems[this._currentWorkspace].setShowDot(false);
-	    this._currentWorkspace = global.screen.get_active_workspace().index();
-	    this.workspacesItems[this._currentWorkspace].setShowDot(true);
-
-	    this.statusLabel.set_text(this._labelText());
-	},
-
-	_labelText : function(workspaceIndex) {
-	    if(workspaceIndex == undefined) {
-		workspaceIndex = this._currentWorkspace;
-	    }
-	    return Meta.prefs_get_workspace_name(workspaceIndex);
-	},
-
-	_createWorkspacesSection : function() {
-		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);
-			}));
-		}
-
-	    this._updateIndicator();
-	},
-
-	_activate : function (index) {
-		if(index >= 0 && index <  global.screen.n_workspaces) {
-			let metaWorkspace = global.screen.get_workspace_by_index(index);
-			metaWorkspace.activate(true);
-		}
-	},
-
-	_onScrollEvent : function(actor, event) {
-		let direction = event.get_scroll_direction();
-		let diff = 0;
-		if (direction == Clutter.ScrollDirection.DOWN) {
-			diff = 1;
-		} else if (direction == Clutter.ScrollDirection.UP) {
-			diff = -1;
-		} else {
-			return;
-		}
-
-		let newIndex = global.screen.get_active_workspace().index() + diff;
-		this._activate(newIndex);
-	},
-}
-
-function init(meta) {
-    Panel.STANDARD_TRAY_ICON_ORDER.unshift('workspace-indicator');
-}
-
-let _indicator;
-
-function enable() {
-    _indicator = new WorkspaceIndicator;
-    Main.panel.addToStatusArea('workspace-indicator', _indicator);
-}
-
-function disable() {
-    _indicator.destroy();
-}
--- a/extensions/workspace-indicator/metadata.json.in
+++ b/extensions/workspace-indicator/metadata.json.in
@@ -1,9 +0,0 @@
-{
-    "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@" ],
-    "localedir": "@LOCALEDIR@",
-    "original-authors": [ "erick.red@gmail.com" ],
-    "url": "@url@"
-}
--- a/extensions/workspace-indicator/stylesheet.css
+++ b/extensions/workspace-indicator/stylesheet.css
@@ -1,4 +0,0 @@
-.workspace-indicator-shorter {
-	min-width: 25px;
-	font-size: 10pt;
-}
--- a/extensions/xrandr-indicator/extension.js
+++ b/extensions/xrandr-indicator/extension.js
@@ -102,7 +102,7 @@ Indicator.prototype = {
                    output.set_rotation(bitmask);
                    try {
                        config.save();
-                        this._proxy.ApplyConfigurationRemote(0, event.get_time());
+                        this._proxy.ApplyConfigurationRemote(global.stage_xwindow, event.get_time());
                    } catch (e) {
                        log ('Could not save monitor configuration: ' + e);
                    }
@@ -136,17 +136,8 @@ Indicator.prototype = {
 }


-function init(metadata) {
+function main(metadata) {
    imports.gettext.bindtextdomain('gnome-shell-extensions', metadata.localedir);
+
+    Panel.STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION['display'] = Indicator;
 }
-
-let _indicator;
-
-function enable() {
-    _indicator = new Indicator();
-    Main.panel.addToStatusArea('display', _indicator);
-}
-
-function disable() {
-    _indicator.destroy();
-}
--- a/extensions/xrandr-indicator/metadata.json.in
+++ b/extensions/xrandr-indicator/metadata.json.in
@@ -2,7 +2,7 @@
 "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@" ],
+"shell-version": [ "3.0" ],
 "localedir": "@LOCALEDIR@",
 "url": "@url@"
 }
--- a/gnome-shell-extensions.doap
+++ b/gnome-shell-extensions.doap
@@ -6,13 +6,6 @@

  <name xml:lang="en">GNOME Shell Extensions</name>
  <shortdesc xml:lang="en">Modify and extend GNOME Shell functionality and behavior</shortdesc>
-  <description xml:lang="en">
-GNOME Shell Extensions is a collection of extensions providing
-additional and optional functionality to GNOME Shell.
-Most extensions can be installed by configuring --prefix=$HOME/.local,
-and will be picked automatically at next login.
-  </description>
-  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-shell&amp;component=extensions" />
  <homepage rdf:resource="http://live.gnome.org/GnomeShell/Extenstions" />

  <maintainer>
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,25 +1,16 @@
-ca
 cs
 da
 de
 es
-fa
 fr
 gl
-he
-hu
 it
-ja
 lv
 nb
-pa
 pt
 pt_BR
 pl
-ru
 sl
 sv
 vi
 zh_CN
-zh_HK
-zh_TW
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,13 +1,10 @@
 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/ca.po
+++ b/po/ca.po
@@ -1,318 +0,0 @@
-# Catalan 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.
-# Jordi Mas i Hernandez <jmas@softcatala.org>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-06 13:25+0200\n"
-"PO-Revision-Date: 2011-08-02 07:30+0200\n"
-"Last-Translator: jmas@softcatala.org\n"
-"Language-Team: ca_ES <tradgnome@softcatala.net>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../extensions/alternative-status-menu/extension.js:39
-msgid "Available"
-msgstr "Disponible"
-
-#: ../extensions/alternative-status-menu/extension.js:44
-msgid "Busy"
-msgstr "Ocupat"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "My Account"
-msgstr "El meu compte"
-
-#: ../extensions/alternative-status-menu/extension.js:56
-msgid "System Settings"
-msgstr "Paràmetres de l'ordinador"
-
-#: ../extensions/alternative-status-menu/extension.js:63
-msgid "Lock Screen"
-msgstr "Bloca la pantalla"
-
-#: ../extensions/alternative-status-menu/extension.js:67
-msgid "Switch User"
-msgstr "Canvia d'usuari"
-
-#: ../extensions/alternative-status-menu/extension.js:72
-msgid "Log Out..."
-msgstr "Surt..."
-
-#: ../extensions/alternative-status-menu/extension.js:79
-msgid "Suspend"
-msgstr "Atura temporalment"
-
-#: ../extensions/alternative-status-menu/extension.js:85
-msgid "Hibernate"
-msgstr "Hiberna"
-
-#: ../extensions/alternative-status-menu/extension.js:91
-msgid "Power Off..."
-msgstr "Apaga..."
-
-#: ../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"
-"\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"
-msgstr ""
-"Aquest és el primer cop que useu l'extensió Alternate Tab. \n"
-"Trieu el vostre comportament preferit:\n"
-"\n"
-"Totes i miniatures:\n"
-"    Aquest mode presenta totes les aplicacions de tots els espais de treball "
-"com a\n"
-"    una llista de selecció. En comptes d'usar la icona d'aplicació de cada "
-"finestra, usa \n"
-"    miniatures que representen el contingut de la finestra. \n"
-"\n"
-"Espai de treball i icones:\n"
-"    Aquest mode us permet canviar entre aplicacions de l'espai de treball "
-"actual \n"
-"    i us dóna la possibilitat de canviar a l'última aplicació usada de "
-"l'espai de \n"
-"    treball anterior. Aquest és sempre el darrer símbol a la llista i està "
-"separat  \n"
-"    per una línia vertical/separador quan està disponible. \n"
-"    Cada finestra es representa per la seva icona d'aplicació.  \n"
-"\n"
-"Nadiu:\n"
-"    Aquest és el mode de comportament nadiu al GNOME 3 o amb altres "
-"paraules: fent \n"
-"    clic inhabilita l'extensió Alternate Tab. \n"
-
-#: ../extensions/alternate-tab/extension.js:269
-msgid "Alt Tab Behaviour"
-msgstr "Comportament de l'Alt Tab"
-
-#: ../extensions/alternate-tab/extension.js:285
-msgid "All & Thumbnails"
-msgstr "Totes i miniatures"
-
-#: ../extensions/alternate-tab/extension.js:292
-msgid "Workspace & Icons"
-msgstr "Espai de treball i icones"
-
-#: ../extensions/alternate-tab/extension.js:299
-msgid "Native"
-msgstr "Nadiu"
-
-#: ../extensions/alternate-tab/extension.js:306
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: ../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 "Si és cert, pregunta a l'usuari pel comportament per defecte."
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:2
-msgid "Indicates if Alternate Tab is newly installed"
-msgstr "Indica si s'acaba d'instal·lar novament l'Alternate Tab"
-
-#: ../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 ""
-"Defineix el comportament de l'Alt-Tab. Els valors possibles són: «native», "
-"«all_thumbnails» i «workspace_icons»."
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:4
-msgid "The alt tab behaviour."
-msgstr "Comportament de l'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), "
-"followed by a colon and the workspace number"
-msgstr ""
-"Una llista de cadenes, que cada una conté l'identificador d'aplicació (nom del "
-"fitxer de l'escriptori), seguit de dos punts i el número de l'espai de "
-"treball"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid "Application and workspace list"
-msgstr "Aplicació i llista d'espais de treball"
-
-#: ../extensions/dock/extension.js:437
-msgid "Drag here to add favorites"
-msgstr "Arrossegueu aquí per afegir als preferits"
-
-#: ../extensions/dock/extension.js:771
-msgid "New Window"
-msgstr "Finestra nova"
-
-#: ../extensions/dock/extension.js:773
-msgid "Quit Application"
-msgstr "Surt de l'aplicació"
-
-#: ../extensions/dock/extension.js:778
-msgid "Remove from Favorites"
-msgstr "Suprimeix dels favorits"
-
-#: ../extensions/dock/extension.js:779
-msgid "Add to Favorites"
-msgstr "Afegeix als favorits"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:1
-msgid "Autohide duration"
-msgstr "Duració de l'ocultació automàtica"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:2
-msgid "Autohide effect"
-msgstr "Efecte d'ocultació automàtica"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:3
-msgid "Enable/disable autohide"
-msgstr "Habilita/Inhabilita l'ocultació automàtica"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:4
-msgid "Icon size"
-msgstr "Mida de l'icona"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:5
-msgid "Position of the dock"
-msgstr "Posició de l'acoblador"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:6
-msgid "Sets icon size of the dock."
-msgstr "Defineix la mida de l'icona per a l'acoblador."
-
-#: ../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 ""
-"Defineix l'efecte de l'acoblador amagat. Els valors permesos són «resize» o "
-"«rescale»"
-
-#: ../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 ""
-"Defineix la posició de l'acoblador a la pantalla. Els valors permesos són "
-"«right» o «left»"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:9
-msgid "Sets the time duration of the autohide effect."
-msgstr "Defineix la durada en temps de l'efecte d'ocultació automàtica."
-
-#: ../extensions/example/extension.js:11
-msgid "Hello, world!"
-msgstr "Hola, món!"
-
-#: ../extensions/gajim/extension.js:219
-#, c-format
-msgid "%s is away."
-msgstr "%s es troba absent."
-
-#: ../extensions/gajim/extension.js:222
-#, c-format
-msgid "%s is offline."
-msgstr "%s està fora de línia."
-
-#: ../extensions/gajim/extension.js:225
-#, c-format
-msgid "%s is online."
-msgstr "%s està en línia."
-
-#: ../extensions/gajim/extension.js:228
-#, c-format
-msgid "%s is busy."
-msgstr "%s està ocupat."
-
-#: ../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 ""
-"Si és cert, posiciona el títol de la finestra damunt de la miniatura "
-"corresponent, substituint comportament per defecte del Shell de posicionar-"
-"ho a baix. Per tal de que aquest canvi tingui efecte cal reiniciar el Shell."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid "Place window captions on top"
-msgstr "Posiciona els títols de les finestres al damunt"
-
-#: ../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 ""
-"L'algoritme usat per posicionar les miniatures en la perspectiva general. "
-"Useu «grid» per a utilitzar l'algoritme per defecte basat en disposició en "
-"graella, o «natural» per a usar un algoritme que reflexa millor la posició i "
-"mida de la finestra actual."
-
-#: ../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 ""
-"Intenta usar més pantalla per a posicionar les miniatures de les finestres "
-"adaptant la ràtio d'aspecte de la pantalla, consolidant-les més per a reduir "
-"la capsa que les envolta. Aquest paràmetre de configuració s'aplica "
-"només a l'estratègia de posicionament de finestres natural."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:5
-msgid "Use more screen for windows"
-msgstr "Usa més pantalla per les finestres"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:6
-msgid "Window placement strategy"
-msgstr "Estratègia de posicionament de la finestra"
-
-#: ../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 "El nom del tema, que es carregarà des de ~/.themes/name/gnome-shell"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "Theme name"
-msgstr "Nom del tema"
-
-#: ../extensions/xrandr-indicator/extension.js:26
-msgid "Normal"
-msgstr "Normal"
-
-#: ../extensions/xrandr-indicator/extension.js:27
-msgid "Left"
-msgstr "Esquerra"
-
-#: ../extensions/xrandr-indicator/extension.js:28
-msgid "Right"
-msgstr "Dreta"
-
-#: ../extensions/xrandr-indicator/extension.js:29
-msgid "Upside-down"
-msgstr "Capgira"
-
-#: ../extensions/xrandr-indicator/extension.js:78
-msgid "Configure display settings..."
-msgstr "Configura els paràmetres de visualització..."
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,143 +0,0 @@
-# Persian translation for gnome-shell-extensions.
-# Copyright (C) 2011 Iranian Free Software Users Group (IFSUG.org) translation team.
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# Arash Mousavi <mousavi.arash@gmail.com>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions gnome-3-0\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-05-21 14:17+0000\n"
-"PO-Revision-Date: 2011-05-23 22:28+0330\n"
-"Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
-"Language-Team: Persian <translate@ifsug.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Persian\n"
-"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
-"X-Poedit-SourceCharset: utf-8\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 "خواب‌زمستانی"
-
-#: ../extensions/alternative-status-menu/extension.js:26
-#: ../extensions/alternative-status-menu/extension.js:92
-msgid "Suspend"
-msgstr "تعلیق"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "Available"
-msgstr "موجود"
-
-#: ../extensions/alternative-status-menu/extension.js:57
-msgid "Busy"
-msgstr "مشغول"
-
-#: ../extensions/alternative-status-menu/extension.js:65
-msgid "My Account"
-msgstr "حساب من"
-
-#: ../extensions/alternative-status-menu/extension.js:69
-msgid "System Settings"
-msgstr "تنظیمات سیستم"
-
-#: ../extensions/alternative-status-menu/extension.js:76
-msgid "Lock Screen"
-msgstr "قفل‌کردن صفحه‌نمایش"
-
-#: ../extensions/alternative-status-menu/extension.js:80
-msgid "Switch User"
-msgstr "تعویض کاربر"
-
-#: ../extensions/alternative-status-menu/extension.js:85
-msgid "Log Out..."
-msgstr "خروج از سیستم..."
-
-#: ../extensions/alternative-status-menu/extension.js:100
-msgid "Power Off..."
-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:116
-msgid "Drag here to add favorites"
-msgstr "به اینجا بکشید تا به علاقه‌مندی‌ها اضافه شود"
-
-#: ../extensions/dock/extension.js:417
-msgid "New Window"
-msgstr "پنجره جدید"
-
-#: ../extensions/dock/extension.js:419
-msgid "Quit Application"
-msgstr "خروج از برنامه"
-
-#: ../extensions/dock/extension.js:424
-msgid "Remove from Favorites"
-msgstr "حذف از علاقه‌مندی‌ها"
-
-#: ../extensions/dock/extension.js:425
-msgid "Add to Favorites"
-msgstr "اضافه کردن به علاقه‌مندی‌ها"
-
-#: ../extensions/example/extension.js:11
-msgid "Hello, world!"
-msgstr "سلام دنیا!"
-
-#: ../extensions/gajim/extension.js:219
-#, c-format
-msgid "%s is away."
-msgstr "%s غائب است."
-
-#: ../extensions/gajim/extension.js:222
-#, c-format
-msgid "%s is offline."
-msgstr "%s برون‌خط است."
-
-#: ../extensions/gajim/extension.js:225
-#, c-format
-msgid "%s is online."
-msgstr "%s برخط است."
-
-#: ../extensions/gajim/extension.js:228
-#, c-format
-msgid "%s is busy."
-msgstr "%s مشغول است."
-
-#: ../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 "نام تم، جهت بارگیری از شاخه themes/name/gnome-shell./~"
-
-#: ../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 "عادی"
-
-#: ../extensions/xrandr-indicator/extension.js:27
-msgid "Left"
-msgstr "چپ"
-
-#: ../extensions/xrandr-indicator/extension.js:28
-msgid "Right"
-msgstr "راست"
-
-#: ../extensions/xrandr-indicator/extension.js:29
-msgid "Upside-down"
-msgstr "برعکس"
-
-#: ../extensions/xrandr-indicator/extension.js:78
-msgid "Configure display settings..."
-msgstr "پیکربندی تنظیمات نمایش..."
-
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-30 17:01+0200\n"
-"PO-Revision-Date: 2011-08-30 17:04+0200\n"
+"POT-Creation-Date: 2011-04-14 09:58+0200\n"
+"PO-Revision-Date: 2011-04-14 09:54+0200\n"
 "Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -18,134 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: ../extensions/alternative-status-menu/extension.js:39
-msgid "Available"
-msgstr "Dispoñible"
-
-#: ../extensions/alternative-status-menu/extension.js:44
-msgid "Busy"
-msgstr "Ocupado"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "My Account"
-msgstr "A Miña Conta"
-
-#: ../extensions/alternative-status-menu/extension.js:56
-msgid "System Settings"
-msgstr "Configuracións do sistema"
-
-#: ../extensions/alternative-status-menu/extension.js:63
-msgid "Lock Screen"
-msgstr "Bloquear Pantaia"
-
-#: ../extensions/alternative-status-menu/extension.js:68
-msgid "Switch User"
-msgstr "Trocar de Usario"
-
-#: ../extensions/alternative-status-menu/extension.js:73
-msgid "Log Out..."
-msgstr "Sair da sesión"
-
-#: ../extensions/alternative-status-menu/extension.js:82
-msgid "Suspend"
-msgstr "Suspender"
-
-#: ../extensions/alternative-status-menu/extension.js:88
-msgid "Hibernate"
-msgstr "Hibernar"
-
-#: ../extensions/alternative-status-menu/extension.js:94
-msgid "Power Off..."
-msgstr "Apagar…"
-
-#: ../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"
-"\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"
-msgstr ""
-"É a primeira vez que usa a extensión de Tab alternativo.\n"
-"Seleccione o comportamento prefirido:\n"
-"\n"
-"Todo e miniaturas:\n"
-"    Este modo mostra tódolos aplicativos de tódolos espazos de traballa "
-"nunha\n"
-"    lista de selección. No lugar de usar as iconas de aplicativos para cada\n"
-"    xanela, usa miniaturas pequenas que representan as xanelas.\n"
-"\n"
-"Espazos de traballo e iconas:\n"
-"    Este modo permítelle cambiar entre os aplicativos do seu espazo de "
-"traballo \n"
-"    actual e permítelle engadir a opción de cambiar entre o último "
-"aplicativo\n"
-"    usado do seu espazo de traballo anterior. Sempre é o último símbolo na\n"
-"    lista e está separado por unha liña separador/vertical se está "
-"dispoñíbel.\n"
-"    Cada xanela está representada pola icona do aplicativo.\n"
-"\n"
-"Nativo:\n"
-"    Este modo é o comportamento nativo de GNOME 3 ou noutras palabras: ao \n"
-"    seleccionar nativo desactiva a extensión Tab alternativo.\n"
-
-#: ../extensions/alternate-tab/extension.js:269
-msgid "Alt Tab Behaviour"
-msgstr "Comportamento do Alt Tab"
-
-#: ../extensions/alternate-tab/extension.js:285
-msgid "All & Thumbnails"
-msgstr "Todo e miniaturas"
-
-#: ../extensions/alternate-tab/extension.js:292
-msgid "Workspace & Icons"
-msgstr "Espazos de traballo e iconas"
-
-#: ../extensions/alternate-tab/extension.js:299
-msgid "Native"
-msgstr "Nativa"
-
-#: ../extensions/alternate-tab/extension.js:306
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../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 "Preguntarlle o comportamento predeterminado ao usuario se é certo."
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:2
-msgid "Indicates if Alternate Tab is newly installed"
-msgstr "Indica se o Tab alternativo está instalado recentemente"
-
-#: ../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 ""
-"Estabelece o comportamento do Alt-Tab. Os valores posíbeis son: nativa, "
-"all_thumbnaisl e worspace_icons."
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:4
-msgid "The alt tab behaviour."
-msgstr "O comportamento de 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), "
@@ -158,69 +30,26 @@ msgstr ""
 msgid "Application and workspace list"
 msgstr "Lista de aplicativos e espazos de traballo"

-#: ../extensions/dock/extension.js:486
+#: ../extensions/dock/extension.js:116
 msgid "Drag here to add favorites"
 msgstr "Arrastre aquí para engadir aos favoritos"

-#: ../extensions/dock/extension.js:820
+#: ../extensions/dock/extension.js:417
 msgid "New Window"
 msgstr "Nova xanela"

-#: ../extensions/dock/extension.js:822
+#: ../extensions/dock/extension.js:419
 msgid "Quit Application"
 msgstr "Saír do aplicativo"

-#: ../extensions/dock/extension.js:827
+#: ../extensions/dock/extension.js:424
 msgid "Remove from Favorites"
 msgstr "Eliminar dos favoritos"

-#: ../extensions/dock/extension.js:828
+#: ../extensions/dock/extension.js:425
 msgid "Add to Favorites"
 msgstr "Engadir aos favoritos"

-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:1
-msgid "Autohide duration"
-msgstr "Duración do autoagochado"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:2
-msgid "Autohide effect"
-msgstr "Efecto de autoagochado"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:3
-msgid "Enable/disable autohide"
-msgstr "Activar/desactivar autoagochado"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:4
-msgid "Icon size"
-msgstr "Tamaño da icona"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:5
-msgid "Position of the dock"
-msgstr "Posición da doca"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:6
-msgid "Sets icon size of the dock."
-msgstr "Estabelece o tamaño das iconas na doca."
-
-#: ../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 ""
-"Estabelece o efecto de agochado da doca. Os valores permitidos son «resize» "
-"e «rescale»"
-
-#: ../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 ""
-"Estabelece a posición da doca na pantalla. Os valores permitidos son «right» "
-"e «left»"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:9
-msgid "Sets the time duration of the autohide effect."
-msgstr "Estabelece a duración do efecto de autoagochado."
-
 #: ../extensions/example/extension.js:11
 msgid "Hello, world!"
 msgstr "Hola, mundo!"
@@ -245,45 +74,6 @@ msgstr "%s está conectado."
 msgid "%s is busy."
 msgstr "%s está ocupado."

-#: ../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 "Pór a xanela sempre na parte superior"
-
-#: ../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 ""
-"O algoritmo usado pola disposición de miniaturas na vista previa. «grid» "
-"para usar o algoritmo predeterminado baseado na grella, «natural» para usar "
-"outro que reflexa máis a posición e tamaño da xanela actual"
-
-#: ../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 ""
-"Tente usar máis pantalla para dispor as miniaturas das xanelas adaptándose á "
-"taxa de aspecto da pantalla e consolidalas para reducir a caixa saltante. "
-"Esta configuración aplícase só para a estratexia de disposició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 "Usar máis pantalla para as xanelas"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:6
-msgid "Window placement strategy"
-msgstr "Estratexia de disposición de xanelas"
-
 #: ../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 "O nome do tema, a cargar desde ~/.themes/name/gnome-shell"
@@ -310,4 +100,4 @@ msgstr "Co de arriba cara abaixo"

 #: ../extensions/xrandr-indicator/extension.js:78
 msgid "Configure display settings..."
-msgstr "Configurar as configuracións de pantalla…"
+msgstr "Configurar as configuracións de pantalla..."
--- a/po/he.po
+++ b/po/he.po
@@ -1,187 +0,0 @@
-# Hebrew translations for PACKAGE package.
-# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-13 13:11+0300\n"
-"PO-Revision-Date: 2011-05-13 13:15+0200\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: Hebrew <sh.yaron@gmail.com>\n"
-"Language: he\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-Poedit-Language: Hebrew\n"
-"X-Poedit-Country: ISRAEL\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#: ../extensions/alternative-status-menu/extension.js:39
-msgid "Available"
-msgstr "פנוי"
-
-#: ../extensions/alternative-status-menu/extension.js:44
-msgid "Busy"
-msgstr "עסוק"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "My Account"
-msgstr "החשבון שלי"
-
-#: ../extensions/alternative-status-menu/extension.js:56
-msgid "System Settings"
-msgstr "הגדרות המערכת"
-
-#: ../extensions/alternative-status-menu/extension.js:63
-msgid "Lock Screen"
-msgstr "נעילת המסך"
-
-#: ../extensions/alternative-status-menu/extension.js:67
-msgid "Switch User"
-msgstr "החלפת משתמש"
-
-#: ../extensions/alternative-status-menu/extension.js:72
-msgid "Log Out..."
-msgstr "יציאה..."
-
-#: ../extensions/alternative-status-menu/extension.js:79
-msgid "Suspend"
-msgstr "השהיה"
-
-#: ../extensions/alternative-status-menu/extension.js:85
-msgid "Hibernate"
-msgstr "תרדמת"
-
-#: ../extensions/alternative-status-menu/extension.js:91
-msgid "Power Off..."
-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 ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid "Application and workspace list"
-msgstr "Application and workspace list"
-
-#: ../extensions/dock/extension.js:116
-msgid "Drag here to add favorites"
-msgstr "יש לגרור לכאן כדי להוסיף למועדפים"
-
-#: ../extensions/dock/extension.js:417
-msgid "New Window"
-msgstr "חלון חדש"
-
-#: ../extensions/dock/extension.js:419
-msgid "Quit Application"
-msgstr "יציאה מהיישום"
-
-#: ../extensions/dock/extension.js:424
-msgid "Remove from Favorites"
-msgstr "הסרה מהמועדפים"
-
-#: ../extensions/dock/extension.js:425
-msgid "Add to Favorites"
-msgstr "הוספה למועדפים"
-
-#: ../extensions/example/extension.js:11
-msgid "Hello, world!"
-msgstr "שלום, עולם!"
-
-#: ../extensions/gajim/extension.js:219
-#, c-format
-msgid "%s is away."
-msgstr "%s הופיע/ה כמרוחק/ת."
-
-#: ../extensions/gajim/extension.js:222
-#, c-format
-msgid "%s is offline."
-msgstr "%s התנתק/ה."
-
-#: ../extensions/gajim/extension.js:225
-#, c-format
-msgid "%s is online."
-msgstr "%s פנוי/ה."
-
-#: ../extensions/gajim/extension.js:228
-#, c-format
-msgid "%s is busy."
-msgstr "%s עסוק/ה."
-
-#: ../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 ""
-"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."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid "Place window captions on top"
-msgstr "Place window captions on top"
-
-#: ../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 ""
-"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"
-
-#: ../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 ""
-"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."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:5
-msgid "Use more screen for windows"
-msgstr "Use more screen for windows"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:6
-msgid "Window placement strategy"
-msgstr "Window placement strategy"
-
-#: ../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 "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "Theme name"
-msgstr "Theme name"
-
-#: ../extensions/xrandr-indicator/extension.js:26
-msgid "Normal"
-msgstr "רגיל"
-
-#: ../extensions/xrandr-indicator/extension.js:27
-msgid "Left"
-msgstr "שמאל"
-
-#: ../extensions/xrandr-indicator/extension.js:28
-msgid "Right"
-msgstr "ימין"
-
-#: ../extensions/xrandr-indicator/extension.js:29
-msgid "Upside-down"
-msgstr "הפוך"
-
-#: ../extensions/xrandr-indicator/extension.js:78
-msgid "Configure display settings..."
-msgstr "הגדרת תצורת התצוגה..."
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,177 +0,0 @@
-# Hungarian translation of 
-# Copyright (C) 2011. Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell-extensions package.
-#
-# Biró Balázs <arch.scar at gmail dot com>, 2011.
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-07 22:45+0200\n"
-"PO-Revision-Date: 2011-06-07 22:44+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-
-#: ../extensions/alternative-status-menu/extension.js:39
-msgid "Available"
-msgstr "Elérhető"
-
-#: ../extensions/alternative-status-menu/extension.js:44
-msgid "Busy"
-msgstr "Elfoglalt"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "My Account"
-msgstr "Saját fiók"
-
-#: ../extensions/alternative-status-menu/extension.js:56
-msgid "System Settings"
-msgstr "Rendszerbeállítások"
-
-#: ../extensions/alternative-status-menu/extension.js:63
-msgid "Lock Screen"
-msgstr "Képernyő zárolása"
-
-#: ../extensions/alternative-status-menu/extension.js:67
-msgid "Switch User"
-msgstr "Felhasználóváltás"
-
-#: ../extensions/alternative-status-menu/extension.js:72
-msgid "Log Out..."
-msgstr "Kijelentkezés…"
-
-#: ../extensions/alternative-status-menu/extension.js:79
-msgid "Suspend"
-msgstr "Felfüggesztés"
-
-#: ../extensions/alternative-status-menu/extension.js:85
-msgid "Hibernate"
-msgstr "Hibernálás"
-
-#: ../extensions/alternative-status-menu/extension.js:91
-msgid "Power Off..."
-msgstr "Kikapcsolás…"
-
-#: ../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 ""
-"Alkalmazásazonosítókat (.desktop fájl neve), majd kettősponttal elválasztva "
-"a munkaterület számát tartalmazó karakterláncok sorozata"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid "Application and workspace list"
-msgstr "Alkalmazások és munkaterületek listája"
-
-#: ../extensions/dock/extension.js:136
-msgid "Drag here to add favorites"
-msgstr "Húzza ide kedvenceit"
-
-#: ../extensions/dock/extension.js:456
-msgid "New Window"
-msgstr "Új ablak"
-
-#: ../extensions/dock/extension.js:458
-msgid "Quit Application"
-msgstr "Alkalmazás bezárása"
-
-#: ../extensions/dock/extension.js:463
-msgid "Remove from Favorites"
-msgstr "Eltávolítás a Kedvencek közül"
-
-#: ../extensions/dock/extension.js:464
-msgid "Add to Favorites"
-msgstr "Hozzáadás a Kedvencekhez"
-
-#: ../extensions/example/extension.js:11
-msgid "Hello, world!"
-msgstr "Helló, világ!"
-
-#: ../extensions/gajim/extension.js:219
-#, c-format
-msgid "%s is away."
-msgstr "%s távol van."
-
-#: ../extensions/gajim/extension.js:222
-#, c-format
-msgid "%s is offline."
-msgstr "%s kilépett."
-
-#: ../extensions/gajim/extension.js:225
-#, c-format
-msgid "%s is online."
-msgstr "%s elérhető."
-
-#: ../extensions/gajim/extension.js:228
-#, c-format
-msgid "%s is busy."
-msgstr "%s elfoglalt."
-
-#: ../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 "A ~/.themes/név/gnome-shell alól betöltendő téma neve"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "Theme name"
-msgstr "Témanév"
-
-#: ../extensions/xrandr-indicator/extension.js:26
-msgid "Normal"
-msgstr "Normál"
-
-#: ../extensions/xrandr-indicator/extension.js:27
-msgid "Left"
-msgstr "Balra"
-
-#: ../extensions/xrandr-indicator/extension.js:28
-msgid "Right"
-msgstr "Jobbra"
-
-#: ../extensions/xrandr-indicator/extension.js:29
-msgid "Upside-down"
-msgstr "Fejjel lefelé"
-
-#: ../extensions/xrandr-indicator/extension.js:78
-msgid "Configure display settings..."
-msgstr "Kijelzőbeállítások…"
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions 2.91.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-26 15:14+0200\n"
-"PO-Revision-Date: 2011-04-26 15:27+0200\n"
+"POT-Creation-Date: 2011-03-12 22:11+0100\n"
+"PO-Revision-Date: 2011-03-12 22:12+0100\n"
 "Last-Translator: Giovanni Campagna <scampa.giovanni@gmail.com>\n"
 "Language-Team: none <LL@li.org>\n"
 "Language: \n"
@@ -17,110 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: ../extensions/alternative-status-menu/extension.js:39
-msgid "Available"
-msgstr "Disponibile"
-
-#: ../extensions/alternative-status-menu/extension.js:44
-msgid "Busy"
-msgstr "Non disponibile"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "My Account"
-msgstr "Account personale"
-
-#: ../extensions/alternative-status-menu/extension.js:56
-msgid "System Settings"
-msgstr "Impostazioni di sistema"
-
-#: ../extensions/alternative-status-menu/extension.js:63
-msgid "Lock Screen"
-msgstr "Blocca schermo"
-
-#: ../extensions/alternative-status-menu/extension.js:67
-msgid "Switch User"
-msgstr "Cambia utente"
-
-#: ../extensions/alternative-status-menu/extension.js:72
-msgid "Log Out..."
-msgstr "Termina sessione..."
-
-#: ../extensions/alternative-status-menu/extension.js:79
-msgid "Suspend"
-msgstr "Sospendi"
-
-#: ../extensions/alternative-status-menu/extension.js:85
-msgid "Hibernate"
-msgstr "Iberna"
-
-#: ../extensions/alternative-status-menu/extension.js:91
-msgid "Power Off..."
-msgstr "Spegni..."
-
-#: ../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 ""
-"Una lista di stringhe, ognuna contenente un id applicazione (nome del file ."
-"desktop), seguito da due punti e il numero dello spazio di lavoro"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid "Application and workspace list"
-msgstr "Lista applicazioni e spazi di lavoro"
-
-#: ../extensions/dock/extension.js:116
-msgid "Drag here to add favorites"
-msgstr "Trascina qui per aggiungere ai preferiti"
-
-#: ../extensions/dock/extension.js:417
-msgid "New Window"
-msgstr "Nuova finestra"
-
-#: ../extensions/dock/extension.js:419
-msgid "Quit Application"
-msgstr "Chiudi applicazione"
-
-#: ../extensions/dock/extension.js:424
-msgid "Remove from Favorites"
-msgstr "Rimuovi dai preferiti"
-
-#: ../extensions/dock/extension.js:425
-msgid "Add to Favorites"
-msgstr "Aggiungi ai preferiti"
-
 #: ../extensions/example/extension.js:11
 msgid "Hello, world!"
 msgstr "Ciao, mondo!"

-#: ../extensions/gajim/extension.js:219
-#, c-format
-msgid "%s is away."
-msgstr "%s è assente"
-
-#: ../extensions/gajim/extension.js:222
-#, c-format
-msgid "%s is offline."
-msgstr "%s è fuori rete"
-
-#: ../extensions/gajim/extension.js:225
-#, c-format
-msgid "%s is online."
-msgstr "%s è disponibile"
-
-#: ../extensions/gajim/extension.js:228
-#, c-format
-msgid "%s is busy."
-msgstr "%s non è disponibile"
-
-#: ../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 "Il nome del tema, da caricare in ~/.themes/nome/gnome-shell"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "Theme name"
-msgstr "Nome del tema"
-
 #: ../extensions/xrandr-indicator/extension.js:26
 msgid "Normal"
 msgstr "Normale"
@@ -140,3 +40,43 @@ msgstr "Rovesciato"
 #: ../extensions/xrandr-indicator/extension.js:78
 msgid "Configure display settings..."
 msgstr "Configura impostazioni display..."
+
+#: ../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 ""
+"Una lista di stringhe, ognuna contenente un id applicazione (nome del file ."
+"desktop), seguito da due punti e il numero dello spazio di lavoro"
+
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+msgid "Application and workspace list"
+msgstr "Lista applicazioni e spazi di lavoro"
+
+#: ../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 "Il nome del tema, da caricare in ~/.themes/nome/gnome-shell"
+
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+msgid "Theme name"
+msgstr "Nome del tema"
+
+#: ../extensions/dock/extension.js:116
+msgid "Drag here to add favorites"
+msgstr "Trascina qui per aggiungere ai preferiti"
+
+#: ../extensions/dock/extension.js:417
+msgid "New Window"
+msgstr "Nuova finestra"
+
+#: ../extensions/dock/extension.js:419
+msgid "Quit Application"
+msgstr "Chiudi applicazione"
+
+#: ../extensions/dock/extension.js:424
+msgid "Remove from Favorites"
+msgstr "Rimuovi dai preferiti"
+
+#: ../extensions/dock/extension.js:425
+msgid "Add to Favorites"
+msgstr "Aggiungi ai preferiti"
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,205 +0,0 @@
-# gnome-shell-extensions ja.po
-# Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# Takeshi AIHANA <takeshi.aihana@gmail.com>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-05 00:34+0900\n"
-"PO-Revision-Date: 2011-07-05 00:34+0900\n"
-"Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
-"Language-Team: Japanese <takeshi.aihana@gmail.com>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../extensions/alternative-status-menu/extension.js:39
-msgid "Available"
-msgstr "在席中"
-
-#: ../extensions/alternative-status-menu/extension.js:44
-msgid "Busy"
-msgstr "離席中"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "My Account"
-msgstr "自分のアカウント"
-
-#: ../extensions/alternative-status-menu/extension.js:56
-msgid "System Settings"
-msgstr "システムの設定"
-
-#: ../extensions/alternative-status-menu/extension.js:63
-msgid "Lock Screen"
-msgstr "画面のロック"
-
-#: ../extensions/alternative-status-menu/extension.js:67
-msgid "Switch User"
-msgstr "ユーザの切り替え"
-
-#: ../extensions/alternative-status-menu/extension.js:72
-msgid "Log Out..."
-msgstr "ログアウト..."
-
-#: ../extensions/alternative-status-menu/extension.js:79
-msgid "Suspend"
-msgstr "サスペンド"
-
-#: ../extensions/alternative-status-menu/extension.js:85
-msgid "Hibernate"
-msgstr "ハイバーネート"
-
-#: ../extensions/alternative-status-menu/extension.js:91
-msgid "Power Off..."
-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 ""
-"アプリケーションの識別子 (.desktop ファイル名) とコロンの後にワークスペース番"
-"号を付与した文字列を要素とするリストです。"
-
-#: ../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:142
-msgid "Drag here to add favorites"
-msgstr "ここにドラッグしてお気に入りへ追加します"
-
-#: ../extensions/dock/extension.js:462
-msgid "New Window"
-msgstr "新しいウィンドウで開く"
-
-#: ../extensions/dock/extension.js:464
-msgid "Quit Application"
-msgstr "アプリケーションの終了"
-
-#: ../extensions/dock/extension.js:469
-msgid "Remove from Favorites"
-msgstr "お気に入りから削除する"
-
-#: ../extensions/dock/extension.js:470
-msgid "Add to Favorites"
-msgstr "お気に入りへ追加する"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:1
-msgid "Icon size"
-msgstr "アイコンのサイズ"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:2
-msgid "Position of the dock"
-msgstr "ドックの位置"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:3
-msgid "Sets icon size of the dock."
-msgstr "ドックに表示するアイコンの大きさを指定します。"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:4
-msgid ""
-"Sets the position of the dock in the screen. Allowed values are 'right' or "
-"'left'"
-msgstr ""
-"ドックをデスクトップに表示する位置を指定します。指定可能な値: 'right'、'left'"
-
-#: ../extensions/example/extension.js:11
-msgid "Hello, world!"
-msgstr "\"Hello, world!\""
-
-#: ../extensions/gajim/extension.js:219
-#, c-format
-msgid "%s is away."
-msgstr "%sさんは離席中です"
-
-#: ../extensions/gajim/extension.js:222
-#, c-format
-msgid "%s is offline."
-msgstr "%sさんはオフラインです"
-
-#: ../extensions/gajim/extension.js:225
-#, c-format
-msgid "%s is online."
-msgstr "%sさんはオンラインです"
-
-#: ../extensions/gajim/extension.js:228
-#, c-format
-msgid "%s is busy."
-msgstr "%sさんは取り込み中です"
-
-#: ../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 ""
-"TRUE にすると、ウィンドウのサムネイルの上端にそのウィンドウのタイトルバーを表"
-"示します (これは、サムネイルの下端にタイトルバーを表示する GNOME シェルのデ"
-"フォルト値よりも優先されます)。この設定を適用する際は GNOME シェルを再起動し"
-"て下さい。"
-
-#: ../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 ""
-"オーバービュー・モードでウィンドウのサムネイルを配置する際のアルゴリズムで"
-"す。指定可能な値: 'grid' (原則的に格子状に配置していくアルゴリズ"
-"ム)、'natural' (ウィンドウの実際の位置や大きさを考慮して配置していくアルゴリ"
-"ズム)"
-
-#: ../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 ""
-"ウィンドウのサムネイルを複数配置する際に、画面のアスペクト比に合わせて、境界"
-"部分を減らすことにより、ウィンドウを統合しすることで、さらにたくさんの画面を"
-"使用できるようにするかどうかです。この設定は 'natural' の配置アルゴリズムを採"
-"用している場合にのみ適用されます。"
-
-#: ../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 "テーマの名前です (~/.themes/name/gnome-shell 配下に格納します)。"
-
-#: ../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 "標準"
-
-#: ../extensions/xrandr-indicator/extension.js:27
-msgid "Left"
-msgstr "左回り"
-
-#: ../extensions/xrandr-indicator/extension.js:28
-msgid "Right"
-msgstr "右回り"
-
-#: ../extensions/xrandr-indicator/extension.js:29
-msgid "Upside-down"
-msgstr "逆さま"
-
-#: ../extensions/xrandr-indicator/extension.js:78
-msgid "Configure display settings..."
-msgstr "ディスプレイの設定..."
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,305 +0,0 @@
-# Punjabi 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.
-#
-# A S Alam <aalam@users.sf.net>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions gnome-3-0\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-08-01 14:02+0000\n"
-"PO-Revision-Date: 2011-08-21 09:55+0530\n"
-"Last-Translator: A S Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pa\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../extensions/alternative-status-menu/extension.js:39
-msgid "Available"
-msgstr "ਉਪਲੱਬਧ"
-
-#: ../extensions/alternative-status-menu/extension.js:44
-msgid "Busy"
-msgstr "ਰੁਝਿਆ"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "My Account"
-msgstr "ਮੇਰਾ ਅਕਾਊਂਟ"
-
-#: ../extensions/alternative-status-menu/extension.js:56
-msgid "System Settings"
-msgstr "ਸਿਸਟਮ ਸੈਟਿੰਗ"
-
-#: ../extensions/alternative-status-menu/extension.js:63
-msgid "Lock Screen"
-msgstr "ਸਕਰੀਨ ਲਾਕ ਕਰੋ"
-
-#: ../extensions/alternative-status-menu/extension.js:67
-msgid "Switch User"
-msgstr "ਯੂਜ਼ਰ ਬਦਲੋ"
-
-#: ../extensions/alternative-status-menu/extension.js:72
-msgid "Log Out..."
-msgstr "ਲਾਗਆਉਟ..."
-
-#: ../extensions/alternative-status-menu/extension.js:79
-msgid "Suspend"
-msgstr "ਸਸਪੈਂਡ"
-
-#: ../extensions/alternative-status-menu/extension.js:85
-msgid "Hibernate"
-msgstr "ਹਾਈਬਰਨੇਟ"
-
-#: ../extensions/alternative-status-menu/extension.js:91
-msgid "Power Off..."
-msgstr "...ਬੰਦ ਕਰੋ"
-
-#: ../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"
-"\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"
-msgstr ""
-"ਇਹ ਪਹਿਲੀ ਵਾਰ ਹੈ, ਜਦੋਂ ਤੁਸੀਂ Alt(ernate) Tab ਇਕਸਟੈਨਸ਼ਨ ਵਰਤ ਰਹੇ ਹੋ।\n"
-"ਆਪਣੀ ਪਸੰਦ ਮੁਤਾਬਕ ਰਵੱਈਏ ਦੀ ਚੋਣ ਕਰੋ ਜੀ:\n"
-"\n"
-"ਸਭ ਅਤੇ ਥੰਮਨੇਲ:\n"
-"   ਇਹ ਮੋਡ ਸਭ ਵਰਕਸਪੇਸ ਤੋਂ ਸਭ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਇੱਕ ਚੋਣ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾਉਂਦੀ ਹੈ।\n"
-"   ਹਰੇਕ ਵਿੰਡੋ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਆਈਕਾਨ ਵਰਤਣ ਦੀ ਬਜਾਏ, ਇਹ ਹਰ ਵਿੰਡੋ ਨਾਲ ਰਲਦੇ\n"
-"    ਛੋਟੇ ਛੋਟੇ ਥੰਮਨੇਲ ਵਰਤਦੀ ਹੈ।\n"
-"\n"
-"ਵਰਕਸਪੇਸ ਅਤੇ ਆਈਕਾਨ:\n"
-"    ਇਹ ਮੋਡ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਵਰਕਸਪੇਸ ਦੀ ਐਪਲੀਕੇਸ਼ਨ ਵਿੱਚ ਮੱਦਦ ਕਰਨ ਲਈ ਸਹਾਇਕ "
-"ਹੈ\n"
-"    ਅਤੇ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਪਿਛਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਵਰਤੀ ਆਖਰੀ ਐਪਲੀਕੇਸ਼ਨ ਵਰਤਣ ਦੀ ਚੋਣ ਵੀ\n"
-"   ਵਾਧੂ ਰੂਪ ਵਿੱਚ ਦਿੰਦਾ ਹੈ। ਇਹ ਲਿਸਟ ਵਿੱਚ ਆਖਰੀ ਨਿਸ਼ਾਨ ਹੁੰਦਾ ਹੈ ਅਤੇ ਇਸ ਨੂੰ ਵੱਖ "
-"ਕਰਨ ਲਈ\n"
-"    ਖਿੜਵੀ/ਲੇਟਵੀ ਲਾਈਨ ਨਾਲ ਵੱਖ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਜੇ ਉਪਲੱਬਧ ਹੋਵੇ।\n"
-"    ਹਰੇਕ ਵਿੰਡੋ ਨੂੰ ਇਸ ਦੇ ਐਪਲੀਕੇਸ਼ਨ ਆਈਕਾਨ ਨਾਲ ਦਰਸਾਇਆ ਜਾਂਦਾ ਹੈ।\n"
-"\n"
-"ਨੇਟਿਵ:\n"
-"    ਇਹ ਮੋਡ ਨੇਟਿਵ ਗਨੋਮ 3 ਰਵੱਈਆ ਹੈ ਜਾਂ ਇੰਝ ਕਹਿ ਲਵੋ: ਨੇਟਿਵ ਸਵਿੱਚਾਂ ਨੂੰ ਨਾਲ\n"
-"    Alternative Tab ਇਕਸਟੈਨਸ਼ਨ ਬੰਦ ਕਰਦਾ ਹੈ।\n"
-
-#: ../extensions/alternate-tab/extension.js:269
-msgid "Alt Tab Behaviour"
-msgstr "Alt Tab ਰਵੱਈਆ"
-
-#: ../extensions/alternate-tab/extension.js:285
-msgid "All & Thumbnails"
-msgstr "ਸਭ ਅਤੇ ਥੰਮਨੇਲ"
-
-#: ../extensions/alternate-tab/extension.js:292
-msgid "Workspace & Icons"
-msgstr "ਵਰਕਸਪੇਸ ਅਤੇ ਆਈਕਾਨ"
-
-#: ../extensions/alternate-tab/extension.js:299
-msgid "Native"
-msgstr "ਨੇਟਿਵ"
-
-#: ../extensions/alternate-tab/extension.js:306
-msgid "Cancel"
-msgstr "ਰੱਦ ਕਰੋ"
-
-#: ../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 ""
-"Alt-Tab ਰਵੱਈਆ ਸੈੱਟ ਕਰੋ। ਸੰਭਵ ਮੁੱਲ ਹਨ: native, all_thumbnails ਅਤੇ "
-"workspace_icons।"
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:4
-msgid "The alt tab behaviour."
-msgstr "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), "
-"followed by a colon and the workspace number"
-msgstr ""
-"ਲਾਈਨਾਂ ਦੀ ਲਿਸਟ, ਜੋ ਕਿ ਐਪਲੀਕੇਸ਼ਨ ID (ਡੈਸਕਟਾਪ ਫਾਇਲ ਨਾਂ), ਬਾਅਦ 'ਚ ਕਾਲਮ ਅਤੇ "
-"ਵਰਕਸਪੇਸ ਨੰਬਰ "
-"ਰੱਖਦਾ ਹੈ"
-
-#: ../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:437
-msgid "Drag here to add favorites"
-msgstr "ਪਸੰਦ ਵਿੱਚ ਜੋੜਨ ਲਈ ਇੱਥੇ ਸੁੱਟੋ"
-
-#: ../extensions/dock/extension.js:771
-msgid "New Window"
-msgstr "ਨਵੀਂ ਵਿੰਡੋ"
-
-#: ../extensions/dock/extension.js:773
-msgid "Quit Application"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਬੰਦ ਕਰੋ"
-
-#: ../extensions/dock/extension.js:778
-msgid "Remove from Favorites"
-msgstr "ਪਸੰਦ ਵਿੱਚੋਂ ਹਟਾਓ"
-
-#: ../extensions/dock/extension.js:779
-msgid "Add to Favorites"
-msgstr "ਪਸੰਦ 'ਚ ਸ਼ਾਮਲ ਕਰੋ"
-
-#: ../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 ""
-"ਡੌਕ ਓਹਲੇ ਕਰਨ ਦਾ ਪ੍ਰਭਾਵ ਸੈੱਟ ਕਰਦਾ ਹੈ। ਸੰਭਵ ਮੁੱਲ ਹਨ 'resize' ਅਤੇ 'rescale'"
-
-#: ../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 "ਸਕਰੀਨ ਵਿੱਚ ਡੌਕ ਦੀ ਸਥਿਤੀ ਸੈੱਟ ਕਰਦਾ ਹੈ। ਸੰਭਵ ਮੁੱਲ ਹਨ 'right' ਜਾਂ 'left'"
-
-#: ../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 "ਹੈਲੋ, ਵਰਲਡ!"
-
-#: ../extensions/gajim/extension.js:219
-#, c-format
-msgid "%s is away."
-msgstr "%s ਦੂਰ ਹੈ।"
-
-#: ../extensions/gajim/extension.js:222
-#, c-format
-msgid "%s is offline."
-msgstr "%s ਆਫਲਾਈਨ ਹੈ।"
-
-#: ../extensions/gajim/extension.js:225
-#, c-format
-msgid "%s is online."
-msgstr "%s ਆਨਲਾਈਨ ਹੈ।"
-
-#: ../extensions/gajim/extension.js:228
-#, c-format
-msgid "%s is busy."
-msgstr "%s ਰੁੱਝਿਆ/ਰੁੱਝੀ ਹੈ।"
-
-#: ../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 "ਥੀਮ ਦਾ ਨਾਂ, ਜੋ ~/.themes/name/gnome-shell ਤੋਂ ਲੋਡ ਕੀਤਾ ਜਾਵੇਗਾ"
-
-#: ../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 "ਸਧਾਰਨ"
-
-#: ../extensions/xrandr-indicator/extension.js:27
-msgid "Left"
-msgstr "ਖੱਬੇ"
-
-#: ../extensions/xrandr-indicator/extension.js:28
-msgid "Right"
-msgstr "ਸੱਜੇ"
-
-#: ../extensions/xrandr-indicator/extension.js:29
-msgid "Upside-down"
-msgstr "ਉਤਲਾ ਹੇਠ"
-
-#: ../extensions/xrandr-indicator/extension.js:78
-msgid "Configure display settings..."
-msgstr "ਡਿਸਪਲੇਅ ਸੈਟਿੰਗ ਸੰਰਚਨਾ..."
-
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,141 +0,0 @@
-# Russian 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.
-# Yuri Myasoedov <omerta13@yandex.ru>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions gnome-3-0\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-06-04 07:00+0000\n"
-"PO-Revision-Date: 2011-06-05 14:59+0300\n"
-"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
-"Language-Team: Russian <gnome-cyr@gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 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 "Спящий режим"
-
-#: ../extensions/alternative-status-menu/extension.js:26
-#: ../extensions/alternative-status-menu/extension.js:92
-msgid "Suspend"
-msgstr "Ждущий режим"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "Available"
-msgstr "Доступен"
-
-#: ../extensions/alternative-status-menu/extension.js:57
-msgid "Busy"
-msgstr "Занят"
-
-#: ../extensions/alternative-status-menu/extension.js:65
-msgid "My Account"
-msgstr "Моя учётная запись"
-
-#: ../extensions/alternative-status-menu/extension.js:69
-msgid "System Settings"
-msgstr "Системные параметры"
-
-#: ../extensions/alternative-status-menu/extension.js:76
-msgid "Lock Screen"
-msgstr "Заблокировать экран"
-
-#: ../extensions/alternative-status-menu/extension.js:80
-msgid "Switch User"
-msgstr "Переключить пользователя"
-
-#: ../extensions/alternative-status-menu/extension.js:85
-msgid "Log Out..."
-msgstr "Выйти…"
-
-#: ../extensions/alternative-status-menu/extension.js:100
-msgid "Power Off..."
-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 "Список строк, содержащих id приложения (имя desktop-файла), далее следует двоеточие и номер рабочего места"
-
-#: ../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:116
-msgid "Drag here to add favorites"
-msgstr "Перетащите, чтобы добавить в избранное"
-
-#: ../extensions/dock/extension.js:417
-msgid "New Window"
-msgstr "Создать окно"
-
-#: ../extensions/dock/extension.js:419
-msgid "Quit Application"
-msgstr "Закрыть приложение"
-
-#: ../extensions/dock/extension.js:424
-msgid "Remove from Favorites"
-msgstr "Удалить из избранного"
-
-#: ../extensions/dock/extension.js:425
-msgid "Add to Favorites"
-msgstr "Добавить в избранное"
-
-#: ../extensions/example/extension.js:11
-msgid "Hello, world!"
-msgstr "Привет, мир!"
-
-#: ../extensions/gajim/extension.js:219
-#, c-format
-msgid "%s is away."
-msgstr "%s отошёл."
-
-#: ../extensions/gajim/extension.js:222
-#, c-format
-msgid "%s is offline."
-msgstr "%s не в сети."
-
-#: ../extensions/gajim/extension.js:225
-#, c-format
-msgid "%s is online."
-msgstr "%s в сети."
-
-#: ../extensions/gajim/extension.js:228
-#, c-format
-msgid "%s is busy."
-msgstr "%s занят."
-
-#: ../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 "Название темы, загружаемой из ~/.themes/name/gnome-shell"
-
-#: ../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 "Обычно"
-
-#: ../extensions/xrandr-indicator/extension.js:27
-msgid "Left"
-msgstr "Влево"
-
-#: ../extensions/xrandr-indicator/extension.js:28
-msgid "Right"
-msgstr "Вправо"
-
-#: ../extensions/xrandr-indicator/extension.js:29
-msgid "Upside-down"
-msgstr "На 180 градусов"
-
-#: ../extensions/xrandr-indicator/extension.js:78
-msgid "Configure display settings..."
-msgstr "Настроить параметры экрана…"
-
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,11 @@
 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-04-01 16:40+0000\n"
-"PO-Revision-Date: 2011-04-18 21:07+0700\n"
-"Last-Translator: Lê Trường An <xinemdungkhoc1@gmail.com>\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-04-16 16:32+0000\n"
+"PO-Revision-Date: 2011-03-27 17:37+0700\n"
+"Last-Translator: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,44 +21,44 @@ msgstr ""
 #: ../extensions/alternative-status-menu/extension.js:27
 #: ../extensions/alternative-status-menu/extension.js:93
 msgid "Hibernate"
-msgstr "Ngủ đông"
+msgstr ""

 #: ../extensions/alternative-status-menu/extension.js:26
 #: ../extensions/alternative-status-menu/extension.js:92
 msgid "Suspend"
-msgstr "Ngừng"
+msgstr ""

 #: ../extensions/alternative-status-menu/extension.js:52
 msgid "Available"
-msgstr "Có mặt"
+msgstr ""

 #: ../extensions/alternative-status-menu/extension.js:57
 msgid "Busy"
-msgstr "Bận"
+msgstr ""

 #: ../extensions/alternative-status-menu/extension.js:65
 msgid "My Account"
-msgstr "Tài khoản của tôi"
+msgstr ""

 #: ../extensions/alternative-status-menu/extension.js:69
 msgid "System Settings"
-msgstr "Thiết lập hệ thống"
+msgstr ""

 #: ../extensions/alternative-status-menu/extension.js:76
 msgid "Lock Screen"
-msgstr "Khoá màn hình"
+msgstr ""

 #: ../extensions/alternative-status-menu/extension.js:80
 msgid "Switch User"
-msgstr "Đổi người dùng"
+msgstr ""

 #: ../extensions/alternative-status-menu/extension.js:85
 msgid "Log Out..."
-msgstr "Đăng xuất..."
+msgstr ""

 #: ../extensions/alternative-status-menu/extension.js:100
 msgid "Power Off..."
-msgstr "Tắt máy..."
+msgstr ""

 #: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid ""
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,275 +0,0 @@
-# Chinese (Hong Kong) 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.
-# Cheng-Chia Tseng <pswo10680@gmail.com>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions gnome-3-0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-29 18:59+0800\n"
-"PO-Revision-Date: 2011-08-29 18:59+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
-"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../extensions/alternative-status-menu/extension.js:39
-msgid "Available"
-msgstr "有空"
-
-#: ../extensions/alternative-status-menu/extension.js:44
-msgid "Busy"
-msgstr "忙碌"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "My Account"
-msgstr "我的帳號"
-
-#: ../extensions/alternative-status-menu/extension.js:56
-msgid "System Settings"
-msgstr "系統設定值"
-
-#: ../extensions/alternative-status-menu/extension.js:63
-msgid "Lock Screen"
-msgstr "鎖定畫面"
-
-#: ../extensions/alternative-status-menu/extension.js:68
-msgid "Switch User"
-msgstr "切換使用者"
-
-#: ../extensions/alternative-status-menu/extension.js:73
-msgid "Log Out..."
-msgstr "登出..."
-
-#: ../extensions/alternative-status-menu/extension.js:82
-msgid "Suspend"
-msgstr "暫停"
-
-#: ../extensions/alternative-status-menu/extension.js:88
-msgid "Hibernate"
-msgstr "休眠"
-
-#: ../extensions/alternative-status-menu/extension.js:94
-msgid "Power Off..."
-msgstr "關閉電源..."
-
-#: ../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"
-"\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"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:269
-msgid "Alt Tab Behaviour"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:285
-msgid "All & Thumbnails"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:292
-msgid "Workspace & Icons"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:299
-msgid "Native"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:306
-msgid "Cancel"
-msgstr ""
-
-#: ../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 "字串的清單，每個都包含一個應用程式 id (桌面檔名稱)，後面接着半形分號 \";\" 與工作區號碼"
-
-#: ../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:486
-msgid "Drag here to add favorites"
-msgstr "拖曳至此處以加入喜好"
-
-#: ../extensions/dock/extension.js:820
-msgid "New Window"
-msgstr "新視窗"
-
-#: ../extensions/dock/extension.js:822
-msgid "Quit Application"
-msgstr "退出應用程式"
-
-#: ../extensions/dock/extension.js:827
-msgid "Remove from Favorites"
-msgstr "自喜好移除"
-
-#: ../extensions/dock/extension.js:828
-msgid "Add to Favorites"
-msgstr "加入喜好"
-
-#: ../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 "你好，世界！"
-
-#: ../extensions/gajim/extension.js:219
-#, c-format
-msgid "%s is away."
-msgstr "%s 已離開。"
-
-#: ../extensions/gajim/extension.js:222
-#, c-format
-msgid "%s is offline."
-msgstr "%s 現在離線。"
-
-#: ../extensions/gajim/extension.js:225
-#, c-format
-msgid "%s is online."
-msgstr "%s 現在上線。"
-
-#: ../extensions/gajim/extension.js:228
-#, c-format
-msgid "%s is busy."
-msgstr "%s 正忙碌。"
-
-#: ../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 "主題的名稱，要從 ~/.themes/name/gnome-shell 載入"
-
-#: ../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 "一般"
-
-#: ../extensions/xrandr-indicator/extension.js:27
-msgid "Left"
-msgstr "左"
-
-#: ../extensions/xrandr-indicator/extension.js:28
-msgid "Right"
-msgstr "右"
-
-#: ../extensions/xrandr-indicator/extension.js:29
-msgid "Upside-down"
-msgstr "上下顛倒"
-
-#: ../extensions/xrandr-indicator/extension.js:78
-msgid "Configure display settings..."
-msgstr "設定顯示器設定值..."
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,277 +0,0 @@
-# Chinese (Taiwan) 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.
-# Cheng-Chia Tseng <pswo10680@gmail.com>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions gnome-3-0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-29 18:59+0800\n"
-"PO-Revision-Date: 2011-08-29 17:16+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) <chinese-l10n@googlegroups.com>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../extensions/alternative-status-menu/extension.js:39
-msgid "Available"
-msgstr "有空"
-
-#: ../extensions/alternative-status-menu/extension.js:44
-msgid "Busy"
-msgstr "忙碌"
-
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "My Account"
-msgstr "我的帳號"
-
-#: ../extensions/alternative-status-menu/extension.js:56
-msgid "System Settings"
-msgstr "系統設定值"
-
-#: ../extensions/alternative-status-menu/extension.js:63
-msgid "Lock Screen"
-msgstr "鎖定畫面"
-
-#: ../extensions/alternative-status-menu/extension.js:68
-msgid "Switch User"
-msgstr "切換使用者"
-
-#: ../extensions/alternative-status-menu/extension.js:73
-msgid "Log Out..."
-msgstr "登出..."
-
-#: ../extensions/alternative-status-menu/extension.js:82
-msgid "Suspend"
-msgstr "暫停"
-
-#: ../extensions/alternative-status-menu/extension.js:88
-msgid "Hibernate"
-msgstr "休眠"
-
-#: ../extensions/alternative-status-menu/extension.js:94
-msgid "Power Off..."
-msgstr "關閉電源..."
-
-#: ../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"
-"\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"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:269
-msgid "Alt Tab Behaviour"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:285
-msgid "All & Thumbnails"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:292
-msgid "Workspace & Icons"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:299
-msgid "Native"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:306
-msgid "Cancel"
-msgstr ""
-
-#: ../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 ""
-"字串的清單，每個都包含一個應用程式 id (桌面檔名稱)，後面接著半形分號 \";\" 與"
-"工作區號碼"
-
-#: ../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:486
-msgid "Drag here to add favorites"
-msgstr "拖曳至此處以加入喜好"
-
-#: ../extensions/dock/extension.js:820
-msgid "New Window"
-msgstr "新視窗"
-
-#: ../extensions/dock/extension.js:822
-msgid "Quit Application"
-msgstr "退出應用程式"
-
-#: ../extensions/dock/extension.js:827
-msgid "Remove from Favorites"
-msgstr "自喜好移除"
-
-#: ../extensions/dock/extension.js:828
-msgid "Add to Favorites"
-msgstr "加入喜好"
-
-#: ../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 "你好，世界！"
-
-#: ../extensions/gajim/extension.js:219
-#, c-format
-msgid "%s is away."
-msgstr "%s 已離開。"
-
-#: ../extensions/gajim/extension.js:222
-#, c-format
-msgid "%s is offline."
-msgstr "%s 現在離線。"
-
-#: ../extensions/gajim/extension.js:225
-#, c-format
-msgid "%s is online."
-msgstr "%s 現在上線。"
-
-#: ../extensions/gajim/extension.js:228
-#, c-format
-msgid "%s is busy."
-msgstr "%s 正忙碌。"
-
-#: ../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 "主題的名稱，要從 ~/.themes/name/gnome-shell 載入"
-
-#: ../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 "一般"
-
-#: ../extensions/xrandr-indicator/extension.js:27
-msgid "Left"
-msgstr "左"
-
-#: ../extensions/xrandr-indicator/extension.js:28
-msgid "Right"
-msgstr "右"
-
-#: ../extensions/xrandr-indicator/extension.js:29
-msgid "Upside-down"
-msgstr "上下顛倒"
-
-#: ../extensions/xrandr-indicator/extension.js:78
-msgid "Configure display settings..."
-msgstr "設定顯示器設定值..."
Author	SHA1	Message	Date
Giovanni Campagna	7b5f024531	Bump version to 3.0.2 Bump package version to 3.0.2, and at the same time write out all extensions' version explicitly (in case gnome-shell does not release 3.0.2)	2011-05-20 15:48:08 +02:00
Elad Alfassa	7576883744	Support globally installed themes If a theme cannot be found in the user directory, try in system data dirs (XDG_DATA_DIRS, usually /usr/share and /usr/local/share) Signed-off-by: Giovanni Campagna <gcampagna@src.gnome.org>	2011-05-20 15:47:54 +02:00
Giovanni Campagna	f7e32aabc5	user-theme: fix resetting theme to null Previously null stylesheets were ignored, making it impossible to reset the default. We still need to filter out invalid (non existing) stylesheets, as no check is performed by shell code.	2011-05-20 15:47:54 +02:00
Giovanni Campagna	757ab0096e	Add COPYING License file for GNU General Public Licence v2	2011-05-20 15:43:51 +02:00
Giovanni Campagna	2b10d99295	Bump version to 3.0.1 This is in case someone uses make dist. Has no effect on gnome-shell compatibility, for the stable branch.	2011-04-26 01:20:23 +02:00
				`@@ -1 +0,0 @@`
				`/* This extensions requires no custom styling */`