Merge lp:~tkluck/ubuntu/oneiric/gnome-shell/fix-bluetooth-device-switch into lp:ubuntu/oneiric/gnome-shell

[Timo Kluck]

This fixes #918208:

"""
The device connection switches in the gnome-shell bluetooth menu can be toggled but don't work: their status is independent from the actual connection status.

This is a known bug with a trivial patch, and it has already been fixed in master:
https://bugzilla.gnome.org/show_bug.cgi?id=662384

It would be nice if the trivial fix could be incorporated into the Ubuntu's 3.2.1 package.
"""

[Jeremy Bicha (jbicha)]

Hi, bugs need to be fixed in the current development release (precise) before being proposed against a stable release. Could you propose a merge with https://code.launchpad.net/~ubuntu-desktop/gnome-shell/ubuntu instead?

review: Needs Fixing

[Colin Watson (cjwatson)]

Rejected by request of seb128.

[Sebastien Bacher (seb128)]

Rejecting the merge request since it was adressed to the wrong serie (oneiric rather than oneiric-proposed) and the fix seems to have been uploaded since according to the bug

Unmerged revisions

46. By Timo Kluck on 2012-01-18

Fix bluetooth device connecting from gnome-shell menu

45. By Evan Broder on 2011-12-19

No-change rebuild to fix up dependencies (LP: #903382)

44. By Jeremy Bicha on 2011-10-24

[ Jeremy Bicha ]
* New upstream release (LP: #878672).
  - Restore the IM state on startup - if you were available in when you
    logged out, then you'll be set available again when you log in.
  - Improve searching for contacts in the overview: search more fields,
    show a more meaningful name, require that all search terms match.
  - Improve search for applications in the overview: take frequency into
    account and tweak match algorithm
  - Remove the "Show Password" switch from network password prompts, and
    move the functionality to a right-click menu
  - Add context menus with Cut/Paste options to most entries
  - Display a caps-lock warning in password entries
  - Show the state of installed extensions in Looking Glass
  - Load user extensions after system ones
  - Fix problem with many applications showing extra-large icons in
    notifications
  - Fix a problem where alt-Tab had trouble tracking the current
    application with certain applications such as Emacs.
  - Fix confusion between different users avatar images
  - Remove behavior where you could switch workspaces by bumping
    a dragged window in the overview against a screen edge; it was
    leftover and just confusing.
  - Fix long-standing bug where the Dash in the overview could end up
    mis-sized and run off the screen
  - Fix automatic launching of applications when media is inserted
  - Fix handling of vertically stacked monitors with NVIDIA drivers
  - Translation marking fixes
  - Code cleanups and warning fixes
  - Small memory leak fixes
  - On screen keyboard:
    + Show the keyboard immediately when it's turned enabled
    + Fix problem where keyboard would hide when starting to type
      in the search entry
    + Fix problem with keyboard hiding when selected accented characters
  - Misc bug fixes
* debian/control.in:
  - Bump minimum mutter to 3.2.1
  - Drop dependency against libdconf0 and let dh_installgsettings set
    the right dependencies.
  - Depends on cups-pk-helper instead of recommends to ensure that
    the printer applet works (LP: #877367)
* 01_favorite_apps.patch: dropped, replaced by override file.
* New upstream release.

=== removed directory '.pc/01_favorite_apps.patch'
=== removed directory '.pc/01_favorite_apps.patch/data'
=== removed file '.pc/01_favorite_apps.patch/data/org.gnome.shell.gschema.xml.in'
--- .pc/01_favorite_apps.patch/data/org.gnome.shell.gschema.xml.in	2011-09-22 08:50:45 +0000
+++ .pc/01_favorite_apps.patch/data/org.gnome.shell.gschema.xml.in	1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-<schemalist>
-  <schema id="org.gnome.shell" path="/org/gnome/shell/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="development-tools" type="b">
-      <default>true</default>
-      <_summary>
-        Enable internal tools useful for developers and testers from Alt-F2
-      </_summary>
-      <_description>
-        Allows access to internal debugging and monitoring tools
-        using the Alt-F2 dialog.
-      </_description>
-    </key>
-    <key name="enabled-extensions" type="as">
-      <default>[]</default>
-      <_summary>Uuids of extensions to enable</_summary>
-      <_description>
-        GNOME Shell extensions have a uuid property; this key lists extensions
-        which should be loaded.  disabled-extensions overrides this setting for
-        extensions that appear in both lists.
-      </_description>
-    </key>
-    <key name="enable-app-monitoring" type="b">
-      <default>true</default>
-      <_summary>Whether to collect stats about applications usage</_summary>
-      <_description>
-        The shell normally monitors active applications in order to present
-        the most used ones (e.g. in launchers). While this data will be
-        kept private, you may want to disable this for privacy reasons.
-        Please note that doing so won't remove already saved data.
-      </_description>
-    </key>
-    <key name="favorite-apps" type="as">
-      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
-      <_summary>List of desktop file IDs for favorite applications</_summary>
-      <_description>
-        The applications corresponding to these identifiers
-        will be displayed in the favorites area.
-      </_description>
-    </key>
-    <key name="disabled-open-search-providers" type="as">
-      <default>[]</default>
-      <_summary>disabled OpenSearch providers</_summary>
-    </key>
-    <key name="command-history" type="as">
-      <default>[]</default>
-      <_summary>History for command (Alt-F2) dialog</_summary>
-    </key>
-    <key name="looking-glass-history" type="as">
-      <default>[]</default>
-      <_summary>History for the looking glass dialog</_summary>
-    </key>
-    <child name="clock" schema="org.gnome.shell.clock"/>
-    <child name="calendar" schema="org.gnome.shell.calendar"/>
-    <child name="recorder" schema="org.gnome.shell.recorder"/>
-    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
-  </schema>
-
-  <schema id="org.gnome.shell.calendar" path="/org/gnome/shell/calendar/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="show-weekdate" type="b">
-      <default>false</default>
-      <_summary>Show the week date in the calendar</_summary>
-      <_description>
-        If true, display the ISO week date in the calendar.
-      </_description>
-      </key>
-  </schema>
-
-  <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="keyboard-type" type="s">
-      <default>'touch'</default>
-      <_summary>Which keyboard to use</_summary>
-      <_description>
-        The type of keyboard to use.
-      </_description>
-    </key>
-  </schema>
-
-  <schema id="org.gnome.shell.clock" path="/org/gnome/shell/clock/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="show-seconds" type="b">
-      <default>false</default>
-      <_summary>Show time with seconds</_summary>
-      <_description>
-        If true, display seconds in time.
-      </_description>
-    </key>
-    <key name="show-date" type="b">
-      <default>false</default>
-      <_summary>Show date in clock</_summary>
-      <_description>
-        If true, display date in the clock, in addition to time.
-      </_description>
-    </key>
-  </schema>
-
-  <schema id="org.gnome.shell.recorder" path="/org/gnome/shell/recorder/"
-          gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="framerate" type="i">
-      <default>15</default>
-      <_summary>Framerate used for recording screencasts.</_summary>
-      <_description>
-        The framerate of the resulting screencast recordered
-        by GNOME Shell's screencast recorder in frames-per-second.
-      </_description>
-    </key>
-    <key name="pipeline" type="s">
-      <default>''</default>
-      <_summary>The gstreamer pipeline used to encode the screencast</_summary>
-      <_description>
-        Sets the GStreamer pipeline used to encode recordings.
-        It follows the syntax used for gst-launch. The pipeline should have
-        an unconnected sink pad where the recorded video is recorded. It will
-        normally have a unconnected source pad; output from that pad
-        will be written into the output file. However the pipeline can also
-        take care of its own output - this might be used to send the output
-        to an icecast server via shout2send or similar. When unset or set
-        to an empty value, the default pipeline will be used. This is currently
-        'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux'
-        and records to WEBM using the VP8 codec. %T is used as a placeholder
-        for a guess at the optimal thread count on the system.
-      </_description>
-    </key>
-    <key name="file-extension" type="s">
-      <default>'webm'</default>
-      <_summary>File extension used for storing the screencast</_summary>
-      <_description>
-        The filename for recorded screencasts will be a unique filename
-        based on the current date, and use this extension. It should be
-        changed when recording to a different container format.
-      </_description>
-    </key>
-  </schema>
-</schemalist>

=== modified file '.pc/03_remove-glx-dependency-on-armel.patch/configure'
--- .pc/03_remove-glx-dependency-on-armel.patch/configure	2011-09-28 06:48:58 +0000
+++ .pc/03_remove-glx-dependency-on-armel.patch/configure	2012-01-18 14:13:28 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gnome-shell 3.2.0.
+# Generated by GNU Autoconf 2.68 for gnome-shell 3.2.1.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell>.
 #
@@ -571,8 +571,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnome-shell'
 PACKAGE_TARNAME='gnome-shell'
-PACKAGE_VERSION='3.2.0'
-PACKAGE_STRING='gnome-shell 3.2.0'
+PACKAGE_VERSION='3.2.1'
+PACKAGE_STRING='gnome-shell 3.2.1'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell'
 PACKAGE_URL=''
 
@@ -1453,7 +1453,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gnome-shell 3.2.0 to adapt to many kinds of systems.
+\`configure' configures gnome-shell 3.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1523,7 +1523,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnome-shell 3.2.0:";;
+     short | recursive ) echo "Configuration of gnome-shell 3.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1698,7 +1698,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnome-shell configure 3.2.0
+gnome-shell configure 3.2.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2067,7 +2067,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gnome-shell $as_me 3.2.0, which was
+It was created by gnome-shell $as_me 3.2.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2894,7 +2894,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-shell'
- VERSION='3.2.0'
+ VERSION='3.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14948,7 +14948,7 @@
 CLUTTER_MIN_VERSION=1.7.5
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.29.18
-MUTTER_MIN_VERSION=3.0.0
+MUTTER_MIN_VERSION=3.2.1
 FOLKS_MIN_VERSION=0.5.2
 GTK_MIN_VERSION=3.0.0
 GIO_MIN_VERSION=2.29.10
@@ -17259,7 +17259,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gnome-shell $as_me 3.2.0, which was
+This file was extended by gnome-shell $as_me 3.2.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17325,7 +17325,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gnome-shell config.status 3.2.0
+gnome-shell config.status 3.2.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file '.pc/03_remove-glx-dependency-on-armel.patch/configure.ac'
--- .pc/03_remove-glx-dependency-on-armel.patch/configure.ac	2011-09-28 06:48:58 +0000
+++ .pc/03_remove-glx-dependency-on-armel.patch/configure.ac	2012-01-18 14:13:28 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.2.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.2.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -67,7 +67,7 @@
 CLUTTER_MIN_VERSION=1.7.5
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.29.18
-MUTTER_MIN_VERSION=3.0.0
+MUTTER_MIN_VERSION=3.2.1
 FOLKS_MIN_VERSION=0.5.2
 GTK_MIN_VERSION=3.0.0
 GIO_MIN_VERSION=2.29.10

=== added directory '.pc/04_bluetooth-fix-connection-from-gs-menu.patch'
=== added file '.pc/04_bluetooth-fix-connection-from-gs-menu.patch/.timestamp'
=== added directory '.pc/04_bluetooth-fix-connection-from-gs-menu.patch/js'
=== added directory '.pc/04_bluetooth-fix-connection-from-gs-menu.patch/js/ui'
=== added directory '.pc/04_bluetooth-fix-connection-from-gs-menu.patch/js/ui/status'
=== added file '.pc/04_bluetooth-fix-connection-from-gs-menu.patch/js/ui/status/bluetooth.js'
--- .pc/04_bluetooth-fix-connection-from-gs-menu.patch/js/ui/status/bluetooth.js	1970-01-01 00:00:00 +0000
+++ .pc/04_bluetooth-fix-connection-from-gs-menu.patch/js/ui/status/bluetooth.js	2012-01-18 14:13:28 +0000
@@ -0,0 +1,508 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Clutter = imports.gi.Clutter;
+const Gdk = imports.gi.Gdk;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const GnomeBluetoothApplet = imports.gi.GnomeBluetoothApplet;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+
+const Main = imports.ui.main;
+const MessageTray = imports.ui.messageTray;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const ConnectionState = {
+    DISCONNECTED: 0,
+    CONNECTED: 1,
+    DISCONNECTING: 2,
+    CONNECTING: 3
+}
+
+function Indicator() {
+    this._init.apply(this, arguments);
+}
+
+Indicator.prototype = {
+    __proto__: PanelMenu.SystemStatusButton.prototype,
+
+    _init: function() {
+        PanelMenu.SystemStatusButton.prototype._init.call(this, 'bluetooth-disabled', null);
+
+        GLib.spawn_command_line_sync ('pkill -f "^bluetooth-applet$"');
+        this._applet = new GnomeBluetoothApplet.Applet();
+
+        this._killswitch = new PopupMenu.PopupSwitchMenuItem(_("Bluetooth"), false);
+        this._applet.connect('notify::killswitch-state', Lang.bind(this, this._updateKillswitch));
+        this._killswitch.connect('toggled', Lang.bind(this, function() {
+            let current_state = this._applet.killswitch_state;
+            if (current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED &&
+                current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER) {
+                this._applet.killswitch_state = this._killswitch.state ?
+                    GnomeBluetoothApplet.KillswitchState.UNBLOCKED:
+                    GnomeBluetoothApplet.KillswitchState.SOFT_BLOCKED;
+            } else
+                this._killswitch.setToggleState(false);
+        }));
+
+        this._discoverable = new PopupMenu.PopupSwitchMenuItem(_("Visibility"), this._applet.discoverable);
+        this._applet.connect('notify::discoverable', Lang.bind(this, function() {
+            this._discoverable.setToggleState(this._applet.discoverable);
+        }));
+        this._discoverable.connect('toggled', Lang.bind(this, function() {
+            this._applet.discoverable = this._discoverable.state;
+        }));
+
+        this._updateKillswitch();
+        this.menu.addMenuItem(this._killswitch);
+        this.menu.addMenuItem(this._discoverable);
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        this._fullMenuItems = [new PopupMenu.PopupSeparatorMenuItem(),
+                               new PopupMenu.PopupMenuItem(_("Send Files to Device...")),
+                               new PopupMenu.PopupMenuItem(_("Set up a New Device...")),
+                               new PopupMenu.PopupSeparatorMenuItem()];
+        this._hasDevices = false;
+
+        this._fullMenuItems[1].connect('activate', function() {
+            GLib.spawn_command_line_async('bluetooth-sendto');
+        });
+        this._fullMenuItems[2].connect('activate', function() {
+            GLib.spawn_command_line_async('bluetooth-wizard');
+        });
+
+        for (let i = 0; i < this._fullMenuItems.length; i++) {
+            let item = this._fullMenuItems[i];
+            this.menu.addMenuItem(item);
+        }
+
+        this._deviceItemPosition = 3;
+        this._deviceItems = [];
+        this._applet.connect('devices-changed', Lang.bind(this, this._updateDevices));
+        this._updateDevices();
+
+        this._applet.connect('notify::show-full-menu', Lang.bind(this, this._updateFullMenu));
+        this._updateFullMenu();
+
+        this.menu.addSettingsAction(_("Bluetooth Settings"), 'bluetooth-properties.desktop');
+
+        this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest));
+        this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest));
+        this._applet.connect('auth-request', Lang.bind(this, this._authRequest));
+        this._applet.connect('cancel-request', Lang.bind(this, this._cancelRequest));
+    },
+
+    _updateKillswitch: function() {
+        let current_state = this._applet.killswitch_state;
+        let on = current_state == GnomeBluetoothApplet.KillswitchState.UNBLOCKED;
+        let has_adapter = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER;
+        let can_toggle = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER &&
+                         current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED;
+
+        this._killswitch.setToggleState(on);
+        if (can_toggle)
+            this._killswitch.setStatus(null);
+        else
+            /* TRANSLATORS: this means that bluetooth was disabled by hardware rfkill */
+            this._killswitch.setStatus(_("hardware disabled"));
+
+        if (has_adapter)
+            this.actor.show();
+        else
+            this.actor.hide();
+
+        if (on) {
+            this._discoverable.actor.show();
+            this.setIcon('bluetooth-active');
+        } else {
+            this._discoverable.actor.hide();
+            this.setIcon('bluetooth-disabled');
+        }
+    },
+
+    _updateDevices: function() {
+        let devices = this._applet.get_devices();
+
+        let newlist = [ ];
+        for (let i = 0; i < this._deviceItems.length; i++) {
+            let item = this._deviceItems[i];
+            let destroy = true;
+            for (let j = 0; j < devices.length; j++) {
+                if (item._device.device_path == devices[j].device_path) {
+                    this._updateDeviceItem(item, devices[j]);
+                    destroy = false;
+                    break;
+                }
+            }
+            if (destroy)
+                item.destroy();
+            else
+                newlist.push(item);
+        }
+
+        this._deviceItems = newlist;
+        this._hasDevices = newlist.length > 0;
+        for (let i = 0; i < devices.length; i++) {
+            let d = devices[i];
+            if (d._item)
+                continue;
+            let item = this._createDeviceItem(d);
+            if (item) {
+                this.menu.addMenuItem(item, this._deviceItemPosition + this._deviceItems.length);
+                this._deviceItems.push(item);
+                this._hasDevices = true;
+            }
+        }
+    },
+
+    _updateDeviceItem: function(item, device) {
+        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) {
+            item.destroy();
+            return;
+        }
+
+        let prevDevice = item._device;
+        let prevCapabilities = prevDevice.capabilities;
+        let prevCanConnect = prevDevice.can_connect;
+
+        // adopt the new device object
+        item._device = device;
+        device._item = item;
+
+        // update properties
+        item.label.text = device.alias;
+
+        if (prevCapabilities != device.capabilities ||
+            prevCanConnect != device.can_connect) {
+            // need to rebuild the submenu
+            item.menu.removeAll();
+            this._buildDeviceSubMenu(item, device);
+        }
+
+        // update connected property
+        if (device.can_connect)
+            item._connectedMenuitem.setToggleState(device.connected);
+    },
+
+    _createDeviceItem: function(device) {
+        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
+            return null;
+        let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
+
+        // adopt the device object, and add a back link
+        item._device = device;
+        device._item = item;
+
+        this._buildDeviceSubMenu(item, device);
+
+        return item;
+    },
+
+    _buildDeviceSubMenu: function(item, device) {
+        if (device.can_connect) {
+            item._connected = device.connected;
+            item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+            item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
+                if (item._connected > ConnectionState.CONNECTED) {
+                    // operation already in progress, revert
+                    // (should not happen anyway)
+                    menuitem.setToggleState(menuitem.state);
+                }
+                if (item._connected) {
+                    item._connected = ConnectionState.DISCONNECTING;
+                    menuitem.setStatus(_("disconnecting..."));
+                    this._applet.disconnect_device(item._device.device_path, function(applet, success) {
+                        if (success) { // apply
+                            item._connected = ConnectionState.DISCONNECTED;
+                            menuitem.setToggleState(false);
+                        } else { // revert
+                            item._connected = ConnectionState.CONNECTED;
+                            menuitem.setToggleState(true);
+                        }
+                        menuitem.setStatus(null);
+                    });
+                } else {
+                    item._connected = ConnectionState.CONNECTING;
+                    menuitem.setStatus(_("connecting..."));
+                    this._applet.connect_device(item._device.device_path, function(applet, success) {
+                        if (success) { // apply
+                            item._connected = ConnectionState.CONNECTED;
+                            menuitem.setToggleState(true);
+                        } else { // revert
+                            item._connected = ConnectionState.DISCONNECTED;
+                            menuitem.setToggleState(false);
+                        }
+                        menuitem.setStatus(null);
+                    });
+                }
+            }));
+
+            item.menu.addMenuItem(item._connectedMenuitem);
+        }
+
+        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
+            item.menu.addAction(_("Send Files..."), Lang.bind(this, function() {
+                this._applet.send_to_address(device.bdaddr, device.alias);
+            }));
+        }
+        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
+            item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
+                this._applet.browse_address(device.bdaddr, event.get_time(),
+                    Lang.bind(this, function(applet, result) {
+                        try {
+                            applet.browse_address_finish(result);
+                        } catch (e) {
+                            this._ensureSource();
+                            this._source.notify(new MessageTray.Notification(this._source,
+                                 _("Bluetooth"),
+                                 _("Error browsing device"),
+                                 { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
+                        }
+                    }));
+            }));
+        }
+
+        switch (device.type) {
+        case GnomeBluetoothApplet.Type.KEYBOARD:
+            item.menu.addSettingsAction(_("Keyboard Settings"), 'gnome-keyboard-panel.desktop');
+            break;
+        case GnomeBluetoothApplet.Type.MOUSE:
+            item.menu.addSettingsAction(_("Mouse Settings"), 'gnome-mouse-panel.desktop');
+            break;
+        case GnomeBluetoothApplet.Type.HEADSET:
+        case GnomeBluetoothApplet.Type.HEADPHONES:
+        case GnomeBluetoothApplet.Type.OTHER_AUDIO:
+            item.menu.addSettingsAction(_("Sound Settings"), 'gnome-sound-panel.desktop');
+            break;
+        default:
+            break;
+        }
+    },
+
+    _updateFullMenu: function() {
+        if (this._applet.show_full_menu) {
+            this._showAll(this._fullMenuItems);
+            if (this._hasDevices)
+                this._showAll(this._deviceItems);
+        } else {
+            this._hideAll(this._fullMenuItems);
+            this._hideAll(this._deviceItems);
+        }
+    },
+
+    _showAll: function(items) {
+        for (let i = 0; i < items.length; i++)
+            items[i].actor.show();
+    },
+
+    _hideAll: function(items) {
+        for (let i = 0; i < items.length; i++)
+            items[i].actor.hide();
+    },
+
+    _destroyAll: function(items) {
+        for (let i = 0; i < items.length; i++)
+            items[i].destroy();
+    },
+
+    _ensureSource: function() {
+        if (!this._source) {
+            this._source = new Source();
+            Main.messageTray.add(this._source);
+        }
+    },
+
+    _authRequest: function(applet, device_path, name, long_name, uuid) {
+        this._ensureSource();
+        this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name, uuid));
+    },
+
+    _confirmRequest: function(applet, device_path, name, long_name, pin) {
+        this._ensureSource();
+        this._source.notify(new ConfirmNotification(this._source, this._applet, device_path, name, long_name, pin));
+    },
+
+    _pinRequest: function(applet, device_path, name, long_name, numeric) {
+        this._ensureSource();
+        this._source.notify(new PinNotification(this._source, this._applet, device_path, name, long_name, numeric));
+    },
+
+    _cancelRequest: function() {
+        this._source.destroy();
+    }
+}
+
+function Source() {
+    this._init.apply(this, arguments);
+}
+
+Source.prototype = {
+    __proto__: MessageTray.Source.prototype,
+
+    _init: function() {
+        MessageTray.Source.prototype._init.call(this, _("Bluetooth"));
+
+        this._setSummaryIcon(this.createNotificationIcon());
+    },
+
+    notify: function(notification) {
+        this._private_destroyId = notification.connect('destroy', Lang.bind(this, function(notification) {
+            if (this.notification == notification) {
+                // the destroyed notification is the last for this source
+                this.notification.disconnect(this._private_destroyId);
+                this.destroy();
+            }
+        }));
+
+        MessageTray.Source.prototype.notify.call(this, notification);
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ icon_name: 'bluetooth-active',
+                             icon_type: St.IconType.SYMBOLIC,
+                             icon_size: this.ICON_SIZE });
+    }
+}
+
+function AuthNotification() {
+    this._init.apply(this, arguments);
+}
+
+AuthNotification.prototype = {
+    __proto__: MessageTray.Notification.prototype,
+
+    _init: function(source, applet, device_path, name, long_name, uuid) {
+        MessageTray.Notification.prototype._init.call(this,
+                                                      source,
+                                                      _("Bluetooth"),
+                                                      _("Authorization request from %s").format(name),
+                                                      { customContent: true });
+        this.setResident(true);
+
+        this._applet = applet;
+        this._devicePath = device_path;
+        this.addBody(_("Device %s wants access to the service '%s'").format(long_name, uuid));
+
+        this.addButton('always-grant', _("Always grant access"));
+        this.addButton('grant', _("Grant this time only"));
+        this.addButton('reject', _("Reject"));
+
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            switch (action) {
+            case 'always-grant':
+                this._applet.agent_reply_auth(this._devicePath, true, true);
+                break;
+            case 'grant':
+                this._applet.agent_reply_auth(this._devicePath, true, false);
+                break;
+            case 'reject':
+            default:
+                this._applet.agent_reply_auth(this._devicePath, false, false);
+            }
+            this.destroy();
+        }));
+    }
+}
+
+function ConfirmNotification() {
+    this._init.apply(this, arguments);
+}
+
+ConfirmNotification.prototype = {
+    __proto__: MessageTray.Notification.prototype,
+
+    _init: function(source, applet, device_path, name, long_name, pin) {
+        MessageTray.Notification.prototype._init.call(this,
+                                                      source,
+                                                      _("Bluetooth"),
+                                                      _("Pairing confirmation for %s").format(name),
+                                                      { customContent: true });
+        this.setResident(true);
+
+        this._applet = applet;
+        this._devicePath = device_path;
+        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
+        this.addBody(_("Please confirm whether the PIN '%s' matches the one on the device.").format(pin));
+
+        this.addButton('matches', _("Matches"));
+        this.addButton('does-not-match', _("Does not match"));
+
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            if (action == 'matches')
+                this._applet.agent_reply_confirm(this._devicePath, true);
+            else
+                this._applet.agent_reply_confirm(this._devicePath, false);
+            this.destroy();
+        }));
+    }
+}
+
+function PinNotification() {
+    this._init.apply(this, arguments);
+}
+
+PinNotification.prototype = {
+    __proto__: MessageTray.Notification.prototype,
+
+    _init: function(source, applet, device_path, name, long_name, numeric) {
+        MessageTray.Notification.prototype._init.call(this,
+                                                      source,
+                                                      _("Bluetooth"),
+                                                      _("Pairing request for %s").format(name),
+                                                      { customContent: true });
+        this.setResident(true);
+
+        this._applet = applet;
+        this._devicePath = device_path;
+        this._numeric = numeric;
+        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
+        this.addBody(_("Please enter the PIN mentioned on the device."));
+
+        this._entry = new St.Entry();
+        this._entry.connect('key-release-event', Lang.bind(this, function(entry, event) {
+            let key = event.get_key_symbol();
+            if (key == Clutter.KEY_Return) {
+                this.emit('action-invoked', 'ok');
+                return true;
+            } else if (key == Clutter.KEY_Escape) {
+                this.emit('action-invoked', 'cancel');
+                return true;
+            }
+            return false;
+        }));
+        this.addActor(this._entry);
+
+        this.addButton('ok', _("OK"));
+        this.addButton('cancel', _("Cancel"));
+
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            if (action == 'ok') {
+                if (this._numeric) {
+                    let num = parseInt(this._entry.text);
+                    if (isNaN(num)) {
+                        // user reply was empty, or was invalid
+                        // cancel the operation
+                        num = -1;
+                    }
+                    this._applet.agent_reply_passkey(this._devicePath, num);
+                } else
+                    this._applet.agent_reply_pincode(this._devicePath, this._entry.text);
+            } else {
+                if (this._numeric)
+                    this._applet.agent_reply_passkey(this._devicePath, -1);
+                else
+                    this._applet.agent_reply_pincode(this._devicePath, null);
+            }
+            this.destroy();
+        }));
+    },
+
+    grabFocus: function(lockTray) {
+        MessageTray.Notification.prototype.grabFocus.call(this, lockTray);
+        global.stage.set_key_focus(this._entry);
+    }
+}

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-09-22 08:50:45 +0000
+++ .pc/applied-patches	2012-01-18 14:13:28 +0000
@@ -1,2 +1,2 @@
-01_favorite_apps.patch
 03_remove-glx-dependency-on-armel.patch
+04_bluetooth-fix-connection-from-gs-menu.patch

=== modified file 'NEWS'
--- NEWS	2011-09-28 00:41:45 +0000
+++ NEWS	2012-01-18 14:13:28 +0000
@@ -1,3 +1,69 @@
+3.2.1
+=====
+* Restore the IM state on startup - if you were available in when you logged
+  out, then you'll be set available again when you log in.
+  [Florian; #65902, #661485]
+* Improve searching for contacts in the overview: search more fields,
+  show a more meaningful name, require that all search terms match.
+  [Florian, Matthias; #660580]
+* Improve search for applications in the overview: take frequency into
+  account and tweak match algorithm [Florian; #623372]
+* Remove the "Show Password" switch from network password prompts, and
+  move the functionality to a right-click menu [Florian; #658948]
+* Add context menus with Cut/Paste options to most entries [Florian; #659275]
+* On screen keyboard:
+ - Show the keyboard immediately when it's turned enabled [Dan; #659743]
+ - Fix problem where keyboard would hide when starting to type
+   in the search entry [Nohemi; #661340]
+ - Fix problem with keyboard hiding when selected accented characters
+   [Nohemi; 661707]
+* Login mode:
+  - Allow hitting Enter to select the first user [Ray; #657996]
+  - Fix flicker of a fingerprint prompt that could show up [Ray; #660492]
+  - Fix password bullets vanishing during login [Ray; #657894]
+  - Misc bug fixes and visual tweaks [Ray; #659763, #660919, #661479]
+* Display a caps-lock warning in password entries [Florian; #660806]
+* Show the state of installed extensions in Looking Glass [Jasper; #660494]
+* Load user extensions after system ones [Jasper; #661815]
+* Fix problem with many applications showing extra-large icons in
+  notifications [Marina; #659158]
+* Fix a problem where alt-Tab had trouble tracking the current
+  application with certain applications such as Emacs. [Dan; #645026]
+* Fix confusion between different users avatar images [Florian; #660585]
+* Remove behavior where you could switch workspaces by bumping
+  a dragged window in the overview against a screen edge; it was
+  leftover and just confusing. [Florian; #660838]
+* Fix long-standing bug where the Dash in the overview could end up mis-sized
+  and run off the screen [Florian; #649248]
+* Fix automatic launching of applications when media is inserted
+  [Cosimo; #660821]
+* Fix handling of vertically stacked monitors with NVIDIA drivers
+  [Florian; #661387]
+* Translation marking fixes [Jasper, Wouter; #660600]
+* Code cleanups and warning fixes [Adel, Dan, Florian, Jasper;
+  #659822, #659940, #660122, #660358, #660968, #661231]
+* Small memory leak fixes [Florian, Jasper; #661231]
+* Misc bug fixes [Adel, Florian, Jasper; #659274, #659861, #660166, #660310,
+  #660397, #660608,  #660606, #660674, #660774. #660848, #661151, #661617]
+
+Contributors:
+  Wouter Bolsterlee, Cosimo Cecchi, Matthias Clasen, Nohemi Fernandez,
+  Adel Gadllah, Florian Müllner, Jasper St. Pierre, Ray Strode, Dan Winship,
+  Marina Zhurakhinskaya
+
+Translations:
+ Tiffany Antopolski [eo], Xandru Armesto [ast], Alexander Shopov,
+ Ivaylo Valkov [bg], Gil Forcada [ca], Carles Ferrando [ca@valencia],
+ Mario Blättermann, Paul Seyfert [de], Bruce Cowan [en_GB],
+ Jorge González, Daniel Mustieles [es], Arash Mousavi [fa], Bruno Brouard [fr],
+ Seán de Búrca [ga], Fran Diéguez [gl], Gabor Kelemen [hu], Luca Ferretti [it],
+ Takayuki Kusano [ja], Changwoo Ryu [ko], Erdal Ronahi [ku],
+ Algimantas Margevičius [lt], Rudolfs Mazurs [lv], Wouter Bolsterlee [nl],
+ Piotr Drąg [pl], Adorilson Bezerra [pt_BR], Yuri Myasoedov [ru],
+ Matej Urbančič [sl], Daniel Nylander [sv], Miroslav Nikolić [sr, sr@latin],
+ Tirumurti Vasudevan [ta], Krishnababu Krothapalli [te], Daniel Korostil [uk],
+ Nguyễn Thái Ngọc Duy [vi], YunQiang Su [zh_CN]
+
 3.2.0
 =====
 * Prevent the fallback on-screen keyboard from showing up while

=== modified file 'configure'
--- configure	2011-09-28 06:48:58 +0000
+++ configure	2012-01-18 14:13:28 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gnome-shell 3.2.0.
+# Generated by GNU Autoconf 2.68 for gnome-shell 3.2.1.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell>.
 #
@@ -571,8 +571,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnome-shell'
 PACKAGE_TARNAME='gnome-shell'
-PACKAGE_VERSION='3.2.0'
-PACKAGE_STRING='gnome-shell 3.2.0'
+PACKAGE_VERSION='3.2.1'
+PACKAGE_STRING='gnome-shell 3.2.1'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell'
 PACKAGE_URL=''
 
@@ -1453,7 +1453,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gnome-shell 3.2.0 to adapt to many kinds of systems.
+\`configure' configures gnome-shell 3.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1523,7 +1523,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnome-shell 3.2.0:";;
+     short | recursive ) echo "Configuration of gnome-shell 3.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1698,7 +1698,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnome-shell configure 3.2.0
+gnome-shell configure 3.2.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2067,7 +2067,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gnome-shell $as_me 3.2.0, which was
+It was created by gnome-shell $as_me 3.2.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2894,7 +2894,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-shell'
- VERSION='3.2.0'
+ VERSION='3.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14948,7 +14948,7 @@
 CLUTTER_MIN_VERSION=1.7.5
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.29.18
-MUTTER_MIN_VERSION=3.0.0
+MUTTER_MIN_VERSION=3.2.1
 FOLKS_MIN_VERSION=0.5.2
 GTK_MIN_VERSION=3.0.0
 GIO_MIN_VERSION=2.29.10
@@ -17250,7 +17250,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gnome-shell $as_me 3.2.0, which was
+This file was extended by gnome-shell $as_me 3.2.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17316,7 +17316,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gnome-shell config.status 3.2.0
+gnome-shell config.status 3.2.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-09-28 06:48:58 +0000
+++ configure.ac	2012-01-18 14:13:28 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.2.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.2.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -67,7 +67,7 @@
 CLUTTER_MIN_VERSION=1.7.5
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.29.18
-MUTTER_MIN_VERSION=3.0.0
+MUTTER_MIN_VERSION=3.2.1
 FOLKS_MIN_VERSION=0.5.2
 GTK_MIN_VERSION=3.0.0
 GIO_MIN_VERSION=2.29.10

=== modified file 'data/org.gnome.shell.gschema.xml.in'
--- data/org.gnome.shell.gschema.xml.in	2011-09-22 08:50:45 +0000
+++ data/org.gnome.shell.gschema.xml.in	2012-01-18 14:13:28 +0000
@@ -31,7 +31,7 @@
       </_description>
     </key>
     <key name="favorite-apps" type="as">
-      <default>[ 'firefox.desktop', 'thunderbird.desktop', 'empathy.desktop', 'banshee.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
+      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
       <_summary>List of desktop file IDs for favorite applications</_summary>
       <_description>
         The applications corresponding to these identifiers
@@ -50,6 +50,14 @@
       <default>[]</default>
       <_summary>History for the looking glass dialog</_summary>
     </key>
+    <key name="saved-im-presence" type="i">
+      <default>1</default>
+      <_summary></_summary>
+    </key>
+    <key name="saved-session-presence" type="i">
+      <default>0</default>
+      <_summary></_summary>
+    </key>
     <child name="clock" schema="org.gnome.shell.clock"/>
     <child name="calendar" schema="org.gnome.shell.calendar"/>
     <child name="recorder" schema="org.gnome.shell.recorder"/>

=== modified file 'data/theme/gdm.css'
--- data/theme/gdm.css	2011-09-21 16:26:15 +0000
+++ data/theme/gdm.css	2012-01-18 14:13:28 +0000
@@ -98,8 +98,12 @@
     color: #666666;
 }
 
+.login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
+    color: white;
+}
+
 .login-dialog-prompt-layout {
-    padding-bottom: 64px;
+    padding-bottom: 32px;
 }
 .login-dialog-prompt-label {
     color: white;
@@ -117,6 +121,16 @@
     width: 15em;
 }
 
+.login-dialog-prompt-entry .capslock-warning {
+    icon-size: 16px;
+    warning-color: #999;
+}
+
+.login-dialog-prompt-entry:insensitive {
+    color: rgba(0,0,0,0.7);
+    border: 2px solid #565656;
+}
+
 .login-dialog-session-list {
     color: #ffffff;
     font-size: 10.5pt;

=== modified file 'data/theme/gnome-shell.css'
--- data/theme/gnome-shell.css	2011-09-21 16:26:15 +0000
+++ data/theme/gnome-shell.css	2012-01-18 14:13:28 +0000
@@ -907,7 +907,7 @@
     font-weight: bold;
 }
 
-.lg-extension-actions {
+.lg-extension-meta {
     spacing: 6px;
 }
 
@@ -1907,6 +1907,12 @@
     border: 2px solid #3465a4;
 }
 
+.polkit-dialog-password-entry .capslock-warning {
+    icon-size: 16px;
+    warning-color: #999;
+    padding: 0 4px;
+}
+
 .polkit-dialog-error-label {
     font-size: 10pt;
     color: #ffff00;
@@ -1925,14 +1931,6 @@
     padding-bottom: 8px;
 }
 
-.network-dialog-show-password-checkbox {
-    padding-top: 5px;
-    padding-bottom: 5px;
-    font-size: 10pt;
-    color: white;
-    spacing: 10px;
-}
-
 .network-dialog-secret-table {
     spacing-rows: 15px;
 }

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-28 06:48:58 +0000
+++ debian/changelog	2012-01-18 14:13:28 +0000
@@ -1,3 +1,63 @@
+gnome-shell (3.2.1-0ubuntu1.2~tkluck1) oneiric; urgency=low
+
+  * Fix bluetooth device connecting from gnome-shell menu
+
+ -- Timo Kluck <[e-mail]>  Wed, 18 Jan 2012 14:34:22 +0100
+
+gnome-shell (3.2.1-0ubuntu1.1) oneiric-proposed; urgency=low
+
+  * No-change rebuild to fix up dependencies (LP: #903382)
+
+ -- Evan Broder <[e-mail]>  Mon, 19 Dec 2011 23:13:06 -0800
+
+gnome-shell (3.2.1-0ubuntu1) oneiric-proposed; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release (LP: #878672).
+    - Restore the IM state on startup - if you were available in when you
+      logged out, then you'll be set available again when you log in.
+    - Improve searching for contacts in the overview: search more fields,
+      show a more meaningful name, require that all search terms match.
+    - Improve search for applications in the overview: take frequency into
+      account and tweak match algorithm
+    - Remove the "Show Password" switch from network password prompts, and
+      move the functionality to a right-click menu
+    - Add context menus with Cut/Paste options to most entries
+    - Display a caps-lock warning in password entries
+    - Show the state of installed extensions in Looking Glass
+    - Load user extensions after system ones
+    - Fix problem with many applications showing extra-large icons in
+      notifications
+    - Fix a problem where alt-Tab had trouble tracking the current
+      application with certain applications such as Emacs.
+    - Fix confusion between different users avatar images
+    - Remove behavior where you could switch workspaces by bumping
+      a dragged window in the overview against a screen edge; it was
+      leftover and just confusing.
+    - Fix long-standing bug where the Dash in the overview could end up
+      mis-sized and run off the screen
+    - Fix automatic launching of applications when media is inserted
+    - Fix handling of vertically stacked monitors with NVIDIA drivers
+    - Translation marking fixes
+    - Code cleanups and warning fixes
+    - Small memory leak fixes
+    - On screen keyboard:
+      + Show the keyboard immediately when it's turned enabled
+      + Fix problem where keyboard would hide when starting to type
+        in the search entry
+      + Fix problem with keyboard hiding when selected accented characters
+    - Misc bug fixes
+  * debian/control.in:
+    - Bump minimum mutter to 3.2.1
+    - Drop dependency against libdconf0 and let dh_installgsettings set
+      the right dependencies.
+    - Depends on cups-pk-helper instead of recommends to ensure that
+      the printer applet works (LP: #877367)
+  * 01_favorite_apps.patch: dropped, replaced by override file.
+  * New upstream release.
+
+ -- Jeremy Bicha <[e-mail]>  Mon, 24 Oct 2011 06:43:05 +0200
+
 gnome-shell (3.2.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream stable release.

=== modified file 'debian/control'
--- debian/control	2011-09-28 06:48:58 +0000
+++ debian/control	2012-01-18 14:13:28 +0000
@@ -36,7 +36,7 @@
                libgudev-1.0-dev,
                libnm-glib-dev (>= 0.8.999),
                libstartup-notification0-dev (>= 0.11),
-               libmutter-dev (>= 3.1.92),
+               libmutter-dev (>= 3.2.1),
                librsvg2-dev,
                libwnck-dev,
                libclutter-1.0-dev (>= 1.7.5),
@@ -62,7 +62,7 @@
          ${shlibs:Depends},
          ${misc:Depends},
          caribou,
-         libdconf0 | gsettings-backend,
+         cups-pk-helper,
          gnome-settings-daemon (>= 2.91.5.1),
          gsettings-desktop-schemas (>= 0.1.7),
          gnome-icon-theme-symbolic (>= 2.91),
@@ -78,7 +78,7 @@
          python,
          pkg-config,
          mesa-utils
-Recommends: gnome-control-center, gnome-user-guide, gnome-themes-standard, cups-pk-helper, gnome-session-fallback
+Recommends: gnome-control-center, gnome-user-guide, gnome-themes-standard, gnome-session-fallback
 Breaks: gnome-control-center (<< 1:3.0)
 Description: graphical shell for the GNOME desktop
  The GNOME Shell redefines user interactions with the GNOME desktop.

=== modified file 'debian/control.in'
--- debian/control.in	2011-09-28 06:48:58 +0000
+++ debian/control.in	2012-01-18 14:13:28 +0000
@@ -31,7 +31,7 @@
                libgudev-1.0-dev,
                libnm-glib-dev (>= 0.8.999),
                libstartup-notification0-dev (>= 0.11),
-               libmutter-dev (>= 3.1.92),
+               libmutter-dev (>= 3.2.1),
                librsvg2-dev,
                libwnck-dev,
                libclutter-1.0-dev (>= 1.7.5),
@@ -57,7 +57,7 @@
          ${shlibs:Depends},
          ${misc:Depends},
          caribou,
-         libdconf0 | gsettings-backend,
+         cups-pk-helper,
          gnome-settings-daemon (>= 2.91.5.1),
          gsettings-desktop-schemas (>= 0.1.7),
          gnome-icon-theme-symbolic (>= 2.91),
@@ -73,7 +73,7 @@
          python,
          pkg-config,
          mesa-utils
-Recommends: gnome-control-center, gnome-user-guide, gnome-themes-standard, cups-pk-helper, gnome-session-fallback
+Recommends: gnome-control-center, gnome-user-guide, gnome-themes-standard, gnome-session-fallback
 Breaks: gnome-control-center (<< 1:3.0)
 Description: graphical shell for the GNOME desktop
  The GNOME Shell redefines user interactions with the GNOME desktop.

=== added file 'debian/gnome-shell.gsettings-override'
--- debian/gnome-shell.gsettings-override	1970-01-01 00:00:00 +0000
+++ debian/gnome-shell.gsettings-override	2012-01-18 14:13:28 +0000
@@ -0,0 +1,3 @@
+[org.gnome.shell]
+favorite-apps=[ 'firefox.desktop', 'thunderbird.desktop', 'empathy.desktop', 'banshee.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]
+

=== removed file 'debian/patches/01_favorite_apps.patch'
--- debian/patches/01_favorite_apps.patch	2011-09-22 08:50:45 +0000
+++ debian/patches/01_favorite_apps.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-Description: Use Ubuntu defaults (Firefox, Thunderbird, and Banshee)
-Forwarded: not-needed
-Author: Jeremy Bicha <[e-mail]>
-Index: oneiric/data/org.gnome.shell.gschema.xml.in
-===================================================================
---- oneiric.orig/data/org.gnome.shell.gschema.xml.in	2011-09-20 18:38:13.116385829 -0400
-+++ oneiric/data/org.gnome.shell.gschema.xml.in	2011-09-20 18:38:36.746420484 -0400
-@@ -31,7 +31,7 @@
-       </_description>
-     </key>
-     <key name="favorite-apps" type="as">
--      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
-+      <default>[ 'firefox.desktop', 'thunderbird.desktop', 'empathy.desktop', 'banshee.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
-       <_summary>List of desktop file IDs for favorite applications</_summary>
-       <_description>
-         The applications corresponding to these identifiers

=== added file 'debian/patches/04_bluetooth-fix-connection-from-gs-menu.patch'
--- debian/patches/04_bluetooth-fix-connection-from-gs-menu.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_bluetooth-fix-connection-from-gs-menu.patch	2012-01-18 14:13:28 +0000
@@ -0,0 +1,31 @@
+From 0ed0dc89b51f8e584dd21c87a7178ba138bed44b Mon Sep 17 00:00:00 2001
+From: Alessandro Crismani <[e-mail]>
+Date: Tue, 13 Dec 2011 10:01:34 +0100
+Subject: [PATCH] Bluetooth: fix connecting devices from GS's panel on 3.2.1
+
+Connecting devices from Gnome Shell's panel on Gnome 3.2.1 fails because
+of an undefined variable in
+js/ui/status/bluetooth.js:buildDeviceSubMenu. More explicitly, the
+menuitem variable is not declared and hence connecting and disconnecting
+fails. Fix it to make the bluetooth panel menu item work.
+---
+ js/ui/status/bluetooth.js |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
+index f2d95f5..3aa7960 100644
+--- a/js/ui/status/bluetooth.js
++++ b/js/ui/status/bluetooth.js
+@@ -205,7 +205,8 @@ Indicator.prototype = {
+     _buildDeviceSubMenu: function(item, device) {
+         if (device.can_connect) {
+             item._connected = device.connected;
+-            item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
++            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
++            item._connectedMenuitem = menuitem;
+             item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
+                 if (item._connected > ConnectionState.CONNECTED) {
+                     // operation already in progress, revert
+-- 
+1.7.8
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-22 08:50:45 +0000
+++ debian/patches/series	2012-01-18 14:13:28 +0000
@@ -1,2 +1,2 @@
-01_favorite_apps.patch
 03_remove-glx-dependency-on-armel.patch
+04_bluetooth-fix-connection-from-gs-menu.patch

=== modified file 'js/Makefile.am'
--- js/Makefile.am	2011-09-22 08:50:45 +0000
+++ js/Makefile.am	2012-01-18 14:13:28 +0000
@@ -46,6 +46,7 @@
 	ui/messageTray.js	\
 	ui/modalDialog.js	\
 	ui/networkAgent.js	\
+	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
 	ui/notificationDaemon.js \
 	ui/overview.js		\

=== modified file 'js/Makefile.in'
--- js/Makefile.in	2011-09-22 08:50:45 +0000
+++ js/Makefile.in	2012-01-18 14:13:28 +0000
@@ -337,6 +337,7 @@
 	ui/messageTray.js	\
 	ui/modalDialog.js	\
 	ui/networkAgent.js	\
+	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
 	ui/notificationDaemon.js \
 	ui/overview.js		\

=== modified file 'js/gdm/batch.js'
--- js/gdm/batch.js	2011-09-04 08:02:35 +0000
+++ js/gdm/batch.js	2012-01-18 14:13:28 +0000
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify

=== modified file 'js/gdm/consoleKit.js'
--- js/gdm/consoleKit.js	2011-09-21 16:26:15 +0000
+++ js/gdm/consoleKit.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 

=== modified file 'js/gdm/fingerprint.js'
--- js/gdm/fingerprint.js	2011-09-21 16:26:15 +0000
+++ js/gdm/fingerprint.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;

=== modified file 'js/gdm/loginDialog.js'
--- js/gdm/loginDialog.js	2011-09-21 16:26:15 +0000
+++ js/gdm/loginDialog.js	2012-01-18 14:13:28 +0000
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify
@@ -297,6 +297,20 @@
                                x_align: St.Align.START,
                                y_align: St.Align.MIDDLE });
         this._items = {};
+
+        this.actor.connect('key-focus-in', Lang.bind(this, this._moveFocusToItems));
+    },
+
+    _moveFocusToItems: function() {
+        let hasItems = Object.keys(this._items).length > 0;
+
+        if (!hasItems)
+            return;
+
+        if (global.stage.get_key_focus() != this.actor)
+            return;
+
+        this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     },
 
     _showItem: function(item) {
@@ -502,6 +516,8 @@
                                          item.showFocusAnimation(0);
                                      }));
 
+        this._moveFocusToItems();
+
         this.emit('item-added', item);
     },
 
@@ -694,10 +710,13 @@
         let ids = GdmGreeter.get_session_ids();
         ids.sort();
 
-        if (ids.length <= 1)
+        if (ids.length <= 1) {
             this._box.hide();
-        else
+            this._button.hide();
+        } else {
+            this._button.show();
             this._box.show();
+        }
 
         for (let i = 0; i < ids.length; i++) {
             let [sessionName, sessionDescription] = GdmGreeter.get_session_name_and_description(ids[i]);
@@ -922,6 +941,7 @@
 
                      function() {
                          this._sessionList.close();
+                         this._promptFingerprintMessage.hide();
                          this._userList.actor.show();
                          this._userList.actor.opacity = 255;
                          return this._userList.showItems();
@@ -943,7 +963,18 @@
     },
 
     _onInfo: function(client, serviceName, info) {
-        // we don't want fingerprint messages with the word UPEK in them
+        // We don't display fingerprint messages, because they
+        // have words like UPEK in them. Instead we use the messages
+        // as a cue to display our own message.
+        if (serviceName == _FINGERPRINT_SERVICE_NAME &&
+            this._haveFingerprintReader &&
+            (!this._promptFingerprintMessage.visible ||
+             this._promptFingerprintMessage.opacity != 255)) {
+
+            _fadeInActor(this._promptFingerprintMessage);
+            return;
+        }
+
         if (serviceName != _PASSWORD_SERVICE_NAME)
             return;
         Main.notifyError(info);
@@ -971,10 +1002,10 @@
                      },
 
                      function() {
-                         if (!this._haveFingerprintReader)
-                             return null;
-
-                         return _fadeInActor(this._promptFingerprintMessage);
+                         // Show it with 0 opacity so we preallocate space for it
+                         // in the event we need to fade in the message
+                         this._promptFingerprintMessage.opacity = 0;
+                         this._promptFingerprintMessage.show();
                      },
 
                      function() {
@@ -1046,6 +1077,8 @@
 
                      function() {
                          this._promptFingerprintMessage.hide();
+                         this._promptEntry.reactive = true;
+                         this._promptEntry.remove_style_pseudo_class('insensitive');
                          this._promptEntry.set_text('');
                      }];
 
@@ -1061,7 +1094,8 @@
 
                      function() {
                          let _text = this._promptEntry.get_text();
-                         this._promptEntry.set_text('');
+                         this._promptEntry.reactive = false;
+                         this._promptEntry.add_style_pseudo_class('insensitive');
                          this._greeterClient.call_answer_query(serviceName, _text);
                      }];
 

=== modified file 'js/gdm/powerMenu.js'
--- js/gdm/powerMenu.js	2011-09-21 16:26:15 +0000
+++ js/gdm/powerMenu.js	2012-01-18 14:13:28 +0000
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify

=== modified file 'js/misc/config.js'
--- js/misc/config.js	2011-09-28 00:41:45 +0000
+++ js/misc/config.js	2012-01-18 14:13:28 +0000
@@ -1,10 +1,11 @@
-/* mode: js2; indent-tabs-mode: nil; tab-size: 4 */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
 /* The name of this package (not localized) */
 const PACKAGE_NAME = 'gnome-shell';
 /* The version of this package */
-const PACKAGE_VERSION = '3.2.0';
+const PACKAGE_VERSION = '3.2.1';
 /* The version of GJS we're linking to */
-const GJS_VERSION = '1.29.19';
+const GJS_VERSION = '1.30.0';
 /* 1 if gnome-bluetooth is available, 0 otherwise */
 const HAVE_BLUETOOTH = 1;
 /* The system TLS CA list */

=== modified file 'js/misc/config.js.in'
--- js/misc/config.js.in	2011-09-21 16:26:15 +0000
+++ js/misc/config.js.in	2012-01-18 14:13:28 +0000
@@ -1,4 +1,5 @@
-/* mode: js2; indent-tabs-mode: nil; tab-size: 4 */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
 /* The name of this package (not localized) */
 const PACKAGE_NAME = '@PACKAGE_NAME@';
 /* The version of this package */

=== modified file 'js/misc/docInfo.js'
--- js/misc/docInfo.js	2011-02-25 12:23:23 +0000
+++ js/misc/docInfo.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;

=== modified file 'js/misc/fileUtils.js'
--- js/misc/fileUtils.js	2011-09-21 16:26:15 +0000
+++ js/misc/fileUtils.js	2012-01-18 14:13:28 +0000
@@ -1,3 +1,5 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 

=== modified file 'js/misc/format.js'
--- js/misc/format.js	2010-07-13 14:36:34 +0000
+++ js/misc/format.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 /*
  * This function is intended to extend the String object and provide

=== modified file 'js/misc/gnomeSession.js'
--- js/misc/gnomeSession.js	2011-07-20 14:46:28 +0000
+++ js/misc/gnomeSession.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;
@@ -78,7 +78,7 @@
 Inhibitor.prototype = {
     _init: function(objectPath) {
         DBus.session.proxifyObject(this,
-                                   "org.gnome.SessionManager",
+                                   'org.gnome.SessionManager',
                                    objectPath);
         this.isLoaded = false;
         this._loadingPropertiesCount = InhibitorIface.properties.length;
@@ -94,7 +94,7 @@
 
                     if (this._loadingPropertiesCount == 0) {
                         this.isLoaded = true;
-                        this.emit("is-loaded");
+                        this.emit('is-loaded');
                     }
                 }));
         }

=== modified file 'js/misc/history.js'
--- js/misc/history.js	2011-05-31 19:31:47 +0000
+++ js/misc/history.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;

=== modified file 'js/misc/modemManager.js'
--- js/misc/modemManager.js	2011-03-24 19:28:12 +0000
+++ js/misc/modemManager.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;

=== modified file 'js/misc/params.js'
--- js/misc/params.js	2010-05-31 11:03:29 +0000
+++ js/misc/params.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 // parse:
 // @params: caller-provided parameter object, or %null

=== modified file 'js/misc/screenSaver.js'
--- js/misc/screenSaver.js	2011-08-24 02:33:44 +0000
+++ js/misc/screenSaver.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;

=== modified file 'js/misc/util.js'
--- js/misc/util.js	2011-09-21 16:26:15 +0000
+++ js/misc/util.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;

=== modified file 'js/perf/core.js'
--- js/perf/core.js	2011-09-04 08:02:35 +0000
+++ js/perf/core.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;

=== modified file 'js/ui/altTab.js'
--- js/ui/altTab.js	2011-09-22 08:50:45 +0000
+++ js/ui/altTab.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
@@ -134,11 +134,40 @@
         }
     },
 
+    _getAppLists: function() {
+        let tracker = Shell.WindowTracker.get_default();
+        let appSys = Shell.AppSystem.get_default();
+        let allApps = appSys.get_running ();
+
+        let screen = global.screen;
+        let display = screen.get_display();
+        let windows = display.get_tab_list(Meta.TabList.NORMAL, screen,
+                                           screen.get_active_workspace());
+
+        // windows is only the windows on the current workspace. For
+        // each one, if it corresponds to an app we know, move that
+        // app from allApps to apps.
+        let apps = [];
+        for (let i = 0; i < windows.length && allApps.length != 0; i++) {
+            let app = tracker.get_window_app(windows[i]);
+            let index = allApps.indexOf(app);
+            if (index != -1) {
+                apps.push(app);
+                allApps.splice(index, 1);
+            }
+        }
+
+        // Now @apps is a list of apps on the current workspace, in
+        // standard Alt+Tab order (MRU except for minimized windows),
+        // and allApps is a list of apps that only appear on other
+        // workspaces, sorted by user_time, which is good enough.
+        return [apps, allApps];
+    },
+
     show : function(backward, binding, mask) {
-        let appSys = Shell.AppSystem.get_default();
-        let apps = appSys.get_running ();
+        let [localApps, otherApps] = this._getAppLists();
 
-        if (!apps.length)
+        if (localApps.length == 0 && otherApps.length == 0)
             return false;
 
         if (!Main.pushModal(this.actor))
@@ -152,7 +181,7 @@
         this.actor.connect('button-press-event', Lang.bind(this, this._clickedOutside));
         this.actor.connect('scroll-event', Lang.bind(this, this._onScroll));
 
-        this._appSwitcher = new AppSwitcher(apps, this);
+        this._appSwitcher = new AppSwitcher(localApps, otherApps, 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));
@@ -846,33 +875,32 @@
     }
 };
 
-function AppSwitcher(apps, altTabPopup) {
-    this._init(apps, altTabPopup);
+function AppSwitcher() {
+    this._init.apply(this, arguments);
 }
 
 AppSwitcher.prototype = {
     __proto__ : SwitcherList.prototype,
 
-    _init : function(apps, altTabPopup) {
+    _init : function(localApps, otherApps, altTabPopup) {
         SwitcherList.prototype._init.call(this, true);
 
-        // Construct the AppIcons, sort by time, add to the popup
+        // Construct the AppIcons, add to the popup
         let activeWorkspace = global.screen.get_active_workspace();
         let workspaceIcons = [];
         let otherIcons = [];
-        for (let i = 0; i < apps.length; i++) {
-            let appIcon = new AppIcon(apps[i]);
+        for (let i = 0; i < localApps.length; i++) {
+            let appIcon = new AppIcon(localApps[i]);
             // Cache the window list now; we don't handle dynamic changes here,
             // and we don't want to be continually retrieving it
             appIcon.cachedWindows = appIcon.app.get_windows();
-            if (this._hasWindowsOnWorkspace(appIcon, activeWorkspace))
-              workspaceIcons.push(appIcon);
-            else
-              otherIcons.push(appIcon);
-        }
-
-        workspaceIcons.sort(Lang.bind(this, this._sortAppIcon));
-        otherIcons.sort(Lang.bind(this, this._sortAppIcon));
+            workspaceIcons.push(appIcon);
+        }
+        for (let i = 0; i < otherApps.length; i++) {
+            let appIcon = new AppIcon(otherApps[i]);
+            appIcon.cachedWindows = appIcon.app.get_windows();
+            otherIcons.push(appIcon);
+        }
 
         this.icons = [];
         this._arrows = [];
@@ -1012,19 +1040,6 @@
 
         if (appIcon.cachedWindows.length == 1)
             arrow.hide();
-    },
-
-    _hasWindowsOnWorkspace: function(appIcon, workspace) {
-        let windows = appIcon.cachedWindows;
-        for (let i = 0; i < windows.length; i++) {
-            if (windows[i].get_workspace() == workspace)
-                return true;
-        }
-        return false;
-    },
-
-    _sortAppIcon : function(appIcon1, appIcon2) {
-        return appIcon1.app.compare(appIcon2.app);
     }
 };
 

=== modified file 'js/ui/appDisplay.js'
--- js/ui/appDisplay.js	2011-09-21 16:26:15 +0000
+++ js/ui/appDisplay.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;

=== modified file 'js/ui/appFavorites.js'
--- js/ui/appFavorites.js	2011-09-04 08:02:35 +0000
+++ js/ui/appFavorites.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Shell = imports.gi.Shell;
 const Lang = imports.lang;

=== modified file 'js/ui/automountManager.js'
--- js/ui/automountManager.js	2011-08-24 02:33:44 +0000
+++ js/ui/automountManager.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const DBus = imports.dbus;
@@ -209,10 +209,14 @@
             }
         }
 
+        // Volume is already mounted, don't bother.
+        if (volume.get_mount())
+            return;
+
         if (!this._settings.get_boolean(SETTING_ENABLE_AUTOMOUNT) ||
             !volume.should_automount() ||
             !volume.can_mount()) {
-	    // allow the autorun to run anyway; this can happen if the
+            // allow the autorun to run anyway; this can happen if the
             // mount gets added programmatically later, even if 
             // should_automount() or can_mount() are false, like for
             // blank optical media.

=== modified file 'js/ui/autorunManager.js'
--- js/ui/autorunManager.js	2011-09-28 00:41:45 +0000
+++ js/ui/autorunManager.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const DBus = imports.dbus;
@@ -491,7 +491,7 @@
         let app = null;
 
         if (setting == AutorunSetting.RUN) {
-            app = Gio.app_info_get_default_for_type(type, false);
+            app = Gio.app_info_get_default_for_type(contentTypes[0], false);
         } else if (setting == AutorunSetting.FILES) {
             app = Gio.app_info_get_default_for_type('inode/directory', false);
         }

=== modified file 'js/ui/boxpointer.js'
--- js/ui/boxpointer.js	2011-09-04 08:02:35 +0000
+++ js/ui/boxpointer.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
@@ -46,6 +46,7 @@
         this._yOffset = 0;
         this._xPosition = 0;
         this._yPosition = 0;
+        this._sourceAlignment = 0.5;
     },
 
     show: function(animate, onComplete) {
@@ -75,7 +76,7 @@
         Tweener.addTween(this, { opacity: 255,
                                  xOffset: 0,
                                  yOffset: 0,
-                                 transition: "linear",
+                                 transition: 'linear',
                                  onComplete: onComplete,
                                  time: POPUP_ANIMATION_TIME });
     },
@@ -106,7 +107,7 @@
         Tweener.addTween(this, { opacity: 0,
                                  xOffset: xOffset,
                                  yOffset: yOffset,
-                                 transition: "linear",
+                                 transition: 'linear',
                                  time: POPUP_ANIMATION_TIME,
                                  onComplete: Lang.bind(this, function () {
                                      this.actor.hide();
@@ -180,7 +181,7 @@
         this.bin.allocate(childBox, flags);
 
         if (this._sourceActor && this._sourceActor.mapped)
-            this._reposition(this._sourceActor, this._alignment);
+            this._reposition(this._sourceActor, this._arrowAlignment);
     },
 
     _drawBorder: function(area) {
@@ -312,24 +313,37 @@
         this.actor.show();
 
         this._sourceActor = sourceActor;
-        this._alignment = alignment;
+        this._arrowAlignment = alignment;
 
         this._reposition(sourceActor, alignment);
     },
 
+    setSourceAlignment: function(alignment) {
+        this._sourceAlignment = alignment;
+
+        if (!this._sourceActor)
+            return;
+
+        // We need to show it now to force an allocation,
+        // so that we can query the correct size.
+        this.actor.show();
+
+        this._reposition(this._sourceActor, this._arrowAlignment);
+    },
+
     _reposition: function(sourceActor, alignment) {
         // Position correctly relative to the sourceActor
         let sourceNode = sourceActor.get_theme_node();
         let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
         let sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
-        let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) / 2;
-        let sourceCenterY = sourceAllocation.y1 + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) / 2;
+        let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
+        let sourceCenterY = sourceAllocation.y1 + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) * this._sourceAlignment;
         let [minWidth, minHeight, natWidth, natHeight] = this.actor.get_preferred_size();
 
         // We also want to keep it onscreen, and separated from the
         // edge by the same distance as the main part of the box is
         // separated from its sourceActor
-        let primary = Main.layoutManager.primaryMonitor;
+        let monitor = Main.layoutManager.findMonitorForActor(sourceActor);
         let themeNode = this.actor.get_theme_node();
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let arrowBase = themeNode.get_length('-arrow-base');
@@ -364,8 +378,8 @@
         case St.Side.BOTTOM:
             resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
 
-            resX = Math.max(resX, primary.x + 10);
-            resX = Math.min(resX, primary.x + primary.width - (10 + natWidth));
+            resX = Math.max(resX, monitor.x + 10);
+            resX = Math.min(resX, monitor.x + monitor.width - (10 + natWidth));
             this.setArrowOrigin(sourceCenterX - resX);
             break;
 
@@ -373,8 +387,8 @@
         case St.Side.RIGHT:
             resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
 
-            resY = Math.max(resY, primary.y + 10);
-            resY = Math.min(resY, primary.y + primary.height - (10 + natHeight));
+            resY = Math.max(resY, monitor.y + 10);
+            resY = Math.min(resY, monitor.y + monitor.height - (10 + natHeight));
 
             this.setArrowOrigin(sourceCenterY - resY);
             break;

=== modified file 'js/ui/calendar.js'
--- js/ui/calendar.js	2011-09-04 08:02:35 +0000
+++ js/ui/calendar.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Clutter = imports.gi.Clutter;

=== modified file 'js/ui/contactDisplay.js'
--- js/ui/contactDisplay.js	2011-09-04 08:02:35 +0000
+++ js/ui/contactDisplay.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Folks = imports.gi.Folks
 const Lang = imports.lang;
@@ -26,7 +26,8 @@
 
 Contact.prototype = {
     _init: function(id) {
-        this.individual = Shell.ContactSystem.get_default().get_individual(id);
+        this._contactSys = Shell.ContactSystem.get_default();
+        this.individual = this._contactSys.get_individual(id);
 
         this.actor = new St.Bin({ style_class: 'contact',
                                   reactive: true,
@@ -56,7 +57,12 @@
                                x_align: St.Align.START,
                                y_align: St.Align.MIDDLE });
 
-        let aliasText = this.individual.alias || _("Unknown");
+        let email = this._contactSys.get_email_for_display(this.individual);
+        let aliasText = this.individual.alias     ||
+                        this.individual.full_name ||
+                        this.individual.nickname  ||
+                        email                     ||
+                        _("Unknown");
         let aliasLabel = new St.Label({ text: aliasText,
                                         style_class: 'contact-details-alias' });
         details.add(aliasLabel, { x_fill: true,

=== modified file 'js/ui/ctrlAltTab.js'
--- js/ui/ctrlAltTab.js	2011-09-21 16:26:15 +0000
+++ js/ui/ctrlAltTab.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;

=== modified file 'js/ui/dash.js'
--- js/ui/dash.js	2011-09-21 16:26:15 +0000
+++ js/ui/dash.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Signals = imports.signals;
@@ -37,6 +37,7 @@
         this.child = null;
         this._childScale = 1;
         this._childOpacity = 255;
+        this.animatingOut = false;
     },
 
     _allocate: function(actor, box, flags) {
@@ -115,6 +116,7 @@
             return;
         }
 
+        this.animatingOut = true;
         this.childScale = 1.0;
         Tweener.addTween(this,
                          { childScale: 0.0,
@@ -177,12 +179,6 @@
         this._iconBin._delegate = this;
 
         this.setChild(this._iconBin);
-        this.hiding = false;
-    },
-
-    animateOutAndDestroy: function() {
-        DashItemContainer.prototype.animateOutAndDestroy.call(this);
-        this.hiding = true;
     },
 
     _createIcon: function(size) {
@@ -314,15 +310,12 @@
     _endDrag: function() {
         this._clearDragPlaceholder();
         if (this._favRemoveTarget) {
-            this._favRemoveTarget.actor.hide();
-            this._adjustIconSize();
-            this._favRemoveTarget.actor.show();
-
             this._favRemoveTarget.animateOutAndDestroy();
             this._favRemoveTarget.actor.connect('destroy', Lang.bind(this,
                 function() {
                     this._favRemoveTarget = null;
                 }));
+            this._adjustIconSize();
         }
         DND.removeDragMonitor(this._dragMonitor);
     },
@@ -401,8 +394,18 @@
     },
 
     _adjustIconSize: function() {
-        let children = this._box.get_children();
-        if (children.length == 0) {
+        // For the icon size, we only consider children which are "proper"
+        // icons (i.e. ignoring drag placeholders) and which are not
+        // animating out (which means they will be destroyed at the end of
+        // the animation)
+        let iconChildren = this._box.get_children().filter(function(actor) {
+            return actor._delegate.child &&
+                   actor._delegate.child._delegate &&
+                   actor._delegate.child._delegate.icon &&
+                   !actor._delegate.animatingOut;
+        });
+
+        if (iconChildren.length == 0) {
             this._box.add_style_pseudo_class('empty');
             return;
         }
@@ -412,23 +415,45 @@
         if (this._maxHeight == -1)
             return;
 
-        let iconChildren = children.filter(function(actor) {
-            return actor.visible &&
-                   actor._delegate.child &&
-                   actor._delegate.child._delegate &&
-                   actor._delegate.child._delegate.icon;
-        });
-
-        // Compute the amount of extra space (or missing space) we have
-        // per icon with the current icon size
-        let [minHeight, natHeight] = this.actor.get_preferred_height(-1);
-        let diff = (this._maxHeight - natHeight) / iconChildren.length;
+
+        let themeNode = this.actor.get_theme_node();
+        let maxAllocation = new Clutter.ActorBox({ x1: 0, y1: 0,
+                                                   x2: 42 /* whatever */,
+                                                   y2: this._maxHeight });
+        let maxContent = themeNode.get_content_box(maxAllocation);
+        let availHeight = maxContent.y2 - maxContent.y1;
+        let spacing = themeNode.get_length('spacing');
+
+
+        let firstIcon = iconChildren[0]._delegate.child._delegate.icon;
+
+        let minHeight, natHeight;
+
+        // Enforce the current icon size during the size request if
+        // the icon is animating
+        if (firstIcon._animating) {
+            let [currentWidth, currentHeight] = firstIcon.icon.get_size();
+
+            firstIcon.icon.set_size(this.iconSize, this.iconSize);
+            [minHeight, natHeight] = iconChildren[0].get_preferred_height(-1);
+
+            firstIcon.icon.set_size(currentWidth, currentHeight);
+        } else {
+            [minHeight, natHeight] = iconChildren[0].get_preferred_height(-1);
+        }
+
+
+        // Subtract icon padding and box spacing from the available height
+        availHeight -= iconChildren.length * (natHeight - this.iconSize) +
+                       (iconChildren.length - 1) * spacing;
+
+        let availSize = availHeight / iconChildren.length;
 
         let iconSizes = [ 16, 22, 24, 32, 48, 64 ];
 
         let newIconSize = 16;
         for (let i = 0; i < iconSizes.length; i++) {
-            if (iconSizes[i] < this.iconSize + diff)
+            if (iconSizes[i] < availSize)
                 newIconSize = iconSizes[i];
         }
 
@@ -459,11 +484,15 @@
             icon.icon.set_size(icon.icon.width * scale,
                                icon.icon.height * scale);
 
+            icon._animating = true;
             Tweener.addTween(icon.icon,
                              { width: targetWidth,
                                height: targetHeight,
                                time: DASH_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
+                               transition: 'easeOutQuad',
+                               onComplete: function() {
+                                   icon._animating = false;
+                               }
                              });
         }
     },
@@ -566,29 +595,7 @@
             this._box.insert_actor(addedItems[i].item.actor,
                                    addedItems[i].pos);
 
-        // Hide removed actors to not take them into account
-        // when adjusting the icon size ...
-        for (let i = 0; i < removedActors.length; i++)
-            removedActors[i].hide();
-
-        // ... and do the same for the remove target if necessary
-        if (this._favRemoveTarget && this._favRemoveTarget.hiding)
-            this._favRemoveTarget.actor.hide();
-
-        this._adjustIconSize();
-
-        if (this._favRemoveTarget && this._favRemoveTarget.hiding)
-            this._favRemoveTarget.actor.show();
-
-        // Skip animations on first run when adding the initial set
-        // of items, to avoid all items zooming in at once
-        if (!this._shownInitially) {
-            this._shownInitially = true;
-            return;
-        }
-
         for (let i = 0; i < removedActors.length; i++) {
-            removedActors[i].show();
             let item = removedActors[i]._delegate;
 
             // Don't animate item removal when the overview is hidden
@@ -598,6 +605,15 @@
                 item.actor.destroy();
         }
 
+        this._adjustIconSize();
+
+        // Skip animations on first run when adding the initial set
+        // of items, to avoid all items zooming in at once
+        if (!this._shownInitially) {
+            this._shownInitially = true;
+            return;
+        }
+
         // Don't animate item addition when the overview is hidden
         if (!Main.overview.visible)
             return;

=== modified file 'js/ui/dateMenu.js'
--- js/ui/dateMenu.js	2011-09-21 16:26:15 +0000
+++ js/ui/dateMenu.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;

=== modified file 'js/ui/dnd.js'
--- js/ui/dnd.js	2011-07-20 14:46:28 +0000
+++ js/ui/dnd.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;

=== modified file 'js/ui/docDisplay.js'
--- js/ui/docDisplay.js	2011-09-04 08:02:35 +0000
+++ js/ui/docDisplay.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DocInfo = imports.misc.docInfo;
 const Params = imports.misc.params;

=== modified file 'js/ui/endSessionDialog.js'
--- js/ui/endSessionDialog.js	2011-09-21 16:26:15 +0000
+++ js/ui/endSessionDialog.js	2012-01-18 14:13:28 +0000
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2010 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify

=== modified file 'js/ui/environment.js'
--- js/ui/environment.js	2011-07-20 14:46:28 +0000
+++ js/ui/environment.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 imports.gi.versions.Clutter = '1.0';
 imports.gi.versions.Gio = '2.0';

=== modified file 'js/ui/extensionSystem.js'
--- js/ui/extensionSystem.js	2011-09-21 16:26:15 +0000
+++ js/ui/extensionSystem.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;
@@ -289,7 +289,7 @@
     }
 
     if (extensions[uuid] != undefined) {
-        logExtensionError(uuid, "extension already loaded");
+        logExtensionError(uuid, 'extension already loaded');
         return;
     }
 
@@ -450,7 +450,6 @@
 }
 
 function loadExtensions() {
-    _loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
     let systemDataDirs = GLib.get_system_data_dirs();
     for (let i = 0; i < systemDataDirs.length; i++) {
         let dirPath = systemDataDirs[i] + '/gnome-shell/extensions';
@@ -458,6 +457,7 @@
         if (dir.query_exists(null))
             _loadExtensionsIn(dir, ExtensionType.SYSTEM);
     }
+    _loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
 }
 
 function InstallExtensionDialog(uuid, version_tag, name) {

=== modified file 'js/ui/iconGrid.js'
--- js/ui/iconGrid.js	2011-07-20 14:46:28 +0000
+++ js/ui/iconGrid.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Shell = imports.gi.Shell;

=== modified file 'js/ui/keyboard.js'
--- js/ui/keyboard.js	2011-09-28 00:41:45 +0000
+++ js/ui/keyboard.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Caribou = imports.gi.Caribou;
 const Clutter = imports.gi.Clutter;
@@ -75,7 +75,7 @@
         this._extended_keys = this._key.get_extended_keys();
         this._extended_keyboard = null;
 
-        if (this._key.name == "Control_L" || this._key.name == "Alt_L")
+        if (this._key.name == 'Control_L' || this._key.name == 'Alt_L')
             this._key.latch = true;
 
         this._key.connect('key-pressed', Lang.bind(this, function ()
@@ -218,7 +218,7 @@
         this._redraw();
     },
 
-    _settingsChanged: function () {
+    _settingsChanged: function (settings, key) {
         this._enableKeyboard = this._a11yApplicationsSettings.get_boolean(SHOW_KEYBOARD);
         if (!this._enableKeyboard && !this._keyboard)
             return;
@@ -228,9 +228,20 @@
 
         if (this._keyboard)
             this._destroyKeyboard();
-        if (this._enableKeyboard)
-            this._setupKeyboard();
-        else
+
+        if (this._enableKeyboard) {
+            // If we've been called because the setting actually just
+            // changed to true (as opposed to being called from
+            // this._init()), then we want to pop up the keyboard.
+            let showKeyboard = (settings != null);
+
+            // However, caribou-gtk-module or this._onKeyFocusChanged
+            // will probably immediately tell us to hide it, so we
+            // have to fake things out so we'll ignore that request.
+            if (showKeyboard)
+                this._timestamp = global.display.get_current_time_roundtrip() + 1;
+            this._setupKeyboard(showKeyboard);
+        } else
             Main.layoutManager.hideKeyboard(true);
     },
 
@@ -246,7 +257,7 @@
         this._destroySource();
     },
 
-    _setupKeyboard: function() {
+    _setupKeyboard: function(show) {
         this.actor = new St.BoxLayout({ name: 'keyboard', vertical: true, reactive: true });
         Main.layoutManager.keyboardBox.add_actor(this.actor);
         Main.layoutManager.trackChrome(this.actor);
@@ -263,20 +274,26 @@
 
         this._keyboardNotifyId = this._keyboard.connect('notify::active-group', Lang.bind(this, this._onGroupChanged));
         this._focusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
-        this._createSource();
+
+        if (show)
+            this.show();
+        else
+            this._createSource();
     },
 
     _onKeyFocusChanged: function () {
         let focus = global.stage.key_focus;
 
-        // Showing an extended key popup will grab focus, but ignore that
-        if (focus && focus._extended_keys)
+        // Showing an extended key popup and clicking a key from the extended keys
+        // will grab focus, but ignore that
+        if (focus && (focus._extended_keys || (focus._key && focus._key.extended_key)))
             return;
 
+        let time = global.current_event_time();
         if (focus instanceof Clutter.Text)
-            this.show();
+            this.Show(time);
         else
-            this.hide();
+            this.Hide(time);
     },
 
     _addKeys: function () {
@@ -305,7 +322,8 @@
     },
 
     _getTrayIcon: function () {
-        let trayButton = new St.Button ({ label: "tray", style_class: 'keyboard-key' });
+        let trayButton = new St.Button ({ label: _("tray"),
+                                          style_class: 'keyboard-key' });
         trayButton.key_width = 1;
         trayButton.connect('button-press-event', Lang.bind(this, function () {
             Main.messageTray.toggle();
@@ -339,7 +357,7 @@
                     right_box.add(button.actor);
                 else
                     left_box.add(button.actor);
-                if (key.name == "Caribou_Prefs") {
+                if (key.name == 'Caribou_Prefs') {
                     key.connect('key-released', Lang.bind(this, this.hide));
 
                     // Add new key for hiding message tray
@@ -476,6 +494,9 @@
 
     // D-Bus methods
     Show: function(timestamp) {
+        if (!this._enableKeyboard)
+            return;
+
         if (timestamp - this._timestamp < 0)
             return;
 
@@ -484,6 +505,9 @@
     },
 
     Hide: function(timestamp) {
+        if (!this._enableKeyboard)
+            return;
+
         if (timestamp - this._timestamp < 0)
             return;
 
@@ -492,10 +516,16 @@
     },
 
     SetCursorLocation: function(x, y, w, h) {
+        if (!this._enableKeyboard)
+            return;
+
 //        this._setLocation(x, y);
     },
 
     SetEntryLocation: function(x, y, w, h) {
+        if (!this._enableKeyboard)
+            return;
+
 //        this._setLocation(x, y);
     },
 

=== modified file 'js/ui/layout.js'
--- js/ui/layout.js	2011-09-28 06:48:58 +0000
+++ js/ui/layout.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
@@ -216,10 +216,10 @@
         let monitorLeft = monitor.x, monitorRight = monitor.x + monitor.width;
         let primaryLeft = primary.x, primaryRight = primary.x + primary.width;
 
-        if ((monitorLeft >= primaryLeft && monitorLeft <= primaryRight) ||
-            (monitorRight >= primaryLeft && monitorRight <= primaryRight) ||
-            (primaryLeft >= monitorLeft && primaryLeft <= monitorRight) ||
-            (primaryRight >= monitorLeft && primaryRight <= monitorRight))
+        if ((monitorLeft >= primaryLeft && monitorLeft < primaryRight) ||
+            (monitorRight > primaryLeft && monitorRight <= primaryRight) ||
+            (primaryLeft >= monitorLeft && primaryLeft < monitorRight) ||
+            (primaryRight > monitorLeft && primaryRight <= monitorRight))
             return true;
 
         return false;
@@ -369,6 +369,10 @@
     // Removes @actor from the chrome
     removeChrome: function(actor) {
         this._chrome.removeActor(actor);
+    },
+
+    findMonitorForActor: function(actor) {
+        return this._chrome.findMonitorForActor(actor);
     }
 };
 Signals.addSignalMethods(LayoutManager.prototype);
@@ -621,7 +625,7 @@
         // We can't use Params.parse here because we want to drop
         // the extra values like ancestorData.actor
         for (let prop in defaultParams) {
-            if (!params[prop])
+            if (!params.hasOwnProperty(prop))
                 params[prop] = ancestorData[prop];
         }
 
@@ -700,7 +704,7 @@
             else if (this._inOverview)
                 visible = true;
             else if (!actorData.visibleInFullscreen &&
-                     this._findMonitorForActor(actorData.actor).inFullscreen)
+                     this.findMonitorForActor(actorData.actor).inFullscreen)
                 visible = false;
             else
                 visible = true;
@@ -762,7 +766,7 @@
 
     // This call guarantees that we return some monitor to simplify usage of it
     // In practice all tracked actors should be visible on some monitor anyway
-    _findMonitorForActor: function(actor) {
+    findMonitorForActor: function(actor) {
         let [x, y] = actor.get_transformed_position();
         let [w, h] = actor.get_transformed_size();
         let monitor = this._findMonitorForRect(x, y, w, h);
@@ -821,6 +825,18 @@
                     monitor.inFullscreen = true;
             }
             if (layer == Meta.StackLayer.OVERRIDE_REDIRECT) {
+                // Check whether the window is screen sized
+                let isScreenSized =
+                    (window.x == 0 && window.y == 0 &&
+                    window.width == global.screen_width &&
+                    window.height == global.screen_height);
+
+                if (isScreenSized) {
+                    for (let i = 0; i < this._monitors.length; i++)
+                        this._monitors[i].inFullscreen = true;
+                }
+
+                // Or whether it is monitor sized
                 let monitor = this._findMonitorForWindow(window);
                 if (monitor &&
                     window.x <= monitor.x &&

=== modified file 'js/ui/lightbox.js'
--- js/ui/lightbox.js	2010-12-19 00:08:30 +0000
+++ js/ui/lightbox.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;

=== modified file 'js/ui/link.js'
--- js/ui/link.js	2010-12-19 00:08:30 +0000
+++ js/ui/link.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;

=== modified file 'js/ui/lookingGlass.js'
--- js/ui/lookingGlass.js	2011-09-21 16:26:15 +0000
+++ js/ui/lookingGlass.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Cogl = imports.gi.Cogl;
@@ -17,6 +17,7 @@
 const History = imports.misc.history;
 const ExtensionSystem = imports.ui.extensionSystem;
 const Link = imports.ui.link;
+const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const Main = imports.ui.main;
 
@@ -157,9 +158,9 @@
 function objectToString(o) {
     if (typeof(o) == typeof(objectToString)) {
         // special case this since the default is way, way too verbose
-        return "<js function>";
+        return '<js function>';
     } else {
-        return "" + o;
+        return '' + o;
     }
 }
 
@@ -322,7 +323,7 @@
                     link = new St.Label({ text: '<error>' });
                 }
                 let hbox = new St.BoxLayout();
-                let propText = propName + ": " + valueStr;
+                let propText = propName + ': ' + valueStr;
                 hbox.add(new St.Label({ text: propName + ': ' }));
                 hbox.add(link);
                 this._container.add_actor(hbox);
@@ -343,7 +344,7 @@
             this.actor.move_anchor_point(Math.floor(sourceX + sourceWidth / 2),
                                          Math.floor(sourceY + sourceHeight / 2));
             Tweener.addTween(this.actor, { scale_x: 1, scale_y: 1,
-                                           transition: "easeOutQuad",
+                                           transition: 'easeOutQuad',
                                            time: 0.2 });
         } else {
             this.actor.set_scale(1, 1);
@@ -710,27 +711,23 @@
                                          text: meta.description || 'No description' });
         box.add(description, { expand: true });
 
-        let metaBox = new St.BoxLayout();
+        let metaBox = new St.BoxLayout({ style_class: 'lg-extension-meta' });
         box.add(metaBox);
         let stateString = this._stateToString(meta.state);
         let state = new St.Label({ style_class: 'lg-extension-state',
                                    text: this._stateToString(meta.state) });
-
-        let actionsContainer = new St.Bin({ x_align: St.Align.END });
-        metaBox.add(actionsContainer);
-        let actionsBox = new St.BoxLayout({ style_class: 'lg-extension-actions' });
-        actionsContainer.set_child(actionsBox);
+        metaBox.add(state);
 
         let viewsource = new Link.Link({ label: _("View Source") });
         viewsource.actor._extensionMeta = meta;
         viewsource.actor.connect('clicked', Lang.bind(this, this._onViewSource));
-        actionsBox.add(viewsource.actor);
+        metaBox.add(viewsource.actor);
 
         if (meta.url) {
             let webpage = new Link.Link({ label: _("Web Page") });
             webpage.actor._extensionMeta = meta;
             webpage.actor.connect('clicked', Lang.bind(this, this._onWebPage));
-            actionsBox.add(webpage.actor);
+            metaBox.add(webpage.actor);
         }
 
         return box;
@@ -820,6 +817,7 @@
         entryArea.add(label);
 
         this._entry = new St.Entry({ can_focus: true });
+        ShellEntry.addContextMenu(this._entry);
         entryArea.add(this._entry, { expand: true });
 
         this._windowList = new WindowList();

=== modified file 'js/ui/magnifier.js'
--- js/ui/magnifier.js	2011-02-25 12:23:23 +0000
+++ js/ui/magnifier.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;

=== modified file 'js/ui/magnifierDBus.js'
--- js/ui/magnifierDBus.js	2011-01-12 23:41:41 +0000
+++ js/ui/magnifierDBus.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Main = imports.ui.main;

=== modified file 'js/ui/main.js'
--- js/ui/main.js	2011-09-22 08:50:45 +0000
+++ js/ui/main.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;
@@ -129,8 +129,6 @@
 function _initUserSession() {
     _initRecorder();
 
-    keyboard.init();
-
     global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT, false, -1, 1);
 
     ExtensionSystem.init();
@@ -496,9 +494,9 @@
 function notifyError(msg, details) {
     // Also print to stderr so it's logged somewhere
     if (details)
-        log("error: " + msg + ": " + details);
+        log('error: ' + msg + ': ' + details);
     else
-        log("error: " + msg)
+        log('error: ' + msg);
 
     notify(msg, details);
 }

=== modified file 'js/ui/messageTray.js'
--- js/ui/messageTray.js	2011-09-28 06:48:58 +0000
+++ js/ui/messageTray.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
@@ -252,7 +252,8 @@
         this._prevFocusedWindow = global.display.focus_window;
         this._prevKeyFocusActor = global.stage.get_key_focus();
 
-        if (!Main.overview.visible)
+        if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
+            global.stage_input_mode == Shell.StageInputMode.NORMAL)
             global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
 
         // Use captured-event to notice clicks outside the focused actor
@@ -702,6 +703,7 @@
         this._imageBin.opacity = 230;
         this._table.add_style_class_name('multi-line-notification');
         this._table.add_style_class_name('notification-with-image');
+        this._addBannerBody();
         this._updateLastColumnSettings();
         this._table.add(this._imageBin, { row: 1,
                                           col: 1,
@@ -1585,7 +1587,7 @@
 
         summaryItemToRemove.actor.destroy();
 
-        if (needUpdate);
+        if (needUpdate)
             this._updateState();
     },
 

=== modified file 'js/ui/modalDialog.js'
--- js/ui/modalDialog.js	2011-09-21 16:26:15 +0000
+++ js/ui/modalDialog.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;

=== modified file 'js/ui/networkAgent.js'
--- js/ui/networkAgent.js	2011-09-21 16:26:15 +0000
+++ js/ui/networkAgent.js	2012-01-18 14:13:28 +0000
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2011 Giovanni Campagna <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,6 +30,7 @@
 
 const ModalDialog = imports.ui.modalDialog;
 const PopupMenu = imports.ui.popupMenu;
+const ShellEntry = imports.ui.shellEntry;
 
 function NetworkSecretDialog() {
     this._init.apply(this, arguments);
@@ -103,6 +104,8 @@
             secret.entry = new St.Entry({ style_class: 'polkit-dialog-password-entry',
                                           text: secret.value, can_focus: reactive,
                                           reactive: reactive });
+            ShellEntry.addContextMenu(secret.entry,
+                                      { isPassword: secret.password });
 
             if (secret.validate)
                 secret.valid = secret.validate(secret);
@@ -127,34 +130,14 @@
             } else
                 secret.valid = true;
 
-            secretTable.add(label, { row: pos, col: 0, x_align: St.Align.START, y_align: St.Align.START });
+            secretTable.add(label, { row: pos, col: 0, x_expand: false, x_fill: true, x_align: St.Align.START, y_align: St.Align.START });
             secretTable.add(secret.entry, { row: pos, col: 1, x_expand: true, x_fill: true, y_align: St.Align.END });
             pos++;
 
-            if (secret.password) {
+            if (secret.password)
                 secret.entry.clutter_text.set_password_char('\u25cf');
+        }
 
-                // FIXME: need a real checkbox here
-                let button = new St.Button({ button_mask: St.ButtonMask.ONE,
-                                             can_focus: true });
-                let checkbox = new St.BoxLayout({ vertical: false,
-                                                  style_class: 'network-dialog-show-password-checkbox' 
-                                                });
-                let _switch = new PopupMenu.Switch(false);
-                checkbox.add(_switch.actor);
-                checkbox.add(new St.Label({ text: _("Show password") }), { expand: true });
-                button.connect('clicked', function() {
-                    _switch.toggle();
-                    if (_switch.state)
-                        secret.entry.clutter_text.set_password_char('');
-                    else
-                        secret.entry.clutter_text.set_password_char('\u25cf');
-                });
-                button.child = checkbox;
-                secretTable.add(button, { row: pos, col: 1, x_expand: true, x_fill: true, y_fill: true })
-                pos++;
-            }
-        }
         messageBox.add(secretTable);
 
         this._okButton = { label:  _("Connect"),
@@ -404,4 +387,4 @@
         this._dialogs[requestId].close(global.get_current_time());
         this._dialogs[requestId].destroy();
     }
-};
\ No newline at end of file
+};

=== modified file 'js/ui/notificationDaemon.js'
--- js/ui/notificationDaemon.js	2011-09-04 08:02:35 +0000
+++ js/ui/notificationDaemon.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;
@@ -109,6 +109,14 @@
     _iconForNotificationData: function(icon, hints, size) {
         let textureCache = St.TextureCache.get_default();
 
+        // If an icon is not specified, we use 'image-data' or 'image-path' hint for an icon
+        // and don't show a large image. There are currently many applications that use
+        // notify_notification_set_icon_from_pixbuf() from libnotify, which in turn sets
+        // the 'image-data' hint. These applications don't typically pass in 'app_icon'
+        // argument to Notify() and actually expect the pixbuf to be shown as an icon.
+        // So the logic here does the right thing for this case. If both an icon and either
+        // one of 'image-data' or 'image-path' are specified, we show both an icon and
+        // a large image.
         if (icon) {
             if (icon.substr(0, 7) == 'file://')
                 return textureCache.load_uri_async(icon, size, size);
@@ -119,6 +127,12 @@
                 return new St.Icon({ icon_name: icon,
                                      icon_type: St.IconType.FULLCOLOR,
                                      icon_size: size });
+        } else if (hints['image-data']) {
+            let [width, height, rowStride, hasAlpha,
+                 bitsPerSample, nChannels, data] = hints['image-data'];
+            return textureCache.load_from_raw(data, hasAlpha, width, height, rowStride, size);
+        } else if (hints['image-path']) {
+            return textureCache.load_uri_async(GLib.filename_to_uri(hints['image-path'], null), size, size);
         } else {
             let stockIcon;
             switch (hints.urgency) {
@@ -330,7 +344,8 @@
                                                  clear: true });
         }
 
-        if (hints['image-data'] || hints['image-path']) {
+        // We only display a large image if an icon is also specified.
+        if (icon && (hints['image-data'] || hints['image-path'])) {
             let image = null;
             if (hints['image-data']) {
                 let [width, height, rowStride, hasAlpha,

=== modified file 'js/ui/overview.js'
--- js/ui/overview.js	2011-09-21 16:26:15 +0000
+++ js/ui/overview.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;

=== modified file 'js/ui/panel.js'
--- js/ui/panel.js	2011-09-21 16:26:15 +0000
+++ js/ui/panel.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;

=== modified file 'js/ui/panelMenu.js'
--- js/ui/panelMenu.js	2011-09-21 16:26:15 +0000
+++ js/ui/panelMenu.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;

=== modified file 'js/ui/placeDisplay.js'
--- js/ui/placeDisplay.js	2011-09-04 08:02:35 +0000
+++ js/ui/placeDisplay.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;

=== modified file 'js/ui/polkitAuthenticationAgent.js'
--- js/ui/polkitAuthenticationAgent.js	2011-09-21 16:26:15 +0000
+++ js/ui/polkitAuthenticationAgent.js	2012-01-18 14:13:28 +0000
@@ -1,5 +1,5 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
  * Copyright 2010 Red Hat, Inc
  *
  * This program is free software; you can redistribute it and/or modify
@@ -33,6 +33,7 @@
 const PolkitAgent = imports.gi.PolkitAgent;
 
 const ModalDialog = imports.ui.modalDialog;
+const ShellEntry = imports.ui.shellEntry;
 
 function AuthenticationDialog(actionId, message, cookie, userNames) {
     this._init(actionId, message, cookie, userNames);
@@ -139,6 +140,7 @@
         this._passwordEntry = new St.Entry({ style_class: 'polkit-dialog-password-entry',
                                              text: "",
                                              can_focus: true});
+        ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
         this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivate));
         this._passwordBox.add(this._passwordEntry,
                               {expand: true });

=== modified file 'js/ui/popupMenu.js'
--- js/ui/popupMenu.js	2011-09-28 00:41:45 +0000
+++ js/ui/popupMenu.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
@@ -1142,10 +1142,10 @@
 PopupMenu.prototype = {
     __proto__: PopupMenuBase.prototype,
 
-    _init: function(sourceActor, alignment, arrowSide) {
+    _init: function(sourceActor, arrowAlignment, arrowSide) {
         PopupMenuBase.prototype._init.call (this, sourceActor, 'popup-menu-content');
 
-        this._alignment = alignment;
+        this._arrowAlignment = arrowAlignment;
         this._arrowSide = arrowSide;
 
         this._boxPointer = new BoxPointer.BoxPointer(arrowSide,
@@ -1198,13 +1198,17 @@
         this._boxPointer.setArrowOrigin(origin);
     },
 
+    setSourceAlignment: function(alignment) {
+        this._boxPointer.setSourceAlignment(alignment);
+    },
+
     open: function(animate) {
         if (this.isOpen)
             return;
 
         this.isOpen = true;
 
-        this._boxPointer.setPosition(this.sourceActor, this._alignment);
+        this._boxPointer.setPosition(this.sourceActor, this._arrowAlignment);
         this._boxPointer.show(animate);
 
         this.actor.raise_top();

=== modified file 'js/ui/runDialog.js'
--- js/ui/runDialog.js	2011-08-24 02:33:44 +0000
+++ js/ui/runDialog.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
@@ -12,6 +12,7 @@
 const FileUtils = imports.misc.fileUtils;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
+const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const Util = imports.misc.util;
 const History = imports.misc.history;
@@ -210,6 +211,7 @@
         this.contentLayout.add(label, { y_align: St.Align.START });
 
         let entry = new St.Entry({ style_class: 'run-dialog-entry' });
+        ShellEntry.addContextMenu(entry);
 
         this._entryText = entry.clutter_text;
         this.contentLayout.add(entry, { y_align: St.Align.START });

=== modified file 'js/ui/scripting.js'
--- js/ui/scripting.js	2011-08-24 02:33:44 +0000
+++ js/ui/scripting.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Gio = imports.gi.Gio;

=== modified file 'js/ui/search.js'
--- js/ui/search.js	2011-09-21 16:26:15 +0000
+++ js/ui/search.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;

=== modified file 'js/ui/searchDisplay.js'
--- js/ui/searchDisplay.js	2011-09-21 16:26:15 +0000
+++ js/ui/searchDisplay.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

=== modified file 'js/ui/shellDBus.js'
--- js/ui/shellDBus.js	2011-09-21 16:26:15 +0000
+++ js/ui/shellDBus.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Lang = imports.lang;

=== added file 'js/ui/shellEntry.js'
--- js/ui/shellEntry.js	1970-01-01 00:00:00 +0000
+++ js/ui/shellEntry.js	2012-01-18 14:13:28 +0000
@@ -0,0 +1,173 @@
+const Clutter = imports.gi.Clutter;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const St = imports.gi.St;
+
+const Main = imports.ui.main;
+const Params = imports.misc.params;
+const PopupMenu = imports.ui.popupMenu;
+
+
+function _EntryMenu(entry, params) {
+    this._init(entry, params);
+};
+
+_EntryMenu.prototype = {
+    __proto__: PopupMenu.PopupMenu.prototype,
+
+    _init: function(entry, params) {
+        params = Params.parse (params, { isPassword: false });
+
+        PopupMenu.PopupMenu.prototype._init.call(this, entry, 0, St.Side.TOP);
+
+        this.actor.add_style_class_name('entry-context-menu');
+
+        this._entry = entry;
+        this._clipboard = St.Clipboard.get_default();
+
+        // Populate menu
+        let item;
+        item = new PopupMenu.PopupMenuItem(_("Copy"));
+        item.connect('activate', Lang.bind(this, this._onCopyActivated));
+        this.addMenuItem(item);
+        this._copyItem = item;
+
+        item = new PopupMenu.PopupMenuItem(_("Paste"));
+        item.connect('activate', Lang.bind(this, this._onPasteActivated));
+        this.addMenuItem(item);
+        this._pasteItem = item;
+
+        this._passwordItem = null;
+        if (params.isPassword) {
+            item = new PopupMenu.PopupMenuItem('');
+            item.connect('activate', Lang.bind(this,
+                                               this._onPasswordActivated));
+            this.addMenuItem(item);
+            this._passwordItem = item;
+        }
+
+        Main.uiGroup.add_actor(this.actor);
+        this.actor.hide();
+    },
+
+    open: function() {
+        this._updatePasteItem();
+        this._updateCopyItem();
+        if (this._passwordItem)
+            this._updatePasswordItem();
+
+        let direction = Gtk.DirectionType.TAB_FORWARD;
+        if (!this.actor.navigate_focus(null, direction, false))
+            this.actor.grab_key_focus();
+
+        PopupMenu.PopupMenu.prototype.open.call(this);
+    },
+
+    _updateCopyItem: function() {
+        let selection = this._entry.clutter_text.get_selection();
+        this._copyItem.setSensitive(selection && selection != '');
+    },
+
+    _updatePasteItem: function() {
+        this._clipboard.get_text(Lang.bind(this,
+            function(clipboard, text) {
+                this._pasteItem.setSensitive(text && text != '');
+            }));
+    },
+
+    _updatePasswordItem: function() {
+        let textHidden = (this._entry.clutter_text.password_char);
+        if (textHidden)
+            this._passwordItem.label.set_text(_("Show Text"));
+        else
+            this._passwordItem.label.set_text(_("Hide Text"));
+    },
+
+    _onCopyActivated: function() {
+        let selection = this._entry.clutter_text.get_selection();
+        this._clipboard.set_text(selection);
+    },
+
+    _onPasteActivated: function() {
+        this._clipboard.get_text(Lang.bind(this,
+            function(clipboard, text) {
+                if (!text)
+                    return;
+                this._entry.clutter_text.delete_selection();
+                let pos = this._entry.clutter_text.get_cursor_position();
+                this._entry.clutter_text.insert_text(text, pos);
+            }));
+    },
+
+    _onPasswordActivated: function() {
+        let visible = !!(this._entry.clutter_text.password_char);
+        this._entry.clutter_text.set_password_char(visible ? '' : '\u25cf');
+    }
+};
+
+
+function _setMenuAlignment(entry, stageX) {
+    let [success, entryX, entryY] = entry.transform_stage_point(stageX, 0);
+    if (success)
+        entry._menu.setSourceAlignment(entryX / entry.width);
+};
+
+function _onClicked(action, actor) {
+    let entry = actor._menu ? actor : actor.get_parent();
+
+    if (entry._menu.isOpen) {
+        entry._menu.close();
+    } else if (action.get_button() == 3) {
+        let [stageX, stageY] = action.get_coords();
+        _setMenuAlignment(entry, stageX);
+        entry._menu.open();
+    }
+};
+
+function _onLongPress(action, actor, state) {
+    let entry = actor._menu ? actor : actor.get_parent();
+
+    if (state == Clutter.LongPressState.QUERY)
+        return action.get_button() == 1 && !entry._menu.isOpen;
+
+    if (state == Clutter.LongPressState.ACTIVATE) {
+        let [stageX, stageY] = action.get_coords();
+        _setMenuAlignment(entry, stageX);
+        entry._menu.open();
+    }
+    return false;
+};
+
+function _onPopup(actor) {
+    let entry = actor._menu ? actor : actor.get_parent();
+    let [success, textX, textY, lineHeight] = entry.clutter_text.position_to_coords(-1);
+    if (success)
+        entry._menu.setSourceAlignment(textX / entry.width);
+    entry._menu.open();
+};
+
+function addContextMenu(entry, params) {
+    if (entry._menu)
+        return;
+
+    entry._menu = new _EntryMenu(entry, params);
+    entry._menuManager = new PopupMenu.PopupMenuManager({ actor: entry });
+    entry._menuManager.addMenu(entry._menu);
+
+    let clickAction;
+
+    // Add a click action to both the entry and its clutter_text; the former
+    // so padding is included in the clickable area, the latter because the
+    // event processing of ClutterText prevents event-bubbling.
+    clickAction = new Clutter.ClickAction();
+    clickAction.connect('clicked', _onClicked);
+    clickAction.connect('long-press', _onLongPress);
+    entry.clutter_text.add_action(clickAction);
+
+    clickAction = new Clutter.ClickAction();
+    clickAction.connect('clicked', _onClicked);
+    clickAction.connect('long-press', _onLongPress);
+    entry.add_action(clickAction);
+
+    entry.connect('popup-menu', _onPopup);
+}

=== modified file 'js/ui/shellMountOperation.js'
--- js/ui/shellMountOperation.js	2011-09-04 08:02:35 +0000
+++ js/ui/shellMountOperation.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Signals = imports.signals;

=== modified file 'js/ui/status/accessibility.js'
--- js/ui/status/accessibility.js	2011-09-21 16:26:15 +0000
+++ js/ui/status/accessibility.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const GConf = imports.gi.GConf;

=== modified file 'js/ui/status/bluetooth.js'
--- js/ui/status/bluetooth.js	2011-09-04 08:02:35 +0000
+++ js/ui/status/bluetooth.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
@@ -205,7 +205,8 @@
     _buildDeviceSubMenu: function(item, device) {
         if (device.can_connect) {
             item._connected = device.connected;
-            item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+            item._connectedMenuitem = menuitem;
             item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
                 if (item._connected > ConnectionState.CONNECTED) {
                     // operation already in progress, revert

=== modified file 'js/ui/status/keyboard.js'
--- js/ui/status/keyboard.js	2011-09-21 16:26:15 +0000
+++ js/ui/status/keyboard.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GdkPixbuf = imports.gi.GdkPixbuf;

=== modified file 'js/ui/status/network.js'
--- js/ui/status/network.js	2011-09-21 16:26:15 +0000
+++ js/ui/status/network.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 const ByteArray = imports.byteArray;
 const DBus = imports.dbus;
 const GLib = imports.gi.GLib;

=== modified file 'js/ui/status/power.js'
--- js/ui/status/power.js	2011-09-22 08:50:45 +0000
+++ js/ui/status/power.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
 const DBus = imports.dbus;
@@ -43,8 +43,8 @@
 const PowerManagerInterface = {
     name: 'org.gnome.SettingsDaemon.Power',
     methods: [
-        { name: 'GetDevices', inSignature: '', outSignature: 'a(susbut)' },
-        { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susbut)' },
+        { name: 'GetDevices', inSignature: '', outSignature: 'a(susdut)' },
+        { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' },
         ],
     signals: [
         { name: 'Changed', inSignature: '' },
@@ -155,7 +155,7 @@
     _devicesChanged: function() {
         this._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) {
             if (icon) {
-                let gicon = Shell.util_icon_from_string (icon);
+                let gicon = Gio.icon_new_for_string(icon);
                 this.setGIcon(gicon);
                 this.actor.show();
             } else {
@@ -183,7 +183,7 @@
         this._box = new St.BoxLayout({ style_class: 'popup-device-menu-item' });
         this._label = new St.Label({ text: this._deviceTypeToString(device_type) });
 
-        this._icon = new St.Icon({ gicon: Shell.util_icon_from_string(icon),
+        this._icon = new St.Icon({ gicon: Gio.icon_new_for_string(icon),
                                    icon_type: St.IconType.SYMBOLIC,
                                    style_class: 'popup-menu-icon' });
 

=== modified file 'js/ui/status/volume.js'
--- js/ui/status/volume.js	2011-09-21 16:26:15 +0000
+++ js/ui/status/volume.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;

=== modified file 'js/ui/statusIconDispatcher.js'
--- js/ui/statusIconDispatcher.js	2011-04-11 21:03:31 +0000
+++ js/ui/statusIconDispatcher.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;

=== modified file 'js/ui/telepathyClient.js'
--- js/ui/telepathyClient.js	2011-09-28 00:41:45 +0000
+++ js/ui/telepathyClient.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const DBus = imports.dbus;
 const Gio = imports.gi.Gio;
@@ -257,7 +257,7 @@
         // FIXME: We don't have a 'chat room' icon (bgo #653737) use
         // system-users for now as Empathy does.
         let source = new ApproverSource(dispatchOp, _("Invitation"),
-                                        Shell.util_icon_from_string('system-users'));
+                                        Gio.icon_new_for_string('system-users'));
         Main.messageTray.add(source);
 
         let notif = new RoomInviteNotification(source, dispatchOp, channel, contacts[0]);
@@ -325,8 +325,8 @@
 
         // We got the TpContact
         let source = new ApproverSource(dispatchOp, _("Call"), isVideo ?
-                                        Shell.util_icon_from_string('camera-web') :
-                                        Shell.util_icon_from_string('audio-input-microphone'));
+                                        Gio.icon_new_for_string('camera-web') :
+                                        Gio.icon_new_for_string('audio-input-microphone'));
         Main.messageTray.add(source);
 
         let notif = new AudioVideoNotification(source, dispatchOp, channel, contacts[0], isVideo);
@@ -539,9 +539,13 @@
 
     _updateAlias: function() {
         let oldAlias = this.title;
-        this.setTitle(this._contact.get_alias());
-        this._notification.appendAliasChange(oldAlias, this.title);
-        this.pushNotification(this._notification);
+        let newAlias = this._contact.get_alias();
+
+        if (oldAlias == newAlias)
+            return;
+
+        this.setTitle(newAlias);
+        this._notification.appendAliasChange(oldAlias, newAlias);
     },
 
     createNotificationIcon: function() {
@@ -570,7 +574,7 @@
     open: function(notification) {
           if (this._client.is_handling_channel(this._channel)) {
               // We are handling the channel, try to pass it to Empathy
-              this._client.delegate_channels_async([this._channel], global.get_current_time(), "", null);
+              this._client.delegate_channels_async([this._channel], global.get_current_time(), '', null);
           }
           else {
               // We are not the handler, just ask to present the channel
@@ -1198,6 +1202,7 @@
         this.setResident(true);
 
         this.addButton('reject', _("Reject"));
+        /* translators: this is a button label (verb), not a noun */
         this.addButton('answer', _("Answer"));
 
         this.connect('action-invoked', Lang.bind(this, function(self, action) {

=== modified file 'js/ui/tweener.js'
--- js/ui/tweener.js	2011-02-25 12:23:23 +0000
+++ js/ui/tweener.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

=== modified file 'js/ui/userMenu.js'
--- js/ui/userMenu.js	2011-09-21 16:26:15 +0000
+++ js/ui/userMenu.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const AccountsService = imports.gi.AccountsService;
 const DBus = imports.dbus;
@@ -158,22 +158,29 @@
                             Lang.bind(this, this._changeIMStatus));
 
         this._presence = new GnomeSession.Presence();
-        this._presence.getStatus(Lang.bind(this, this._sessionStatusChanged));
         this._presence.connect('StatusChanged',
                                Lang.bind(this, this._sessionStatusChanged));
 
+        this._sessionPresenceRestored = false;
+        this._imPresenceRestored = false;
         this._currentPresence = undefined;
-        this._previousPresence = undefined;
 
         this._accountMgr = Tp.AccountManager.dup()
         this._accountMgr.connect('most-available-presence-changed',
                                  Lang.bind(this, this._IMStatusChanged));
         this._accountMgr.prepare_async(null, Lang.bind(this,
             function(mgr) {
-                let [presence, s, msg] = mgr.get_most_available_presence();
+                let [presence, status, msg] = mgr.get_most_available_presence();
 
-                this._previousPresence = presence;
-                this._IMStatusChanged(mgr, presence, s, msg);
+                let savedPresence = global.settings.get_int('saved-im-presence');
+                if (savedPresence == presence) {
+                    this._IMStatusChanged(mgr, presence, status, msg);
+                } else {
+                    this._setComboboxPresence(savedPresence);
+                    status = this._statusForPresence(savedPresence);
+                    msg = msg ? msg : '';
+                    mgr.set_all_requested_presences(savedPresence, status, msg);
+                }
             }));
 
         this._userManager = AccountsService.UserManager.get_default();
@@ -261,19 +268,35 @@
     },
 
     _IMStatusChanged: function(accountMgr, presence, status, message) {
+        if (!this._imPresenceRestored)
+            this._imPresenceRestored = true;
+
         if (presence == this._currentPresence)
             return;
 
         this._currentPresence = presence;
+        this._setComboboxPresence(presence);
+
+        if (!this._sessionPresenceRestored) {
+            this._presence.getStatus(Lang.bind(this, this._sessionStatusChanged));
+            return;
+        }
 
         if (presence == Tp.ConnectionPresenceType.AVAILABLE)
             this._presence.setStatus(GnomeSession.PresenceStatus.AVAILABLE);
 
-        if (!this._expectedPresence || presence != this._expectedPresence)
-            this._previousPresence = presence;
+        // We ignore the actual value of _expectedPresence and never safe
+        // the first presence change after an "automatic" change, assuming
+        // that it is the response to our request; this is to account for
+        // mission control falling back to "similar" presences if an account
+        // type does not implement the requested presence.
+        if (!this._expectedPresence)
+            global.settings.set_int('saved-im-presence', presence);
         else
             this._expectedPresence = undefined;
+    },
 
+    _setComboboxPresence: function(presence) {
         let activatedItem;
 
         if (presence == Tp.ConnectionPresenceType.AVAILABLE)
@@ -310,13 +333,16 @@
             return;
 
         status = this._statusForPresence(newPresence);
-        msg = msg ? msg : "";
+        msg = msg ? msg : '';
         this._accountMgr.set_all_requested_presences(newPresence, status, msg);
     },
 
     getIMPresenceForSessionStatus: function(sessionStatus) {
+        // Restore the last user-set presence when coming back from
+        // BUSY/IDLE (otherwise the last user-set presence matches
+        // the current one)
         if (sessionStatus == GnomeSession.PresenceStatus.AVAILABLE)
-            return this._previousPresence;
+            return global.settings.get_int('saved-im-presence');
 
         if (sessionStatus == GnomeSession.PresenceStatus.BUSY) {
             // Only change presence if the current one is "more present" than
@@ -337,6 +363,20 @@
     },
 
     _sessionStatusChanged: function(sessionPresence, sessionStatus) {
+        if (!this._imPresenceRestored)
+            return;
+
+        if (!this._sessionPresenceRestored) {
+            let savedStatus = global.settings.get_int('saved-session-presence');
+            if (sessionStatus != savedStatus) {
+                this._presence.setStatus(savedStatus);
+                return;
+            }
+            this._sessionPresenceRestored = true;
+        }
+
+        global.settings.set_int('saved-session-presence', sessionStatus);
+
         let [presence, s, msg] = this._accountMgr.get_most_available_presence();
         let newPresence, status;
 
@@ -346,7 +386,7 @@
             return;
 
         status = this._statusForPresence(newPresence);
-        msg = msg ? msg : "";
+        msg = msg ? msg : '';
 
         this._expectedPresence = newPresence;
         this._accountMgr.set_all_requested_presences(newPresence, status, msg);

=== modified file 'js/ui/viewSelector.js'
--- js/ui/viewSelector.js	2011-09-21 16:26:15 +0000
+++ js/ui/viewSelector.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
@@ -12,6 +12,7 @@
 const Main = imports.ui.main;
 const Search = imports.ui.search;
 const SearchDisplay = imports.ui.searchDisplay;
+const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 
 function BaseTab(titleActor, pageActor, name, a11yIcon) {
@@ -120,6 +121,7 @@
                                      hint_text: _("Type to search..."),
                                      track_hover: true,
                                      can_focus: true });
+        ShellEntry.addContextMenu(this._entry);
         this._text = this._entry.clutter_text;
         this._text.connect('key-press-event', Lang.bind(this, this._onKeyPress));
 
@@ -289,9 +291,11 @@
     _onCapturedEvent: function(actor, event) {
         if (event.type() == Clutter.EventType.BUTTON_PRESS) {
             let source = event.get_source();
-            if (source != this._text && this._text.text == '') {
+            if (source != this._text && this._text.text == '' &&
+                !Main.layoutManager.keyboardBox.contains(source)) {
                 // the user clicked outside after activating the entry, but
-                // with no search term entered - cancel the search
+                // with no search term entered and no keyboard button pressed
+                // - cancel the search
                 this._reset();
             }
         }

=== modified file 'js/ui/windowAttentionHandler.js'
--- js/ui/windowAttentionHandler.js	2011-09-04 08:02:35 +0000
+++ js/ui/windowAttentionHandler.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
@@ -12,35 +12,10 @@
 
 WindowAttentionHandler.prototype = {
     _init : function() {
-        this._startupIds = {};
         this._tracker = Shell.WindowTracker.get_default();
-        this._tracker.connect('startup-sequence-changed', Lang.bind(this, this._onStartupSequenceChanged));
-
         global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention));
     },
 
-    _onStartupSequenceChanged : function(tracker) {
-        let sequences = tracker.get_startup_sequences();
-        this._startupIds = {};
-        for(let i = 0; i < sequences.length; i++) {
-            this._startupIds[sequences[i].get_id()] = true;
-        }
-    },
-
-    _getTitle : function(app, window) {
-        if (this._startupIds[window.get_startup_id()])
-            return app.get_name();
-        else
-            return window.title;
-    },
-
-    _getBanner : function(app, window) {
-        if (this._startupIds[window.get_startup_id()])
-            return _("%s has finished starting").format(app.get_name());
-        else
-            return _("'%s' is ready").format(window.title);
-    },
-
     _onWindowDemandsAttention : function(display, window) {
         // We don't want to show the notification when the window is already focused,
         // because this is rather pointless.
@@ -57,12 +32,16 @@
         let source = new Source(app, window);
         Main.messageTray.add(source);
 
-        let notification = new MessageTray.Notification(source, this._getTitle(app, window), this._getBanner(app, window));
+        let banner = _("'%s' is ready").format(window.title);
+        let title = app.get_name();
+
+        let notification = new MessageTray.Notification(source, title, banner);
         source.notify(notification);
 
-        source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function(win) {
-                                    notification.update(this._getTitle(app, win), this._getBanner(app, win));
-                              })));
+        source.signalIDs.push(window.connect('notify::title',
+                                             Lang.bind(this, function() {
+                                                 notification.update(title, banner);
+                                             })));
     }
 };
 

=== modified file 'js/ui/windowManager.js'
--- js/ui/windowManager.js	2011-09-21 16:26:15 +0000
+++ js/ui/windowManager.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
@@ -37,28 +37,36 @@
 
 WindowDimmer.prototype = {
     _init: function(actor) {
-        this.effect = new Clutter.ShaderEffect({ shader_type: Clutter.ShaderType.FRAGMENT_SHADER });
-        this.effect.set_shader_source(getDimShaderSource());
+        if (Clutter.feature_available(Clutter.FeatureFlags.SHADERS_GLSL)) {
+            this._effect = new Clutter.ShaderEffect({ shader_type: Clutter.ShaderType.FRAGMENT_SHADER });
+            this._effect.set_shader_source(getDimShaderSource());
+        } else {
+            this._effect = null;
+        }
 
         this.actor = actor;
     },
 
     set dimFraction(fraction) {
         this._dimFraction = fraction;
+
+        if (this._effect == null)
+            return;
+
         if (!Meta.prefs_get_attach_modal_dialogs()) {
-            this.effect.enabled = false;
+            this._effect.enabled = false;
             return;
         }
 
         if (fraction > 0.01) {
-            Shell.shader_effect_set_double_uniform(this.effect, 'height', this.actor.get_height());
-            Shell.shader_effect_set_double_uniform(this.effect, 'fraction', fraction);
+            Shell.shader_effect_set_double_uniform(this._effect, 'height', this.actor.get_height());
+            Shell.shader_effect_set_double_uniform(this._effect, 'fraction', fraction);
 
-            if (!this.effect.actor)
-                this.actor.add_effect(this.effect);
+            if (!this._effect.actor)
+                this.actor.add_effect(this._effect);
         } else {
-            if (this.effect.actor)
-                this.actor.remove_effect(this.effect);
+            if (this._effect.actor)
+                this.actor.remove_effect(this._effect);
         }
     },
 

=== modified file 'js/ui/workspace.js'
--- js/ui/workspace.js	2011-09-21 16:26:15 +0000
+++ js/ui/workspace.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const GConf = imports.gi.GConf;
@@ -135,8 +135,11 @@
         this._realWindowDestroyId = this.realWindow.connect('destroy',
             Lang.bind(this, this._disconnectRealWindowSignals));
 
-        this.actor.connect('button-release-event',
-                           Lang.bind(this, this._onButtonRelease));
+        let clickAction = new Clutter.ClickAction();
+        clickAction.connect('clicked', Lang.bind(this, this._onClicked));
+        clickAction.connect('long-press', Lang.bind(this, this._onLongPress));
+
+        this.actor.add_action(clickAction);
 
         this.actor.connect('scroll-event',
                            Lang.bind(this, this._onScroll));
@@ -147,6 +150,7 @@
 
         this._draggable = DND.makeDraggable(this.actor,
                                             { restoreOnSuccess: true,
+                                              manualMode: true,
                                               dragActorMaxSize: WINDOW_DND_SIZE,
                                               dragActorOpacity: DRAGGING_WINDOW_OPACITY });
         this._draggable.connect('drag-begin', Lang.bind(this, this._onDragBegin));
@@ -345,9 +349,27 @@
         this._zoomStep           = undefined;
     },
 
-    _onButtonRelease : function (actor, event) {
+    _onClicked: function(action, actor) {
         this._selected = true;
-        this.emit('selected', event.get_time());
+        this.emit('selected', global.get_current_time());
+    },
+
+    _onLongPress: function(action, actor, state) {
+        // Take advantage of the Clutter policy to consider
+        // a long-press canceled when the pointer movement
+        // exceeds dnd-drag-threshold to manually start the drag
+        if (state == Clutter.LongPressState.CANCEL) {
+            // A click cancels a long-press before any click handler is
+            // run - make sure to not start a drag in that case
+            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
+                function() {
+                    if (this._selected)
+                        return;
+                    let [x, y] = action.get_coords();
+                    this._draggable.startDrag(x, y, global.get_current_time());
+                }));
+        }
+        return true;
     },
 
     _onDragBegin : function (draggable, time) {

=== modified file 'js/ui/workspaceSwitcherPopup.js'
--- js/ui/workspaceSwitcherPopup.js	2011-08-24 02:33:44 +0000
+++ js/ui/workspaceSwitcherPopup.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

=== modified file 'js/ui/workspaceThumbnail.js'
--- js/ui/workspaceThumbnail.js	2011-09-04 08:02:35 +0000
+++ js/ui/workspaceThumbnail.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

=== modified file 'js/ui/workspacesView.js'
--- js/ui/workspacesView.js	2011-09-21 16:26:15 +0000
+++ js/ui/workspacesView.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
@@ -109,8 +109,6 @@
         this._scrollAdjustment.connect('notify::value',
                                        Lang.bind(this, this._onScroll));
 
-        this._timeoutId = 0;
-
         this._switchWorkspaceNotifyId =
             global.window_manager.connect('switch-workspace',
                                           Lang.bind(this, this._activeWorkspaceChanged));
@@ -321,10 +319,6 @@
         if (this._inDrag)
             this._dragEnd();
 
-        if (this._timeoutId) {
-            Mainloop.source_remove(this._timeoutId);
-            this._timeoutId = 0;
-        }
         if (this._itemDragBeginId > 0) {
             Main.overview.disconnect(this._itemDragBeginId);
             this._itemDragBeginId = 0;
@@ -383,72 +377,10 @@
                 this._extraWorkspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
         }
 
-        let primary = Main.layoutManager.primaryMonitor;
-
-        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        let topWorkspace, bottomWorkspace;
-        topWorkspace  = this._workspaces[activeWorkspaceIndex - 1];
-        bottomWorkspace = this._workspaces[activeWorkspaceIndex + 1];
-        let hoverWorkspace = null;
-
-        // reactive monitor edges
-        let topEdge = primary.y;
-        let switchTop = (dragEvent.y <= topEdge && topWorkspace);
-        if (switchTop && this._dragOverLastY != topEdge) {
-            topWorkspace.metaWorkspace.activate(global.get_current_time());
-            this._dragOverLastY = topEdge;
-
-            return DND.DragMotionResult.CONTINUE;
-        }
-        let bottomEdge = primary.y + primary.height - 1;
-        let switchBottom = (dragEvent.y >= bottomEdge && bottomWorkspace);
-        if (switchBottom && this._dragOverLastY != bottomEdge) {
-            bottomWorkspace.metaWorkspace.activate(global.get_current_time());
-            this._dragOverLastY = bottomEdge;
-
-            return DND.DragMotionResult.CONTINUE;
-        }
-        this._dragOverLastY = dragEvent.y;
-        let result = DND.DragMotionResult.CONTINUE;
-
-        // check hover state of new workspace area / inactive workspaces
-        if (topWorkspace) {
-            if (topWorkspace.actor.contains(dragEvent.targetActor)) {
-                hoverWorkspace = topWorkspace;
-                result = topWorkspace.handleDragOver(dragEvent.source, dragEvent.dragActor);
-            }
-        }
-
-        if (bottomWorkspace) {
-            if (bottomWorkspace.actor.contains(dragEvent.targetActor)) {
-                hoverWorkspace = bottomWorkspace;
-                result = bottomWorkspace.handleDragOver(dragEvent.source, dragEvent.dragActor);
-            }
-        }
-
-        // handle delayed workspace switches
-        if (hoverWorkspace) {
-            if (!this._timeoutId)
-                this._timeoutId = Mainloop.timeout_add_seconds(1,
-                    Lang.bind(this, function() {
-                       hoverWorkspace.metaWorkspace.activate(global.get_current_time());
-                       return false;
-                    }));
-        } else {
-            if (this._timeoutId) {
-                Mainloop.source_remove(this._timeoutId);
-                this._timeoutId = 0;
-            }
-        }
-
-        return result;
+        return DND.DragMotionResult.CONTINUE;
     },
 
     _dragEnd: function() {
-        if (this._timeoutId) {
-            Mainloop.source_remove(this._timeoutId);
-            this._timeoutId = 0;
-        }
         DND.removeDragMonitor(this._dragMonitor);
         this._inDrag = false;
 

=== modified file 'js/ui/xdndHandler.js'
--- js/ui/xdndHandler.js	2011-03-16 21:47:27 +0000
+++ js/ui/xdndHandler.js	2012-01-18 14:13:28 +0000
@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;

=== modified file 'po/LINGUAS'
--- po/LINGUAS	2011-09-28 00:41:45 +0000
+++ po/LINGUAS	2012-01-18 14:13:28 +0000
@@ -2,6 +2,7 @@
 an
 ar
 as
+ast
 be
 bg
 bn
@@ -31,6 +32,7 @@
 ja
 ko
 kn
+ku
 lt
 lv
 mr

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-09-22 08:50:45 +0000
+++ po/POTFILES.in	2012-01-18 14:13:28 +0000
@@ -25,6 +25,7 @@
 js/ui/popupMenu.js
 js/ui/runDialog.js
 js/ui/searchDisplay.js
+js/ui/shellEntry.js
 js/ui/shellMountOperation.js
 js/ui/status/accessibility.js
 js/ui/status/bluetooth.js
@@ -44,4 +45,3 @@
 src/shell-mobile-providers.c
 src/shell-polkit-authentication-agent.c
 src/shell-util.c
-

=== added file 'po/ast.po'
--- po/ast.po	1970-01-01 00:00:00 +0000
+++ po/ast.po	2012-01-18 14:13:28 +0000
@@ -0,0 +1,1630 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Xandru Armesto <[e-mail]>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-shell\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-09-30 18:14+0000\n"
+"PO-Revision-Date: 2011-09-30 20:56+0200\n"
+"Last-Translator: Xandru Armesto <[e-mail]>\n"
+"Language-Team: Softastur <[e-mail]>\n"
+"Language: ast\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Virtaal 0.5.2\n"
+"X-Poedit-Language: asturian\n"
+
+#: ../data/gnome-shell.desktop.in.in.h:1
+msgid "GNOME Shell"
+msgstr "GNOME Shell"
+
+#: ../data/gnome-shell.desktop.in.in.h:2
+msgid "Window management and application launching"
+msgstr "Xestión de ventanes y aniciu d'aplicaciones"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:1
+msgid ""
+"Allows access to internal debugging and monitoring tools using the Alt-F2 "
+"dialog."
+msgstr ""
+"Permitir acceder a les ferramientes internes de depuración y monitorización "
+"usando'l diálogu Alt+F2"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:2
+msgid "Enable internal tools useful for developers and testers from Alt-F2"
+msgstr ""
+"Activar les ferramientes internes, útiles pa desendolcadores y probadores, "
+"dende Alt+F2"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:3
+msgid "File extension used for storing the screencast"
+msgstr "Estensión de ficheru qu'usar p'almacenar los «screencast»"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:4
+msgid "Framerate used for recording screencasts."
+msgstr "Tasa de fotogrames usada pa grabar «screencast»."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:5
+msgid ""
+"GNOME Shell extensions have a uuid property; this key lists extensions which "
+"should be loaded. disabled-extensions overrides this setting for extensions "
+"that appear in both lists."
+msgstr ""
+"Les estensiones de GNOME Shell tienen una propiedá uuid; esta contraseña "
+"llista les estensiones que nun se deben cargar. «disabled-extensions» "
+"sobrescribe esti axuste pa les estensiones qu'aparecen en dambes llistes."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:6
+msgid "History for command (Alt-F2) dialog"
+msgstr "Históricu del diálogu de comandos (Alt+F2)"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:7
+msgid "History for the looking glass dialog"
+msgstr "Históricu del diálogu de «looking glass»"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:8
+msgid "If true, display date in the clock, in addition to time."
+msgstr "Si ye cierta, amuesa la data nel reló, arriendes de la hora."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:9
+msgid "If true, display seconds in time."
+msgstr "Si ye cierta, amuesa los segundos na hora."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:10
+msgid "If true, display the ISO week date in the calendar."
+msgstr "Si ye cierta, amuesa la data de selmana ISO nel calendariu."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:11
+msgid "List of desktop file IDs for favorite applications"
+msgstr "Llista de ID de ficheros d'escritoriu pa les aplicaciones favorites"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#, no-c-format
+msgid ""
+"Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
+"used for gst-launch. The pipeline should have an unconnected sink pad where "
+"the recorded video is recorded. It will normally have a unconnected source "
+"pad; output from that pad will be written into the output file. However the "
+"pipeline can also take care of its own output - this might be used to send "
+"the output to an icecast server via shout2send or similar. When unset or set "
+"to an empty value, the default pipeline will be used. This is currently "
+"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
+"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
+"at the optimal thread count on the system."
+msgstr ""
+"Afita la tubería GStreamer usada pa codificar grabaciones. Sigue la sintaxis "
+"usada pa gst-launch. La tubería tendría tener un sumideru («sink») "
+"d'ensamblaxe/desensamblaxe au'l videu que se ta grabando, se graba. "
+"Xeneralmente tendrá un orixe d'ensambláu/desensambláu; la salida d'esi puntu "
+"escribiráse nel ficheru de salida. Sicasí, la tubería tamién pue tomar "
+"parte na so propia salida; esto pue usase pa unviar la salida a un sirvidor "
+"«icecast» a traviés de shout2send o similar. Cuando nun ta afitáu o lo ta a "
+"un valor baleru, va usase la tubería predeterminada. Anguaño te «videorate ! "
+"vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux» y graba en WEBM "
+"usando'l códec VP8. Úsase %T como suposición pal númberu de filos óptimos "
+"nel sistema."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
+msgid "Show date in clock"
+msgstr "Amosar la data nel reló"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
+msgid "Show the week date in the calendar"
+msgstr "Amosar la data de la selmana nel calendariu"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
+msgid "Show time with seconds"
+msgstr "Amosar la hora con segundos"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
+msgid ""
+"The applications corresponding to these identifiers will be displayed in the "
+"favorites area."
+msgstr ""
+"Les aplicaciones correspondientes con esos identificadores van amosase nel "
+"área de favoritos."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
+msgid ""
+"The filename for recorded screencasts will be a unique filename based on the "
+"current date, and use this extension. It should be changed when recording to "
+"a different container format."
+msgstr ""
+"El nome de ficheru pa los «screencast» sedrá un nome de ficheru únicu basáu "
+"na data actual y usará esta estensión. Tendría de camudase al grabar n'otru "
+"formatu contenedor distintu."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
+msgid ""
+"The framerate of the resulting screencast recordered by GNOME Shell's "
+"screencast recorder in frames-per-second."
+msgstr ""
+"La tasa de fotogrames de la grabación resultante grabada pol grabador de "
+"«screencast» de GNOME Shell, en fotogrames per segundu."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
+msgid "The gstreamer pipeline used to encode the screencast"
+msgstr "La tubería de gstreamer usada pa codificar el «screencast»"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
+msgid ""
+"The shell normally monitors active applications in order to present the most "
+"used ones (e.g. in launchers). While this data will be kept private, you may "
+"want to disable this for privacy reasons. Please note that doing so won't "
+"remove already saved data."
+msgstr ""
+"La «shell» normalmente monitoriza toles aplicaciones actives pa presentar "
+"les más usaes (ex. nos lanzadores). Magar qu'estos datos se caltienen de "
+"forma privada, pues querer desactivalo por razones de privacidá. Nota que "
+"faciéndolo nun desanicies los datos yá guardaos."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
+msgid "The type of keyboard to use."
+msgstr "La triba de tecláu qu'usar."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
+msgid "Uuids of extensions to enable"
+msgstr "Uuid de les estensiones qu'activar"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:24
+msgid "Whether to collect stats about applications usage"
+msgstr ""
+"Indica si hai de recolectar estadístiques tocante al usu de les aplicaciones"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:25
+msgid "Which keyboard to use"
+msgstr "Qué tecláu usar"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:26
+msgid "disabled OpenSearch providers"
+msgstr "fornidores OpenSearch desactivaos"
+
+#: ../js/gdm/loginDialog.js:617
+msgid "Session..."
+msgstr "Sesión…"
+
+#: ../js/gdm/loginDialog.js:785
+msgctxt "title"
+msgid "Sign In"
+msgstr "Entamar sesión"
+
+#. translators: this message is shown below the password entry field
+#. to indicate the user can swipe their finger instead
+#: ../js/gdm/loginDialog.js:830
+msgid "(or swipe finger)"
+msgstr "(o pasa'l deu)"
+
+#: ../js/gdm/loginDialog.js:848
+msgid "Not listed?"
+msgstr "¿Nun ta llistáu?"
+
+#: ../js/gdm/loginDialog.js:1004 ../js/ui/endSessionDialog.js:426
+#: ../js/ui/extensionSystem.js:477 ../js/ui/networkAgent.js:165
+#: ../js/ui/polkitAuthenticationAgent.js:171 ../js/ui/status/bluetooth.js:480
+msgid "Cancel"
+msgstr "Encaboxar"
+
+#: ../js/gdm/loginDialog.js:1009
+msgctxt "button"
+msgid "Sign In"
+msgstr "Entamar sesión"
+
+#: ../js/gdm/loginDialog.js:1358
+msgid "Login Window"
+msgstr "Ventana d'aniciu de sesión"
+
+#: ../js/gdm/powerMenu.js:116 ../js/ui/userMenu.js:514
+#: ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:585
+msgid "Suspend"
+msgstr "Suspender"
+
+#: ../js/gdm/powerMenu.js:121 ../js/ui/endSessionDialog.js:89
+#: ../js/ui/endSessionDialog.js:97 ../js/ui/endSessionDialog.js:106
+msgid "Restart"
+msgstr "Reaniciar"
+
+#: ../js/gdm/powerMenu.js:126 ../js/ui/endSessionDialog.js:80
+#: ../js/ui/endSessionDialog.js:91
+msgid "Power Off"
+msgstr "Apagar"
+
+#: ../js/misc/util.js:92
+msgid "Command not found"
+msgstr "Comandu non alcontráu"
+
+#. Replace "Error invoking GLib.shell_parse_argv: " with
+#. something nicer
+#: ../js/misc/util.js:119
+msgid "Could not parse command:"
+msgstr "Nun pudo analizase'l comandu:"
+
+#: ../js/misc/util.js:127
+#, c-format
+msgid "Execution of '%s' failed:"
+msgstr "Falló la execución de «%s»:"
+
+#. Translators: Filter to display all applications
+#: ../js/ui/appDisplay.js:255
+msgid "All"
+msgstr "Toes"
+
+#: ../js/ui/appDisplay.js:319
+msgid "APPLICATIONS"
+msgstr "APLICACIONES"
+
+#: ../js/ui/appDisplay.js:377
+msgid "SETTINGS"
+msgstr "CONFIGURACIÓN"
+
+#: ../js/ui/appDisplay.js:684
+msgid "New Window"
+msgstr "Ventana nueva"
+
+#: ../js/ui/appDisplay.js:687
+msgid "Remove from Favorites"
+msgstr "Quitar de los favoritos"
+
+#: ../js/ui/appDisplay.js:688
+msgid "Add to Favorites"
+msgstr "Amestar a los favoritos"
+
+#: ../js/ui/appFavorites.js:89
+#, c-format
+msgid "%s has been added to your favorites."
+msgstr "Amestóse %s a los favoritos."
+
+#: ../js/ui/appFavorites.js:120
+#, c-format
+msgid "%s has been removed from your favorites."
+msgstr "Desanicióse %s de los favoritos."
+
+#: ../js/ui/autorunManager.js:280
+msgid "Removable Devices"
+msgstr "Preseos extraíbles"
+
+#: ../js/ui/autorunManager.js:590
+#, c-format
+msgid "Open with %s"
+msgstr "Abrir con %s"
+
+#: ../js/ui/autorunManager.js:616
+msgid "Eject"
+msgstr "Espulsar"
+
+#. Translators: Shown in calendar event list for all day events
+#. * Keep it short, best if you can use less then 10 characters
+#.
+#: ../js/ui/calendar.js:63
+msgctxt "event list time"
+msgid "All Day"
+msgstr "Tol día"
+
+#. Translators: Shown in calendar event list, if 24h format
+#: ../js/ui/calendar.js:68
+msgctxt "event list time"
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. Transators: Shown in calendar event list, if 12h format
+#: ../js/ui/calendar.js:75
+msgctxt "event list time"
+msgid "%l:%M %p"
+msgstr "%l:%M %p"
+
+#. Translators: Calendar grid abbreviation for Sunday.
+#. *
+#. * NOTE: These grid abbreviations are always shown together
+#. * and in order, e.g. "S M T W T F S".
+#.
+#: ../js/ui/calendar.js:115
+msgctxt "grid sunday"
+msgid "S"
+msgstr "D"
+
+#. Translators: Calendar grid abbreviation for Monday
+#: ../js/ui/calendar.js:117
+msgctxt "grid monday"
+msgid "M"
+msgstr "L"
+
+#. Translators: Calendar grid abbreviation for Tuesday
+#: ../js/ui/calendar.js:119
+msgctxt "grid tuesday"
+msgid "T"
+msgstr "M"
+
+#. Translators: Calendar grid abbreviation for Wednesday
+#: ../js/ui/calendar.js:121
+msgctxt "grid wednesday"
+msgid "W"
+msgstr "m"
+
+#. Translators: Calendar grid abbreviation for Thursday
+#: ../js/ui/calendar.js:123
+msgctxt "grid thursday"
+msgid "T"
+msgstr "X"
+
+#. Translators: Calendar grid abbreviation for Friday
+#: ../js/ui/calendar.js:125
+msgctxt "grid friday"
+msgid "F"
+msgstr "V"
+
+#. Translators: Calendar grid abbreviation for Saturday
+#: ../js/ui/calendar.js:127
+msgctxt "grid saturday"
+msgid "S"
+msgstr "S"
+
+#. Translators: Event list abbreviation for Sunday.
+#. *
+#. * NOTE: These list abbreviations are normally not shown together
+#. * so they need to be unique (e.g. Tuesday and Thursday cannot
+#. * both be 'T').
+#.
+#: ../js/ui/calendar.js:140
+msgctxt "list sunday"
+msgid "Su"
+msgstr "Dom"
+
+#. Translators: Event list abbreviation for Monday
+#: ../js/ui/calendar.js:142
+msgctxt "list monday"
+msgid "M"
+msgstr "Llu"
+
+#. Translators: Event list abbreviation for Tuesday
+#: ../js/ui/calendar.js:144
+msgctxt "list tuesday"
+msgid "T"
+msgstr "Mar"
+
+#. Translators: Event list abbreviation for Wednesday
+#: ../js/ui/calendar.js:146
+msgctxt "list wednesday"
+msgid "W"
+msgstr "Mié"
+
+#. Translators: Event list abbreviation for Thursday
+#: ../js/ui/calendar.js:148
+msgctxt "list thursday"
+msgid "Th"
+msgstr "Xue"
+
+#. Translators: Event list abbreviation for Friday
+#: ../js/ui/calendar.js:150
+msgctxt "list friday"
+msgid "F"
+msgstr "Vie"
+
+#. Translators: Event list abbreviation for Saturday
+#: ../js/ui/calendar.js:152
+msgctxt "list saturday"
+msgid "S"
+msgstr "Sáb"
+
+#. Translators: Text to show if there are no events
+#: ../js/ui/calendar.js:687
+msgid "Nothing Scheduled"
+msgstr "Res programáu"
+
+#. Translators: Shown on calendar heading when selected day occurs on current year
+#: ../js/ui/calendar.js:703
+msgctxt "calendar heading"
+msgid "%A, %B %d"
+msgstr "%A, %d de %B"
+
+#. Translators: Shown on calendar heading when selected day occurs on different year
+#: ../js/ui/calendar.js:706
+msgctxt "calendar heading"
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
+#: ../js/ui/calendar.js:716
+msgid "Today"
+msgstr "Güei"
+
+#: ../js/ui/calendar.js:720
+msgid "Tomorrow"
+msgstr "Mañana"
+
+#: ../js/ui/calendar.js:729
+msgid "This week"
+msgstr "Esta selmana"
+
+#: ../js/ui/calendar.js:737
+msgid "Next week"
+msgstr "La selmana que vien"
+
+#: ../js/ui/contactDisplay.js:59 ../js/ui/notificationDaemon.js:444
+#: ../js/ui/status/power.js:223 ../src/shell-app.c:355
+msgid "Unknown"
+msgstr "Desconocíu"
+
+#: ../js/ui/contactDisplay.js:80 ../js/ui/userMenu.js:139
+msgid "Available"
+msgstr "Disponible"
+
+#: ../js/ui/contactDisplay.js:85 ../js/ui/userMenu.js:148
+msgid "Away"
+msgstr "Ausente"
+
+#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:142
+msgid "Busy"
+msgstr "Ocupáu"
+
+#: ../js/ui/contactDisplay.js:93
+msgid "Offline"
+msgstr "Desconeutáu"
+
+#: ../js/ui/contactDisplay.js:140
+msgid "CONTACTS"
+msgstr "CONTAUTOS"
+
+#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1204
+msgid "Remove"
+msgstr "Desaniciar"
+
+#: ../js/ui/dateMenu.js:99
+msgid "Date and Time Settings"
+msgstr "Axustes d'hora y data"
+
+#: ../js/ui/dateMenu.js:125
+msgid "Open Calendar"
+msgstr "Abrir calendariu"
+
+#. Translators: This is the time format with date used
+#. in 24-hour mode.
+#: ../js/ui/dateMenu.js:183
+msgid "%a %b %e, %R:%S"
+msgstr "%a %e de %b, %R:%S"
+
+#: ../js/ui/dateMenu.js:184
+msgid "%a %b %e, %R"
+msgstr "%a %e de %b, %R"
+
+#. Translators: This is the time format without date used
+#. in 24-hour mode.
+#: ../js/ui/dateMenu.js:188
+msgid "%a %R:%S"
+msgstr "%a %R:%S"
+
+#: ../js/ui/dateMenu.js:189
+msgid "%a %R"
+msgstr "%a %R"
+
+#. Translators: This is a time format with date used
+#. for AM/PM.
+#: ../js/ui/dateMenu.js:196
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%a %e de %b, %l:%M:%S %p"
+
+#: ../js/ui/dateMenu.js:197
+msgid "%a %b %e, %l:%M %p"
+msgstr "%a %e de %b, %l:%M %p"
+
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#: ../js/ui/dateMenu.js:201
+msgid "%a %l:%M:%S %p"
+msgstr "%a %l:%M:%S %p"
+
+#: ../js/ui/dateMenu.js:202
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#. Translators: This is the date format to use when the calendar popup is
+#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
+#.
+#: ../js/ui/dateMenu.js:213
+msgid "%A %B %e, %Y"
+msgstr "%A, %e de %B de %Y"
+
+#: ../js/ui/docDisplay.js:16
+msgid "RECENT ITEMS"
+msgstr "ELEMENTOS RECIENTES"
+
+#: ../js/ui/endSessionDialog.js:60
+#, c-format
+msgid "Log Out %s"
+msgstr "Zarrar la sesión %s"
+
+#: ../js/ui/endSessionDialog.js:61 ../js/ui/endSessionDialog.js:75
+msgid "Log Out"
+msgstr "Zarrar la sesión"
+
+#: ../js/ui/endSessionDialog.js:62
+msgid "Click Log Out to quit these applications and log out of the system."
+msgstr ""
+"Calca «Zarrar la sesión» pa colar d'eses aplicaciones y zarrar la sesión del "
+"sistema."
+
+#: ../js/ui/endSessionDialog.js:64
+#, c-format
+msgid "%s will be logged out automatically in %d second."
+msgid_plural "%s will be logged out automatically in %d seconds."
+msgstr[0] "va zarrase automáticamente la sesión de %s en %d segundu."
+msgstr[1] "va zarrase automáticamente la sesión de %s en %d segundos."
+
+#: ../js/ui/endSessionDialog.js:69
+#, c-format
+msgid "You will be logged out automatically in %d second."
+msgid_plural "You will be logged out automatically in %d seconds."
+msgstr[0] "La sesión va zarrase automáticamente en %d segundu."
+msgstr[1] "La sesión va zarrase automáticamente en %d segundos."
+
+#: ../js/ui/endSessionDialog.js:73
+msgid "Logging out of the system."
+msgstr "Zarrando la sesión."
+
+#: ../js/ui/endSessionDialog.js:81
+msgid "Click Power Off to quit these applications and power off the system."
+msgstr "Calca «Apagar» pa colar d'eses aplicaciones y apagar el sistema."
+
+#: ../js/ui/endSessionDialog.js:83
+#, c-format
+msgid "The system will power off automatically in %d second."
+msgid_plural "The system will power off automatically in %d seconds."
+msgstr[0] "El sistema va apagase automáticamente en %d segundu."
+msgstr[1] "El sistema va apagase automáticamente en %d segundos."
+
+#: ../js/ui/endSessionDialog.js:87
+msgid "Powering off the system."
+msgstr "Apagando'l sistema."
+
+#: ../js/ui/endSessionDialog.js:98
+msgid "Click Restart to quit these applications and restart the system."
+msgstr "Calca «Reaniciar» pa colar d'eses aplicaciones y reaniciar el sistema."
+
+#: ../js/ui/endSessionDialog.js:100
+#, c-format
+msgid "The system will restart automatically in %d second."
+msgid_plural "The system will restart automatically in %d seconds."
+msgstr[0] "El sistema va reaniciase automáticamente en %d segundu."
+msgstr[1] "El sistema va reaniciase automáticamente en %d segundos."
+
+#: ../js/ui/endSessionDialog.js:104
+msgid "Restarting the system."
+msgstr "Reaniciando'l sistema."
+
+#: ../js/ui/extensionSystem.js:481
+msgid "Install"
+msgstr "Instalar"
+
+#: ../js/ui/extensionSystem.js:485
+#, c-format
+msgid "Download and install '%s' from extensions.gnome.org?"
+msgstr "¿Baxar ya instalar «%s» dende extensions.gnome.org?"
+
+#: ../js/ui/keyboard.js:529 ../js/ui/status/power.js:211
+msgid "Keyboard"
+msgstr "Tecláu"
+
+#: ../js/ui/lookingGlass.js:645
+msgid "No extensions installed"
+msgstr "Nun hai estensiones instalaes"
+
+#. Translators: argument is an extension UUID.
+#: ../js/ui/lookingGlass.js:700
+#, c-format
+msgid "%s has not emitted any errors."
+msgstr "%s nun emitió error nengún."
+
+#: ../js/ui/lookingGlass.js:706
+msgid "Hide Errors"
+msgstr "Anubrir Errores"
+
+#: ../js/ui/lookingGlass.js:710 ../js/ui/lookingGlass.js:760
+msgid "Show Errors"
+msgstr "Amosar Errores"
+
+#: ../js/ui/lookingGlass.js:719
+msgid "Enabled"
+msgstr "Activáu"
+
+#. translators:
+#. * The device has been disabled
+#: ../js/ui/lookingGlass.js:721 ../src/gvc/gvc-mixer-control.c:1093
+msgid "Disabled"
+msgstr "Desactiváu"
+
+#: ../js/ui/lookingGlass.js:723
+msgid "Error"
+msgstr "Fallu"
+
+#: ../js/ui/lookingGlass.js:725
+msgid "Out of date"
+msgstr "Caducáu"
+
+#: ../js/ui/lookingGlass.js:727
+msgid "Downloading"
+msgstr "Descargando"
+
+#: ../js/ui/lookingGlass.js:748
+msgid "View Source"
+msgstr "Ver fonte"
+
+#: ../js/ui/lookingGlass.js:754
+msgid "Web Page"
+msgstr "Páxina web"
+
+#: ../js/ui/messageTray.js:1197
+msgid "Open"
+msgstr "Abrir"
+
+#: ../js/ui/messageTray.js:2406
+msgid "System Information"
+msgstr "Información del sistema"
+
+#: ../js/ui/networkAgent.js:145
+msgid "Show password"
+msgstr "Amosar contraseña"
+
+#: ../js/ui/networkAgent.js:160
+msgid "Connect"
+msgstr "Coneutar"
+
+#. Cisco LEAP
+#: ../js/ui/networkAgent.js:255 ../js/ui/networkAgent.js:267
+#: ../js/ui/networkAgent.js:294 ../js/ui/networkAgent.js:314
+#: ../js/ui/networkAgent.js:324
+msgid "Password: "
+msgstr "Contraseña: "
+
+#. static WEP
+#: ../js/ui/networkAgent.js:260
+msgid "Key: "
+msgstr "Contraseña:"
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. is not visible here since we only care about phase2 authentication
+#. (and don't even care of which one)
+#: ../js/ui/networkAgent.js:292 ../js/ui/networkAgent.js:310
+msgid "Username: "
+msgstr "Nome d'usuariu:"
+
+#: ../js/ui/networkAgent.js:298
+msgid "Identity: "
+msgstr "Identidá:"
+
+#: ../js/ui/networkAgent.js:300
+msgid "Private key password: "
+msgstr "Clave de la contraseña privada:"
+
+#: ../js/ui/networkAgent.js:312
+msgid "Service: "
+msgstr "Serviciu:"
+
+#: ../js/ui/networkAgent.js:341
+msgid "Authentication required by wireless network"
+msgstr "La rede inalámbrica requier autenticación"
+
+#: ../js/ui/networkAgent.js:342
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+"Necesítense contraseñes o claves de cifráu p'acceder a la rede inalámbrica «"
+"%s»."
+
+#: ../js/ui/networkAgent.js:346
+msgid "Wired 802.1X authentication"
+msgstr "Autenticación 802.1X cableada"
+
+#: ../js/ui/networkAgent.js:348
+msgid "Network name: "
+msgstr "Nome de la rede"
+
+#: ../js/ui/networkAgent.js:353
+msgid "DSL authentication"
+msgstr "Autenticación DSL"
+
+#: ../js/ui/networkAgent.js:360
+msgid "PIN code required"
+msgstr "Códigu PIN requeríu"
+
+#: ../js/ui/networkAgent.js:361
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "Necesítase un códigu PIN pal preséu de banda ancha móvil"
+
+#: ../js/ui/networkAgent.js:362
+msgid "PIN: "
+msgstr "PIN: "
+
+#: ../js/ui/networkAgent.js:368
+msgid "Mobile broadband network password"
+msgstr "Contraseña de la rede de banda ancha móvil"
+
+#: ../js/ui/networkAgent.js:369
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr "Requierse una contraseña pa coneutar a «%s»."
+
+#: ../js/ui/overview.js:91
+msgid "Undo"
+msgstr "Desfacer"
+
+#: ../js/ui/overview.js:205
+msgid "Windows"
+msgstr "Ventanes"
+
+#: ../js/ui/overview.js:208
+msgid "Applications"
+msgstr "Aplicaciones"
+
+#. Translators: this is the name of the dock/favorites area on
+#. the left of the overview
+#: ../js/ui/overview.js:230
+msgid "Dash"
+msgstr "Tableru"
+
+#. TODO - _quit() doesn't really work on apps in state STARTING yet
+#: ../js/ui/panel.js:539
+#, c-format
+msgid "Quit %s"
+msgstr "Colar de %s"
+
+#. Translators: If there is no suitable word for "Activities"
+#. in your language, you can use the word for "Overview".
+#: ../js/ui/panel.js:575
+msgid "Activities"
+msgstr "Actividaes"
+
+#: ../js/ui/panel.js:967
+msgid "Top Bar"
+msgstr "Barra superior"
+
+#: ../js/ui/placeDisplay.js:120
+#, c-format
+msgid "Failed to unmount '%s'"
+msgstr "Falló al desmontar «%s»"
+
+#: ../js/ui/placeDisplay.js:123
+msgid "Retry"
+msgstr "Reintentar"
+
+#: ../js/ui/placeDisplay.js:163
+msgid "Connect to..."
+msgstr "Coneutar a…"
+
+#: ../js/ui/placeDisplay.js:375
+msgid "PLACES & DEVICES"
+msgstr "LLUGARES Y PRESEOS"
+
+#: ../js/ui/polkitAuthenticationAgent.js:72
+msgid "Authentication Required"
+msgstr "Necesítase autenticación"
+
+#: ../js/ui/polkitAuthenticationAgent.js:106
+msgid "Administrator"
+msgstr "Alministrador"
+
+#: ../js/ui/polkitAuthenticationAgent.js:175
+msgid "Authenticate"
+msgstr "Autenticar"
+
+#. Translators: "that didn't work" refers to the fact that the
+#. * requested authentication was not gained; this can happen
+#. * because of an authentication error (like invalid password),
+#. * for instance.
+#: ../js/ui/polkitAuthenticationAgent.js:256
+msgid "Sorry, that didn't work. Please try again."
+msgstr "Inténtalo de nueves,"
+
+#: ../js/ui/polkitAuthenticationAgent.js:268
+msgid "Password:"
+msgstr "Contraseña:"
+
+#. Translators: this MUST be either "toggle-switch-us"
+#. (for toggle switches containing the English words
+#. "ON" and "OFF") or "toggle-switch-intl" (for toggle
+#. switches containing "◯" and "|"). Other values will
+#. simply result in invisible toggle switches.
+#: ../js/ui/popupMenu.js:731
+msgid "toggle-switch-us"
+msgstr "toggle-switch-intl"
+
+#: ../js/ui/runDialog.js:208
+msgid "Please enter a command:"
+msgstr "Introduz un comandu:"
+
+#: ../js/ui/searchDisplay.js:340
+msgid "Searching..."
+msgstr "Guetando…"
+
+#: ../js/ui/searchDisplay.js:363
+msgid "No matching results."
+msgstr "Nun s'atopó dengún resultáu coincidente."
+
+#: ../js/ui/shellMountOperation.js:285
+msgid "Wrong password, please try again"
+msgstr "Contraseña incorreuta; inténtalo de nueves"
+
+#: ../js/ui/status/accessibility.js:60
+msgid "Zoom"
+msgstr "Ampliación"
+
+#. let screenReader = this._buildItem(_("Screen Reader"), APPLICATIONS_SCHEMA,
+#. 'screen-reader-enabled');
+#. this.menu.addMenuItem(screenReader);
+#: ../js/ui/status/accessibility.js:71
+msgid "Screen Keyboard"
+msgstr "Tecláu en pantalla"
+
+#: ../js/ui/status/accessibility.js:75
+msgid "Visual Alerts"
+msgstr "Alertes visuales"
+
+#: ../js/ui/status/accessibility.js:78
+msgid "Sticky Keys"
+msgstr "Tecles persistentes"
+
+#: ../js/ui/status/accessibility.js:81
+msgid "Slow Keys"
+msgstr "Tecles lentes"
+
+#: ../js/ui/status/accessibility.js:84
+msgid "Bounce Keys"
+msgstr "Refugu de tecles"
+
+#: ../js/ui/status/accessibility.js:87
+msgid "Mouse Keys"
+msgstr "Tecles del mur"
+
+#: ../js/ui/status/accessibility.js:91
+msgid "Universal Access Settings"
+msgstr "Configuración del accesu universal"
+
+#: ../js/ui/status/accessibility.js:141
+msgid "High Contrast"
+msgstr "Contraste altu"
+
+#: ../js/ui/status/accessibility.js:178
+msgid "Large Text"
+msgstr "Testu grande"
+
+#: ../js/ui/status/bluetooth.js:39 ../js/ui/status/bluetooth.js:261
+#: ../js/ui/status/bluetooth.js:347 ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:421 ../js/ui/status/bluetooth.js:454
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: ../js/ui/status/bluetooth.js:52
+msgid "Visibility"
+msgstr "Visibilidá"
+
+#: ../js/ui/status/bluetooth.js:66
+msgid "Send Files to Device..."
+msgstr "Unviar ficheros al preséu…"
+
+#: ../js/ui/status/bluetooth.js:67
+msgid "Set up a New Device..."
+msgstr "Configurar un preséu nuevu…"
+
+#: ../js/ui/status/bluetooth.js:91
+msgid "Bluetooth Settings"
+msgstr "Configuración de Bluetooth"
+
+#. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
+#: ../js/ui/status/bluetooth.js:111
+msgid "hardware disabled"
+msgstr "hardware desactiváu"
+
+#: ../js/ui/status/bluetooth.js:208
+msgid "Connection"
+msgstr "Conexón"
+
+#: ../js/ui/status/bluetooth.js:217 ../js/ui/status/network.js:486
+msgid "disconnecting..."
+msgstr "desconeutando…"
+
+#: ../js/ui/status/bluetooth.js:230 ../js/ui/status/network.js:492
+msgid "connecting..."
+msgstr "coneutando…"
+
+#: ../js/ui/status/bluetooth.js:248
+msgid "Send Files..."
+msgstr "Unviar ficheros…"
+
+#: ../js/ui/status/bluetooth.js:253
+msgid "Browse Files..."
+msgstr "Desaminar ficheros…"
+
+#: ../js/ui/status/bluetooth.js:262
+msgid "Error browsing device"
+msgstr "Fallu al desaminar el preséu"
+
+#: ../js/ui/status/bluetooth.js:263
+#, c-format
+msgid "The requested device cannot be browsed, error is '%s'"
+msgstr "Nun se pue desaminar el preséu solicitáu, el fallu ye «%s»"
+
+#: ../js/ui/status/bluetooth.js:271
+msgid "Keyboard Settings"
+msgstr "Configuración del tecláu"
+
+#: ../js/ui/status/bluetooth.js:274
+msgid "Mouse Settings"
+msgstr "Axustes del mur…"
+
+#: ../js/ui/status/bluetooth.js:279 ../js/ui/status/volume.js:62
+msgid "Sound Settings"
+msgstr "Configuración del soníu"
+
+#: ../js/ui/status/bluetooth.js:382
+#, c-format
+msgid "Authorization request from %s"
+msgstr "Solicitú d'autorización de %s"
+
+#: ../js/ui/status/bluetooth.js:388
+#, c-format
+msgid "Device %s wants access to the service '%s'"
+msgstr "El preséu %s quier acceder al serviciu «%s»"
+
+#: ../js/ui/status/bluetooth.js:390
+msgid "Always grant access"
+msgstr "Conceder accesu siempre"
+
+#: ../js/ui/status/bluetooth.js:391
+msgid "Grant this time only"
+msgstr "Conceder namái esta vegada"
+
+#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1200
+msgid "Reject"
+msgstr "Refugar"
+
+#: ../js/ui/status/bluetooth.js:422
+#, c-format
+msgid "Pairing confirmation for %s"
+msgstr "Confirmación d'emparexamientu pa «%s»"
+
+#: ../js/ui/status/bluetooth.js:428 ../js/ui/status/bluetooth.js:462
+#, c-format
+msgid "Device %s wants to pair with this computer"
+msgstr "El preséu «%s» quier emparexase con esti equipu"
+
+#: ../js/ui/status/bluetooth.js:429
+#, c-format
+msgid "Please confirm whether the PIN '%s' matches the one on the device."
+msgstr "Confirma que'l PIN amosáu en «%s» concasa col del preséu."
+
+#: ../js/ui/status/bluetooth.js:431
+msgid "Matches"
+msgstr "Concasa"
+
+#: ../js/ui/status/bluetooth.js:432
+msgid "Does not match"
+msgstr "Nun concasa"
+
+#: ../js/ui/status/bluetooth.js:455
+#, c-format
+msgid "Pairing request for %s"
+msgstr "Solicitú d'emparexamientu pa «%s»"
+
+#: ../js/ui/status/bluetooth.js:463
+msgid "Please enter the PIN mentioned on the device."
+msgstr "Introduz el PIN mencionáu nel preséu."
+
+#: ../js/ui/status/bluetooth.js:479
+msgid "OK"
+msgstr "Aceutar"
+
+#: ../js/ui/status/keyboard.js:73
+msgid "Show Keyboard Layout"
+msgstr "Amosar la distribución del tecláu"
+
+#: ../js/ui/status/keyboard.js:78
+msgid "Region and Language Settings"
+msgstr "Configuración de rexón y llingua"
+
+#: ../js/ui/status/network.js:97
+msgid "<unknown>"
+msgstr "<desconocíu>"
+
+#. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
+#: ../js/ui/status/network.js:285
+msgid "disabled"
+msgstr "desactivada"
+
+#. Translators: this is for network devices that are physically present but are not
+#. under NetworkManager's control (and thus cannot be used in the menu)
+#: ../js/ui/status/network.js:484
+msgid "unmanaged"
+msgstr "non xestionada"
+
+#. Translators: this is for network connections that require some kind of key or password
+#: ../js/ui/status/network.js:495
+msgid "authentication required"
+msgstr "necesítase autenticación"
+
+#. Translators: this is for devices that require some kind of firmware or kernel
+#. module, which is missing
+#: ../js/ui/status/network.js:505
+msgid "firmware missing"
+msgstr "falta'l «firmware»"
+
+#. Translators: this is for wired network devices that are physically disconnected
+#: ../js/ui/status/network.js:512
+msgid "cable unplugged"
+msgstr "cable desconeutáu"
+
+#. Translators: this is for a network device that cannot be activated (for example it
+#. is disabled by rfkill, or it has no coverage
+#: ../js/ui/status/network.js:517
+msgid "unavailable"
+msgstr "non disponible"
+
+#: ../js/ui/status/network.js:519
+msgid "connection failed"
+msgstr "falló la conexón"
+
+#: ../js/ui/status/network.js:575 ../js/ui/status/network.js:1523
+msgid "More..."
+msgstr "Más…"
+
+#. TRANSLATORS: this is the indication that a connection for another logged in user is active,
+#. and we cannot access its settings (including the name)
+#: ../js/ui/status/network.js:611 ../js/ui/status/network.js:1458
+msgid "Connected (private)"
+msgstr "Coneutada (privada)"
+
+#: ../js/ui/status/network.js:689
+msgid "Auto Ethernet"
+msgstr "Ethernet automática"
+
+#: ../js/ui/status/network.js:753
+msgid "Auto broadband"
+msgstr "Banda ancha automática"
+
+#: ../js/ui/status/network.js:756
+msgid "Auto dial-up"
+msgstr "Marcáu automáticu"
+
+#. TRANSLATORS: this the automatic wireless connection name (including the network name)
+#: ../js/ui/status/network.js:878 ../js/ui/status/network.js:1470
+#, c-format
+msgid "Auto %s"