status/keyboard: Adapt to changes in the settings schema

candidatePanel: Use the Lang.Class framework
candidatePanel: Remove the PopupSeparatorMenuItem copy
2012-05-15 02:24:23 +02:00 · 2012-05-03 13:20:01 +02:00 · 2012-05-03 13:20:01 +02:00 · 2012-05-03 13:19:58 +02:00 · 2012-05-03 13:19:53 +02:00 · 2012-05-03 13:19:53 +02:00
76 changed files with 4293 additions and 4168 deletions
--- a/71
+++ b/71
@@ -1,74 +1,3 @@
-3.5.2
-=====
-* main: Move 'toggle-recording' binding into the shell [Florian; #674377]
-* popupMenu: make sure to break the grab when the slider is not visible
-  [Stefano; #672713]
-* st-theme-node-drawing: Don't use GL types [Neil; #672711]
-* Mirror Evolution calendar settings into our own schema [Owen; #674424]
-* shell-network-agent: don't crash if a request isn't found [Dan; #674961]
-* notificationDaemon: Match app based on WM_CLASS [Jasper; #673761]
-* NetworkMenu: use network-offline while loading [Giovanni; #674426]
-* lookingGlass: Remove the Errors tab [Jasper; #675104]
-* searchDisplay: Reset keyboard focus after displaying async results
-  [Rui; #675078]
-* gdm: don't fail if fprintd is unavailable [Ray; #675006]
-* messageTray: Fix scrolling up [Jasper; #661615]
-* main: Close the recorder instead of pausing it [Rui; #675128]
-* Accessibility [Alejandro]
-  - Use the proper label_actor for date menu on top panel [#675307]
-  - Set the proper role/label_actor for SearchResult.content [#672242]
-  - do not expose a label text if 'hidden' style class is used [#675341]
-* Magnifier: Add brightness and contrast functionality [Joseph; #639851]
-* theme: use a smaller border-radius for top bar [Jakub; #672430]
-* placeDisplay: use new bookmark file location [Matthias; #675443]
-* port all synchronous search providers to the async API [Jasper, Rui; #675328]
-* NetworkAgent: disallow multiple requests for the same connection/setting
-  [Giovanni; #674961]
-* userMenu: Update to latest mockups [Florian; #675802]
-* util: Don't double-fork when spawning from Alt-F2 [Colin; #675789]
-* messageTray: Make Source usable without subclassing [Jasper; #661236]
-* panel: Check for appMenu button's reactivity before opening [Florian; #676316]
-* Fix formatting of bluetooth passkey [Florian; #651251]
-* notificationDaemon: Filter out file-transfer notifications [Jasper; #676175]
-* Don't use global.log() [Jasper; #675790]
-* Fix broken extension loading in some distributions [Owen, Alexandre; #670477]
-* shell-app: Raise windows in reverse order to preserve the stacking
-  [Rui; #676371]
-* Generalize gdm-mode [Florian; #676156]
-* Switch string formatting to the one inside gjs [Jasper; #675479]
-* extensionUtils: Support subdirectories in getCurrentExtension
-  [Jasper; #677001]
-* panel: Refuse to add (legacy) status icons not part of the session mode
-  [Florian; #677058]
-* Add an initial-setup mode [Matthias; #676697]
-* status/keyboard: Port to the new input sources settings [Rui; #641531]
-* NetworkMenu: show notifications for failed VPN connections [Giovanni; #676330]
-* userMenu: Indicate progress on status changes [Florian; #659067]
-* recorder: Honor "disable-save-to-disk" lockdown key [Rūdolfs; #673630]
-* searchDisplay: Use the rowLimit we pass to the IconGrid [Christian; #675527]
-* endSessionDialog: Factor out _updateDescription from _updateContent
-  [Alejandro; #674210]
-* Fix empathy's appMenu freezing the shell [Alban; #676447]
-* Code cleanups [Florian, Giovanni, Jasper; #672807, #672413, #676837, #676850,
-  #672272]
-* Misc bug fixes [Alban, Florian, Giovanni, Guillaume, Jasper, Piotr, Rico,
-  Ron, Rui, Stefano; #659968, #672192, #673177, #673198, #674323, #675301,
-  #675370, #676347, #676806, #677097]
-
-Contributors:
- Alban Browaeys, Giovanni Campagna, Matthias Clasen, Guillaume Desmottes,
- Piotr Drąg, Stefano Facchini, Rui Matos, Rūdolfs Mazurs, Florian Müllner,
- Alejandro Piñeiro, Neil Roberts, Alexandre Rostovtsev, Joseph Scheuhammer,
- Jakub Steiner, Jasper St. Pierre, Ray Strode, Owen Taylor, Rico Tzschichholz,
- Colin Walters, Dan Winship, Ron Yorston
-
-Translations:
- OKANO Takayoshi [ja], Daniel Mustieles [es], Changwoo Ryu [ko],
- Yaron Shahrabani [he], Fran Diéguez [gl], Jonh Wendell [pt_BR],
- Kjartan Maraas [nb], Luca Ferretti [it], Tom Tryfonidis [el],
- Sandeep Sheshrao Shedmake [mr], Takanori MATSUURA [ja], Dirgita [id],
- Mantas Kriaučiūnas [lt], Matej Urbančič [sl], Jiro Matsuzawa [ja]
-
 3.4.1
 =====
 * Fix crash that occurred when an icon theme change caused unexpected
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@@ -41,7 +41,7 @@
      "It can be used only by extensions.gnome.org"
 #define PLUGIN_MIME_STRING "application/x-gnome-shell-integration::Gnome Shell Integration Dummy Content-Type";

-#define PLUGIN_API_VERSION 4
+#define PLUGIN_API_VERSION 3

 typedef struct {
  GDBusProxy *proxy;
@@ -163,7 +163,6 @@ NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin)
  plugin->newp = NPP_New;
  plugin->destroy = NPP_Destroy;
  plugin->getvalue = NPP_GetValue;
-  plugin->setwindow = NPP_SetWindow;

  return NPERR_NO_ERROR;
 }
@@ -268,7 +267,6 @@ typedef struct {
  NPObject     parent;
  NPP          instance;
  GDBusProxy  *proxy;
-  GSettings   *settings;
  NPObject    *listener;
  NPObject    *restart_listener;
  gint         signal_id;
@@ -325,9 +323,6 @@ on_shell_appeared (GDBusConnection *connection,
    }
 }

-#define SHELL_SCHEMA "org.gnome.shell"
-#define ENABLED_EXTENSIONS_KEY "enabled-extensions"
-
 static NPObject *
 plugin_object_allocate (NPP      instance,
                        NPClass *klass)
@@ -337,7 +332,6 @@ plugin_object_allocate (NPP      instance,

  obj->instance = instance;
  obj->proxy = g_object_ref (data->proxy);
-  obj->settings = g_settings_new (SHELL_SCHEMA);
  obj->signal_id = g_signal_connect (obj->proxy, "g-signal",
                                     G_CALLBACK (on_shell_signal), obj);

@@ -498,61 +492,7 @@ plugin_enable_extension (PluginObject *obj,
                         NPString      uuid,
                         gboolean      enabled)
 {
-  gboolean ret;
  gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
-  gsize length;
-  gchar **uuids;
-  const gchar **new_uuids;
-
-  if (!uuid_is_valid (uuid_str))
-    {
-      g_free (uuid_str);
-      return FALSE;
-    }
-
-  uuids = g_settings_get_strv (obj->settings, ENABLED_EXTENSIONS_KEY);
-  length = g_strv_length (uuids);
-
-  if (enabled)
-    {
-      new_uuids = g_new (const gchar *, length + 2); /* New key, NULL */
-      memcpy (new_uuids, uuids, length * sizeof (*new_uuids));
-      new_uuids[length] = uuid_str;
-      new_uuids[length + 1] = NULL;
-    }
-  else
-    {
-      gsize i = 0, j = 0;
-      new_uuids = g_new (const gchar *, length);
-      for (i = 0; i < length; i ++)
-        {
-          if (g_str_equal (uuids[i], uuid_str))
-            continue;
-
-          new_uuids[j] = uuids[i];
-          j++;
-        }
-
-      new_uuids[j] = NULL;
-    }
-
-  ret = g_settings_set_strv (obj->settings,
-                             ENABLED_EXTENSIONS_KEY,
-                             new_uuids);
-
-  g_strfreev (uuids);
-  g_free (new_uuids);
-  g_free (uuid_str);
-
-  return ret;
-}
-
-static gboolean
-plugin_install_extension (PluginObject *obj,
-                          NPString      uuid)
-{
-  gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
-
  if (!uuid_is_valid (uuid_str))
    {
      g_free (uuid_str);
@@ -560,7 +500,7 @@ plugin_install_extension (PluginObject *obj,
    }

  g_dbus_proxy_call (obj->proxy,
-                     "InstallRemoteExtension",
+                     (enabled ? "EnableExtension" : "DisableExtension"),
                     g_variant_new ("(s)", uuid_str),
                     G_DBUS_CALL_FLAGS_NONE,
                     -1, /* timeout */
@@ -573,6 +513,40 @@ plugin_install_extension (PluginObject *obj,
  return TRUE;
 }

+static gboolean
+plugin_install_extension (PluginObject *obj,
+                          NPString      uuid,
+                          NPString      version_tag)
+{
+  gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
+  gchar *version_tag_str;
+
+  if (!uuid_is_valid (uuid_str))
+    {
+      g_free (uuid_str);
+      return FALSE;
+    }
+
+  version_tag_str = g_strndup (version_tag.UTF8Characters,
+                               version_tag.UTF8Length);
+
+  g_dbus_proxy_call (obj->proxy,
+                     "InstallRemoteExtension",
+                     g_variant_new ("(ss)",
+                                    uuid_str,
+                                    version_tag_str),
+                     G_DBUS_CALL_FLAGS_NONE,
+                     -1, /* timeout */
+                     NULL, /* cancellable */
+                     NULL, /* callback */
+                     NULL /* user_data */);
+
+  g_free (uuid_str);
+  g_free (version_tag_str);
+
+  return TRUE;
+}
+
 static gboolean
 plugin_uninstall_extension (PluginObject *obj,
                            NPString      uuid,
@@ -797,9 +771,11 @@ plugin_object_invoke (NPObject        *npobj,
  else if (name == install_extension_id)
    {
      if (!NPVARIANT_IS_STRING(args[0])) return FALSE;
+      if (!NPVARIANT_IS_STRING(args[1])) return FALSE;

      return plugin_install_extension (obj,
-                                       NPVARIANT_TO_STRING(args[0]));
+                                       NPVARIANT_TO_STRING(args[0]),
+                                       NPVARIANT_TO_STRING(args[1]));
    }
  else if (name == uninstall_extension_id)
    {
@@ -970,12 +946,3 @@ NPP_GetValue(NPP          instance,

  return NPERR_NO_ERROR;
 }
-
-/* Opera tries to call NPP_SetWindow without checking the
- * NULL pointer beforehand. */
-NPError
-NPP_SetWindow(NPP          instance,
-              NPWindow    *window)
-{
-  return NPERR_NO_ERROR;
-}
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.5.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.4.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])
@@ -63,7 +63,7 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 CLUTTER_MIN_VERSION=1.9.16
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.29.18
-MUTTER_MIN_VERSION=3.5.2
+MUTTER_MIN_VERSION=3.4.1
 FOLKS_MIN_VERSION=0.5.2
 GTK_MIN_VERSION=3.3.9
 GIO_MIN_VERSION=2.31.6
@@ -75,7 +75,6 @@ TELEPATHY_LOGGER_MIN_VERSION=0.2.4
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
 GCR_MIN_VERSION=3.3.90
-GNOME_DESKTOP_REQUIRED_VERSION=3.5.1

 # Collect more than 20 libraries for a prize!
 PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
@@ -96,8 +95,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
                               telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
                               libnm-glib libnm-util gnome-keyring-1
-                               gcr-3 >= $GCR_MIN_VERSION
-                               gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+                               gcr-3 >= $GCR_MIN_VERSION)

 PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)

@@ -123,7 +121,7 @@ PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
 PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 x11)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.5.1)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)

 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
@@ -239,6 +237,31 @@ AC_ARG_ENABLE(jhbuild-wrapper-script,
  AS_HELP_STRING([--enable-jhbuild-wrapper-script],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
 AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes)

+AC_MSG_CHECKING([location of system Certificate Authority list])
+AC_ARG_WITH(ca-certificates,
+            [AC_HELP_STRING([--with-ca-certificates=@<:@path@:>@],
+                            [path to system Certificate Authority list])])
+
+if test "$with_ca_certificates" = "no"; then
+    AC_MSG_RESULT([disabled])
+else
+    if test -z "$with_ca_certificates"; then
+        for f in /etc/pki/tls/certs/ca-bundle.crt \
+                 /etc/ssl/certs/ca-certificates.crt; do
+             if test -f "$f"; then
+                with_ca_certificates="$f"
+             fi
+        done
+        if test -z "$with_ca_certificates"; then
+            AC_MSG_ERROR([could not find. Use --with-ca-certificates=path to set, or --without-ca-certificates to disable])
+        fi
+   fi
+
+   AC_MSG_RESULT($with_ca_certificates)
+   AC_DEFINE_UNQUOTED(SHELL_SYSTEM_CA_FILE, ["$with_ca_certificates"], [The system TLS CA list])
+fi
+AC_SUBST(SHELL_SYSTEM_CA_FILE,["$with_ca_certificates"])
+
 BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])

--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -328,11 +328,6 @@ StScrollBar StButton#vhandle:hover
    background-gradient-end: rgba(255, 255, 255, 0.2);
 }

-.notification-icon-button:insensitive,
-.notification-button:insensitive {
-    color: #9f9f9f;
-}
-
 /* Panel */

 #panel {
@@ -362,7 +357,7 @@ StScrollBar StButton#vhandle:hover
 }

 .panel-corner {
-    -panel-corner-radius: 6px;
+    -panel-corner-radius: 10px;
    -panel-corner-background-color: black;
    -panel-corner-border-width: 2px;
    -panel-corner-border-color: transparent;
@@ -414,7 +409,7 @@ StScrollBar StButton#vhandle:hover
 .panel-button:active,
 .panel-button:overview,
 .panel-button:focus {
-    border-image: url("panel-button-border.svg") 6 10 0 2;
+    border-image: url("panel-button-border.svg") 10 10 0 2;
    background-image: url("panel-button-highlight-wide.svg");
    color: white;
    text-shadow: black 0px 2px 2px;
@@ -1948,12 +1943,10 @@ StScrollBar StButton#vhandle:hover
    padding-bottom: 8px;
 }

-.hidden {
-    color: rgba(0,0,0,0);
-}
-
+/* intentionally left transparent to avoid dialog changing size */
 .prompt-dialog-null-label {
    font-size: 10pt;
+    color: rgba(0,0,0,0);
    padding-bottom: 8px;
 }

@@ -2047,3 +2040,30 @@ StScrollBar StButton#vhandle:hover
    -arrow-rise: 10px;
    -boxpointer-gap: 5px;
 }
+
+/* Candidate Window */
+.candidate-panel {
+    min-width: 100px;
+    padding: .5em;
+    spacing: 0;
+}
+
+.candidate-area {
+    padding-top: 5px;
+}
+
+.candidate-label {
+    cursor: pointer;
+}
+
+.candidate-hlabel-content {
+    padding: 0em .5em 0em 0em;
+}
+
+.candidate-htext-content {
+    padding: 0em;
+}
+
+.candidate-vcontent {
+    padding: 0em .5em 0em 0em;
+}
--- a/data/theme/panel-button-border.svg
+++ b/data/theme/panel-button-border.svg
@@ -9,7 +9,7 @@
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="17"
+   width="21"
   height="10"
   id="svg2"
   version="1.1"
@@ -66,9 +66,9 @@
    <rect
       style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
       id="rect3796"
-       width="7"
+       width="3"
       height="2"
-       x="5"
+       x="9"
       y="8" />
  </g>
 </svg>
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -28,6 +28,7 @@ nobase_dist_js_DATA = 	\
 	misc/config.js		\
 	misc/extensionUtils.js	\
 	misc/fileUtils.js	\
+	misc/format.js		\
 	misc/gnomeSession.js	\
 	misc/history.js		\
 	misc/jsParse.js		\
@@ -66,7 +67,6 @@ nobase_dist_js_DATA = 	\
 	ui/messageTray.js	\
 	ui/modalDialog.js	\
 	ui/networkAgent.js	\
-	ui/sessionMode.js	\
 	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
 	ui/notificationDaemon.js \
@@ -84,6 +84,7 @@ nobase_dist_js_DATA = 	\
 	ui/shellDBus.js		\
 	ui/statusIconDispatcher.js	\
 	ui/status/accessibility.js	\
+	ui/status/candidatePanel.js	\
 	ui/status/keyboard.js	\
 	ui/status/network.js	\
 	ui/status/power.js	\
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@@ -6,11 +6,11 @@ const GObject = imports.gi.GObject;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Pango = imports.gi.Pango;
-const Format = imports.format;

 const _ = Gettext.gettext;

 const Config = imports.misc.config;
+const Format = imports.misc.format;
 const ExtensionUtils = imports.misc.extensionUtils;


@@ -210,7 +210,7 @@ const Application = new Lang.Class({
            try {
                extension = ExtensionUtils.createExtensionObject(uuid, dir, type);
            } catch(e) {
-                logError(e, 'Could not create extensions object');
+                global.logError('' + e);
                return;
            }

@@ -257,7 +257,7 @@ function initEnvironment() {
        },

        logError: function(s) {
-            log('ERROR: ' + s);
+            global.log('ERROR: ' + s);
        },

        userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell'])
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -8,6 +8,8 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
 const GJS_VERSION = '@GJS_VERSION@';
 /* 1 if gnome-bluetooth is available, 0 otherwise */
 const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
+/* The system TLS CA list */
+const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
 /* gettext package */
 const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
 /* locale dir */
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -40,18 +40,13 @@ function getCurrentExtension() {
        throw new Error('Could not find current extension');

    let path = match[1];
-    let file = Gio.File.new_for_path(path);
+    let uuid = GLib.path_get_basename(GLib.path_get_dirname(path));

-    // Walk up the directory tree, looking for an extesion with
-    // the same UUID as a directory name.
-    while (file != null) {
-        let extension = extensions[file.get_basename()];
-        if (extension !== undefined)
-            return extension;
-        file = file.get_parent();
-    }
+    let extension = extensions[uuid];
+    if (extension === undefined)
+        throw new Error('Could not find current extension');

-    throw new Error('Could not find current extension');
+    return extension;
 }

 /**
@@ -125,7 +120,7 @@ function createExtensionObject(uuid, dir, type) {

    // Encourage people to add this
    if (!meta.url) {
-        log('Warning: Missing "url" property in %s/metadata.json'.format(uuid));
+        global.log('Warning: Missing "url" property in metadata.json');
    }

    if (uuid != meta.uuid) {
@@ -162,7 +157,7 @@ function init() {
        if (!userExtensionsDir.query_exists(null))
            userExtensionsDir.make_directory_with_parents(null);
    } catch (e) {
-        logError(e, 'Could not create extensions directory');
+        global.logError('' + e);
    }
 }

@@ -172,7 +167,7 @@ function scanExtensionsInDirectory(callback, dir, type) {
    try {
        fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
    } catch(e) {
-        logError(e, 'Could not enumerate extensions directory');
+        global.logError('' + e);
        return;
    }

--- a/js/misc/format.js
+++ b/js/misc/format.js
@@ -0,0 +1,71 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const ShellJS = imports.gi.ShellJS;
+
+/*
+ * This function is intended to extend the String object and provide
+ * an String.format API for string formatting.
+ * It has to be set up using String.prototype.format = Format.format;
+ * Usage:
+ * "somestring %s %d".format('hello', 5);
+ * It supports %s, %d, %x and %f, for %f it also support precisions like
+ * "%.2f".format(1.526). All specifiers can be prefixed with a minimum
+ * field width, e.g. "%5s".format("foo"). Unless the width is prefixed
+ * with '0', the formatted string will be padded with spaces.
+ */
+
+function format() {
+    let str = this;
+    let i = 0;
+    let args = arguments;
+
+    return str.replace(/%(I+)?([0-9]+)?(?:\.([0-9]+))?(.)/g, function (str, flagsGroup, widthGroup, precisionGroup, genericGroup) {
+
+                    if (precisionGroup != '' && genericGroup != 'f')
+                        throw new Error("Precision can only be specified for 'f'");
+
+                    let hasAlternativeIntFlag = (flagsGroup.indexOf('I') != -1);
+
+                    if (hasAlternativeIntFlag && genericGroup != 'd')
+                        throw new Error("Alternative output digits can only be specfied for 'd'");
+
+                    let fillChar = (widthGroup[0] == '0') ? '0' : ' ';
+                    let width = parseInt(widthGroup, 10) || 0;
+
+                    function fillWidth(s, c, w) {
+                        let fill = '';
+                        for (let i = 0; i < w; i++)
+                            fill += c;
+                        return fill.substr(s.length) + s;
+                    }
+
+                    let s = '';
+                    switch (genericGroup) {
+                        case '%':
+                            return '%';
+                            break;
+                        case 's':
+                            s = args[i++].toString();
+                            break;
+                        case 'd':
+                            let intV = parseInt(args[i++]);
+                            if (hasAlternativeIntFlag)
+                                s = ShellJS.format_int_alternative_output(intV);
+                            else
+                                s = intV.toString();
+                            break;
+                        case 'x':
+                            s = parseInt(args[i++]).toString(16);
+                            break;
+                        case 'f':
+                            if (precisionGroup == '')
+                                s = parseFloat(args[i++]).toString();
+                            else
+                                s = parseFloat(args[i++]).toFixed(parseInt(precisionGroup));
+                            break;
+                        default:
+                            throw new Error('Unsupported conversion character %' + genericGroup);
+                    }
+                    return fillWidth(s, fillChar, width);
+                });
+}
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -83,11 +83,10 @@ function spawnCommandLine(command_line) {
 // this will throw an error.
 function trySpawn(argv)
 {
-    var success, pid;
    try {
-        [success, pid] = GLib.spawn_async(null, argv, null,
-                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                          null, null);
+        GLib.spawn_async(null, argv, null,
+                         GLib.SpawnFlags.SEARCH_PATH,
+                         null, null);
    } catch (err) {
        if (err.code == GLib.SpawnError.G_SPAWN_ERROR_NOENT) {
            err.message = _("Command not found");
@@ -102,10 +101,6 @@ function trySpawn(argv)

        throw err;
    }
-    // Dummy child watch; we don't want to double-fork internally
-    // because then we lose the parent-child relationship, which
-    // can break polkit.  See https://bugzilla.redhat.com//show_bug.cgi?id=819275
-    GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, function () {}, null);
 }

 // trySpawnCommandLine:
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -312,10 +312,11 @@ const AppSearchProvider = new Lang.Class({

    _init: function() {
        this.parent(_("APPLICATIONS"));
+
        this._appSys = Shell.AppSystem.get_default();
    },

-    getResultMetas: function(apps, callback) {
+    getResultMetas: function(apps) {
        let metas = [];
        for (let i = 0; i < apps.length; i++) {
            let app = apps[i];
@@ -326,15 +327,15 @@ const AppSearchProvider = new Lang.Class({
                         }
                       });
        }
-        callback(metas);
+        return metas;
    },

    getInitialResultSet: function(terms) {
-        this.searchSystem.pushResults(this, this._appSys.initial_search(terms));
+        return this._appSys.initial_search(terms);
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        this.searchSystem.pushResults(this, this._appSys.subsearch(previousResults, terms));
+        return this._appSys.subsearch(previousResults, terms);
    },

    activateResult: function(app, params) {
@@ -377,7 +378,7 @@ const SettingsSearchProvider = new Lang.Class({
        this._gnomecc = this._appSys.lookup_app('gnome-control-center.desktop');
    },

-    getResultMetas: function(prefs, callback) {
+    getResultMetas: function(prefs) {
        let metas = [];
        for (let i = 0; i < prefs.length; i++) {
            let pref = prefs[i];
@@ -388,15 +389,15 @@ const SettingsSearchProvider = new Lang.Class({
                         }
                       });
        }
-        callback(metas);
+        return metas;
    },

    getInitialResultSet: function(terms) {
-        this.searchSystem.pushResults(this, this._appSys.search_settings(terms));
+        return this._appSys.search_settings(terms);
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        this.searchSystem.pushResults(this, this._appSys.search_settings(terms));
+        return this._appSys.search_settings(terms);
    },

    activateResult: function(pref, params) {
--- a/js/ui/autorunManager.js
+++ b/js/ui/autorunManager.js
@@ -262,11 +262,12 @@ const AutorunResidentSource = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function() {
-        this.parent(_("Removable Devices"), 'media-removable', St.IconType.FULLCOLOR);
+        this.parent(_("Removable Devices"));

        this._mounts = [];

        this._notification = new AutorunResidentNotification(this);
+        this._setSummaryIcon(this.createNotificationIcon());
    },

    addMount: function(mount, apps) {
@@ -309,6 +310,12 @@ const AutorunResidentSource = new Lang.Class({
            Main.messageTray.add(this);
            this.pushNotification(this._notification);
        }
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon ({ icon_name: 'media-removable',
+                              icon_type: St.IconType.FULLCOLOR,
+                              icon_size: this.ICON_SIZE });
    }
 });

@@ -493,11 +500,11 @@ const AutorunTransientSource = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function(mount, apps) {
+        this.parent(mount.get_name());
+
        this.mount = mount;
        this.apps = apps;

-        this.parent(mount.get_name());
-
        this._notification = new AutorunTransientNotification(this);
        this._setSummaryIcon(this.createNotificationIcon());

--- a/js/ui/contactDisplay.js
+++ b/js/ui/contactDisplay.js
@@ -63,7 +63,7 @@ const Contact = new Lang.Class({
                        this.individual.full_name ||
                        this.individual.nickname  ||
                        email                     ||
-                        C_("contact", "Unknown");
+                        _("Unknown");
        let aliasLabel = new St.Label({ text: aliasText,
                                        style_class: 'contact-details-alias' });
        details.add(aliasLabel, { x_fill: true,
@@ -154,7 +154,7 @@ const ContactSearchProvider = new Lang.Class({
        this._contactSys = Shell.ContactSystem.get_default();
    },

-    getResultMetas: function(ids, callback) {
+    getResultMetas: function(ids) {
        let metas = [];
        for (let i = 0; i < ids.length; i++) {
            let contact = new Contact(ids[i]);
@@ -165,15 +165,15 @@ const ContactSearchProvider = new Lang.Class({
                         }
                       });
        }
-        callback(metas);
+        return metas;
    },

    getInitialResultSet: function(terms) {
-        this.searchSystem.pushResults(this, this._contactSys.initial_search(terms));
+        return this._contactSys.initial_search(terms);
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        this.searchSystem.pushResults(this, this._contactSys.subsearch(previousResults, terms));
+        return this._contactSys.subsearch(previousResults, terms);
    },

    createResultActor: function(resultMeta, terms) {
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -45,7 +45,9 @@ const DateMenuButton = new Lang.Class({
    Name: 'DateMenuButton',
    Extends: PanelMenu.Button,

-    _init: function() {
+    _init: function(params) {
+        params = Params.parse(params, { showEvents: true });
+
        let item;
        let hbox;
        let vbox;
@@ -73,11 +75,11 @@ const DateMenuButton = new Lang.Class({

        // Date
        this._date = new St.Label();
-        this.actor.label_actor = this._clock;
+        this.actor.label_actor = this._date;
        this._date.style_class = 'datemenu-date-label';
        vbox.add(this._date);

-        if (Main.sessionMode.showCalendarEvents) {
+        if (params.showEvents) {
            this._eventSource = new Calendar.DBusEventSource();
            this._eventList = new Calendar.EventsList(this._eventSource);
        } else {
@@ -108,7 +110,7 @@ const DateMenuButton = new Lang.Class({
            item.actor.reparent(vbox);
        }

-        if (Main.sessionMode.showCalendarEvents) {
+        if (params.showEvents) {
            // Add vertical separator

            item = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -342,7 +342,7 @@ const EndSessionDialog = new Lang.Class({
        }
    },

-    _updateDescription: function() {
+    _updateContent: function() {
        if (this.state != ModalDialog.State.OPENING &&
            this.state != ModalDialog.State.OPENED)
            return;
@@ -352,6 +352,17 @@ const EndSessionDialog = new Lang.Class({
        let subject = dialogContent.subject;
        let description;

+        if (this._user.is_loaded && !dialogContent.iconName) {
+            let iconFile = this._user.get_icon_file();
+            if (GLib.file_test(iconFile, GLib.FileTest.EXISTS))
+                this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
+            else
+                this._setIconFromName('avatar-default', dialogContent.iconStyleClass);
+        } else if (dialogContent.iconName) {
+            this._setIconFromName(dialogContent.iconName,
+                                  dialogContent.iconStyleClass);
+        }
+
        if (this._inhibitors.length > 0) {
            this._stopTimer();
            description = dialogContent.inhibitedDescription;
@@ -384,27 +395,6 @@ const EndSessionDialog = new Lang.Class({
        _setLabelText(this._descriptionLabel, description);
    },

-    _updateContent: function() {
-        if (this.state != ModalDialog.State.OPENING &&
-            this.state != ModalDialog.State.OPENED)
-            return;
-
-        let dialogContent = DialogContent[this._type];
-
-        if (this._user.is_loaded && !dialogContent.iconName) {
-            let iconFile = this._user.get_icon_file();
-            if (GLib.file_test(iconFile, GLib.FileTest.EXISTS))
-                this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
-            else
-                this._setIconFromName('avatar-default', dialogContent.iconStyleClass);
-        } else if (dialogContent.iconName) {
-            this._setIconFromName(dialogContent.iconName,
-                                  dialogContent.iconStyleClass);
-        }
-
-        this._updateDescription();
-    },
-
    _updateButtons: function() {
        let dialogContent = DialogContent[this._type];
        let buttons = [{ action: Lang.bind(this, this.cancel),
@@ -451,7 +441,7 @@ const EndSessionDialog = new Lang.Class({
                         { _secondsLeft: 0,
                           time: this._secondsLeft,
                           transition: 'linear',
-                           onUpdate: Lang.bind(this, this._updateDescription),
+                           onUpdate: Lang.bind(this, this._updateContent),
                           onComplete: Lang.bind(this, function() {
                                           let dialogContent = DialogContent[this._type];
                                           let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -90,7 +90,7 @@ function init() {
    }

    // OK, now things are initialized enough that we can import shell JS
-    const Format = imports.format;
+    const Format = imports.misc.format;
    const Tweener = imports.ui.tweener;

    Tweener.init();
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -34,11 +34,24 @@ const REPOSITORY_URL_BASE = 'https://extensions.gnome.org';
 const REPOSITORY_URL_DOWNLOAD = REPOSITORY_URL_BASE + '/download-extension/%s.shell-extension.zip';
 const REPOSITORY_URL_INFO =     REPOSITORY_URL_BASE + '/extension-info/';

-const _httpSession = new Soup.SessionAsync({ ssl_use_system_ca_file: true });
+const _httpSession = new Soup.SessionAsync();

+// The unfortunate state of gjs, gobject-introspection and libsoup
+// means that I have to do a hack to add a feature.
 // See: https://bugzilla.gnome.org/show_bug.cgi?id=655189 for context.
-// _httpSession.add_feature(new Soup.ProxyResolverDefault());
-Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefault());
+
+if (Soup.Session.prototype.add_feature != null)
+    Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefault());
+
+function _getCertFile() {
+    let localCert = GLib.build_filenamev([global.userdatadir, 'extensions.gnome.org.crt']);
+    if (GLib.file_test(localCert, GLib.FileTest.EXISTS))
+        return localCert;
+    else
+        return Config.SHELL_SYSTEM_CA_FILE;
+}
+
+_httpSession.ssl_ca_file = _getCertFile();

 // Arrays of uuids
 var enabledExtensions;
@@ -56,16 +69,18 @@ const disconnect = Lang.bind(_signals, _signals.disconnect);

 const ENABLED_EXTENSIONS_KEY = 'enabled-extensions';

-function installExtensionFromUUID(uuid) {
+function installExtensionFromUUID(uuid, version_tag) {
    let params = { uuid: uuid,
-                   shell_version: Config.PACKAGE_VERSION };
+                   version_tag: version_tag,
+                   shell_version: Config.PACKAGE_VERSION,
+                   api_version: API_VERSION.toString() };

    let message = Soup.form_request_new_from_hash('GET', REPOSITORY_URL_INFO, params);

    _httpSession.queue_message(message,
                               function(session, message) {
                                   let info = JSON.parse(message.response_body.data);
-                                   let dialog = new InstallExtensionDialog(uuid, info);
+                                   let dialog = new InstallExtensionDialog(uuid, version_tag, info.name);
                                   dialog.open(global.get_current_time());
                               });
 }
@@ -100,13 +115,21 @@ function gotExtensionZipFile(session, message, uuid) {
        return;
    }

-    let [file, stream] = Gio.File.new_tmp('XXXXXX.shell-extension.zip');
+    // FIXME: use a GFile mkstemp-type method once one exists
+    let fd, tmpzip;
+    try {
+        [fd, tmpzip] = GLib.file_open_tmp('XXXXXX.shell-extension.zip');
+    } catch (e) {
+        logExtensionError(uuid, 'tempfile: ' + e.toString());
+        return;
+    }
+
+    let stream = new Gio.UnixOutputStream({ fd: fd });
    let dir = ExtensionUtils.userExtensionsDir.get_child(uuid);
-    let contents = message.response_body.flatten().as_bytes();
-    stream.output_stream.write_bytes(contents, null);
+    Shell.write_soup_message_to_stream(stream, message);
    stream.close(null);
    let [success, pid] = GLib.spawn_async(null,
-                                          ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
+                                          ['unzip', '-uod', dir.get_path(), '--', tmpzip],
                                          null,
                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
                                          null);
@@ -214,7 +237,7 @@ function logExtensionError(uuid, message, state) {
        extension.errors = [];

    extension.errors.push(message);
-    log('Extension "%s" had error: %s'.format(uuid, message));
+    global.logError('Extension "%s" had error: %s'.format(uuid, message));
    state = state || ExtensionState.ERROR;
    _signals.emit('extension-state-changed', { uuid: uuid,
                                               error: message,
@@ -226,7 +249,7 @@ function loadExtension(dir, type, enabled) {
    let extension;

    if (ExtensionUtils.extensions[uuid] != undefined) {
-        log('Extension "%s" is already loaded'.format(uuid));
+        global.logError('Extension "%s" is already loaded'.format(uuid));
        return;
    }

@@ -255,6 +278,7 @@ function loadExtension(dir, type, enabled) {
    }

    _signals.emit('extension-state-changed', extension);
+    global.log('Loaded extension ' + uuid);
 }

 function initExtension(uuid) {
@@ -366,11 +390,12 @@ const InstallExtensionDialog = new Lang.Class({
    Name: 'InstallExtensionDialog',
    Extends: ModalDialog.ModalDialog,

-    _init: function(uuid, info) {
+    _init: function(uuid, version_tag, name) {
        this.parent({ styleClass: 'extension-dialog' });

        this._uuid = uuid;
-        this._info = info;
+        this._version_tag = version_tag;
+        this._name = name;

        this.setButtons([{ label: _("Cancel"),
                           action: Lang.bind(this, this._onCancelButtonPressed),
@@ -380,17 +405,13 @@ const InstallExtensionDialog = new Lang.Class({
                           action: Lang.bind(this, this._onInstallButtonPressed)
                         }]);

-        let message = _("Download and install '%s' from extensions.gnome.org?").format(info.name);
+        let message = _("Download and install '%s' from extensions.gnome.org?").format(name);

-        let box = new St.BoxLayout();
-        this.contentLayout.add(box);
+        this._descriptionLabel = new St.Label({ text: message });

-        let gicon = new Gio.FileIcon({ file: Gio.File.new_for_uri(REPOSITORY_URL_BASE + info.icon) })
-        let icon = new St.Icon({ gicon: gicon });
-        box.add(icon);
-
-        let label = new St.Label({ text: message });
-        box.add(label);
+        this.contentLayout.add(this._descriptionLabel,
+                               { y_fill:  true,
+                                 y_align: St.Align.START });
    },

    _onCancelButtonPressed: function(button, event) {
@@ -414,7 +435,9 @@ const InstallExtensionDialog = new Lang.Class({

        _signals.emit('extension-state-changed', state);

-        let params = { shell_version: Config.PACKAGE_VERSION };
+        let params = { version_tag: this._version_tag,
+                       shell_version: Config.PACKAGE_VERSION,
+                       api_version: API_VERSION.toString() };

        let url = REPOSITORY_URL_DOWNLOAD.format(this._uuid);
        let message = Soup.form_request_new_from_hash('GET', url, params);
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -282,10 +282,6 @@ const IconGrid = new Lang.Class({
        return this._computeLayout(rowWidth)[0];
    },

-    getRowLimit: function() {
-        return this._rowLimit;
-    },
-
    _computeLayout: function (forWidth) {
        let nColumns = 0;
        let usedWidth = 0;
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -541,8 +541,16 @@ const KeyboardSource = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function(keyboard) {
+        this.parent(_("Keyboard"));
        this._keyboard = keyboard;
-        this.parent(_("Keyboard"), 'input-keyboard', St.IconType.SYMBOLIC);
+
+        this._setSummaryIcon(this.createNotificationIcon());
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ icon_name: 'input-keyboard',
+                             icon_type: St.IconType.SYMBOLIC,
+                             icon_size: this.ICON_SIZE });
    },

    handleSummaryClick: function() {
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -16,7 +16,6 @@ const Params = imports.misc.params;

 const MOUSE_POLL_FREQUENCY = 50;
 const CROSSHAIRS_CLIP_SIZE = [100, 100];
-const NO_CHANGE = 0.0;

 // Settings
 const APPLICATIONS_SCHEMA       = 'org.gnome.desktop.a11y.applications';
@@ -25,13 +24,6 @@ const SHOW_KEY                  = 'screen-magnifier-enabled';
 const MAGNIFIER_SCHEMA          = 'org.gnome.desktop.a11y.magnifier';
 const SCREEN_POSITION_KEY       = 'screen-position';
 const MAG_FACTOR_KEY            = 'mag-factor';
-const INVERT_LIGHTNESS_KEY      = 'invert-lightness';
-const BRIGHT_RED_KEY            = 'brightness-red';
-const BRIGHT_GREEN_KEY          = 'brightness-green';
-const BRIGHT_BLUE_KEY           = 'brightness-blue';
-const CONTRAST_RED_KEY          = 'contrast-red';
-const CONTRAST_GREEN_KEY        = 'contrast-green';
-const CONTRAST_BLUE_KEY         = 'contrast-blue';
 const LENS_MODE_KEY             = 'lens-mode';
 const CLAMP_MODE_KEY            = 'scroll-at-edges';
 const MOUSE_TRACKING_KEY        = 'mouse-tracking';
@@ -451,21 +443,6 @@ const Magnifier = new Lang.Class({
            aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
            if (aPref)
                zoomRegion.setMouseTrackingMode(aPref);
-
-            aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
-            if (aPref)
-                zoomRegion.setInvertLightness(aPref);
-
-            let bc = {};
-            bc.r = this._settings.get_double(BRIGHT_RED_KEY);
-            bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
-            bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
-            zoomRegion.setBrightness(bc);
-
-            bc.r = this._settings.get_double(CONTRAST_RED_KEY);
-            bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
-            bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
-            zoomRegion.setContrast(bc);
        }

        let showCrosshairs = this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY);
@@ -488,23 +465,6 @@ const Magnifier = new Lang.Class({
        this._settings.connect('changed::' + MOUSE_TRACKING_KEY,
                               Lang.bind(this, this._updateMouseTrackingMode));

-        this._settings.connect('changed::' + INVERT_LIGHTNESS_KEY,
-                               Lang.bind(this, this._updateInvertLightness));
-
-        this._settings.connect('changed::' + BRIGHT_RED_KEY,
-                               Lang.bind(this, this._updateBrightness));
-        this._settings.connect('changed::' + BRIGHT_GREEN_KEY,
-                               Lang.bind(this, this._updateBrightness));
-        this._settings.connect('changed::' + BRIGHT_BLUE_KEY,
-                               Lang.bind(this, this._updateBrightness));
-
-        this._settings.connect('changed::' + CONTRAST_RED_KEY,
-                               Lang.bind(this, this._updateContrast));
-        this._settings.connect('changed::' + CONTRAST_GREEN_KEY,
-                               Lang.bind(this, this._updateContrast));
-        this._settings.connect('changed::' + CONTRAST_BLUE_KEY,
-                               Lang.bind(this, this._updateContrast));
-
        this._settings.connect('changed::' + SHOW_CROSS_HAIRS_KEY,
                               Lang.bind(this, function() {
            this.setCrosshairsVisible(this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY));
@@ -580,38 +540,7 @@ const Magnifier = new Lang.Class({
                this._settings.get_enum(MOUSE_TRACKING_KEY)
            );
        }
-    },
-
-    _updateInvertLightness: function() {
-        // Applies only to the first zoom region.
-        if (this._zoomRegions.length) {
-            this._zoomRegions[0].setInvertLightness(
-                this._settings.get_boolean(INVERT_LIGHTNESS_KEY)
-            );
-        }
-    },
-
-    _updateBrightness: function() {
-        // Applies only to the first zoom region.
-        if (this._zoomRegions.length) {
-            let brightness = {};
-            brightness.r = this._settings.get_double(BRIGHT_RED_KEY);
-            brightness.g = this._settings.get_double(BRIGHT_GREEN_KEY);
-            brightness.b = this._settings.get_double(BRIGHT_BLUE_KEY);
-            this._zoomRegions[0].setBrightness(brightness);
-        }
-    },
-
-    _updateContrast: function() {
-        // Applies only to the first zoom region.
-        if (this._zoomRegions.length) {
-            let contrast = {};
-            contrast.r = this._settings.get_double(CONTRAST_RED_KEY);
-            contrast.g = this._settings.get_double(CONTRAST_GREEN_KEY);
-            contrast.b = this._settings.get_double(CONTRAST_BLUE_KEY);
-            this._zoomRegions[0].setContrast(contrast);
-        }
-    },
+    }
 });
 Signals.addSignalMethods(Magnifier.prototype);

@@ -625,9 +554,6 @@ const ZoomRegion = new Lang.Class({
        this._clampScrollingAtEdges = false;
        this._lensMode = false;
        this._screenPosition = GDesktopEnums.MagnifierScreenPosition.FULL_SCREEN;
-        this._invertLightness = false;
-        this._brightness = { r: NO_CHANGE, g: NO_CHANGE, b: NO_CHANGE };
-        this._contrast = { r: NO_CHANGE, g: NO_CHANGE, b: NO_CHANGE };

        this._magView = null;
        this._background = null;
@@ -953,86 +879,6 @@ const ZoomRegion = new Lang.Class({
        }
    },

-    /**
-     * setInvertLightness:
-     * Set whether to invert the lightness of the magnified view.
-     * @flag    Boolean to either invert brightness (true), or not (false).
-     */
-    setInvertLightness: function(flag) {
-        this._invertLightness = flag;
-        if (this._magShaderEffects)
-            this._magShaderEffects.setInvertLightness(this._invertLightness);
-    },
-
-    /**
-     * getInvertLightness:
-     * Retrieve whether the lightness is inverted.
-     * @return    Boolean indicating inversion (true), or not (false).
-     */
-    getInvertLightness: function() {
-        return this._invertLightness;
-    },
-
-    /**
-     * setBrightness:
-     * Alter the brightness of the magnified view.
-     * @brightness  Object containing the contrast for the red, green,
-     *              and blue channels.  Values of 0.0 represent "standard"
-     *              brightness (no change), whereas values less or greater than
-     *              0.0 indicate decreased or incresaed brightness, respectively.
-     */
-    setBrightness: function(brightness) {
-        this._brightness.r = brightness.r;
-        this._brightness.g = brightness.g;
-        this._brightness.b = brightness.b;
-        if (this._magShaderEffects)
-            this._magShaderEffects.setBrightness(this._brightness);
-    },
-
-    /**
-     * getBrightness:
-     * Retrive the current brightness of the Zoom Region.
-     * @return  Object containing the brightness change for the red, green,
-     *          and blue channels.
-     */
-    getBrightness: function() {
-        let brightness = {};
-        brightness.r = this._brightness.r;
-        brightness.g = this._brightness.g;
-        brightness.b = this._brightness.b;
-        return brightness;
-    },
-
-    /**
-     * setContrast:
-     * Alter the contrast of the magnified view.
-     * @contrast    Object containing the contrast for the red, green,
-     *              and blue channels.  Values of 0.0 represent "standard"
-     *              contrast (no change), whereas values less or greater than
-     *              0.0 indicate decreased or incresaed contrast, respectively.
-     */
-    setContrast: function(contrast) {
-        this._contrast.r = contrast.r;
-        this._contrast.g = contrast.g;
-        this._contrast.b = contrast.b;
-        if (this._magShaderEffects)
-            this._magShaderEffects.setContrast(this._contrast);
-    },
-
-    /**
-     * getContrast:
-     * Retreive the contrast of the magnified view.
-     * @return  Object containing the contrast for the red, green,
-     *          and blue channels.
-     */
-    getContrast: function() {
-        let contrast = {};
-        contrast.r = this._contrast.r;
-        contrast.g = this._contrast.g;
-        contrast.b = this._contrast.b;
-        return contrast;
-    },
-
    //// Private methods ////

    _createActors: function() {
@@ -1071,12 +917,6 @@ const ZoomRegion = new Lang.Class({
            this._crossHairsActor = this._crossHairs.addToZoomRegion(this, this._mouseActor);
        else
            this._crossHairsActor = null;
-
-        // Contrast and brightness effects.
-        this._magShaderEffects = new MagShaderEffects(this._uiGroupClone);
-        this._magShaderEffects.setInvertLightness(this._invertLightness);
-        this._magShaderEffects.setBrightness(this._brightness);
-        this._magShaderEffects.setContrast(this._contrast);
    },

    _destroyActors: function() {
@@ -1085,8 +925,6 @@ const ZoomRegion = new Lang.Class({
        if (this._crossHairs)
            this._crossHairs.removeFromParent(this._crossHairsActor);

-        this._magShaderEffects.destroyEffects();
-        this._magShaderEffects = null;
        this._magView.destroy();
        this._magView = null;
        this._background = null;
@@ -1595,133 +1433,3 @@ const Crosshairs = new Lang.Class({
        this._vertBottomHair.set_position((groupWidth - thickness) / 2, bottom);
    }
 });
-
-const MagShaderEffects = new Lang.Class({
-    Name: 'MagShaderEffects',
-
-    _init: function(uiGroupClone) {
-        this._inverse = new Shell.InvertLightnessEffect();
-        this._brightnessContrast = new Clutter.BrightnessContrastEffect();
-        this._inverse.set_enabled(false);
-        this._brightnessContrast.set_enabled(false);
-
-        this._magView = uiGroupClone;
-        this._magView.add_effect(this._inverse);
-        this._magView.add_effect(this._brightnessContrast);
-    },
-
-    /**
-     * destroyEffects:
-     * Remove contrast and brightness effects from the magnified view, and
-     * lose the reference to the actor they were applied to.  Don't use this
-     * object after calling this.
-     */
-    destroyEffects: function() {
-        this._magView.clear_effects();
-        this._brightnessContrast = null;
-        this._inverse = null;
-        this._magView = null;
-    },
-
-    /**
-     * setInvertLightness:
-     * Enable/disable invert lightness effect.
-     * @invertFlag:     Enabled flag.
-     */
-    setInvertLightness: function(invertFlag) {
-        this._inverse.set_enabled(invertFlag);
-    },
-
-    /**
-     * getInvertLightness:
-     * Report whether the inversion effect is enabled.
-     * @return:     Boolean.
-     */
-    getInvertLightness: function() {
-        return this._inverse.get_enabled();
-    },
-
-    /**
-     * setBrightness:
-     * Set the brightness of the magnified view.
-     * @brightness: Object containing the brightness for the red, green,
-     *              and blue channels.  Values of 0.0 represent "standard"
-     *              brightness (no change), whereas values less or greater than
-     *              0.0 indicate decreased or incresaed brightness,
-     *              respectively.
-     */
-    setBrightness: function(brightness) {
-        let bRed = brightness.r;
-        let bGreen = brightness.g;
-        let bBlue = brightness.b;
-        this._brightnessContrast.set_brightness_full(bRed, bGreen, bBlue);
-
-        // Enable the effect if the brightness OR contrast change are such that
-        // it modifies the brightness and/or contrast.
-        let [cRed, cGreen, cBlue] = this._brightnessContrast.get_contrast();
-        this._brightnessContrast.set_enabled(
-            (bRed != NO_CHANGE || bGreen != NO_CHANGE || bBlue != NO_CHANGE ||
-             cRed != NO_CHANGE || cGreen != NO_CHANGE || cBlue != NO_CHANGE)
-        );
-    },
-
-    /**
-     * getBrightness:
-     * Retrieve current brightness of the magnified view.
-     * @return: Object containing the brightness for the red, green,
-     *          and blue channels.  Values of 0.0 represent "standard" 
-     *          brightness (no change), whereas values less or greater than
-     *          0.0 indicate decreased or incresaed brightness, respectively.
-     */
-    getBrightness: function() {
-        let result = {};
-        let [bRed, bGreen, bBlue] = this._brightnessContrast.get_brightness();
-        result.r = bRed;
-        result.g = bGreen;
-        result.b = bBlue;
-
-        return result;
-    },
-
-    /**
-     * Set the contrast of the magnified view.
-     * @contrast:   Object containing the contrast for the red, green,
-     *              and blue channels.  Values of 0.0 represent "standard"
-     *              contrast (no change), whereas values less or greater than
-     *              0.0 indicate decreased or incresaed contrast, respectively.
-     */
-    setContrast: function(contrast) {
-        let cRed = contrast.r;
-        let cGreen = contrast.g;
-        let cBlue = contrast.b;
-
-        this._brightnessContrast.set_contrast_full(cRed, cGreen, cBlue);
-
-        // Enable the effect if the contrast OR brightness change are such that
-        // it modifies the brightness and/or contrast.
-        // should be able to use Clutter.color_equal(), but that complains of
-        // a null first argument.
-        let [bRed, bGreen, bBlue] = this._brightnessContrast.get_brightness();
-        this._brightnessContrast.set_enabled(
-             cRed != NO_CHANGE || cGreen != NO_CHANGE || cBlue != NO_CHANGE ||
-             bRed != NO_CHANGE || bGreen != NO_CHANGE || bBlue != NO_CHANGE
-        );
-    },
-
-    /**
-     * Retrieve current contrast of the magnified view.
-     * @return: Object containing the contrast for the red, green,
-     *          and blue channels.  Values of 0.0 represent "standard"
-     *          contrast (no change), whereas values less or greater than
-     *          0.0 indicate decreased or incresaed contrast, respectively.
-     */
-    getContrast: function() {
-        let resutl = {};
-        let [cRed, cGreen, cBlue] = this._brightnessContrast.get_contrast();
-        result.r = cRed;
-        result.g = cGreen;
-        result.b = cBlue;
-
-        return result;
-    }
-});
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -30,7 +30,6 @@ const NetworkAgent = imports.ui.networkAgent;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
 const Scripting = imports.ui.scripting;
-const SessionMode = imports.ui.sessionMode;
 const ShellDBus = imports.ui.shellDBus;
 const TelepathyClient = imports.ui.telepathyClient;
 const WindowManager = imports.ui.windowManager;
@@ -47,6 +46,7 @@ let automountManager = null;
 let autorunManager = null;
 let panel = null;
 let hotCorners = [];
+let placesManager = null;
 let overview = null;
 let runDialog = null;
 let lookingGlass = null;
@@ -57,7 +57,6 @@ let windowAttentionHandler = null;
 let telepathyClient = null;
 let ctrlAltTabManager = null;
 let recorder = null;
-let sessionMode = null;
 let shellDBusService = null;
 let modalCount = 0;
 let modalActorFocusStack = [];
@@ -71,24 +70,24 @@ let networkAgent = null;
 let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
+let _gdmCssStylesheet = null;
 let _overridesSettings = null;

 let background = null;

-function createUserSession() {
+function _createUserSession() {
    // Load the calendar server. Note that we are careful about
    // not loading any events until the user presses the clock
    global.launch_calendar_server();

+    placesManager = new PlaceDisplay.PlacesManager();
    telepathyClient = new TelepathyClient.Client();
    automountManager = new AutomountManager.AutomountManager();
    autorunManager = new AutorunManager.AutorunManager();
    networkAgent = new NetworkAgent.NetworkAgent();
-
-    _initRecorder();
 }

-function createGDMSession() {
+function _createGDMSession() {
    // We do this this here instead of at the top to prevent GDM
    // related code from getting loaded in normal user sessions
    const LoginDialog = imports.gdm.loginDialog;
@@ -99,13 +98,8 @@ function createGDMSession() {
                        });
 }

-function createInitialSetupSession() {
-    networkAgent = new NetworkAgent.NetworkAgent();
-}
-
 function _initRecorder() {
    let recorderSettings = new Gio.Settings({ schema: 'org.gnome.shell.recorder' });
-    let desktopLockdownSettings = new Gio.Settings({ schema: 'org.gnome.desktop.lockdown' });
    let bindingSettings = new Gio.Settings({ schema: 'org.gnome.shell.keybindings' });

    global.display.add_keybinding('toggle-recording',
@@ -118,7 +112,7 @@ function _initRecorder() {
        if (recorder.is_recording()) {
            recorder.close();
            Meta.enable_unredirect_for_screen(global.screen);
-        } else if (!desktopLockdownSettings.get_boolean('disable-save-to-disk')) {
+        } else {
            // read the parameters from GSettings always in case they have changed
            recorder.set_framerate(recorderSettings.get_int('framerate'));
            /* Translators: this is a filename used for screencast recording */
@@ -137,6 +131,26 @@ function _initRecorder() {
    });
 }

+function _initUserSession() {
+    _initRecorder();
+
+    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT, false, -1, 1);
+
+    ExtensionSystem.init();
+    ExtensionSystem.loadExtensions();
+
+    Meta.keybindings_set_custom_handler('panel-run-dialog', function() {
+       getRunDialog().open();
+    });
+
+    Meta.keybindings_set_custom_handler('panel-main-menu', function () {
+        overview.toggle();
+    });
+
+    global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));
+
+}
+
 function start() {
    // These are here so we don't break compatibility.
    global.logError = window.log;
@@ -147,7 +161,6 @@ function start() {

    Gio.DesktopAppInfo.set_desktop_env('GNOME');

-    sessionMode = new SessionMode.SessionMode();
    shellDBusService = new ShellDBus.GnomeShell();

    // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
@@ -170,6 +183,7 @@ function start() {
    global.stage.no_clear_hint = true;

    _defaultCssStylesheet = global.datadir + '/theme/gnome-shell.css';
+    _gdmCssStylesheet = global.datadir + '/theme/gdm.css';
    loadTheme();

    // Set up stage hierarchy to group all UI actors under one container.
@@ -197,7 +211,8 @@ function start() {
    layoutManager = new Layout.LayoutManager();
    xdndHandler = new XdndHandler.XdndHandler();
    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
-    overview = new Overview.Overview();
+    // This overview object is just a stub for non-user sessions
+    overview = new Overview.Overview({ isDummy: global.session_type != Shell.SessionType.USER });
    magnifier = new Magnifier.Magnifier();
    statusIconDispatcher = new StatusIconDispatcher.StatusIconDispatcher();
    panel = new Panel.Panel();
@@ -207,7 +222,10 @@ function start() {
    notificationDaemon = new NotificationDaemon.NotificationDaemon();
    windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();

-    sessionMode.createSession();
+    if (global.session_type == Shell.SessionType.USER)
+        _createUserSession();
+    else if (global.session_type == Shell.SessionType.GDM)
+        _createGDMSession();

    panel.startStatusArea();

@@ -215,30 +233,8 @@ function start() {
    keyboard.init();
    overview.init();

-    if (sessionMode.hasWorkspaces)
-        global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
-                                                false, -1, 1);
-
-    if (sessionMode.allowExtensions) {
-        ExtensionSystem.init();
-        ExtensionSystem.loadExtensions();
-    }
-
-    if (sessionMode.hasRunDialog) {
-        Meta.keybindings_set_custom_handler('panel-run-dialog', function() {
-           getRunDialog().open();
-        });
-    }
-
-    if (sessionMode.hasOverview) {
-        Meta.keybindings_set_custom_handler('panel-main-menu', function () {
-            overview.toggle();
-        });
-
-        global.display.connect('overlay-key',
-                               Lang.bind(overview, overview.toggle));
-    }
-
+    if (global.session_type == Shell.SessionType.USER)
+        _initUserSession();
    statusIconDispatcher.start(messageTray.actor);

    // Provide the bus object for gnome-session to
@@ -497,8 +493,8 @@ function loadTheme() {

    let theme = new St.Theme ({ application_stylesheet: cssStylesheet });

-    if (sessionMode.extraStylesheet)
-        theme.load_stylesheet(sessionMode.extraStylesheet);
+    if (global.session_type == Shell.SessionType.GDM)
+        theme.load_stylesheet(_gdmCssStylesheet);

    if (previousTheme) {
        let customStylesheets = previousTheme.get_custom_stylesheets();
@@ -562,11 +558,6 @@ function _globalKeyPressHandler(actor, event) {
    if (event.type() != Clutter.EventType.KEY_PRESS)
        return false;

-    if (!sessionMode.allowKeybindingsWhenModal) {
-        if (modalCount > (overview.visible ? 1 : 0))
-            return false;
-    }
-
    let symbol = event.get_key_symbol();
    let keyCode = event.get_key_code();
    let ignoredModifiers = global.display.get_ignored_modifier_mask();
@@ -575,6 +566,11 @@ function _globalKeyPressHandler(actor, event) {
    // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
    let action = global.display.get_keybinding_action(keyCode, modifierState);

+    // Other bindings are only available to the user session when the overview is up and
+    // no modal dialog is present.
+    if (global.session_type == Shell.SessionType.USER && (!overview.visible || modalCount > 1))
+        return false;
+
    // This isn't a Meta.KeyBindingAction yet
    if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
        overview.hide();
@@ -587,39 +583,28 @@ function _globalKeyPressHandler(actor, event) {
        return true;
    }

+    // None of the other bindings are relevant outside of the user's session
+    if (global.session_type != Shell.SessionType.USER)
+        return false;
+
    switch (action) {
        // left/right would effectively act as synonyms for up/down if we enabled them;
        // but that could be considered confusing; we also disable them in the main view.
        //
        // case Meta.KeyBindingAction.WORKSPACE_LEFT:
-        //  if (!sessionMode.hasWorkspaces)
-        //      return false;
-        //
        //     wm.actionMoveWorkspaceLeft();
        //     return true;
        // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
-        //  if (!sessionMode.hasWorkspaces)
-        //      return false;
-        //
        //     wm.actionMoveWorkspaceRight();
        //     return true;
        case Meta.KeyBindingAction.WORKSPACE_UP:
-            if (!sessionMode.hasWorkspaces)
-                return false;
-
            wm.actionMoveWorkspaceUp();
            return true;
        case Meta.KeyBindingAction.WORKSPACE_DOWN:
-            if (!sessionMode.hasWorkspaces)
-                return false;
-
            wm.actionMoveWorkspaceDown();
            return true;
        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
        case Meta.KeyBindingAction.COMMAND_2:
-            if (!sessionMode.hasRunDialog)
-                return false;
-
            getRunDialog().open();
            return true;
        case Meta.KeyBindingAction.PANEL_MAIN_MENU:
@@ -892,8 +877,7 @@ function initializeDeferredWork(actor, callback, props) {
 function queueDeferredWork(workId) {
    let data = _deferredWorkData[workId];
    if (!data) {
-        let message = 'Invalid work id %d'.format(workId);
-        logError(new Error(message), message);
+        global.logError('invalid work id ', workId);
        return;
    }
    if (_deferredWorkQueue.indexOf(workId) < 0)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -746,7 +746,6 @@ const Notification = new Lang.Class({
        }

        let button = new St.Button({ can_focus: true });
-        button._actionId = id;

        if (this._useActionIcons && Gtk.IconTheme.get_default().has_icon(id)) {
            button.add_style_class_name('notification-icon-button');
@@ -766,31 +765,6 @@ const Notification = new Lang.Class({
        this.updated();
    },

-    // setButtonSensitive:
-    // @id: the action ID
-    // @sensitive: whether the button should be sensitive
-    //
-    // If the notification contains a button with action ID @id,
-    // its sensitivity will be set to @sensitive. Insensitive
-    // buttons cannot be clicked.
-    setButtonSensitive: function(id, sensitive) {
-        if (!this._buttonBox)
-            return;
-
-        let button = this._buttonBox.get_children().filter(function(b) {
-            return b._actionId == id;
-        })[0];
-
-        if (!button || button.reactive == sensitive)
-            return;
-
-        button.reactive = sensitive;
-        if (sensitive)
-            button.remove_style_pseudo_class('insensitive');
-        else
-            button.add_style_pseudo_class('insensitive');
-    },
-
    setUrgency: function(urgency) {
        this.urgency = urgency;
    },
@@ -986,10 +960,8 @@ const Source = new Lang.Class({

    ICON_SIZE: 24,

-    _init: function(title, iconName, iconType) {
+    _init: function(title) {
        this.title = title;
-        this.iconName = iconName;
-        this.iconType = iconType;

        this.actor = new Shell.GenericContainer();
        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
@@ -1019,8 +991,6 @@ const Source = new Lang.Class({
        this.isMuted = false;

        this.notifications = [];
-
-        this._setSummaryIcon(this.createNotificationIcon());
    },

    _getPreferredWidth: function (actor, forHeight, alloc) {
@@ -1091,12 +1061,10 @@ const Source = new Lang.Class({
    },

    // Called to create a new icon actor (of size this.ICON_SIZE).
-    // Provides a sane default implementation, override if you need
-    // something more fancy.
+    // Must be overridden by the subclass if you do not pass icons
+    // explicitly to the Notification() constructor.
    createNotificationIcon: function() {
-        return new St.Icon({ icon_name: this.iconName,
-                             icon_type: this.iconType,
-                             icon_size: this.ICON_SIZE });
+        throw new Error('no implementation of createNotificationIcon in ' + this);
    },

    // Unlike createNotificationIcon, this always returns the same actor;
@@ -1147,14 +1115,16 @@ const Source = new Lang.Class({
    },

    //// Protected methods ////
+
+    // The subclass must call this at least once to set the summary icon.
    _setSummaryIcon: function(icon) {
        if (this._iconBin.child)
            this._iconBin.child.destroy();
        this._iconBin.child = icon;
    },

+    // Default implementation is to do nothing, but subclasses can override
    open: function(notification) {
-        this.emit('opened', notification);
    },

    destroyNonResidentNotifications: function() {
@@ -2519,7 +2489,15 @@ const SystemNotificationSource = new Lang.Class({
    Extends: Source,

    _init: function() {
-        this.parent(_("System Information"), 'dialog-information', St.IconType.SYMBOLIC);
+        this.parent(_("System Information"));
+
+        this._setSummaryIcon(this.createNotificationIcon());
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ icon_name: 'dialog-information',
+                             icon_type: St.IconType.SYMBOLIC,
+                             icon_size: this.ICON_SIZE });
    },

    open: function() {
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -221,19 +221,12 @@ const NotificationDaemon = new Lang.Class({
        let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params;
        let id;

-        for (let hint in hints) {
-            // unpack the variants
-            hints[hint] = hints[hint].deep_unpack();
-        }
-
-        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
-
        // Filter out chat, presence, calls and invitation notifications from
        // Empathy, since we handle that information from telepathyClient.js
        if (appName == 'Empathy' && (hints['category'] == 'im.received' ||
              hints['category'] == 'x-empathy.im.room-invitation' ||
              hints['category'] == 'x-empathy.call.incoming' ||
-              hints['category'] == 'x-empathy.transfer.incoming' ||
+              hints['category'] == 'x-empathy.call.incoming"' ||
              hints['category'] == 'x-empathy.im.subscription-request' ||
              hints['category'] == 'presence.online' ||
              hints['category'] == 'presence.offline')) {
@@ -256,6 +249,13 @@ const NotificationDaemon = new Lang.Class({
            }
        }

+        for (let hint in hints) {
+            // unpack the variants
+            hints[hint] = hints[hint].deep_unpack();
+        }
+
+        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
+
        // Be compatible with the various hints for image data and image path
        // 'image-data' and 'image-path' are the latest name of these hints, introduced in 1.2

@@ -483,7 +483,7 @@ const NotificationDaemon = new Lang.Class({
    },

    _onTrayIconAdded: function(o, icon) {
-        let source = this._getSource(icon.title || icon.wm_class || C_("program", "Unknown"), icon.pid, null, null, icon);
+        let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null, icon);
    },

    _onTrayIconRemoved: function(o, icon) {
@@ -638,10 +638,5 @@ const Source = new Lang.Class({
        }

        this.parent();
-    },
-
-    createNotificationIcon: function() {
-        // We set the summary icon ourselves.
-        return null;
    }
 });
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -99,8 +99,10 @@ const ShellInfo = new Lang.Class({
 const Overview = new Lang.Class({
    Name: 'Overview',

-    _init : function() {
-        this.isDummy = !Main.sessionMode.hasOverview;
+    _init : function(params) {
+        params = Params.parse(params, { isDummy: false });
+
+        this.isDummy = params.isDummy;

        // We only have an overview in user sessions, so
        // create a dummy overview in other cases
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -14,6 +14,7 @@ const St = imports.gi.St;
 const Signals = imports.signals;
 const Atk = imports.gi.Atk;

+const Config = imports.misc.config;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const DND = imports.ui.dnd;
 const Layout = imports.ui.layout;
@@ -31,6 +32,33 @@ const BUTTON_DND_ACTIVATION_TIMEOUT = 250;
 const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const SPINNER_ANIMATION_TIME = 0.2;

+const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'network', 'battery', 'userMenu'];
+const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = {
+    'a11y': imports.ui.status.accessibility.ATIndicator,
+    'volume': imports.ui.status.volume.Indicator,
+    'battery': imports.ui.status.power.Indicator,
+    'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
+    'userMenu': imports.ui.userMenu.UserMenuButton
+};
+
+if (Config.HAVE_BLUETOOTH)
+    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
+
+try {
+    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
+} catch(e) {
+    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+}
+
+const GDM_STATUS_AREA_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'battery', 'powerMenu'];
+const GDM_STATUS_AREA_SHELL_IMPLEMENTATION = {
+    'a11y': imports.ui.status.accessibility.ATIndicator,
+    'volume': imports.ui.status.volume.Indicator,
+    'battery': imports.ui.status.power.Indicator,
+    'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
+    'powerMenu': imports.gdm.powerMenu.PowerMenuButton
+};
+
 // To make sure the panel corners blend nicely with the panel,
 // we draw background and borders the same way, e.g. drawing
 // them as filled shapes from the outside inwards instead of
@@ -934,7 +962,7 @@ const Panel = new Lang.Class({
        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));

        /* Button on the left side of the panel. */
-        if (Main.sessionMode.hasOverview) {
+        if (global.session_type == Shell.SessionType.USER) {
            this._activitiesButton = new ActivitiesButton();
            this._activities = this._activitiesButton.actor;
            this._leftBox.add(this._activities);
@@ -942,19 +970,28 @@ const Panel = new Lang.Class({
            // The activities button has a pretend menu, so as to integrate
            // more cleanly with the rest of the panel
            this._menus.addMenu(this._activitiesButton.menu);
-        }

-        if (Main.sessionMode.hasAppMenu) {
            this._appMenu = new AppMenuButton(this._menus);
            this._leftBox.add(this._appMenu.actor);
        }

        /* center */
-        this._dateMenu = new DateMenu.DateMenuButton();
+        if (global.session_type == Shell.SessionType.USER)
+            this._dateMenu = new DateMenu.DateMenuButton({ showEvents: true });
+        else
+            this._dateMenu = new DateMenu.DateMenuButton({ showEvents: false });
        this._centerBox.add(this._dateMenu.actor, { y_fill: true });
        this._menus.addMenu(this._dateMenu.menu);

        /* right */
+        if (global.session_type == Shell.SessionType.GDM) {
+            this._status_area_order = GDM_STATUS_AREA_ORDER;
+            this._status_area_shell_implementation = GDM_STATUS_AREA_SHELL_IMPLEMENTATION;
+        } else {
+            this._status_area_order = STANDARD_STATUS_AREA_ORDER;
+            this._status_area_shell_implementation = STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION;
+        }
+
        Main.statusIconDispatcher.connect('status-icon-added', Lang.bind(this, this._onTrayIconAdded));
        Main.statusIconDispatcher.connect('status-icon-removed', Lang.bind(this, this._onTrayIconRemoved));

@@ -1078,17 +1115,17 @@ const Panel = new Lang.Class({

    openAppMenu: function() {
        let menu = this._appMenu.menu;
-        if (!this._appMenu.actor.reactive || menu.isOpen)
-            return;
+        if (Main.overview.visible || menu.isOpen)
+          return;

        menu.open();
        menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
    },

    startStatusArea: function() {
-        for (let i = 0; i < Main.sessionMode.statusArea.order.length; i++) {
-            let role = Main.sessionMode.statusArea.order[i];
-            let constructor = Main.sessionMode.statusArea.implementation[role];
+        for (let i = 0; i < this._status_area_order.length; i++) {
+            let role = this._status_area_order[i];
+            let constructor = this._status_area_shell_implementation[role];
            if (!constructor) {
                // This icon is not implemented (this is a bug)
                continue;
@@ -1138,21 +1175,18 @@ const Panel = new Lang.Class({
    },

    _onTrayIconAdded: function(o, icon, role) {
-        if (Main.sessionMode.statusArea.implementation[role]) {
+        if (this._status_area_shell_implementation[role]) {
            // This icon is legacy, and replaced by a Shell version
            // Hide it
            return;
        }

-        if (Main.sessionMode.statusArea.order.indexOf(role) == -1)
-            return;
-
        icon.height = PANEL_ICON_SIZE;
        let buttonBox = new PanelMenu.ButtonBox();
        let box = buttonBox.actor;
        box.add_actor(icon);

-        this._insertStatusItem(box, Main.sessionMode.statusArea.order.indexOf(role));
+        this._insertStatusItem(box, this._status_area_order.indexOf(role));
    },

    _onTrayIconRemoved: function(o, icon) {
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@@ -189,7 +189,7 @@ const PlacesManager = new Lang.Class({
        this._volumeMonitor.connect('drive-changed', Lang.bind(this, this._updateDevices));
        this._updateDevices();

-        this._bookmarksPath = GLib.build_filenamev([GLib.get_user_config_dir(), 'gtk-3.0', 'bookmarks']);
+        this._bookmarksPath = GLib.build_filenamev([GLib.get_home_dir(), '.gtk-bookmarks']);
        this._bookmarksFile = Gio.file_new_for_path(this._bookmarksPath);
        this._monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
        this._bookmarkTimeoutId = 0;
@@ -365,13 +365,12 @@ const PlaceSearchProvider = new Lang.Class({

    _init: function() {
        this.parent(_("PLACES & DEVICES"));
-        this.placesManager = new PlacesManager();
    },

-    getResultMetas: function(resultIds, callback) {
+    getResultMetas: function(resultIds) {
        let metas = [];
        for (let i = 0; i < resultIds.length; i++) {
-            let placeInfo = this.placesManager.lookupPlaceById(resultIds[i]);
+            let placeInfo = Main.placesManager.lookupPlaceById(resultIds[i]);
            if (!placeInfo)
                metas.push(null);
            else
@@ -382,22 +381,24 @@ const PlaceSearchProvider = new Lang.Class({
                             }
                           });
        }
-        callback(metas);
+        return metas;
    },

    activateResult: function(id, params) {
-        let placeInfo = this.placesManager.lookupPlaceById(id);
+        let placeInfo = Main.placesManager.lookupPlaceById(id);
        placeInfo.launch(params);
    },

    _compareResultMeta: function (idA, idB) {
-        let infoA = this.placesManager.lookupPlaceById(idA);
-        let infoB = this.placesManager.lookupPlaceById(idB);
+        let infoA = Main.placesManager.lookupPlaceById(idA);
+        let infoB = Main.placesManager.lookupPlaceById(idB);
        return infoA.name.localeCompare(infoB.name);
    },

    _searchPlaces: function(places, terms) {
+        let multiplePrefixResults = [];
        let prefixResults = [];
+        let multipleSubstringResults = [];
        let substringResults = [];

        terms = terms.map(String.toLowerCase);
@@ -405,26 +406,29 @@ const PlaceSearchProvider = new Lang.Class({
        for (let i = 0; i < places.length; i++) {
            let place = places[i];
            let mtype = place.matchTerms(terms);
-            if (mtype == Search.MatchType.PREFIX)
+            if (mtype == Search.MatchType.MULTIPLE_PREFIX)
+                multiplePrefixResults.push(place.id);
+            else if (mtype == Search.MatchType.PREFIX)
                prefixResults.push(place.id);
+            else if (mtype == Search.MatchType.MULTIPLE_SUBSTRING)
+                multipleSubstringResults.push(place.id);
            else if (mtype == Search.MatchType.SUBSTRING)
                substringResults.push(place.id);
        }
-        prefixResults.sort(Lang.bind(this, this._compareResultMeta));
-        substringResults.sort(Lang.bind(this, this._compareResultMeta));
-
-        this.searchSystem.pushResults(this, prefixResults.concat(substringResults));
+        multiplePrefixResults.sort(this._compareResultMeta);
+        prefixResults.sort(this._compareResultMeta);
+        multipleSubstringResults.sort(this._compareResultMeta);
+        substringResults.sort(this._compareResultMeta);
+        return multiplePrefixResults.concat(prefixResults.concat(multipleSubstringResults.concat(substringResults)));
    },

    getInitialResultSet: function(terms) {
-        let places = this.placesManager.getAllPlaces();
-        this._searchPlaces(places, terms);
+        let places = Main.placesManager.getAllPlaces();
+        return this._searchPlaces(places, terms);
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        let places = previousResults.map(Lang.bind(this, function(id) {
-            return this.placesManager.lookupPlaceById(id);
-        }));
-        this._searchPlaces(places, terms);
+        let places = previousResults.map(function (id) { return Main.placesManager.lookupPlaceById(id); });
+        return this._searchPlaces(places, terms);
    }
 });
--- a/js/ui/polkitAuthenticationAgent.js
+++ b/js/ui/polkitAuthenticationAgent.js
@@ -167,7 +167,6 @@ const AuthenticationDialog = new Lang.Class({
         */
        this._nullMessageLabel = new St.Label({ style_class: 'prompt-dialog-null-label',
                                                text: 'abc'});
-        this._nullMessageLabel.add_style_class_name('hidden');
        this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
        this._nullMessageLabel.clutter_text.line_wrap = true;
        messageBox.add(this._nullMessageLabel);
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -888,7 +888,8 @@ const PopupMenuBase = new Lang.Class({
    },

    addSettingsAction: function(title, desktopFile) {
-        if (!Main.sessionMode.allowSettings)
+        // Don't allow user settings to get edited unless we're in a user session
+        if (global.session_type != Shell.SessionType.USER)
            return null;

        let menuItem = this.addAction(title, function() {
@@ -1920,7 +1921,7 @@ const RemoteMenu = new Lang.Class({
        while (k0 < currentItems.length && currentItems[k0]._ignored)
            k0++;
        // find the right menu item matching the model item
-        for (j0 = 0; k0 < currentItems.length && j0 < position; j0++, k0++) {
+        for (j0 = 0; j0 < position; j0++, k0++) {
            if (currentItems[k0]._ignored)
                k0++;
        }
@@ -1930,7 +1931,7 @@ const RemoteMenu = new Lang.Class({
            for (k = k0; k < currentItems.length; k++)
                currentItems[k].destroy();
        } else {
-            for (j = j0, k = k0; k < currentItems.length && j < j0 + removed; j++, k++) {
+            for (j = j0, k = k0; j < j0 + removed; j++, k++) {
                currentItems[k].destroy();

                if (currentItems[k]._ignored)
@@ -1961,9 +1962,8 @@ const RemoteMenu = new Lang.Class({
                    k++;
                }
            } else if (changeSignal) {
-                let signalId = this.actionGroup.connect(changeSignal, Lang.bind(this, function(actionGroup, actionName) {
-                    actionGroup.disconnect(signalId);
-                    if (this._actions[actionName]) return;
+                let signalId = this.actionGroup.connect(changeSignal, Lang.bind(this, function() {
+                    this.actionGroup.disconnect(signalId);

                    // force a full update
                    this._modelChanged(model, 0, -1, model.get_n_items(), target);
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -91,6 +91,7 @@ const RemoteSearchProvider = new Lang.Class({
                                              dbusName, dbusPath);

        this.parent(title.toUpperCase());
+        this.async = true;
        this._cancellable = new Gio.Cancellable();
    },

@@ -119,7 +120,7 @@ const RemoteSearchProvider = new Lang.Class({
        this.searchSystem.pushResults(this, results[0]);
    },

-    getInitialResultSet: function(terms) {
+    getInitialResultSetAsync: function(terms) {
        this._cancellable.cancel();
        this._cancellable.reset();
        try {
@@ -132,7 +133,7 @@ const RemoteSearchProvider = new Lang.Class({
        }
    },

-    getSubsearchResultSet: function(previousResults, newTerms) {
+    getSubsearchResultSetAsync: function(previousResults, newTerms) {
        this._cancellable.cancel();
        this._cancellable.reset();
        try {
@@ -163,7 +164,7 @@ const RemoteSearchProvider = new Lang.Class({
        callback(resultMetas);
    },

-    getResultMetas: function(ids, callback) {
+    getResultMetasAsync: function(ids, callback) {
        this._cancellable.cancel();
        this._cancellable.reset();
        try {
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -18,7 +18,9 @@ const DISABLED_OPEN_SEARCH_PROVIDERS_KEY = 'disabled-open-search-providers';
 const MatchType = {
    NONE: 0,
    SUBSTRING: 1,
-    PREFIX: 2
+    MULTIPLE_SUBSTRING: 2,
+    PREFIX: 3,
+    MULTIPLE_PREFIX: 4
 };

 const SearchResultDisplay = new Lang.Class({
@@ -70,8 +72,11 @@ const SearchResultDisplay = new Lang.Class({
 * Subclass this object to add a new result type
 * to the search system, then call registerProvider()
 * in SearchSystem with an instance.
- * Search is asynchronous and uses the
+ * By default, search is synchronous and uses the
 * getInitialResultSet()/getSubsearchResultSet() methods.
+ * For asynchronous search, set the async property to true
+ * and implement getInitialResultSetAsync()/getSubsearchResultSetAsync()
+ * instead.
 */
 const SearchProvider = new Lang.Class({
    Name: 'SearchProvider',
@@ -79,6 +84,7 @@ const SearchProvider = new Lang.Class({
    _init: function(title) {
        this.title = title;
        this.searchSystem = null;
+        this.async = false;
    },

    /**
@@ -89,7 +95,7 @@ const SearchProvider = new Lang.Class({
     * therefore a single term of length one or two), or when
     * a new term is added.
     *
-     * Should "return" an array of result identifier strings representing
+     * Should return an array of result identifier strings representing
     * items which match the given search terms.  This
     * is expected to be a substring match on the metadata for a given
     * item.  Ordering of returned results is up to the discretion of the provider,
@@ -99,9 +105,6 @@ const SearchProvider = new Lang.Class({
     *    description) before single matches
     *  * Put items which match on a prefix before non-prefix substring matches
     *
-     * We say "return" above, but in order to make the query asynchronous, use
-     * this.searchSystem.pushResults();. The return value should be ignored.
-     *
     * This function should be fast; do not perform unindexed full-text searches
     * or network queries.
     */
@@ -109,6 +112,18 @@ const SearchProvider = new Lang.Class({
        throw new Error('Not implemented');
    },

+    /**
+     * getInitialResultSetAsync:
+     * @terms: Array of search terms, treated as logical AND
+     *
+     * Like getInitialResultSet(), but the method should return immediately
+     * without a return value - use SearchSystem.pushResults() when the
+     * corresponding results are ready.
+     */
+    getInitialResultSetAsync: function(terms) {
+        throw new Error('Not implemented');
+    },
+
    /**
     * getSubsearchResultSet:
     * @previousResults: Array of item identifiers
@@ -121,23 +136,46 @@ const SearchProvider = new Lang.Class({
     *
     * This allows search providers to only search through the previous
     * result set, rather than possibly performing a full re-query.
-     *
-     * Similar to getInitialResultSet, the return value for this will
-     * be ignored; use this.searchSystem.pushResults();.
     */
    getSubsearchResultSet: function(previousResults, newTerms) {
        throw new Error('Not implemented');
    },

+    /**
+     * getSubsearchResultSetAsync:
+     * @previousResults: Array of item identifiers
+     * @newTerms: Updated search terms
+     *
+     * Like getSubsearchResultSet(), but the method should return immediately
+     * without a return value - use SearchSystem.pushResults() when the
+     * corresponding results are ready.
+     */
+    getSubsearchResultSetAsync: function(previousResults, newTerms) {
+        throw new Error('Not implemented');
+    },
+
    /**
     * getResultMetas:
     * @ids: Result identifier strings
     *
-     * Call callback with array of objects with 'id', 'name', (both strings) and
+     * Return an array of objects with 'id', 'name', (both strings) and
     * 'createIcon' (function(size) returning a Clutter.Texture) properties
     * with the same number of members as @ids
     */
-    getResultMetas: function(ids, callback) {
+    getResultMetas: function(ids) {
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * getResultMetasAsync:
+     * @ids: Result identifier strings
+     * @callback: callback to pass the results to when ready
+     *
+     * Like getResultMetas(), but the method should return immediately
+     * without a return value - pass the results to the provided @callback
+     * when ready.
+     */
+    getResultMetasAsync: function(ids, callback) {
        throw new Error('Not implemented');
    },

@@ -341,33 +379,42 @@ const SearchSystem = new Lang.Class({
            }
        }

-        let previousResultsArr = this._previousResults;
-
        let results = [];
-        this._previousTerms = terms;
-        this._previousResults = results;
-
        if (isSubSearch) {
            for (let i = 0; i < this._providers.length; i++) {
-                let [provider, previousResults] = previousResultsArr[i];
+                let [provider, previousResults] = this._previousResults[i];
                try {
-                    results.push([provider, []]);
-                    provider.getSubsearchResultSet(previousResults, terms);
+                    if (provider.async) {
+                        provider.getSubsearchResultSetAsync(previousResults, terms);
+                        results.push([provider, []]);
+                    } else {
+                        let providerResults = provider.getSubsearchResultSet(previousResults, terms);
+                        results.push([provider, providerResults]);
+                    }
                } catch (error) {
-                    log('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
+                    global.log ('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
                }
            }
        } else {
            for (let i = 0; i < this._providers.length; i++) {
                let provider = this._providers[i];
                try {
-                    results.push([provider, []]);
-                    provider.getInitialResultSet(terms);
+                    if (provider.async) {
+                        provider.getInitialResultSetAsync(terms);
+                        results.push([provider, []]);
+                    } else {
+                        let providerResults = provider.getInitialResultSet(terms);
+                        results.push([provider, providerResults]);
+                    }
                } catch (error) {
-                    log('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
+                    global.log ('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
                }
            }
        }
+
+        this._previousTerms = terms;
+        this._previousResults = results;
+        this.emit('search-completed', results);
    },
 });
 Signals.addSignalMethods(SearchSystem.prototype);
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -5,7 +5,6 @@ const Lang = imports.lang;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
-const Atk = imports.gi.Atk;

 const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
@@ -34,13 +33,12 @@ const SearchResult = new Lang.Class({
            content = new St.Bin({ style_class: 'search-result-content',
                                   reactive: true,
                                   can_focus: true,
-                                   track_hover: true,
-                                   accessible_role: Atk.Role.PUSH_BUTTON });
+                                   track_hover: true });
            let icon = new IconGrid.BaseIcon(this.metaInfo['name'],
                                             { createIcon: this.metaInfo['createIcon'] });
            content.set_child(icon.actor);
            this._dragActorSource = icon.icon;
-            content.label_actor = icon.label;
+            this.actor.label_actor = icon.label;
        } else {
            if (content._delegate && content._delegate.getDragActorSource)
                this._dragActorSource = content._delegate.getDragActorSource();
@@ -121,7 +119,13 @@ const GridSearchResults = new Lang.Class({
                if (results.length == 0)
                    return;

-                provider.getResultMetas(results, Lang.bind(this, this.renderResults));
+                if (provider.async) {
+                    provider.getResultMetasAsync(results,
+                                                 Lang.bind(this, this.renderResults));
+                } else {
+                    let metas = provider.getResultMetas(results);
+                    this.renderResults(metas);
+                }
            }));
        }));
        this._notDisplayedResult = [];
@@ -131,7 +135,7 @@ const GridSearchResults = new Lang.Class({

    getResultsForDisplay: function() {
        let alreadyVisible = this._pendingClear ? 0 : this._grid.visibleItemsCount();
-        let canDisplay = this._grid.childrenInRow(this._width) * this._grid.getRowLimit()
+        let canDisplay = this._grid.childrenInRow(this._width) * MAX_SEARCH_RESULTS_ROWS
                         - alreadyVisible;

        let numResults = Math.min(this._notDisplayedResult.length, canDisplay);
@@ -175,7 +179,8 @@ const SearchResults = new Lang.Class({

    _init: function(searchSystem, openSearchSystem) {
        this._searchSystem = searchSystem;
-        this._searchSystem.connect('search-updated', Lang.bind(this, this._updateResults));
+        this._searchSystem.connect('search-updated', Lang.bind(this, this._updateCurrentResults));
+        this._searchSystem.connect('search-completed', Lang.bind(this, this._updateResults));
        this._openSearchSystem = openSearchSystem;

        this.actor = new St.BoxLayout({ name: 'searchResults',
@@ -209,8 +214,10 @@ const SearchResults = new Lang.Class({
        this._content.add(this._statusText);
        this._providers = this._searchSystem.getProviders();
        this._providerMeta = [];
+        this._providerMetaResults = {};
        for (let i = 0; i < this._providers.length; i++) {
            this.createProviderMeta(this._providers[i]);
+            this._providerMetaResults[this.providers[i].title] = [];
        }
        this._searchProvidersBox = new St.BoxLayout({ style_class: 'search-providers-box' });
        this.actor.add(this._searchProvidersBox);
@@ -283,7 +290,8 @@ const SearchResults = new Lang.Class({

        this._providerMeta.push({ provider: provider,
                                  actor: providerBox,
-                                  resultDisplay: resultDisplay });
+                                  resultDisplay: resultDisplay,
+                                  hasPendingResults: false });
        this._content.add(providerBox);
    },

@@ -299,6 +307,7 @@ const SearchResults = new Lang.Class({
    },

    _clearDisplay: function() {
+        this._visibleResultsCount = 0;
        for (let i = 0; i < this._providerMeta.length; i++) {
            let meta = this._providerMeta[i];
            meta.resultDisplay.clear();
@@ -326,8 +335,6 @@ const SearchResults = new Lang.Class({

    doSearch: function (searchString) {
        this._searchSystem.updateSearch(searchString);
-        let terms = this._searchSystem.getTerms();
-        this._openSearchSystem.setSearchTerms(terms);
    },

    _metaForProvider: function(provider) {
@@ -339,6 +346,8 @@ const SearchResults = new Lang.Class({

        for (let i = 0; i < this._providerMeta.length; i++) {
            let meta = this._providerMeta[i];
+            if (meta.hasPendingResults)
+                return;

            if (!meta.actor.visible)
                continue;
@@ -363,57 +372,78 @@ const SearchResults = new Lang.Class({
        }
    },

-    _updateStatusText: function () {
-        let haveResults = false;
+    _updateCurrentResults: function(searchSystem, results) {
+        let terms = searchSystem.getTerms();
+        let [provider, providerResults] = results;
+        let meta = this._metaForProvider(provider);
+        meta.hasPendingResults = false;
+        this._updateProviderResults(provider, providerResults, terms);
+    },

-        for (let i = 0; i < this._providerMeta.length; ++i)
-            if (this._providerMeta[i].resultDisplay.getFirstResult()) {
-                haveResults = true;
-                break;
+    _updateProviderResults: function(provider, providerResults, terms) {
+        let meta = this._metaForProvider(provider);
+        if (providerResults.length == 0) {
+            this._clearDisplayForProvider(provider);
+            meta.resultDisplay.setResults([], []);
+        } else {
+            this._providerMetaResults[provider.title] = providerResults;
+            meta.resultDisplay.setResults(providerResults, terms);
+            let results = meta.resultDisplay.getResultsForDisplay();
+
+            if (provider.async) {
+                provider.getResultMetasAsync(results, Lang.bind(this,
+                    function(metas) {
+                        this._clearDisplayForProvider(provider);
+                        meta.actor.show();
+
+                        // Hinding drops the key focus if we have it
+                        let focus = global.stage.get_key_focus();
+                        this._content.hide();
+
+                        meta.resultDisplay.renderResults(metas);
+                        this._maybeSetInitialSelection();
+
+                        this._content.show();
+                        if (this._content.contains(focus))
+                            global.stage.set_key_focus(focus);
+                    }));
+            } else {
+                let metas = provider.getResultMetas(results);
+                this._clearDisplayForProvider(provider);
+                meta.actor.show();
+                meta.resultDisplay.renderResults(metas);
            }
+        }
+        this._maybeSetInitialSelection();
+    },

-        if (!haveResults) {
+    _updateResults: function(searchSystem, results) {
+        if (results.length == 0) {
            this._statusText.set_text(_("No matching results."));
            this._statusText.show();
        } else {
            this._statusText.hide();
        }
-    },

-    _updateResults: function(searchSystem, results) {
        let terms = searchSystem.getTerms();
-        let [provider, providerResults] = results;
-        let meta = this._metaForProvider(provider);
+        this._openSearchSystem.setSearchTerms(terms);

-        if (providerResults.length == 0) {
-            this._clearDisplayForProvider(provider);
-            meta.resultDisplay.setResults([], []);
-            this._maybeSetInitialSelection();
-            this._updateStatusText();
-        } else {
-            meta.resultDisplay.setResults(providerResults, terms);
-            let results = meta.resultDisplay.getResultsForDisplay();
+        // To avoid CSS transitions causing flickering when the first search
+        // result stays the same, we hide the content while filling in the
+        // results.
+        this._content.hide();

-            provider.getResultMetas(results, Lang.bind(this, function(metas) {
-                this._clearDisplayForProvider(provider);
-                meta.actor.show();
-
-                // Hiding drops the key focus if we have it
-                let focus = global.stage.get_key_focus();
-                // To avoid CSS transitions causing flickering when
-                // the first search result stays the same, we hide the
-                // content while filling in the results.
-                this._content.hide();
-
-                meta.resultDisplay.renderResults(metas);
-                this._maybeSetInitialSelection();
-                this._updateStatusText();
-
-                this._content.show();
-                if (this._content.contains(focus))
-                    global.stage.set_key_focus(focus);
-            }));
+        for (let i = 0; i < results.length; i++) {
+            let [provider, providerResults] = results[i];
+            let meta = this._metaForProvider(provider);
+            meta.hasPendingResults = provider.async;
+            if (!meta.hasPendingResults)
+                this._updateProviderResults(provider, providerResults, terms);
        }
+
+        this._content.show();
+
+        return true;
    },

    activateDefault: function() {
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -1,124 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-
-const Config = imports.misc.config;
-const Main = imports.ui.main;
-const Params = imports.misc.params;
-
-
-const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = {
-    'a11y': imports.ui.status.accessibility.ATIndicator,
-    'volume': imports.ui.status.volume.Indicator,
-    'battery': imports.ui.status.power.Indicator,
-    'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
-    'userMenu': imports.ui.userMenu.UserMenuButton
-};
-
-if (Config.HAVE_BLUETOOTH)
-    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] =
-        imports.ui.status.bluetooth.Indicator;
-
-try {
-    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] =
-        imports.ui.status.network.NMApplet;
-} catch(e) {
-    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
-}
-
-
-const DEFAULT_MODE = 'user';
-
-const _modes = {
-    'gdm': { hasOverview: false,
-             hasAppMenu: false,
-             showCalendarEvents: false,
-             allowSettings: false,
-             allowExtensions: false,
-             allowKeybindingsWhenModal: true,
-             hasRunDialog: false,
-             hasWorkspaces: false,
-             createSession: Main.createGDMSession,
-             extraStylesheet: global.datadir + '/theme/gdm.css',
-             statusArea: {
-                 order: [
-                     'a11y', 'display', 'keyboard',
-                     'volume', 'battery', 'powerMenu'
-                 ],
-                 implementation: {
-                     'a11y': imports.ui.status.accessibility.ATIndicator,
-                     'volume': imports.ui.status.volume.Indicator,
-                     'battery': imports.ui.status.power.Indicator,
-                     'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
-                     'powerMenu': imports.gdm.powerMenu.PowerMenuButton
-                 }
-             }
-           },
-
-    'initial-setup': { hasOverview: false,
-                       hasAppMenu: false,
-                       showCalendarEvents: false,
-                       allowSettings: false,
-                       allowExtensions: false,
-                       allowKeybindingsWhenModal: false,
-                       hasRunDialog: false,
-                       hasWorkspaces: false,
-                       createSession: Main.createInitialSetupSession,
-                       extraStylesheet: null,
-                       statusArea: {
-                           order: [
-                               'a11y', 'keyboard', 'volume'
-                           ],
-                           implementation: {
-                               'a11y': imports.ui.status.accessibility.ATIndicator,
-                               'keyboard': imports.ui.status.keyboard.XKBIndicator,
-                               'volume': imports.ui.status.volume.Indicator
-                        }
-                }
-           },
-
-    'user': { hasOverview: true,
-              hasAppMenu: true,
-              showCalendarEvents: true,
-              allowSettings: true,
-              allowExtensions: true,
-              allowKeybindingsWhenModal: false,
-              hasRunDialog: true,
-              hasWorkspaces: true,
-              createSession: Main.createUserSession,
-              extraStylesheet: null,
-              statusArea: {
-                  order: [
-                      'input-method', 'a11y', 'keyboard', 'volume', 'bluetooth',
-                      'network', 'battery', 'userMenu'
-                  ],
-                  implementation: STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION
-              }
-            }
-};
-
-function listModes() {
-    let modes = Object.getOwnPropertyNames(_modes);
-    for (let i = 0; i < modes.length; i++)
-        print(modes[i]);
-}
-
-const SessionMode = new Lang.Class({
-    Name: 'SessionMode',
-
-    _init: function() {
-        let params = _modes[global.session_mode];
-
-        params = Params.parse(params, _modes[DEFAULT_MODE]);
-
-        this._createSession = params.createSession;
-        delete params.createSession;
-
-        Lang.copyProperties(params, this);
-    },
-
-    createSession: function() {
-        if (this._createSession)
-            this._createSession();
-    }
-});
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -56,8 +56,15 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
    <arg type="i" direction="in" name="width"/>
    <arg type="i" direction="in" name="height"/>
 </method>
+<method name="EnableExtension">
+    <arg type="s" direction="in" name="uuid"/>
+</method>
+<method name="DisableExtension">
+    <arg type="s" direction="in" name="uuid"/>
+</method>
 <method name="InstallRemoteExtension">
    <arg type="s" direction="in" name="uuid"/>
+    <arg type="s" direction="in" name="version"/>
 </method>
 <method name="UninstallExtension">
    <arg type="s" direction="in" name="uuid"/>
@@ -253,8 +260,22 @@ const GnomeShell = new Lang.Class({
        return extension.errors;
    },

-    InstallRemoteExtension: function(uuid) {
-        ExtensionSystem.installExtensionFromUUID(uuid);
+    EnableExtension: function(uuid) {
+        let enabledExtensions = global.settings.get_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY);
+        if (enabledExtensions.indexOf(uuid) == -1)
+            enabledExtensions.push(uuid);
+        global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions);
+    },
+
+    DisableExtension: function(uuid) {
+        let enabledExtensions = global.settings.get_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY);
+        while (enabledExtensions.indexOf(uuid) != -1)
+            enabledExtensions.splice(enabledExtensions.indexOf(uuid), 1);
+        global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions);
+    },
+
+    InstallRemoteExtension: function(uuid, version_tag) {
+        ExtensionSystem.installExtensionFromUUID(uuid, version_tag);
    },

    UninstallExtension: function(uuid) {
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -243,7 +243,6 @@ const ShellMountPasswordSource = new Lang.Class({
        this.parent(strings[0]);

        this._notification = new ShellMountPasswordNotification(this, strings, icon, reaskPassword);
-        this._setSummaryIcon(icon);

        // add ourselves as a source, and popup the notification
        Main.messageTray.add(this);
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -305,7 +305,7 @@ const Indicator = new Lang.Class({

    _ensureSource: function() {
        if (!this._source) {
-            this._source = new MessageTray.Source(_("Bluetooth"), 'bluetooth-active', St.IconType.SYMBOLIC);
+            this._source = new Source();
            Main.messageTray.add(this._source);
        }
    },
@@ -330,6 +330,35 @@ const Indicator = new Lang.Class({
    }
 });

+const Source = new Lang.Class({
+    Name: 'BluetoothSource',
+    Extends: MessageTray.Source,
+
+    _init: function() {
+        this.parent(_("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();
+            }
+        }));
+
+        this.parent(notification);
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ icon_name: 'bluetooth-active',
+                             icon_type: St.IconType.SYMBOLIC,
+                             icon_size: this.ICON_SIZE });
+    }
+});
+
 const AuthNotification = new Lang.Class({
    Name: 'AuthNotification',
    Extends: MessageTray.Notification,
@@ -380,7 +409,7 @@ const ConfirmNotification = new Lang.Class({
        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 '%06d' matches the one on the device.").format(pin));
+        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"));
@@ -416,8 +445,7 @@ const PinNotification = new Lang.Class({
        this._entry.connect('key-release-event', Lang.bind(this, function(entry, event) {
            let key = event.get_key_symbol();
            if (key == Clutter.KEY_Return) {
-                if (this._canActivateOkButton())
-                    this.emit('action-invoked', 'ok');
+                this.emit('action-invoked', 'ok');
                return true;
            } else if (key == Clutter.KEY_Escape) {
                this.emit('action-invoked', 'cancel');
@@ -430,12 +458,6 @@ const PinNotification = new Lang.Class({
        this.addButton('ok', _("OK"));
        this.addButton('cancel', _("Cancel"));

-        this.setButtonSensitive('ok', this._canActivateOkButton());
-        this._entry.clutter_text.connect('text-changed', Lang.bind(this,
-            function() {
-                this.setButtonSensitive('ok', this._canActivateOkButton());
-            }));
-
        this.connect('action-invoked', Lang.bind(this, function(self, action) {
            if (action == 'ok') {
                if (this._numeric) {
@@ -458,11 +480,6 @@ const PinNotification = new Lang.Class({
        }));
    },

-    _canActivateOkButton: function() {
-        // PINs have a fixed length of 6
-        return this._entry.clutter_text.text.length == 6;
-    },
-
    grabFocus: function(lockTray) {
        this.parent(lockTray);
        global.stage.set_key_focus(this._entry);
--- a/js/ui/status/candidatePanel.js
+++ b/js/ui/status/candidatePanel.js
@@ -0,0 +1,584 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
+ * Copyright 2012 Red Hat, Inc.
+ * Copyright 2012 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright 2012 Takao Fujiwara <tfujiwar@redhat.com>
+ * Copyright 2012 Tiger Soldier <tigersoldi@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+const St = imports.gi.St;
+const GLib = imports.gi.GLib;
+const IBus = imports.gi.IBus;
+const Lang = imports.lang;
+const Signals = imports.signals;
+const Shell = imports.gi.Shell;
+
+const BoxPointer = imports.ui.boxpointer;
+const Main = imports.ui.main;
+const PopupMenu = imports.ui.popupMenu;
+
+const ORIENTATION_HORIZONTAL  = 0;
+const ORIENTATION_VERTICAL    = 1;
+const ORIENTATION_SYSTEM      = 2;
+
+const StCandidateArea = new Lang.Class({
+    Name: 'StCandidateArea',
+
+    _init: function(orientation) {
+        this.actor = new St.BoxLayout({ style_class: 'candidate-area' });
+        this._orientation = orientation;
+        this._labels = [];
+        this._labelBoxes = [];
+        this._createUI();
+    },
+
+    _removeOldWidgets: function() {
+        this.actor.destroy_all_children();
+        this._labels = [];
+        this._labelBoxes = [];
+    },
+
+    _createUI: function() {
+        let vbox = null;
+        let hbox = null;
+        if (this._orientation == ORIENTATION_VERTICAL) {
+            vbox = new St.BoxLayout({ vertical: true,
+                                      style_class: 'candidate-vertical' });
+            this.actor.add_child(vbox,
+                                 { expand: true,
+                                   x_fill: true,
+                                   y_fill: true
+                                 });
+        } else {
+            hbox = new St.BoxLayout({ vertical: false,
+                                      style_class: 'candidate-horizontal' });
+            this.actor.add_child(hbox,
+                                 { expand: true,
+                                   x_fill: true,
+                                   y_fill: true
+                                 });
+        }
+        for (let i = 0; i < 16; i++) {
+            let label1 = new St.Label({ text: '1234567890abcdef'.charAt(i) + '.',
+                                        style_class: 'popup-menu-item',
+                                        reactive: true });
+
+            let label2 = new St.Label({ text: '' ,
+                                        style_class: 'popup-menu-item',
+                                        reactive: true });
+
+            if (this._orientation == ORIENTATION_VERTICAL) {
+                let candidateHBox = new St.BoxLayout({vertical: false});
+                let labelBox = new St.Bin({ style_class: 'candidate-hlabel-content' });
+                labelBox.set_child(label1);
+                labelBox.set_fill(true, true);
+                let textBox = new St.Bin({ style_class: 'candidate-htext-content' });
+
+                textBox.set_child(label2);
+                textBox.set_fill(true, true);
+                candidateHBox.add_child(labelBox,
+                                        { expand: false,
+                                          x_fill: false,
+                                          y_fill: true
+                                        });
+                candidateHBox.add_child(textBox,
+                                        { expand: true,
+                                          x_fill: true,
+                                          y_fill: true
+                                        });
+                vbox.add_child(candidateHBox);
+                this._labelBoxes.push(candidateHBox);
+            } else {
+                let candidateHBox = new St.BoxLayout({ style_class: 'candidate-vcontent',
+                                                       vertical: false });
+                candidateHBox.add_child(label1);
+                candidateHBox.add_child(label2);
+                hbox.add_child(candidateHBox);
+                this._labelBoxes.push(candidateHBox);
+            }
+
+            this._labels.push([label1, label2]);
+        }
+
+        for (let i = 0; i < this._labels.length; i++) {
+            for(let j = 0; j < this._labels[i].length; j++) {
+                let widget = this._labels[i][j];
+                widget.candidateIndex = i;
+                widget.connect('button-press-event',
+                               Lang.bind(this, function (widget, event) {
+                                   this._candidateClickedCB(widget, event);
+                               }));
+                widget.connect('enter-event',
+                               function(widget, event) {
+                                   widget.add_style_pseudo_class('hover');
+                               });
+                widget.connect('leave-event',
+                               function(widget, event) {
+                                   widget.remove_style_pseudo_class('hover');
+                               });
+            }
+        }
+    },
+
+    _recreateUI: function() {
+        this._removeOldWidgets();
+        this._createUI();
+    },
+
+    _candidateClickedCB: function(widget, event) {
+        this.emit('candidate-clicked',
+                  widget.candidateIndex,
+                  event.get_button(),
+                  event.get_state());
+    },
+
+    setLabels: function(labels) {
+        if (!labels || labels.length == 0) {
+            for (let i = 0; i < 16; i++) {
+                this._labels[i][0].set_text('1234567890abcdef'.charAt(i) + '.');
+            }
+            return;
+        }
+
+        for (let i = 0; i < labels.length && i < this._labels.length; i++) {
+            /* Use a ClutterActor attribute of Shell's theme instead of
+             * Pango.AttrList for the lookup window GUI and
+             * can ignore 'attrs' simply from IBus engines?
+             */
+            let [text, attrs] = labels[i];
+            this._labels[i][0].set_text(text);
+        }
+    },
+
+    setCandidates: function(candidates, focusCandidate, showCursor) {
+        if (focusCandidate == undefined) {
+            focusCandidate = 0;
+        }
+        if (showCursor == undefined) {
+            showCursor = true;
+        }
+        if (candidates.length > this._labels.length) {
+            assert();
+        }
+
+        for (let i = 0; i < candidates.length; i++) {
+            /* Use a ClutterActor attribute of Shell's theme instead of
+             * Pango.AttrList for the lookup window GUI and
+             * can ignore 'attrs' simply from IBus engines?
+             */
+            let [text, attrs] = candidates[i];
+            if (i == focusCandidate && showCursor) {
+                this._labels[i][1].add_style_pseudo_class('active');
+            } else {
+                this._labels[i][1].remove_style_pseudo_class('active');
+            }
+            this._labels[i][1].set_text(text);
+            this._labelBoxes[i].show();
+        }
+
+        for (let i = this._labelBoxes.length - 1; i >= candidates.length; i--) {
+            this._labelBoxes[i].hide();
+        }
+    },
+
+    setOrientation: function(orientation) {
+        if (orientation == this._orientation)
+            return;
+        this._orientation = orientation;
+        this._recreateUI();
+    },
+
+    showAll: function() {
+        this.actor.show();
+    },
+
+    hideAll: function() {
+        this.actor.hide();
+    },
+});
+Signals.addSignalMethods(StCandidateArea.prototype);
+
+const CandidatePanel = new Lang.Class({
+    Name: 'CandidatePanel',
+
+    _init: function() {
+        this._orientation = ORIENTATION_VERTICAL;
+        this._currentOrientation = this._orientation;
+        this._preeditVisible = false;
+        this._auxStringVisible = false;
+        this._lookupTableVisible = false;
+        this._lookupTable = null;
+
+        this._cursorLocation = [0, 0, 0, 0];
+        this._movedCursorLocation = null;
+
+        this._initSt();
+
+    },
+
+    _initSt: function() {
+        this._arrowSide = St.Side.TOP;
+        this._arrowAlignment = 0.0;
+        this._boxPointer = new BoxPointer.BoxPointer(this._arrowSide,
+                                                     { x_fill: true,
+                                                       y_fill: true,
+                                                       x_align: St.Align.START });
+        this.actor = this._boxPointer.actor;
+        this.actor._delegate = this;
+        this.actor.style_class = 'popup-menu-boxpointer';
+        this.actor.add_style_class_name('popup-menu');
+        this.actor.add_style_class_name('candidate-panel');
+        this._cursorActor = new Shell.GenericContainer();
+        Main.uiGroup.add_actor(this.actor);
+        Main.uiGroup.add_actor(this._cursorActor);
+
+        this._stCandidatePanel = new St.BoxLayout({ style_class: 'candidate-panel',
+                                                    vertical: true });
+        this._boxPointer.bin.set_child(this._stCandidatePanel);
+
+        this._stPreeditLabel = new St.Label({ style_class: 'popup-menu-item',
+                                              text: '' });
+        if (!this._preeditVisible) {
+            this._stPreeditLabel.hide();
+        }
+        this._stAuxLabel = new St.Label({ style_class: 'popup-menu-item',
+                                          text: '' });
+        if (!this._auxVisible) {
+            this._stAuxLabel.hide();
+        }
+
+        this._separator = new PopupMenu.PopupSeparatorMenuItem();
+        if (!this._preeditVisible && !this._auxVisible) {
+            this._separator.actor.hide();
+        }
+        // create candidates area
+        this._stCandidateArea = new StCandidateArea(this._currentOrientation);
+        this._stCandidateArea.connect('candidate-clicked',
+                                      Lang.bind(this, function(x, i, b, s) {
+                                                this.emit('candidate-clicked', i, b, s);}));
+        this.updateLookupTable(this._lookupTable, this._lookupTableVisible);
+
+        // TODO: page up/down GUI
+
+        this._packAllStWidgets();
+        this._isVisible = true;
+        this.hideAll();
+        this._checkShowStates();
+    },
+
+    _packAllStWidgets: function() {
+        this._stCandidatePanel.add_child(this._stPreeditLabel,
+                                         { x_fill: true,
+                                           y_fill: false,
+                                           x_align: St.Align.MIDDLE,
+                                           y_align: St.Align.START });
+        this._stCandidatePanel.add_child(this._stAuxLabel,
+                                         { x_fill: true,
+                                           y_fill: false,
+                                           x_align: St.Align.MIDDLE,
+                                           y_align: St.Align.MIDDLE });
+        this._stCandidatePanel.add_child(this._separator.actor,
+                                         { x_fill: true,
+                                           y_fill: false,
+                                           x_align: St.Align.MIDDLE,
+                                           y_align: St.Align.MIDDLE });
+        this._stCandidatePanel.add_child(this._stCandidateArea.actor,
+                                         { x_fill: true,
+                                           y_fill: false,
+                                           x_align: St.Align.MIDDLE,
+                                           y_align: St.Align.END });
+    },
+
+    showPreeditText: function() {
+        this._preeditVisible = true;
+        this._stPreeditLabel.show();
+        this._checkShowStates();
+    },
+
+    hidePreeditText: function() {
+        this._preeditVisible = false;
+        this._checkShowStates();
+        this._stPreeditLabel.hide();
+    },
+
+    updatePreeditText: function(text, cursorPos, visible) {
+        if (visible) {
+            this.showPreeditText();
+        } else {
+            this.hidePreeditText();
+        }
+        let str = text.get_text();
+        this._stPreeditLabel.set_text(str);
+
+        let attrs = text.get_attributes();
+        for (let i = 0; attrs != null && attrs.get(i) != null; i++) {
+            let attr = attrs.get(i);
+            if (attr.get_attr_type() == IBus.AttrType.BACKGROUND) {
+                let startIndex = attr.get_start_index();
+                let endIndex = attr.get_end_index();
+                let len = GLib.utf8_strlen(str, -1);
+                let markup = '';
+                if (startIndex == 0 &&
+                    endIndex == GLib.utf8_strlen(str, -1)) {
+                    markup = markup.concat(str);
+                } else {
+                    if (startIndex > 0) {
+                        markup = markup.concat(GLib.utf8_substring(str,
+                                                                   0,
+                                                                   startIndex));
+                    }
+                    if (startIndex != endIndex) {
+                        markup = markup.concat('<span background=\"#555555\">');
+                        markup = markup.concat(GLib.utf8_substring(str,
+                                                                   startIndex,
+                                                                   endIndex));
+                        markup = markup.concat('</span>');
+                    }
+                    if (endIndex < len) {
+                        markup = markup.concat(GLib.utf8_substring(str,
+                                                                   endIndex,
+                                                                   len));
+                    }
+                }
+                let clutter_text = this._stPreeditLabel.get_clutter_text();
+                clutter_text.set_markup(markup);
+                clutter_text.queue_redraw();
+            }
+        }
+    },
+
+    showAuxiliaryText: function() {
+        this._auxStringVisible = true;
+        this._stAuxLabel.show();
+        this._checkShowStates();
+    },
+
+    hideAuxiliaryText: function() {
+        this._auxStringVisible = false;
+        this._checkShowStates();
+        this._stAuxLabel.hide();
+    },
+
+    updateAuxiliaryText: function(text, show) {
+        if (show) {
+            this.showAuxiliaryText();
+        } else {
+            this.hideAuxiliaryText();
+        }
+
+        this._stAuxLabel.set_text(text.get_text());
+    },
+
+    _refreshLabels: function() {
+        let newLabels = [];
+        for (let i = 0; this._lookupTable.get_label(i) != null; i++) {
+            let label = this._lookupTable.get_label(i);
+            newLabels.push([label.get_text(), label.get_attributes()]);
+        }
+        this._stCandidateArea.setLabels(newLabels);
+    },
+
+
+    _getCandidatesInCurrentPage: function() {
+        let cursorPos = this._lookupTable.get_cursor_pos();
+        let pageSize = this._lookupTable.get_page_size();
+        let page = ((cursorPos == 0) ? 0 : Math.floor(cursorPos / pageSize));
+        let startIndex = page * pageSize;
+        let endIndex = Math.min((page + 1) * pageSize,
+                                this._lookupTable.get_number_of_candidates());
+        let candidates = [];
+        for (let i = startIndex; i < endIndex; i++) {
+            candidates.push(this._lookupTable.get_candidate(i));
+        }
+        return candidates;
+    },
+
+    _getCursorPosInCurrentPage: function() {
+        let cursorPos = this._lookupTable.get_cursor_pos();
+        let pageSize = this._lookupTable.get_page_size();
+        let posInPage = cursorPos % pageSize;
+        return posInPage;
+    },
+
+    _refreshCandidates: function() {
+        let candidates = this._getCandidatesInCurrentPage();
+        let newCandidates = [];
+        for (let i = 0; i < candidates.length; i++) {
+            let candidate = candidates[i];
+            newCandidates.push([candidate.get_text(),
+                                candidate.get_attributes()]);
+        }
+        this._stCandidateArea.setCandidates(newCandidates,
+                                            this._getCursorPosInCurrentPage(),
+                                            this._lookupTable.is_cursor_visible());
+    },
+
+    updateLookupTable: function(lookupTable, visible) {
+        // hide lookup table
+        if (!visible) {
+            this.hideLookupTable();
+        }
+
+        this._lookupTable = lookupTable || new IBus.LookupTable();
+        let orientation = this._lookupTable.get_orientation();
+        if (orientation != ORIENTATION_HORIZONTAL &&
+            orientation != ORIENTATION_VERTICAL) {
+            orientation = this._orientation;
+        }
+        this.setCurrentOrientation(orientation);
+        this._refreshCandidates();
+        this._refreshLabels();
+
+        // show lookup table
+        if (visible) {
+            this.showLookupTable();
+        }
+    },
+
+    showLookupTable: function() {
+        this._lookupTableVisible = true;
+        this._stCandidateArea.showAll();
+        this._checkShowStates();
+    },
+
+    hideLookupTable: function() {
+        this._lookupTableVisible = false;
+        this._checkShowStates();
+        this._stCandidateArea.hideAll();
+    },
+
+    pageUpLookupTable: function() {
+        this._lookupTable.page_up();
+        this._refreshCandidates();
+    },
+
+    pageDownLookup_table: function() {
+        this._lookupTable.page_down();
+        this._refreshCandidates();
+    },
+
+    cursorUpLookupTable: function() {
+        this._lookupTable.cursor_up();
+        this._refreshCandidates();
+    },
+
+    cursorDownLookupTable: function() {
+        this._lookupTable.cursor_down();
+        this._refreshCandidates();
+    },
+
+    setCursorLocation: function(x, y, w, h) {
+        // if cursor location is changed, we reset the moved cursor location
+        if (this._cursorLocation.join() != [x, y, w, h].join()) {
+            this._cursorLocation = [x, y, w, h];
+            this._movedCursorLocation = null;
+            this._checkPosition();
+        }
+    },
+
+    _checkShowStates: function() {
+        this._checkSeparatorShowStates();
+        if (this._preeditVisible ||
+            this._auxStringVisible ||
+            this._lookupTableVisible) {
+            this._checkPosition();
+            this.showAll();
+            this.emit('show');
+        } else {
+            this.hideAll();
+            this.emit('hide');
+        }
+    },
+
+    _checkSeparatorShowStates: function() {
+        if (this._preeditVisible || this._auxStringVisible) {
+            this._separator.actor.show();
+        }
+        else
+            this._separator.actor.hide();
+    },
+
+    reset: function() {
+        let text = IBus.Text.new_from_string('');
+        this.updatePreeditText(text, 0, false);
+        text = IBus.Text.new_from_string('');
+        this.updateAuxiliaryText(text, false);
+        this.updateLookupTable(null, false);
+        this.hideAll();
+    },
+
+    setCurrentOrientation: function(orientation) {
+        if (this._currentOrientation == orientation) {
+            return;
+        }
+        this._currentOrientation = orientation;
+        this._stCandidateArea.setOrientation(orientation);
+    },
+
+    setOrientation: function(orientation) {
+        this._orientation = orientation;
+        this.updateLookupTable(this._lookupTable, this._lookupTableVisible);
+    },
+
+    getCurrentOrientation: function() {
+        return this._currentOrientation;
+    },
+
+    _checkPosition: function() {
+        let cursorLocation = this._movedCursorLocation || this._cursorLocation;
+        let [cursorX, cursorY, cursorWidth, cursorHeight] = cursorLocation;
+
+        let windowRight = cursorX + cursorWidth + this.actor.get_width();
+        let windowBottom = cursorY + cursorHeight + this.actor.get_height();
+
+        this._cursorActor.set_position(cursorX, cursorY);
+        this._cursorActor.set_size(cursorWidth, cursorHeight);
+
+        let monitor = Main.layoutManager.findMonitorForActor(this._cursorActor);
+        let [sx, sy] = [monitor.x + monitor.width, monitor.y + monitor.height];
+
+        if (windowBottom > sy) {
+            this._arrowSide = St.Side.BOTTOM;
+        } else {
+            this._arrowSide = St.Side.TOP;
+        }
+
+        this._boxPointer._arrowSide = this._arrowSide;
+        this._boxPointer.setArrowOrigin(this._arrowSide);
+        this._boxPointer.setPosition(this._cursorActor, this._arrowAlignment);
+    },
+
+    showAll: function() {
+        if (!this._isVisible) {
+            this.actor.opacity = 255;
+            this.actor.show();
+            this._isVisible = true;
+        }
+    },
+
+    hideAll: function() {
+        if (this._isVisible) {
+            this.actor.opacity = 0;
+            this.actor.hide();
+            this._isVisible = false;
+        }
+    },
+
+    move: function(x, y) {
+        this.actor.set_position(x, y);
+    }
+});
+Signals.addSignalMethods(CandidatePanel.prototype);
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -4,33 +4,45 @@ const Clutter = imports.gi.Clutter;
 const GdkPixbuf = imports.gi.GdkPixbuf;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Lang = imports.lang;
+const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;

+try {
+    var IBus = imports.gi.IBus;
+    const CandidatePanel = imports.ui.status.candidatePanel;
+} catch (e) {
+    var IBus = null;
+}
+
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
 const Util = imports.misc.util;

+const DESKTOP_INPUT_SOURCES_KEYBINDINGS_SCHEMA = 'org.gnome.desktop.input-sources.keybindings';
 const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
-const KEY_CURRENT_INPUT_SOURCE = 'current';
+const KEY_CURRENT_IS    = 'current';
 const KEY_INPUT_SOURCES = 'sources';

-const INPUT_SOURCE_TYPE_XKB = 'xkb';
-
 const LayoutMenuItem = new Lang.Class({
    Name: 'LayoutMenuItem',
    Extends: PopupMenu.PopupBaseMenuItem,

-    _init: function(displayName, shortName) {
+    _init: function(name, shortName, xkbLayout, xkbVariant, ibusEngine) {
        this.parent();

-        this.label = new St.Label({ text: displayName });
+        this.label = new St.Label({ text: name });
        this.indicator = new St.Label({ text: shortName });
        this.addActor(this.label);
        this.addActor(this.indicator);
+
+        this.sourceName = name;
+        this.shortName = shortName;
+        this.xkbLayout = xkbLayout;
+        this.xkbVariant = xkbVariant;
+        this.ibusEngine = ibusEngine;
    }
 });

@@ -48,144 +60,312 @@ const InputSourceIndicator = new Lang.Class({
        this.actor.add_actor(this._container);
        this.actor.add_style_class_name('panel-status-button');

-        this._labelActors = {};
-        this._layoutItems = {};
+        this._labelActors = [ ];
+        this._layoutItems = [ ];

        this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA });
-        this._settings.connect('changed::' + KEY_CURRENT_INPUT_SOURCE, Lang.bind(this, this._currentInputSourceChanged));
+        this._settings.connect('changed::' + KEY_CURRENT_IS, Lang.bind(this, this._currentISChanged));
        this._settings.connect('changed::' + KEY_INPUT_SOURCES, Lang.bind(this, this._inputSourcesChanged));

-        this._currentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
-        this._xkbInfo = new GnomeDesktop.XkbInfo();
+        if (IBus)
+            this._ibusInit();

        this._inputSourcesChanged();

-        // re-using "allowSettings" for the keyboard layout is a bit shady,
-        // but at least for now it is used as "allow popping up windows
-        // from shell menus"; we can always add a separate sessionMode
-        // option if need arises.
-        if (Main.sessionMode.allowSettings) {
+        if (global.session_type == Shell.SessionType.USER) {
            this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-            this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, this._showLayout));
+            this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, function() {
+                Main.overview.hide();
+                let description = this._selectedLayout.xkbLayout;
+                if (this._selectedLayout.xkbVariant.length > 0)
+                    description = description + '\t' + this._selectedLayout.xkbVariant;
+                Util.spawn(['gkbd-keyboard-display', '-l', description]);
+            }));
        }
        this.menu.addSettingsAction(_("Region and Language Settings"), 'gnome-region-panel.desktop');
+
+        global.display.add_keybinding('switch-next',
+                                      new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_KEYBINDINGS_SCHEMA }),
+                                      Meta.KeyBindingFlags.NONE,
+                                      Lang.bind(this, this._switchNext));
+        global.display.add_keybinding('switch-previous',
+                                      new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_KEYBINDINGS_SCHEMA }),
+                                      Meta.KeyBindingFlags.NONE,
+                                      Lang.bind(this, this._switchPrevious));
    },

-    _currentInputSourceChanged: function() {
-        let nVisibleSources = Object.keys(this._layoutItems).length;
-        if (nVisibleSources < 2)
+    _ibusInit: function() {
+        IBus.init();
+        this._ibus = new IBus.Bus();
+        if (!this._ibus.is_connected()) {
+            log('ibus-daemon is not running');
            return;
-
-        let nSources = this._settings.get_value(KEY_INPUT_SOURCES).n_children();
-        let newCurrentSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
-        if (newCurrentSourceIndex >= nSources)
-            return;
-
-        if (!this._layoutItems[newCurrentSourceIndex]) {
-            // This source index is invalid as we weren't able to
-            // build a menu item for it, so we hide ourselves since we
-            // can't fix it here. *shrug*
-            this.menu.close();
-            this.actor.hide();
-            return;
-        } else {
-            this.actor.show();
        }

-        if (this._layoutItems[this._currentSourceIndex]) {
-            this._layoutItems[this._currentSourceIndex].setShowDot(false);
-            this._container.set_skip_paint(this._labelActors[this._currentSourceIndex], true);
+        this._ibus.request_name(IBus.SERVICE_PANEL,
+                                IBus.BusNameFlag.ALLOW_REPLACEMENT |
+                                IBus.BusNameFlag.REPLACE_EXISTING);
+        this._panel = new IBus.PanelService({ connection: this._ibus.get_connection(),
+                                              object_path: IBus.PATH_PANEL });
+        this._ibusInitPanelService();
+
+        this._candidatePanel = new CandidatePanel.CandidatePanel();
+        this._ibusInitCandidatePanel();
+    },
+
+    _ibusInitCandidatePanel: function() {
+        this._candidatePanel.connect('cursor-up',
+                                     Lang.bind(this, function(widget) {
+                                         this.cursorUp();
+                                     }));
+        this._candidatePanel.connect('cursor-down',
+                                     Lang.bind(this, function(widget) {
+                                         this.cursorDown();
+                                     }));
+        this._candidatePanel.connect('page-up',
+                                     Lang.bind(this, function(widget) {
+                                         this.pageUp();
+                                     }));
+        this._candidatePanel.connect('page-down',
+                                     Lang.bind(this, function(widget) {
+                                         this.pageDown();
+                                     }));
+        this._candidatePanel.connect('candidate-clicked',
+                                     Lang.bind(this, function(widget, index, button, state) {
+                                         this.candidateClicked(index, button, state);
+                                     }));
+    },
+
+    _ibusInitPanelService: function() {
+        this._panel.connect('set-cursor-location',
+                            Lang.bind(this, this.setCursorLocation));
+        this._panel.connect('update-preedit-text',
+                            Lang.bind(this, this.updatePreeditText));
+        this._panel.connect('show-preedit-text',
+                            Lang.bind(this, this.showPreeditText));
+        this._panel.connect('hide-preedit-text',
+                            Lang.bind(this, this.hidePreeditText));
+        this._panel.connect('update-auxiliary-text',
+                            Lang.bind(this, this.updateAuxiliaryText));
+        this._panel.connect('show-auxiliary-text',
+                            Lang.bind(this, this.showAuxiliaryText));
+        this._panel.connect('hide-auxiliary-text',
+                            Lang.bind(this, this.hideAuxiliaryText));
+        this._panel.connect('update-lookup-table',
+                            Lang.bind(this, this.updateLookupTable));
+        this._panel.connect('show-lookup-table',
+                            Lang.bind(this, this.showLookupTable));
+        this._panel.connect('hide-lookup-table',
+                            Lang.bind(this, this.hideLookupTable));
+        this._panel.connect('page-up-lookup-table',
+                            Lang.bind(this, this.pageUpLookupTable));
+        this._panel.connect('page-down-lookup-table',
+                            Lang.bind(this, this.pageDownLookupTable));
+        this._panel.connect('cursor-up-lookup-table',
+                            Lang.bind(this, this.cursorUpLookupTable));
+        this._panel.connect('cursor-down-lookup-table',
+                            Lang.bind(this, this.cursorDownLookupTable));
+        this._panel.connect('focus-in', Lang.bind(this, this.focusIn));
+        this._panel.connect('focus-out', Lang.bind(this, this.focusOut));
+    },
+
+    setCursorLocation: function(panel, x, y, w, h) {
+        this._candidatePanel.setCursorLocation(x, y, w, h);
+    },
+
+    updatePreeditText: function(panel, text, cursorPos, visible) {
+        this._candidatePanel.updatePreeditText(text, cursorPos, visible);
+    },
+
+    showPreeditText: function(panel) {
+        this._candidatePanel.showPreeditText();
+    },
+
+    hidePreeditText: function(panel) {
+        this._candidatePanel.hidePreeditText();
+    },
+
+    updateAuxiliaryText: function(panel, text, visible) {
+        this._candidatePanel.updateAuxiliaryText(text, visible);
+    },
+
+    showAuxiliaryText: function(panel) {
+        this._candidatePanel.showAuxiliaryText();
+    },
+
+    hideAuxiliaryText: function(panel) {
+        this._candidatePanel.hideAuxiliaryText();
+    },
+
+    updateLookupTable: function(panel, lookupTable, visible) {
+        this._candidatePanel.updateLookupTable(lookupTable, visible);
+    },
+
+    showLookupTable: function(panel) {
+        this._candidatePanel.showLookupTable();
+    },
+
+    hideLookupTable: function(panel) {
+        this._candidatePanel.hideLookupTable();
+    },
+
+    pageUpLookupTable: function(panel) {
+        this._candidatePanel.pageUpLookupTable();
+    },
+
+    pageDownLookupTable: function(panel) {
+        this._candidatePanel.pageDownLookupTable();
+    },
+
+    cursorUpLookupTable: function(panel) {
+        this._candidatePanel.cursorUpLookupTable();
+    },
+
+    cursorDownLookupTable: function(panel) {
+        this._candidatePanel.cursorDownLookupTable();
+    },
+
+    focusIn: function(panel, path) {
+    },
+
+    focusOut: function(panel, path) {
+        this._candidatePanel.reset();
+    },
+
+    cursorUp: function() {
+        this._panel.cursor_up();
+    },
+
+    cursorDown: function() {
+        this._panel.cursor_down();
+    },
+
+    pageUp: function() {
+        this._panel.page_up();
+    },
+
+    pageDown: function() {
+        this._panel.page_down();
+    },
+
+    candidateClicked: function(index, button, state) {
+        this._panel.candidate_clicked(index, button, state);
+    },
+
+    _currentISChanged: function() {
+        let source = this._settings.get_value(KEY_CURRENT_IS);
+        let name = source.get_child_value(0).get_string()[0];
+
+        if (this._selectedLayout) {
+            this._selectedLayout.setShowDot(false);
+            this._selectedLayout = null;
        }

-        this._layoutItems[newCurrentSourceIndex].setShowDot(true);
-        this._container.set_skip_paint(this._labelActors[newCurrentSourceIndex], false);
+        if (this._selectedLabel) {
+            this._container.set_skip_paint(this._selectedLabel, true);
+            this._selectedLabel = null;
+        }

-        this._currentSourceIndex = newCurrentSourceIndex;
+        for (let i = 0; i < this._layoutItems.length; ++i) {
+            let item = this._layoutItems[i];
+            if (item.sourceName == name) {
+                item.setShowDot(true);
+                this._selectedLayout = item;
+                break;
+            }
+        }
+
+        for (let i = 0; i < this._labelActors.length; ++i) {
+            let actor = this._labelActors[i];
+            if (actor.sourceName == name) {
+                this._selectedLabel = actor;
+                this._container.set_skip_paint(actor, false);
+                break;
+            }
+        }
+
+        if (!this._selectedLayout || !this._selectedLabel)
+            this._layoutItems[0].activate();
    },

    _inputSourcesChanged: function() {
        let sources = this._settings.get_value(KEY_INPUT_SOURCES);
-        let nSources = sources.n_children();
-
-        for (let i in this._layoutItems)
-            this._layoutItems[i].destroy();
-
-        for (let i in this._labelActors)
-            this._labelActors[i].destroy();
-
-        this._layoutItems = {};
-        this._labelActors = {};
-
-        let infos = [];
-        let infosByShortName = {};
-
-        for (let i = 0; i < nSources; i++) {
-            let [type, id] = sources.get_child_value(i).deep_unpack();
-            if (type != INPUT_SOURCE_TYPE_XKB)
-                continue;
-
-            let info = {};
-            [info.exists, info.displayName, info.shortName, , ] =
-                this._xkbInfo.get_layout_info(id);
-
-            if (!info.exists)
-                continue;
-
-            info.sourceIndex = i;
-
-            if (!(info.shortName in infosByShortName))
-                infosByShortName[info.shortName] = [];
-            infosByShortName[info.shortName].push(info);
-            infos.push(info);
-        }
-
-        if (infos.length > 1) {
+        if (sources.n_children() > 1) {
            this.actor.show();
        } else {
            this.menu.close();
            this.actor.hide();
        }

-        for (let i = 0; i < infos.length; i++) {
-            let info = infos[i];
-            if (infosByShortName[info.shortName].length > 1) {
-                let sub = infosByShortName[info.shortName].indexOf(info) + 1;
-                info.shortName += String.fromCharCode(0x2080 + sub);
-            }
+        for (let i = 0; i < this._layoutItems.length; i++)
+            this._layoutItems[i].destroy();

-            let item = new LayoutMenuItem(info.displayName, info.shortName);
-            this._layoutItems[info.sourceIndex] = item;
+        for (let i = 0; i < this._labelActors.length; i++)
+            this._labelActors[i].destroy();
+
+        this._selectedLayout = null;
+        this._layoutItems = [ ];
+        this._selectedLabel = null;
+        this._labelActors = [ ];
+
+        for (let i = 0; i < sources.n_children(); ++i) {
+            let name = sources.get_child_value(i).get_child_value(0).get_string()[0];
+            let shortName = sources.get_child_value(i).get_child_value(1).get_string()[0];
+            let xkbLayout = sources.get_child_value(i).get_child_value(2).get_string()[0];
+            let xkbVariant = sources.get_child_value(i).get_child_value(3).get_string()[0];
+            let ibusEngine = sources.get_child_value(i).get_child_value(4).get_string()[0];
+
+            let item = new LayoutMenuItem(name, shortName, xkbLayout, xkbVariant, ibusEngine);
+            this._layoutItems.push(item);
            this.menu.addMenuItem(item, i);
            item.connect('activate', Lang.bind(this, function() {
-                this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
-                                         GLib.Variant.new_uint32(info.sourceIndex));
+                if (this._selectedLayout == null || item.sourceName != this._selectedLayout.sourceName) {
+                    let name = GLib.Variant.new_string(item.sourceName);
+                    let shortName = GLib.Variant.new_string(item.shortName);
+                    let xkbLayout = GLib.Variant.new_string(item.xkbLayout);
+                    let xkbVariant = GLib.Variant.new_string(item.xkbVariant);
+                    let ibusEngine = GLib.Variant.new_string(item.ibusEngine);
+                    let tuple = GLib.Variant.new_tuple([name, shortName, xkbLayout, xkbVariant, ibusEngine], 5);
+                    this._settings.set_value(KEY_CURRENT_IS, tuple);
+                }
            }));

-            let shortLabel = new St.Label({ text: info.shortName });
-            this._labelActors[info.sourceIndex] = shortLabel;
+            let shortLabel = new St.Label({ text: shortName });
+            shortLabel.sourceName = name;
+            this._labelActors.push(shortLabel);
            this._container.add_actor(shortLabel);
            this._container.set_skip_paint(shortLabel, true);
        }

-        this._currentInputSourceChanged();
+        this._currentISChanged();
    },

-    _showLayout: function() {
-        Main.overview.hide();
-
-        let sources = this._settings.get_value(KEY_INPUT_SOURCES);
-        let current = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
-        let id = sources.get_child_value(current).deep_unpack()[1];
-        let [, , , xkbLayout, xkbVariant] = this._xkbInfo.get_layout_info(id);
-
-        if (!xkbLayout || xkbLayout.length == 0)
+    _switchNext: function() {
+        if (!this._selectedLayout || !this._selectedLabel) {
+            this._layoutItems[0].activate();
            return;
+          }
+        for (let i = 0; i < this._layoutItems.length; ++i) {
+            let item = this._layoutItems[i];
+            if (item.sourceName == this._selectedLayout.sourceName) {
+                this._layoutItems[(++i == this._layoutItems.length) ? 0 : i].activate();
+                break;
+            }
+        }
+    },

-        let description = xkbLayout;
-        if (xkbVariant.length > 0)
-            description = description + '\t' + xkbVariant;
-
-        Util.spawn(['gkbd-keyboard-display', '-l', description]);
+    _switchPrevious: function() {
+        if (!this._selectedLayout || !this._selectedLabel) {
+            this._layoutItems[0].activate();
+            return;
+        }
+        for (let i = 0; i < this._layoutItems.length; ++i) {
+            let item = this._layoutItems[i];
+            if (item.sourceName == this._selectedLayout.sourceName) {
+                this._layoutItems[(--i == -1) ? (this._layoutItems.length - 1) : i].activate();
+                break;
+            }
+        }
    },

    _containerGetPreferredWidth: function(container, for_height, alloc) {
@@ -194,7 +374,7 @@ const InputSourceIndicator = new Lang.Class({
        // for those we don't actually display.
        let max_min_width = 0, max_natural_width = 0;

-        for (let i in this._labelActors) {
+        for (let i = 0; i < this._labelActors.length; i++) {
            let [min_width, natural_width] = this._labelActors[i].get_preferred_width(for_height);
            max_min_width = Math.max(max_min_width, min_width);
            max_natural_width = Math.max(max_natural_width, natural_width);
@@ -207,7 +387,7 @@ const InputSourceIndicator = new Lang.Class({
    _containerGetPreferredHeight: function(container, for_width, alloc) {
        let max_min_height = 0, max_natural_height = 0;

-        for (let i in this._labelActors) {
+        for (let i = 0; i < this._labelActors.length; i++) {
            let [min_height, natural_height] = this._labelActors[i].get_preferred_height(for_width);
            max_min_height = Math.max(max_min_height, min_height);
            max_natural_height = Math.max(max_natural_height, natural_height);
@@ -224,7 +404,7 @@ const InputSourceIndicator = new Lang.Class({
        box.y2 -= box.y1;
        box.y1 = 0;

-        for (let i in this._labelActors)
+        for (let i = 0; i < this._labelActors.length; i++)
            this._labelActors[i].allocate_align_fill(box, 0.5, 0, false, false, flags);
    }
 });
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -304,10 +304,9 @@ const NMDevice = new Lang.Class({
            // record the connection
            let obj = {
                connection: connections[i],
-                name: connections[i].get_id(),
-                uuid: connections[i].get_uuid(),
+                name: connections[i]._name,
+                uuid: connections[i]._uuid,
                timestamp: connections[i]._timestamp,
-                item: null,
            };
            this._connections.push(obj);
        }
@@ -402,46 +401,48 @@ const NMDevice = new Lang.Class({
    },

    checkConnection: function(connection) {
-        let pos = this._findConnection(connection.get_uuid());
+        let pos = this._findConnection(connection._uuid);
        let exists = pos != -1;
        let valid = this.connectionValid(connection);
-        let similar = false;
-        if (exists) {
-            let existing = this._connections[pos];

-            // Check if connection changed name or id
-            similar = existing.name == connection.get_id() &&
-                existing.timestamp == connection._timestamp;
-        }
-
-        if (exists && valid && similar) {
-            // Nothing to do
-            return;
-        }
-
-        if (exists)
+        if (exists && !valid)
            this.removeConnection(connection);
-        if (valid)
+        else if (!exists && valid)
            this.addConnection(connection);
+        else if (exists && valid) {
+            // propagate changes and update the UI
+
+            if (this._connections[pos].timestamp != connection._timestamp) {
+                this._connections[pos].timestamp = connection._timestamp;
+                this._connections.sort(this._connectionSortFunction);
+
+                this._clearSection();
+                this._queueCreateSection();
+            }
+        }
    },

    addConnection: function(connection) {
        // record the connection
        let obj = {
            connection: connection,
-            name: connection.get_id(),
-            uuid: connection.get_uuid(),
+            name: connection._name,
+            uuid: connection._uuid,
            timestamp: connection._timestamp,
-            item: null,
        };
-        Util.insertSorted(this._connections, obj, this._connectionSortFunction);
+        this._connections.push(obj);
+        this._connections.sort(this._connectionSortFunction);

        this._clearSection();
        this._queueCreateSection();
    },

    removeConnection: function(connection) {
-        let pos = this._findConnection(connection.get_uuid());
+        if (!connection._uuid) {
+            log('Cannot remove a connection without an UUID');
+            return;
+        }
+        let pos = this._findConnection(connection._uuid);
        if (pos == -1) {
            // this connection was never added, nothing to do here
            return;
@@ -711,10 +712,10 @@ const NMDeviceWired = new Lang.Class({

    _createAutomaticConnection: function() {
        let connection = new NetworkManager.Connection();
-        let uuid = NetworkManager.utils_uuid_generate();
+        connection._uuid = NetworkManager.utils_uuid_generate();
        connection.add_setting(new NetworkManager.SettingWired());
        connection.add_setting(new NetworkManager.SettingConnection({
-            uuid: uuid,
+            uuid: connection._uuid,
            id: this._autoConnectionName,
            type: NetworkManager.SETTING_WIRED_SETTING_NAME,
            autoconnect: true
@@ -858,10 +859,10 @@ const NMDeviceBluetooth = new Lang.Class({

    _createAutomaticConnection: function() {
        let connection = new NetworkManager.Connection;
-        let uuid = NetworkManager.utils_uuid_generate();
+        connection._uuid = NetworkManager.utils_uuid_generate();
        connection.add_setting(new NetworkManager.SettingBluetooth);
        connection.add_setting(new NetworkManager.SettingConnection({
-            uuid: uuid,
+            uuid: connection._uuid,
            id: this._autoConnectionName,
            type: NetworkManager.SETTING_BLUETOOTH_SETTING_NAME,
            autoconnect: false
@@ -896,12 +897,12 @@ const NMDeviceVPN = new Lang.Class({
    Name: 'NMDeviceVPN',
    Extends: NMDevice,

-    _init: function(client, device, connections) {
+    _init: function(client) {
        // Disable autoconnections
        this._autoConnectionName = null;
        this.category = NMConnectionCategory.VPN;

-        this.parent(client, null, connections);
+        this.parent(client, null, [ ]);
    },

    connectionValid: function(connection) {
@@ -913,24 +914,13 @@ const NMDeviceVPN = new Lang.Class({
    },

    get connected() {
-        if (!this._activeConnection)
-            return false;
-
-        return this._activeConnection.vpn_state == NetworkManager.VPNConnectionState.ACTIVATED;
+        return !!this._activeConnection;
    },

    setActiveConnection: function(activeConnection) {
-        if (this._stateChangeId)
-            this._activeConnection.disconnect(this._stateChangeId);
-        this._stateChangeId = 0;
-
        this.parent(activeConnection);

-        if (this._activeConnection)
-            this._stateChangeId = this._activeConnection.connect('vpn-state-changed',
-                                                                 Lang.bind(this, this._connectionStateChanged));
-
-        this.emit('state-changed');
+        this.emit('active-connection-changed');
    },

    _shouldShowConnectionList: function() {
@@ -943,39 +933,7 @@ const NMDeviceVPN = new Lang.Class({
    },

    getStatusLabel: function() {
-        if (!this._activeConnection) // Same as DISCONNECTED
-            return null;
-
-        switch(this._activeConnection.vpn_state) {
-        case NetworkManager.VPNConnectionState.DISCONNECTED:
-        case NetworkManager.VPNConnectionState.ACTIVATED:
-            return null;
-        case NetworkManager.VPNConnectionState.PREPARE:
-        case NetworkManager.VPNConnectionState.CONNECT:
-        case NetworkManager.VPNConnectionState.IP_CONFIG_GET:
-            return _("connecting...");
-        case NetworkManager.VPNConnectionState.NEED_AUTH:
-            /* Translators: this is for network connections that require some kind of key or password */
-            return _("authentication required");
-        case NetworkManager.VPNConnectionState.FAILED:
-            return _("connection failed");
-        default:
-            log('VPN connection state invalid, is %d'.format(this.device.state));
-            return 'invalid';
-        }
-    },
-
-    _connectionStateChanged: function(connection, newstate, reason) {
-        if (newstate == NetworkManager.VPNConnectionState.FAILED) {
-            // FIXME: if we ever want to show something based on reason,
-            // we need to convert from NetworkManager.VPNConnectionStateReason
-            // to NetworkManager.DeviceStateReason
-            this.emit('activation-failed', reason);
-        }
-
-        // Differently from real NMDevices, there is no need to queue
-        // an update of the menu section, contents wouldn't change anyway
-        this.emit('state-changed');
+        return null;
    }
 });

@@ -1365,7 +1323,9 @@ const NMDeviceWireless = new Lang.Class({
    },

    removeConnection: function(connection) {
-        let pos = this._findConnection(connection.get_uuid());
+        if (!connection._uuid)
+            return;
+        let pos = this._findConnection(connection._uuid);
        if (pos == -1) {
            // removing connection that was never added
            return;
@@ -1379,7 +1339,7 @@ const NMDeviceWireless = new Lang.Class({
            let apObj = this._networks[i];
            let connections = apObj.connections;
            for (let k = 0; k < connections.length; k++) {
-                if (connections[k].get_uuid() == connection.get_uuid()) {
+                if (connections[k]._uuid == connection._uuid) {
                    // remove the connection from the access point group
                    connections.splice(k);
                    forceupdate = forceupdate || connections.length == 0;
@@ -1395,7 +1355,7 @@ const NMDeviceWireless = new Lang.Class({
                                forceupdate = true;
                            } else {
                                for (let j = 0; j < items.length; j++) {
-                                    if (items[j]._connection.get_uuid() == connection.get_uuid()) {
+                                    if (items[j]._connection._uuid == connection._uuid) {
                                        items[j].destroy();
                                        break;
                                    }
@@ -1422,8 +1382,8 @@ const NMDeviceWireless = new Lang.Class({
        // record the connection
        let obj = {
            connection: connection,
-            name: connection.get_id(),
-            uuid: connection.get_uuid(),
+            name: connection._name,
+            uuid: connection._uuid,
        };
        this._connections.push(obj);

@@ -1584,15 +1544,6 @@ const NMApplet = new Lang.Class({
        this.menu.addMenuItem(this._statusSection);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

-        this._activeConnections = [ ];
-        this._connections = [ ];
-
-        this._mainConnection = null;
-        this._activeAccessPointUpdateId = 0;
-        this._activeAccessPoint = null;
-        this._mobileUpdateId = 0;
-        this._mobileUpdateDevice = null;
-
        this._devices = { };

        this._devices.wired = {
@@ -1628,9 +1579,13 @@ const NMApplet = new Lang.Class({

        this._devices.vpn = {
            section: new PopupMenu.PopupMenuSection(),
-            device: this._makeWrapperDevice(NMDeviceVPN, null),
+            device: new NMDeviceVPN(this._client),
            item: new NMWiredSectionTitleMenuItem(_("VPN Connections"))
        };
+        this._devices.vpn.device.connect('active-connection-changed', Lang.bind(this, function() {
+            this._devices.vpn.item.updateForDevice(this._devices.vpn.device);
+        }));
+        this._devices.vpn.item.updateForDevice(this._devices.vpn.device);
        this._devices.vpn.section.addMenuItem(this._devices.vpn.item);
        this._devices.vpn.section.addMenuItem(this._devices.vpn.device.section);
        this._devices.vpn.section.actor.hide();
@@ -1638,6 +1593,15 @@ const NMApplet = new Lang.Class({
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');

+        this._activeConnections = [ ];
+        this._connections = [ ];
+
+        this._mainConnection = null;
+        this._activeAccessPointUpdateId = 0;
+        this._activeAccessPoint = null;
+        this._mobileUpdateId = 0;
+        this._mobileUpdateDevice = null;
+
        // Device types
        this._dtypes = { };
        this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
@@ -1680,10 +1644,7 @@ const NMApplet = new Lang.Class({

    _ensureSource: function() {
        if (!this._source) {
-            this._source = new MessageTray.Source(_("Network Manager"),
-                                                  'network-transmit-receive',
-                                                  St.IconType.SYMBOLIC);
-
+            this._source = new NMMessageTraySource();
            this._source.connect('destroy', Lang.bind(this, function() {
                this._source = null;
            }));
@@ -1704,18 +1665,6 @@ const NMApplet = new Lang.Class({
    },

    _syncSectionTitle: function(category) {
-        if (category == NMConnectionCategory.VPN) {
-            // Special case VPN: it's only one device (and a fake one
-            // actually), and we don't show it if empty
-            let device = this._devices.vpn.device;
-            let section = this._devices.vpn.section;
-            let item = this._devices.vpn.item;
-
-            section.actor.visible = !device.empty;
-            item.updateForDevice(device);
-            return;
-        }
-
        let devices = this._devices[category].devices;
        let item = this._devices[category].item;
        let section = this._devices[category].section;
@@ -1766,29 +1715,6 @@ const NMApplet = new Lang.Class({
        this._source.notify(device._notification);
    },

-    _makeWrapperDevice: function(wrapperClass, device) {
-        let wrapper = new wrapperClass(this._client, device, this._connections);
-
-        wrapper._activationFailedId = wrapper.connect('activation-failed', Lang.bind(this, function(device, reason) {
-            // XXX: nm-applet has no special text depending on reason
-            // but I'm not sure of this generic message
-            this._notifyForDevice(device, 'network-error',
-                                  _("Connection failed"),
-                                  _("Activation of network connection failed"),
-                                  MessageTray.Urgency.HIGH);
-        }));
-        wrapper._deviceStateChangedId = wrapper.connect('state-changed', Lang.bind(this, function(dev) {
-            this._syncSectionTitle(dev.category);
-        }));
-        wrapper._destroyId = wrapper.connect('destroy', function(wrapper) {
-            wrapper.disconnect(wrapper._activationFailedId);
-            wrapper.disconnect(wrapper._deviceStateChangedId);
-            wrapper.disconnect(wrapper._destroyId);
-        });
-
-        return wrapper;
-    },
-
    _deviceAdded: function(client, device) {
        if (device._delegate) {
            // already seen, not adding again
@@ -1796,8 +1722,24 @@ const NMApplet = new Lang.Class({
        }
        let wrapperClass = this._dtypes[device.get_device_type()];
        if (wrapperClass) {
-            let wrapper = this._makeWrapperDevice(wrapperClass, device);
+            let wrapper = new wrapperClass(this._client, device, this._connections);

+            wrapper._activationFailedId = wrapper.connect('activation-failed', Lang.bind(this, function(device, reason) {
+                // XXX: nm-applet has no special text depending on reason
+                // but I'm not sure of this generic message
+                this._notifyForDevice(device, 'network-error',
+                                      _("Connection failed"),
+                                      _("Activation of network connection failed"),
+                                     MessageTray.Urgency.HIGH);
+            }));
+            wrapper._deviceStateChangedId = wrapper.connect('state-changed', Lang.bind(this, function(dev) {
+                this._syncSectionTitle(dev.category);
+            }));
+            wrapper._destroyId = wrapper.connect('destroy', function(wrapper) {
+                wrapper.disconnect(wrapper._activationFailedId);
+                wrapper.disconnect(wrapper._deviceStateChangedId);
+                wrapper.disconnect(wrapper._destroyId);
+            });
            let section = this._devices[wrapper.category].section;
            let devices = this._devices[wrapper.category].devices;

@@ -1933,7 +1875,7 @@ const NMApplet = new Lang.Class({
        let connections = this._settings.list_connections();
        for (let i = 0; i < connections.length; i++) {
            let connection = connections[i];
-            if (connection._updatedId) {
+            if (connection._uuid) {
                // connection was already seen (for example because NetworkManager was restarted)
                continue;
            }
@@ -1946,7 +1888,7 @@ const NMApplet = new Lang.Class({
    },

    _newConnection: function(settings, connection) {
-        if (connection._updatedId) {
+        if (connection._uuid) {
            // connection was already seen
            return;
        }
@@ -1969,31 +1911,35 @@ const NMApplet = new Lang.Class({

        if (section == NMConnectionCategory.VPN) {
            this._devices.vpn.device.removeConnection(connection);
-            this._syncSectionTitle(section);
+            if (this._devices.vpn.device.empty)
+                this._devices.vpn.section.actor.hide();
        } else if (section != NMConnectionCategory.INVALID) {
            let devices = this._devices[section].devices;
            for (let i = 0; i < devices.length; i++)
                devices[i].removeConnection(connection);
        }

+        connection._uuid = null;
        connection.disconnect(connection._removedId);
        connection.disconnect(connection._updatedId);
-        connection._removedId = connection._updatedId = 0;
    },

    _updateConnection: function(connection) {
        let connectionSettings = connection.get_setting_by_name(NetworkManager.SETTING_CONNECTION_SETTING_NAME);
        connection._type = connectionSettings.type;
+
        connection._section = this._ctypes[connection._type] || NMConnectionCategory.INVALID;
+        connection._name = connectionSettings.id;
+        connection._uuid = connectionSettings.uuid;
        connection._timestamp = connectionSettings.timestamp;

        let section = connection._section;

-        if (section == NMConnectionCategory.INVALID)
+        if (connection._section == NMConnectionCategory.INVALID)
            return;
        if (section == NMConnectionCategory.VPN) {
            this._devices.vpn.device.checkConnection(connection);
-            this._syncSectionTitle(section);
+            this._devices.vpn.section.actor.show();
        } else {
            let devices = this._devices[section].devices;
            for (let i = 0; i < devices.length; i++) {
@@ -2016,10 +1962,12 @@ const NMApplet = new Lang.Class({

        this._statusSection.actor.hide();

-        this._syncSectionTitle(NMConnectionCategory.WIRED);
-        this._syncSectionTitle(NMConnectionCategory.WIRELESS);
-        this._syncSectionTitle(NMConnectionCategory.WWAN);
-        this._syncSectionTitle(NMConnectionCategory.VPN);
+        this._syncSectionTitle('wired');
+        this._syncSectionTitle('wireless');
+        this._syncSectionTitle('wwan');
+
+        if (!this._devices.vpn.device.empty)
+            this._devices.vpn.section.actor.show();
    },

    _syncNMState: function() {
@@ -2152,3 +2100,18 @@ const NMApplet = new Lang.Class({
        }
    }
 });
+
+const NMMessageTraySource = new Lang.Class({
+    Name: 'NMMessageTraySource',
+    Extends: MessageTray.Source,
+
+    _init: function() {
+        this.parent(_("Network Manager"));
+
+        let icon = new St.Icon({ icon_name: 'network-transmit-receive',
+                                 icon_type: St.IconType.SYMBOLIC,
+                                 icon_size: this.ICON_SIZE
+                               });
+        this._setSummaryIcon(icon);
+    }
+});
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -212,7 +212,7 @@ const DeviceItem = new Lang.Class({
        case UPDeviceType.COMPUTER:
            return _("Computer");
        default:
-            return C_("device", "Unknown");
+            return _("Unknown");
        }
    }
 });
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -365,9 +365,8 @@ const Client = new Lang.Class({

    _ensureSubscriptionSource: function() {
        if (this._subscriptionSource == null) {
-            this._subscriptionSource = new MessageTray.Source(_("Subscription request"),
-                                                              'gtk-dialog-question',
-                                                              St.IconType.FULLCOLOR);
+            this._subscriptionSource = new MultiNotificationSource(
+                _("Subscription request"), 'gtk-dialog-question');
            Main.messageTray.add(this._subscriptionSource);
            this._subscriptionSource.connect('destroy', Lang.bind(this, function () {
                this._subscriptionSource = null;
@@ -402,9 +401,8 @@ const Client = new Lang.Class({

    _ensureAccountSource: function() {
        if (this._accountSource == null) {
-            this._accountSource = new MessageTray.Source(_("Connection error"),
-                                                         'gtk-dialog-error',
-                                                         St.IconType.FULLCOLOR);
+            this._accountSource = new MultiNotificationSource(
+                _("Connection error"), 'gtk-dialog-error');
            Main.messageTray.add(this._accountSource);
            this._accountSource.connect('destroy', Lang.bind(this, function () {
                this._accountSource = null;
@@ -420,13 +418,14 @@ const ChatSource = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function(account, conn, channel, contact, client) {
+        this.parent(contact.get_alias());
+
+        this.isChat = true;
+
        this._account = account;
        this._contact = contact;
        this._client = client;

-        this.parent(contact.get_alias());
-
-        this.isChat = true;
        this._pendingMessages = [];

        this._conn = conn;
@@ -447,6 +446,8 @@ const ChatSource = new Lang.Class({
        this._receivedId = this._channel.connect('message-received', Lang.bind(this, this._messageReceived));
        this._pendingId = this._channel.connect('pending-message-removed', Lang.bind(this, this._pendingRemoved));

+        this._setSummaryIcon(this.createNotificationIcon());
+
        this._notifyAliasId = this._contact.connect('notify::alias', Lang.bind(this, this._updateAlias));
        this._notifyAvatarId = this._contact.connect('notify::avatar-file', Lang.bind(this, this._updateAvatarIcon));
        this._presenceChangedId = this._contact.connect('presence-changed', Lang.bind(this, this._presenceChanged));
@@ -509,10 +510,10 @@ const ChatSource = new Lang.Class({
    _getLogMessages: function() {
        let logManager = Tpl.LogManager.dup_singleton();
        let entity = Tpl.Entity.new_from_tp_contact(this._contact, Tpl.EntityType.CONTACT);
-
-        logManager.get_filtered_events_async(this._account, entity,
-                                             Tpl.EventTypeMask.TEXT, SCROLLBACK_HISTORY_LINES,
-                                             null, Lang.bind(this, this._displayPendingMessages));
+        Shell.get_contact_events(logManager,
+                                 this._account, entity,
+                                 SCROLLBACK_HISTORY_LINES,
+                                 Lang.bind(this, this._displayPendingMessages));
    },

    _displayPendingMessages: function(logManager, result) {
@@ -1001,10 +1002,11 @@ const ApproverSource = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function(dispatchOp, text, gicon) {
-        this._gicon = gicon;
-
        this.parent(text);

+        this._gicon = gicon;
+        this._setSummaryIcon(this.createNotificationIcon());
+
        this._dispatchOp = dispatchOp;

        // Destroy the source if the channel dispatch operation is invalidated
@@ -1026,6 +1028,7 @@ const ApproverSource = new Lang.Class({

    createNotificationIcon: function() {
        return new St.Icon({ gicon: this._gicon,
+                             icon_type: St.IconType.FULLCOLOR,
                             icon_size: this.ICON_SIZE });
    }
 });
@@ -1148,6 +1151,40 @@ const FileTransferNotification = new Lang.Class({
    }
 });

+// A notification source that can embed multiple notifications
+const MultiNotificationSource = new Lang.Class({
+    Name: 'MultiNotificationSource',
+    Extends: MessageTray.Source,
+
+    _init: function(title, icon) {
+        this.parent(title);
+
+        this._icon = icon;
+        this._setSummaryIcon(this.createNotificationIcon());
+        this._nbNotifications = 0;
+    },
+
+    notify: function(notification) {
+        this.parent(notification);
+
+        this._nbNotifications += 1;
+
+        // Display the source while there is at least one notification
+        notification.connect('destroy', Lang.bind(this, function () {
+            this._nbNotifications -= 1;
+
+            if (this._nbNotifications == 0)
+                this.destroy();
+        }));
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ gicon: Gio.icon_new_for_string(this._icon),
+                             icon_type: St.IconType.FULLCOLOR,
+                             icon_size: this.ICON_SIZE });
+    }
+});
+
 // Subscription request
 const SubscriptionRequestNotification = new Lang.Class({
    Name: 'SubscriptionRequestNotification',
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const AccountsService = imports.gi.AccountsService;
-const GdmGreeter = imports.gi.GdmGreeter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
@@ -474,22 +473,13 @@ const UserMenuButton = new Lang.Class({
                                       style_class: 'popup-menu-icon' });
        this._idleIcon = new St.Icon({ icon_name: 'user-idle',
                                       style_class: 'popup-menu-icon' });
-        this._pendingIcon = new St.Icon({ icon_name: 'user-status-pending',
-                                          style_class: 'popup-menu-icon' });

        this._accountMgr.connect('most-available-presence-changed',
                                  Lang.bind(this, this._updatePresenceIcon));
-        this._accountMgr.connect('account-enabled',
-                                  Lang.bind(this, this._onAccountEnabled));
-        this._accountMgr.connect('account-disabled',
-                                 Lang.bind(this, this._onAccountDisabled));
-        this._accountMgr.connect('account-removed',
-                                  Lang.bind(this, this._onAccountDisabled));
        this._accountMgr.prepare_async(null, Lang.bind(this,
            function(mgr) {
                let [presence, s, msg] = mgr.get_most_available_presence();
                this._updatePresenceIcon(mgr, presence, s, msg);
-                this._setupAccounts();
            }));

        this._name = new St.Label();
@@ -507,13 +497,13 @@ const UserMenuButton = new Lang.Class({
        }));

        this._userManager.connect('notify::is-loaded',
-                                  Lang.bind(this, this._updateMultiUser));
+                                  Lang.bind(this, this._updateSwitchUser));
        this._userManager.connect('notify::has-multiple-users',
-                                  Lang.bind(this, this._updateMultiUser));
+                                  Lang.bind(this, this._updateSwitchUser));
        this._userManager.connect('user-added',
-                                  Lang.bind(this, this._updateMultiUser));
+                                  Lang.bind(this, this._updateSwitchUser));
        this._userManager.connect('user-removed',
-                                  Lang.bind(this, this._updateMultiUser));
+                                  Lang.bind(this, this._updateSwitchUser));
        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
                                       Lang.bind(this, this._updateSwitchUser));
        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
@@ -552,32 +542,24 @@ const UserMenuButton = new Lang.Class({
            this._name.set_text("");
    },

-    _updateMultiUser: function() {
-        this._updateSwitchUser();
-        this._updateLogout();
-    },
-
    _updateSwitchUser: function() {
        let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
-        let multiUser = this._userManager.can_switch() && this._userManager.has_multiple_users;
-        let multiSession = GdmGreeter.get_session_ids().length > 1;
-
-        this._loginScreenItem.label.set_text(multiUser ? _("Switch User")
-                                                       : _("Switch Session"));
-        this._loginScreenItem.actor.visible = allowSwitch && (multiUser || multiSession);
+        if (allowSwitch &&
+            this._userManager.can_switch() &&
+            this._userManager.has_multiple_users)
+            this._loginScreenItem.actor.show();
+        else
+            this._loginScreenItem.actor.hide();
    },

    _updateLogout: function() {
        let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
-        let multiUser = this._userManager.has_multiple_users;
-        let multiSession = GdmGreeter.get_session_ids().length > 1;
-
-        this._logoutItem.actor.visible = allowLogout && (multiUser || multiSession);
+        this._logoutItem.actor.visible = allowLogout;
    },

    _updateLockScreen: function() {
        let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
-        this._lockScreenItem.actor.visible = allowLockScreen;
+        this._logoutItem.actor.visible = allowLockScreen;
    },

    _updateHaveShutdown: function() {
@@ -598,14 +580,14 @@ const UserMenuButton = new Lang.Class({

        this._suspendOrPowerOffItem.actor.visible = this._haveShutdown || this._haveSuspend;

-        // If we can't power off show Suspend instead
+        // If we can't suspend show Power Off... instead
        // and disable the alt key
-        if (!this._haveShutdown) {
+        if (!this._haveSuspend) {
+            this._suspendOrPowerOffItem.updateText(_("Power Off..."), null);
+        } else if (!this._haveShutdown) {
            this._suspendOrPowerOffItem.updateText(_("Suspend"), null);
-        } else if (!this._haveSuspend) {
-            this._suspendOrPowerOffItem.updateText(_("Power Off"), null);
        } else {
-            this._suspendOrPowerOffItem.updateText(_("Power Off"), _("Suspend"));
+            this._suspendOrPowerOffItem.updateText(_("Suspend"), _("Power Off..."));
        }
    },

@@ -629,52 +611,11 @@ const UserMenuButton = new Lang.Class({
            this._iconBox.child = this._offlineIcon;
    },

-    _setupAccounts: function() {
-        let accounts = this._accountMgr.get_valid_accounts();
-        for (let i = 0; i < accounts.length; i++) {
-            accounts[i]._changingId = accounts[i].connect('notify::connection-status',
-                                                          Lang.bind(this, this._updateChangingPresence));
-        }
-        this._updateChangingPresence();
-    },
-
-    _onAccountEnabled: function(accountMgr, account) {
-        if (!account._changingId)
-            account._changingId = account.connect('notify::connection-status',
-                                                  Lang.bind(this, this._updateChangingPresence));
-        this._updateChangingPresence();
-    },
-
-    _onAccountDisabled: function(accountMgr, account) {
-        account.disconnect(account._changingId);
-        account._changingId = 0;
-        this._updateChangingPresence();
-    },
-
-    _updateChangingPresence: function() {
-        let accounts = this._accountMgr.get_valid_accounts();
-        let changing = false;
-        for (let i = 0; i < accounts.length; i++) {
-            if (accounts[i].connection_status == Tp.ConnectionStatus.CONNECTING) {
-                changing = true;
-                break;
-            }
-        }
-
-        if (changing) {
-            this._iconBox.child = this._pendingIcon;
-        } else {
-            let [presence, s, msg] = this._accountMgr.get_most_available_presence();
-            this._updatePresenceIcon(this._accountMgr, presence, s, msg);
-        }
-    },
-
    _createSubMenu: function() {
        let item;

        item = new IMStatusChooserItem();
-        if (Main.sessionMode.allowSettings)
-            item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
+        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
        this.menu.addMenuItem(item);
        this._statusChooser = item;

@@ -686,28 +627,28 @@ const UserMenuButton = new Lang.Class({
        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);

-        if (Main.sessionMode.allowSettings) {
-            item = new PopupMenu.PopupMenuItem(_("System Settings"));
-            item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-            this.menu.addMenuItem(item);
-        }
-
-        item = new PopupMenu.PopupAlternatingMenuItem(_("Power Off"),
-                                                      _("Suspend"));
+        item = new PopupMenu.PopupMenuItem(_("Online Accounts"));
+        item.connect('activate', Lang.bind(this, this._onOnlineAccountsActivate));
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupMenuItem(_("System Settings"));
+        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
        this.menu.addMenuItem(item);
-        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
-        this._suspendOrPowerOffItem = item;
-        this._updateSuspendOrPowerOff();

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

+        item = new PopupMenu.PopupMenuItem(_("Lock Screen"));
+        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
+        this.menu.addMenuItem(item);
+        this._lockScreenItem = item;
+
        item = new PopupMenu.PopupMenuItem(_("Switch User"));
        item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
        this.menu.addMenuItem(item);
        this._loginScreenItem = item;

-        item = new PopupMenu.PopupMenuItem(_("Log Out"));
+        item = new PopupMenu.PopupMenuItem(_("Log Out..."));
        item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
        this.menu.addMenuItem(item);
        this._logoutItem = item;
@@ -715,10 +656,12 @@ const UserMenuButton = new Lang.Class({
        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);

-        item = new PopupMenu.PopupMenuItem(_("Lock"));
-        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
+        item = new PopupMenu.PopupAlternatingMenuItem(_("Suspend"),
+                                                      _("Power Off..."));
        this.menu.addMenuItem(item);
-        this._lockScreenItem = item;
+        this._suspendOrPowerOffItem = item;
+        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
+        this._updateSuspendOrPowerOff();
    },

    _updatePresenceStatus: function(item, event) {
@@ -746,6 +689,12 @@ const UserMenuButton = new Lang.Class({
        app.activate();
    },

+    _onOnlineAccountsActivate: function() {
+        Main.overview.hide();
+        let app = Shell.AppSystem.get_default().lookup_setting('gnome-online-accounts-panel.desktop');
+        app.activate(-1);
+    },
+
    _onPreferencesActivate: function() {
        Main.overview.hide();
        let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
@@ -774,14 +723,14 @@ const UserMenuButton = new Lang.Class({
    _onSuspendOrPowerOffActivate: function() {
        Main.overview.hide();

-        if (this._haveShutdown &&
+        if (this._haveSuspend &&
            this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
-            this._session.ShutdownRemote();
-        } else {
            // Ensure we only suspend after locking the screen
            this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
                this._upClient.suspend_sync(null);
            }));
+        } else {
+            this._session.ShutdownRemote();
        }
    }
 });
--- a/js/ui/wanda.js
+++ b/js/ui/wanda.js
@@ -168,35 +168,34 @@ const WandaSearchProvider = new Lang.Class({
        this.parent(_("Your favorite Easter Egg"));
    },

-    getResultMetas: function(fish, callback) {
-        callback([{ 'id': fish[0], // there may be many fish in the sea, but
-                    // only one which speaks the truth!
-                    'name': capitalize(fish[0]),
-                    'createIcon': function(iconSize) {
-                        // for DND only (maybe could be improved)
-                        // DON'T use St.Icon here, it crashes the shell
-                        // (dnd.js code assumes it can query the actor size
-                        // without parenting it, while StWidget accesses
-                        // StThemeNode in get_preferred_width/height, which
-                        // triggers an assertion failure)
-                        return St.TextureCache.get_default().load_icon_name(null,
-                                                                            'face-smile',
-                                                                            St.IconType.FULLCOLOR,
-                                                                            iconSize);
-                    }
-                  }]);
+    getResultMetas: function(fish) {
+        return [{ 'id': fish[0], // there may be many fish in the sea, but
+                                 // only one which speaks the truth!
+                  'name': capitalize(fish[0]),
+                  'createIcon': function(iconSize) {
+                      // for DND only (maybe could be improved)
+                      // DON'T use St.Icon here, it crashes the shell
+                      // (dnd.js code assumes it can query the actor size
+                      // without parenting it, while StWidget accesses
+                      // StThemeNode in get_preferred_width/height, which
+                      // triggers an assertion failure)
+                      return St.TextureCache.get_default().load_icon_name(null,
+                                                                          'face-smile',
+                                                                          St.IconType.FULLCOLOR,
+                                                                          iconSize);
+                  }
+                }];
    },

    getInitialResultSet: function(terms) {
        if (terms.join(' ') == MAGIC_FISH_KEY) {
-            this.searchSystem.pushResults(this, [ FISH_NAME ]);
-        } else {
-            this.searchSystem.pushResults(this, []);
+            return [ FISH_NAME ];
        }
+        return [];
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        this.getInitialResultSet(terms);
+        return this.getInitialResultSet(terms);
    },

    activateResult: function(fish, params) {
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@@ -53,10 +53,10 @@ const Source = new Lang.Class({
    Extends: MessageTray.Source,

    _init: function(app, window) {
+        this.parent(app.get_name());
        this._window = window;
        this._app = app;
-
-        this.parent(app.get_name());
+        this._setSummaryIcon(this.createNotificationIcon());

        this.signalIDs = [];
        this.signalIDs.push(this._window.connect('notify::demands-attention', Lang.bind(this, function() { this.destroy(); })));
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -529,11 +529,9 @@ const WorkspacesDisplay = new Lang.Class({
            this._updateAlwaysZoom();
        }));

-        global.screen.connect('notify::n-workspaces',
-                              Lang.bind(this, this._workspacesChanged));
-
        this._switchWorkspaceNotifyId = 0;

+        this._nWorkspacesChangedId = 0;
        this._itemDragBeginId = 0;
        this._itemDragCancelledId = 0;
        this._itemDragEndId = 0;
@@ -572,6 +570,9 @@ const WorkspacesDisplay = new Lang.Class({
            global.screen.connect('restacked',
                                  Lang.bind(this, this._onRestacked));

+        if (this._nWorkspacesChangedId == 0)
+            this._nWorkspacesChangedId = global.screen.connect('notify::n-workspaces',
+                                                               Lang.bind(this, this._workspacesChanged));
        if (this._itemDragBeginId == 0)
            this._itemDragBeginId = Main.overview.connect('item-drag-begin',
                                                          Lang.bind(this, this._dragBegin));
@@ -924,16 +925,19 @@ const WorkspacesDisplay = new Lang.Class({
    },

    _workspacesChanged: function() {
+        let oldNumWorkspaces = this._workspaces[0].length;
+        let newNumWorkspaces = global.screen.n_workspaces;
+        let active = global.screen.get_active_workspace_index();
+
+        if (oldNumWorkspaces == newNumWorkspaces)
+            return;
+
        this._updateAlwaysZoom();
        this._updateZoom();

        if (this._workspacesViews == null)
            return;

-        let oldNumWorkspaces = this._workspaces[0].length;
-        let newNumWorkspaces = global.screen.n_workspaces;
-        let active = global.screen.get_active_workspace_index();
-
        let lostWorkspaces = [];
        if (newNumWorkspaces > oldNumWorkspaces) {
            let monitors = Main.layoutManager.monitors;
--- a/po/es.po
+++ b/po/es.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
@@ -8,15 +8,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-12 20:08+0200\n"
-"PO-Revision-Date: 2012-05-12 20:09+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-04-28 13:41+0000\n"
+"PO-Revision-Date: 2012-04-30 15:32+0200\n"
 "Last-Translator: Luca Ferretti <lferrett@gnome.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
@@ -143,42 +144,34 @@ msgid "Keybinding to open the application menu."
 msgstr "Associazione di tasti per aprire il menù delle applicazioni."

 #: ../data/org.gnome.shell.gschema.xml.in.h:18
-msgid "Keybinding to toggle the screen recorder"
-msgstr "Associazione tasti per commutare registrazione schermo"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
-msgid "Keybinding to start/stop the builtin screen recorder."
-msgstr "Associazione di tasti per avviare/fermare il registratore di schermo incorporato."
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Which keyboard to use"
 msgstr "Quale tastiera usare"

-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid "The type of keyboard to use."
 msgstr "Il tipo di tastiera da usare."

-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Show time with seconds"
 msgstr "Mostra l'ora con i secondi"

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "If true, display seconds in time."
 msgstr "Se VERO, mostra i secondi nell'orario."

-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "Show date in clock"
 msgstr "Mostra la data nell'orologio"

-#: ../data/org.gnome.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid "If true, display date in the clock, in addition to time."
 msgstr "Se VERO, mostra nell'orologio la data, oltre all'orario."

-#: ../data/org.gnome.shell.gschema.xml.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.h:24
 msgid "Framerate used for recording screencasts."
 msgstr "Framerate per la registrazione di screencast."

-#: ../data/org.gnome.shell.gschema.xml.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.h:25
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -186,11 +179,11 @@ msgstr ""
 "Il framerate in fotogrammi al secondo dello screencast registrato attraverso "
 "il registratore della GNOME Shell."

-#: ../data/org.gnome.shell.gschema.xml.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.h:26
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "La pipeline di gstreamer utilizzata per codificare lo screencast"

-#: ../data/org.gnome.shell.gschema.xml.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.h:28
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -216,11 +209,11 @@ msgstr ""
 "WEBM usando il codec VP8. %T è usato come un segnaposto per una stima del "
 "valore di thread ottimale per il sistema in uso."

-#: ../data/org.gnome.shell.gschema.xml.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.h:29
 msgid "File extension used for storing the screencast"
 msgstr "Estensione del file utilizzato per salvare lo screencast"

-#: ../data/org.gnome.shell.gschema.xml.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.h:30
 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 "
@@ -270,7 +263,7 @@ msgstr "Non elencato?"

 #: ../js/gdm/loginDialog.js:1023 ../js/ui/endSessionDialog.js:401
 #: ../js/ui/extensionSystem.js:400 ../js/ui/networkAgent.js:153
-#: ../js/ui/polkitAuthenticationAgent.js:175 ../js/ui/status/bluetooth.js:459
+#: ../js/ui/polkitAuthenticationAgent.js:175 ../js/ui/status/bluetooth.js:462
 msgid "Cancel"
 msgstr "Annulla"

@@ -283,31 +276,30 @@ msgstr "Accedi"
 msgid "Login Window"
 msgstr "Finestra di accesso"

-#: ../js/gdm/powerMenu.js:130 ../js/ui/userMenu.js:588
-#: ../js/ui/userMenu.js:592 ../js/ui/userMenu.js:637
+#: ../js/gdm/powerMenu.js:155 ../js/ui/userMenu.js:597
+#: ../js/ui/userMenu.js:599 ../js/ui/userMenu.js:668
 msgid "Suspend"
 msgstr "Sospendi"

-#: ../js/gdm/powerMenu.js:135
+#: ../js/gdm/powerMenu.js:160
 msgid "Restart"
 msgstr "Riavvia"

-#: ../js/gdm/powerMenu.js:140 ../js/ui/userMenu.js:590
-#: ../js/ui/userMenu.js:592 ../js/ui/userMenu.js:636
+#: ../js/gdm/powerMenu.js:165
 msgid "Power Off"
 msgstr "Spegni"

-#: ../js/misc/util.js:93
+#: ../js/misc/util.js:92
 msgid "Command not found"
 msgstr "Comando non trovato"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:124
+#: ../js/misc/util.js:119
 msgid "Could not parse command:"
 msgstr "Impossibile analizzare il comando:"

-#: ../js/misc/util.js:132
+#: ../js/misc/util.js:127
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Esecuzione di «%s» non riuscita:"
@@ -321,19 +313,19 @@ msgstr "Tutte"
 msgid "APPLICATIONS"
 msgstr "APPLICAZIONI"

-#: ../js/ui/appDisplay.js:374
+#: ../js/ui/appDisplay.js:375
 msgid "SETTINGS"
 msgstr "IMPOSTAZIONI"

-#: ../js/ui/appDisplay.js:679
+#: ../js/ui/appDisplay.js:680
 msgid "New Window"
 msgstr "Nuova finestra"

-#: ../js/ui/appDisplay.js:682
+#: ../js/ui/appDisplay.js:683
 msgid "Remove from Favorites"
 msgstr "Rimuovi dai preferiti"

-#: ../js/ui/appDisplay.js:683
+#: ../js/ui/appDisplay.js:684
 msgid "Add to Favorites"
 msgstr "Aggiungi ai preferiti"

@@ -533,7 +525,7 @@ msgstr "Fuori rete"
 msgid "CONTACTS"
 msgstr "CONTATTI"

-#: ../js/ui/dash.js:239 ../js/ui/messageTray.js:1209
+#: ../js/ui/dash.js:229 ../js/ui/messageTray.js:1207
 msgid "Remove"
 msgstr "Rimuovi"

@@ -715,53 +707,53 @@ msgstr "Password:"
 msgid "Type again:"
 msgstr "Inserire di nuovo:"

-#: ../js/ui/lookingGlass.js:693
+#: ../js/ui/lookingGlass.js:732
 msgid "No extensions installed"
 msgstr "Nessuna estensione installata"

 #. Translators: argument is an extension UUID.
-#: ../js/ui/lookingGlass.js:747
+#: ../js/ui/lookingGlass.js:786
 #, c-format
 msgid "%s has not emitted any errors."
 msgstr "%s non ha emesso alcun errore."

-#: ../js/ui/lookingGlass.js:753
+#: ../js/ui/lookingGlass.js:792
 msgid "Hide Errors"
 msgstr "Nascondi errori"

-#: ../js/ui/lookingGlass.js:757 ../js/ui/lookingGlass.js:808
+#: ../js/ui/lookingGlass.js:796 ../js/ui/lookingGlass.js:847
 msgid "Show Errors"
 msgstr "Mostra errori"

 # (ndt) o abilitata?
-#: ../js/ui/lookingGlass.js:766
+#: ../js/ui/lookingGlass.js:805
 msgid "Enabled"
 msgstr "Abilitato"

 # (ndt) o disabilitata?
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:769 ../src/gvc/gvc-mixer-control.c:1082
+#: ../js/ui/lookingGlass.js:808 ../src/gvc/gvc-mixer-control.c:1082
 msgid "Disabled"
 msgstr "Disabilitato"

-#: ../js/ui/lookingGlass.js:771
+#: ../js/ui/lookingGlass.js:810
 msgid "Error"
 msgstr "Errore"

-#: ../js/ui/lookingGlass.js:773
+#: ../js/ui/lookingGlass.js:812
 msgid "Out of date"
 msgstr "Non aggiornato"

-#: ../js/ui/lookingGlass.js:775
+#: ../js/ui/lookingGlass.js:814
 msgid "Downloading"
 msgstr "Scaricamento"

-#: ../js/ui/lookingGlass.js:796
+#: ../js/ui/lookingGlass.js:835
 msgid "View Source"
 msgstr "Visualizza sorgente"

-#: ../js/ui/lookingGlass.js:802
+#: ../js/ui/lookingGlass.js:841
 msgid "Web Page"
 msgstr "Pagina web"

@@ -771,19 +763,19 @@ msgstr "Pagina web"
 msgid "Screencast from %d %t"
 msgstr "Screencast da %d %t"

-#: ../js/ui/messageTray.js:1202
+#: ../js/ui/messageTray.js:1200
 msgid "Open"
 msgstr "Apri"

-#: ../js/ui/messageTray.js:1219
+#: ../js/ui/messageTray.js:1217
 msgid "Unmute"
 msgstr "Attiva audio"

-#: ../js/ui/messageTray.js:1219
+#: ../js/ui/messageTray.js:1217
 msgid "Mute"
 msgstr "Escludi audio"

-#: ../js/ui/messageTray.js:2492
+#: ../js/ui/messageTray.js:2490
 msgid "System Information"
 msgstr "Informazione di sistema"

@@ -829,8 +821,8 @@ msgstr "Richiesta autenticazione dalla rete wireless"
 #: ../js/ui/networkAgent.js:330
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
 msgstr ""
 "È richiesta una password o una chiave di cifratura per accedere alla rete "
 "wireless «%s»."
@@ -948,7 +940,7 @@ msgstr "Errore nell'autenticazione. Provare di nuovo."
 #. "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:728
+#: ../js/ui/popupMenu.js:724
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"

@@ -956,11 +948,11 @@ msgstr "toggle-switch-us"
 msgid "Please enter a command:"
 msgstr "Inserire un comando:"

-#: ../js/ui/searchDisplay.js:321
+#: ../js/ui/searchDisplay.js:332
 msgid "Searching..."
 msgstr "Ricerca..."

-#: ../js/ui/searchDisplay.js:374
+#: ../js/ui/searchDisplay.js:415
 msgid "No matching results."
 msgstr "Nessun risultato corrispondente."

@@ -1033,9 +1025,9 @@ msgid "Large Text"
 msgstr "Caratteri grandi"

 #: ../js/ui/status/bluetooth.js:31 ../js/ui/status/bluetooth.js:35
-#: ../js/ui/status/bluetooth.js:255 ../js/ui/status/bluetooth.js:338
-#: ../js/ui/status/bluetooth.js:368 ../js/ui/status/bluetooth.js:404
-#: ../js/ui/status/bluetooth.js:433 ../js/ui/status/network.js:890
+#: ../js/ui/status/bluetooth.js:258 ../js/ui/status/bluetooth.js:341
+#: ../js/ui/status/bluetooth.js:371 ../js/ui/status/bluetooth.js:407
+#: ../js/ui/status/bluetooth.js:436 ../js/ui/status/network.js:893
 msgid "Bluetooth"
 msgstr "Bluetooth"

@@ -1063,102 +1055,102 @@ msgstr "hardware disabilitato"

 # indica lo stato del device BT, per esempio gli auricolari
 # credo sia meglio l'aggettivo che il sostantivo
-#: ../js/ui/status/bluetooth.js:200
+#: ../js/ui/status/bluetooth.js:203
 msgid "Connection"
 msgstr "Collegato"

-#: ../js/ui/status/bluetooth.js:211 ../js/ui/status/network.js:491
+#: ../js/ui/status/bluetooth.js:214 ../js/ui/status/network.js:491
 msgid "disconnecting..."
 msgstr "disconnessione..."

-#: ../js/ui/status/bluetooth.js:224 ../js/ui/status/network.js:497
+#: ../js/ui/status/bluetooth.js:227 ../js/ui/status/network.js:497
 msgid "connecting..."
 msgstr "connessione..."

-#: ../js/ui/status/bluetooth.js:242
+#: ../js/ui/status/bluetooth.js:245
 msgid "Send Files..."
 msgstr "Invia file..."

-#: ../js/ui/status/bluetooth.js:247
+#: ../js/ui/status/bluetooth.js:250
 msgid "Browse Files..."
 msgstr "Esplora file..."

-#: ../js/ui/status/bluetooth.js:256
+#: ../js/ui/status/bluetooth.js:259
 msgid "Error browsing device"
 msgstr "Errore nell'esplorare il dispositivo"

-#: ../js/ui/status/bluetooth.js:257
+#: ../js/ui/status/bluetooth.js:260
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "Non è possibile esplorare il dispositivo richiesto, l'errore è «%s»"

-#: ../js/ui/status/bluetooth.js:265
+#: ../js/ui/status/bluetooth.js:268
 msgid "Keyboard Settings"
 msgstr "Impostazioni tastiera"

-#: ../js/ui/status/bluetooth.js:268
+#: ../js/ui/status/bluetooth.js:271
 msgid "Mouse Settings"
 msgstr "Impostazioni mouse"

-#: ../js/ui/status/bluetooth.js:273 ../js/ui/status/volume.js:59
+#: ../js/ui/status/bluetooth.js:276 ../js/ui/status/volume.js:59
 msgid "Sound Settings"
 msgstr "Impostazioni audio"

-#: ../js/ui/status/bluetooth.js:369
+#: ../js/ui/status/bluetooth.js:372
 #, c-format
 msgid "Authorization request from %s"
 msgstr "Richesta autorizzazione da %s"

-#: ../js/ui/status/bluetooth.js:375
+#: ../js/ui/status/bluetooth.js:378
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "Il dispositivo %s vuole accedere al servizio «%s»"

-#: ../js/ui/status/bluetooth.js:377
+#: ../js/ui/status/bluetooth.js:380
 msgid "Always grant access"
 msgstr "Accorda sempre l'accesso"

-#: ../js/ui/status/bluetooth.js:378
+#: ../js/ui/status/bluetooth.js:381
 msgid "Grant this time only"
 msgstr "Accorda solo stavolta"

-#: ../js/ui/status/bluetooth.js:379 ../js/ui/telepathyClient.js:1093
+#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1093
 msgid "Reject"
 msgstr "Rifiuta"

-#: ../js/ui/status/bluetooth.js:405
+#: ../js/ui/status/bluetooth.js:408
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Conferma associazione per %s"

-#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:441
+#: ../js/ui/status/bluetooth.js:414 ../js/ui/status/bluetooth.js:444
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "Il dispositivo %s vuole associarsi con questo computer"

-#: ../js/ui/status/bluetooth.js:412
+#: ../js/ui/status/bluetooth.js:415
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgstr "Confermare la corrispondenza del PIN «%s» con quello sul dispositivo."

-#: ../js/ui/status/bluetooth.js:414
+#: ../js/ui/status/bluetooth.js:417
 msgid "Matches"
 msgstr "Corrisponde"

-#: ../js/ui/status/bluetooth.js:415
+#: ../js/ui/status/bluetooth.js:418
 msgid "Does not match"
 msgstr "Non corrisponde"

-#: ../js/ui/status/bluetooth.js:434
+#: ../js/ui/status/bluetooth.js:437
 #, c-format
 msgid "Pairing request for %s"
 msgstr "Richiesta di associazione per %s"

-#: ../js/ui/status/bluetooth.js:442
+#: ../js/ui/status/bluetooth.js:445
 msgid "Please enter the PIN mentioned on the device."
 msgstr "Inserire il PIN indicato sul dispositivo."

-#: ../js/ui/status/bluetooth.js:458
+#: ../js/ui/status/bluetooth.js:461
 msgid "OK"
 msgstr "OK"

@@ -1212,13 +1204,13 @@ msgstr "non disponibile"
 msgid "connection failed"
 msgstr "connessione non riuscita"

-#: ../js/ui/status/network.js:585 ../js/ui/status/network.js:1497
+#: ../js/ui/status/network.js:585 ../js/ui/status/network.js:1505
 msgid "More..."
 msgstr "Altro..."

 #. 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:621 ../js/ui/status/network.js:1432
+#: ../js/ui/status/network.js:621 ../js/ui/status/network.js:1440
 msgid "Connected (private)"
 msgstr "Connessa (privata)"

@@ -1226,69 +1218,69 @@ msgstr "Connessa (privata)"
 msgid "Auto Ethernet"
 msgstr "Ethernet automatica"

-#: ../js/ui/status/network.js:754
+#: ../js/ui/status/network.js:757
 msgid "Auto broadband"
 msgstr "Banda larga automatica"

-#: ../js/ui/status/network.js:757
+#: ../js/ui/status/network.js:760
 msgid "Auto dial-up"
 msgstr "Dial-up automatica"

 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:876 ../js/ui/status/network.js:1444
+#: ../js/ui/status/network.js:879 ../js/ui/status/network.js:1452
 #, c-format
 msgid "Auto %s"
 msgstr "%s automatica"

-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:881
 msgid "Auto bluetooth"
 msgstr "Bluetooth automatica"

-#: ../js/ui/status/network.js:1446
+#: ../js/ui/status/network.js:1454
 msgid "Auto wireless"
 msgstr "Wireless automatica"

-#: ../js/ui/status/network.js:1533
+#: ../js/ui/status/network.js:1541
 msgid "Network"
 msgstr "Rete"

-#: ../js/ui/status/network.js:1540
+#: ../js/ui/status/network.js:1548
 msgid "Enable networking"
 msgstr "Abilita rete"

-#: ../js/ui/status/network.js:1552
+#: ../js/ui/status/network.js:1560
 msgid "Wired"
 msgstr "Via cavo"

-#: ../js/ui/status/network.js:1563
+#: ../js/ui/status/network.js:1571
 msgid "Wireless"
 msgstr "Wireless"

-#: ../js/ui/status/network.js:1573
+#: ../js/ui/status/network.js:1581
 msgid "Mobile broadband"
 msgstr "Banda larga mobile"

-#: ../js/ui/status/network.js:1583
+#: ../js/ui/status/network.js:1591
 msgid "VPN Connections"
 msgstr "Connessioni VPN"

-#: ../js/ui/status/network.js:1594
+#: ../js/ui/status/network.js:1602
 msgid "Network Settings"
 msgstr "Impostazioni rete"

-#: ../js/ui/status/network.js:1731
+#: ../js/ui/status/network.js:1739
 msgid "Connection failed"
 msgstr "Connessione non riuscita"

-#: ../js/ui/status/network.js:1732
+#: ../js/ui/status/network.js:1740
 msgid "Activation of network connection failed"
 msgstr "Attivazione della connessione di rete non riuscita"

-#: ../js/ui/status/network.js:1985
+#: ../js/ui/status/network.js:1993
 msgid "Networking is disabled"
 msgstr "Rete disabilitata"

-#: ../js/ui/status/network.js:2109
+#: ../js/ui/status/network.js:2117
 msgid "Network Manager"
 msgstr "Gestore reti"

@@ -1668,32 +1660,40 @@ msgstr "Inattivo"
 msgid "Unavailable"
 msgstr "Non disponibile"

-#: ../js/ui/userMenu.js:624
+#: ../js/ui/userMenu.js:595 ../js/ui/userMenu.js:599 ../js/ui/userMenu.js:669
+msgid "Power Off..."
+msgstr "Spegni..."
+
+#: ../js/ui/userMenu.js:631
 msgid "Notifications"
 msgstr "Notifiche"

-#: ../js/ui/userMenu.js:632
+#: ../js/ui/userMenu.js:639
+msgid "Online Accounts"
+msgstr "Account online"
+
+#: ../js/ui/userMenu.js:643
 msgid "System Settings"
 msgstr "Impostazioni di sistema"

-#: ../js/ui/userMenu.js:646
+#: ../js/ui/userMenu.js:650
+msgid "Lock Screen"
+msgstr "Blocca schermo"
+
+#: ../js/ui/userMenu.js:655
 msgid "Switch User"
 msgstr "Cambia utente"

-#: ../js/ui/userMenu.js:651
-msgid "Log Out"
-msgstr "Termina sessione"
-
-#: ../js/ui/userMenu.js:659
-msgid "Lock"
-msgstr "Blocca"
+#: ../js/ui/userMenu.js:660
+msgid "Log Out..."
+msgstr "Termina sessione..."

 # accorciato, altrimenti non si legge...
-#: ../js/ui/userMenu.js:677
+#: ../js/ui/userMenu.js:688
 msgid "Your chat status will be set to busy"
 msgstr "Stato per chat impostato a non disponibile"

-#: ../js/ui/userMenu.js:678
+#: ../js/ui/userMenu.js:689
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@@ -1817,18 +1817,6 @@ msgstr "File system"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Power Off..."
-#~ msgstr "Spegni..."
-
-#~ msgid "Online Accounts"
-#~ msgstr "Account online"
-
-#~ msgid "Lock Screen"
-#~ msgstr "Blocca schermo"
-
-#~ msgid "Log Out..."
-#~ msgstr "Termina sessione..."
-
 #~ msgid "RECENT ITEMS"
 #~ msgstr "ELEMENTI RECENTI"

--- a/po/ja.po
+++ b/po/ja.po
--- a/po/ko.po
+++ b/po/ko.po
@@ -13,7 +13,7 @@ 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: 2012-04-19 21:14+0000\n"
-"PO-Revision-Date: 2012-05-19 22:57+0900\n"
+"PO-Revision-Date: 2012-04-26 01:05+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgstr "Alt-F2 대화 상자에서 내부 디버깅 및 감시 기능에 접근

 #: ../data/org.gnome.shell.gschema.xml.in.h:3
 msgid "Uuids of extensions to enable"
-msgstr "사용할 확장의 UUID 목록"
+msgstr "사용할 확장 기능의 UUID 목록"

 #: ../data/org.gnome.shell.gschema.xml.in.h:4
 msgid ""
@@ -71,7 +71,11 @@ msgid ""
 "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 "셸에서는 최근에 사용한 프로그램을(실행 메뉴 등에서) 표시하는 목적으로, 현재 사용 중인 프로그램을 감시합니다. 이 데이터는 비공개 데이터이지만 사생활 문제가 걱정된다면 이 기능을 끌 수도 있습니다. 단 이 기능을 사용하지 않더라도 이미 저장된 데이터를 제거하지는 않습니다."
+msgstr ""
+"셸에서는 최근에 사용한 프로그램을 (실행 메뉴 등에서) 표시하는 목적으로, 현재 "
+"사용 중인 프로그램을 감시합니다. 이 데이터는 비공개 데이터이지만 사생활 문제"
+"가 걱정된다면 이 기능을 끌 수도 있습니다. 단 이 기능을 사용하지 않더라도 이"
+"미 저장된 데이터를 제거하지는 않습니다."

 #: ../data/org.gnome.shell.gschema.xml.in.h:7
 msgid "List of desktop file IDs for favorite applications"
@@ -89,7 +93,7 @@ msgstr "사용하지 않는 OpenSearch 서비스"

 #: ../data/org.gnome.shell.gschema.xml.in.h:10
 msgid "History for command (Alt-F2) dialog"
-msgstr "명령어 대화 상자에(Alt-F2) 기록 기능"
+msgstr "명령어 대화 상자에 (Alt-F2) 기록 기능"

 #: ../data/org.gnome.shell.gschema.xml.in.h:11
 msgid "History for the looking glass dialog"
@@ -162,7 +166,7 @@ msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "스크린 방송 인코딩에 사용할 gstreamer 파이프라인"

 #: ../data/org.gnome.shell.gschema.xml.in.h:28
-#, no-c-format
+#, no-c-format, fuzzy
 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 "
@@ -174,31 +178,45 @@ msgid ""
 "'vp8enc quality=8 speed=6 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 "녹화 인코딩에 사용할 GStreamer 파이프라인을 지정합니다. gst-launch 프로그램에 사용하는 문법을 따릅니다. 녹화한 영상이 입력되는 싱크 패드는 이 파이프라인에 연결하지 않은 상태여야 합니다. 보통은 소스 패드도 연결하지 않고, 소스 패드의 출력을 출력 파일에 기록합니다. 하지만 파이프라인에서 이 출력을 처리할 수도 있습니다. shout2send 같은 프로그램을 이용해 아이스캐스트 서버로 출력을 보내거나 하는 용도로 사용할 수 있습니다. 설정을 취소하거나 빈 값으로 설정하면, 기본 파이프라인을 사용합니다. 기본 파이프라인은 'vp8enc quality=8 speed=6 threads=%T ! queue ! webmmux'이고 VP8 코덱을 사용해 WEBM 형식으로 녹화합니다. '%T' 기호는 시스템에서 최적으로 생각되는 스레드 수로 대체됩니다."
+msgstr ""
+"녹화 인코딩에 사용할 GStreamer 파이프라인을 지정합니다. gst-launch에 사용하"
+"는 문법을 따릅니다. 파이프라인은 녹화한 영상이 있는 싱크 패드를 연결하지 않"
+"은 상태여야 합니다. 보통 소스 패드와 연결하지 않았을 것입니다. 이 패드의 출력"
+"은 출력 파일에 기록할 것입니다. 그러나 파이프라인은 이 출력을 다룰 수 있기도 "
+"합니다 - 아마 shout2send와 같은 것을 통해 icecast 서버로 출력을 보내는데 사용"
+"할지도 모릅니다. 만약 설정을 취소하거나 빈 값으로 설정한다면, 기본 파이프라인"
+"을 사용할 것입니다. 이것은 현재 'vp8enc quality=8 speed=6 threads=%T ! "
+"queue ! webmmux' 이며 VP8 코덱을 사용하여 WEBM으로 녹화합니다. %T는 시스템 상"
+"의 최적의 스레드 수를 추측하기 위해 대체기호로 사용합니다."

 #: ../data/org.gnome.shell.gschema.xml.in.h:29
 msgid "File extension used for storing the screencast"
 msgstr "스크린 방송을 저장할 때 사용할 파일 확장자"

 #: ../data/org.gnome.shell.gschema.xml.in.h:30
+#, fuzzy
 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 "녹화한 스크린 방송 영상 파일은, 현재 날짜와 여기서 설정하는 확장자를 붙여 파일 이름을 만듭니다. 다른 컨테이너 형식으로 녹화하려면 이 값을 바꿔야 합니다."
+msgstr ""
+"스크린 방송 녹화 파일 이름은 현재 날짜와 이 확장자를 사용해서 결정됩니다. 녹"
+"화할 때 다른 형식으로 바꿀 수도 있습니다."

 #: ../js/extensionPrefs/main.js:125
-#, c-format
+#, c-format, fuzzy
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "%s에 대한 기본 설정 대화상자를 불러오는데 오류가 발생했습니다:"

 #: ../js/extensionPrefs/main.js:165
+#, fuzzy
 msgid "<b>Extension</b>"
 msgstr "<b>확장</b>"

 #: ../js/extensionPrefs/main.js:189
+#, fuzzy
 msgid "Select an extension to configure using the combobox above."
-msgstr "위의 콤보상자를 사용해 설정할 확장을 선택하십시오."
+msgstr "위의 콤보상자를 사용하여 설정할 확장을 선택하십시오."

 #: ../js/gdm/loginDialog.js:627
 msgid "Session..."
@@ -656,13 +674,13 @@ msgstr "다시 입력하십시오:"

 #: ../js/ui/lookingGlass.js:732
 msgid "No extensions installed"
-msgstr "확장을 설치하지 않았습니다"
+msgstr "확장 기능을 설치하지 않았습니다"

 #. Translators: argument is an extension UUID.
 #: ../js/ui/lookingGlass.js:786
 #, c-format
 msgid "%s has not emitted any errors."
-msgstr "%s에서 발생한 에러가 없습니다."
+msgstr "%s이(가) 발생한 에러가 없습니다."

 #: ../js/ui/lookingGlass.js:792
 msgid "Hide Errors"
@@ -1149,7 +1167,7 @@ msgstr "더 보기..."
 #. and we cannot access its settings (including the name)
 #: ../js/ui/status/network.js:621 ../js/ui/status/network.js:1440
 msgid "Connected (private)"
-msgstr "연결됨(개인)"
+msgstr "연결됨 (개인)"

 #: ../js/ui/status/network.js:696
 msgid "Auto Ethernet"
@@ -1555,7 +1573,7 @@ msgstr "내부 오류"
 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
 #: ../js/ui/telepathyClient.js:1345
-#, c-format
+#, c-format, fuzzy
 msgid "Connection to %s failed"
 msgstr "%s에 연결이 실패했습니다"

--- a/po/lt.po
+++ b/po/lt.po
@@ -3,20 +3,19 @@
 # This file is distributed under the same license as the gnome-shell package.
 # Žygimantas Beručka <zygis@gnome.org>, 2010, 2011, 2012.
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
-# Mantas Kriaučiūnas <mantas@akl.lt>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-05-19 13:58+0000\n"
+"POT-Creation-Date: 2012-03-30 17:59+0000\n"
 "PO-Revision-Date: 2012-04-05 15:14+0300\n"
-"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
+"Last-Translator: Žygimantas Beručka <zygis@gnome.org>\n"
 "Language-Team: Lithuanian\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.0\n"
@@ -24,7 +23,7 @@ msgstr ""

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
-msgstr "GNOME Shell aplinka"
+msgstr "GNOME Shell"

 #: ../data/gnome-shell.desktop.in.in.h:2
 msgid "Window management and application launching"
@@ -80,11 +79,10 @@ msgid ""
 "want to disable this for privacy reasons. Please note that doing so won't "
 "remove already saved data."
 msgstr ""
-"Įprastai GNOME aplinka stebi aktyvias programas siekiant pateikti "
-"dažniausiai naudojamas (pvz., leistukuose). Nors šie duomenys "
-"konfidencialiai saugomi, jei norite, saugumo sumetimais galite šią funkciją "
-"išjungti. Atminkite, kad išjungus šią funkciją anksčiau įrašyti duomenys "
-"nebus pašalinti."
+"Apvalkalas paprastai stebi aktyvias programas siekiant pateikti dažniausiai "
+"naudojamas (pvz., leistukuose). Nors šie duomenys konfidencialiai saugomi, "
+"jei norite, saugumo sumetimais galite šią funkciją išjungti. Atminkite, kad "
+"tai padarius jau įrašyti duomenys jau nebus įrašyti."

 #: ../data/org.gnome.shell.gschema.xml.in.h:7
 msgid "List of desktop file IDs for favorite applications"
@@ -224,7 +222,7 @@ msgstr ""
 #: ../js/extensionPrefs/main.js:125
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
-msgstr "Įvyko klaida įkeliant %s nustatymų dialogą:"
+msgstr "Kilo klaida įkeliant %s nustatymų dialogą:"

 #: ../js/extensionPrefs/main.js:165
 msgid "<b>Extension</b>"
@@ -234,40 +232,40 @@ msgstr "<b>Plėtinys</b>"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Išskleidžiamajame sąraše pasirinkite konfigūruotiną plėtinį."

-#: ../js/gdm/loginDialog.js:627
+#: ../js/gdm/loginDialog.js:624
 msgid "Session..."
 msgstr "Seansas..."

-#: ../js/gdm/loginDialog.js:789
+#: ../js/gdm/loginDialog.js:786
 msgctxt "title"
 msgid "Sign In"
 msgstr "Prisijungti"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/loginDialog.js:834
+#: ../js/gdm/loginDialog.js:831
 msgid "(or swipe finger)"
 msgstr "(arba perbraukite pirštu)"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:855
+#: ../js/gdm/loginDialog.js:852
 msgid "Not listed?"
 msgstr "Nėra sąraše?"

-#: ../js/gdm/loginDialog.js:1023 ../js/ui/endSessionDialog.js:401
-#: ../js/ui/extensionSystem.js:400 ../js/ui/networkAgent.js:153
+#: ../js/gdm/loginDialog.js:1020 ../js/ui/endSessionDialog.js:401
+#: ../js/ui/extensionSystem.js:399 ../js/ui/networkAgent.js:153
 #: ../js/ui/polkitAuthenticationAgent.js:175 ../js/ui/status/bluetooth.js:462
 msgid "Cancel"
-msgstr "Atsisakyti"
+msgstr "Atšaukti"

-#: ../js/gdm/loginDialog.js:1028
+#: ../js/gdm/loginDialog.js:1025
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prisijungti"

-#: ../js/gdm/loginDialog.js:1380
+#: ../js/gdm/loginDialog.js:1377
 msgid "Login Window"
 msgstr "Prisijungimo langas"

@@ -675,11 +673,11 @@ msgstr[2] "Sistema bus paleista iš naujo po %d sekundžių."
 msgid "Restarting the system."
 msgstr "Sistema paleidžiama iš naujo."

-#: ../js/ui/extensionSystem.js:404
+#: ../js/ui/extensionSystem.js:403
 msgid "Install"
 msgstr "Įdiegti"

-#: ../js/ui/extensionSystem.js:408
+#: ../js/ui/extensionSystem.js:407
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Atsiųsti ir įdiegti „%s“ iš extensions.gnome.org?"
@@ -688,8 +686,7 @@ msgstr "Atsiųsti ir įdiegti „%s“ iš extensions.gnome.org?"
 msgid "tray"
 msgstr "dėklas"

-#: ../js/ui/keyboard.js:544 ../js/ui/status/keyboard.js:44
-#: ../js/ui/status/power.js:203
+#: ../js/ui/keyboard.js:544 ../js/ui/status/power.js:203
 msgid "Keyboard"
 msgstr "Klaviatūra"

@@ -725,7 +722,7 @@ msgstr "Įjungta"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:808 ../src/gvc/gvc-mixer-control.c:1082
+#: ../js/ui/lookingGlass.js:808 ../src/gvc/gvc-mixer-control.c:1093
 msgid "Disabled"
 msgstr "Išjungta"

@@ -942,7 +939,7 @@ msgstr "Įveskite komandą:"
 msgid "Searching..."
 msgstr "Ieškoma..."

-#: ../js/ui/searchDisplay.js:415
+#: ../js/ui/searchDisplay.js:414
 msgid "No matching results."
 msgstr "Nerasta atitikmenų."

@@ -1100,7 +1097,7 @@ msgstr "Visada leisti prieigą"
 msgid "Grant this time only"
 msgstr "Leisti tik šį kartą"

-#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1093
+#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1091
 msgid "Reject"
 msgstr "Atmesti"

@@ -1177,7 +1174,7 @@ msgstr "Trūksta integruotos programinės įrangos (firmware)"
 #. Translators: this is for wired network devices that are physically disconnected
 #: ../js/ui/status/network.js:517
 msgid "cable unplugged"
-msgstr "atjungtas laidas"
+msgstr "kabelis neįjungtas"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage
@@ -1191,7 +1188,7 @@ msgstr "nepavyko prisijungti"

 #: ../js/ui/status/network.js:585 ../js/ui/status/network.js:1505
 msgid "More..."
-msgstr "Rodyti daugiau tinklų..."
+msgstr "Daugiau..."

 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
@@ -1388,7 +1385,7 @@ msgstr "Skambutis"
 #. We got the TpContact
 #: ../js/ui/telepathyClient.js:287
 msgid "File Transfer"
-msgstr "Failo persiuntimas"
+msgstr "Failo perdavimas"

 #: ../js/ui/telepathyClient.js:369
 msgid "Subscription request"
@@ -1421,35 +1418,35 @@ msgstr "%s yra užsiėmęs (-usi)."
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:889
+#: ../js/ui/telepathyClient.js:887
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Išsiųsta <b>%X</b> <b>%A</b>"

 #. Translators: this is a time format in the style of "Wednesday, May 25",
 #. shown when you get a chat message in the same year.
-#: ../js/ui/telepathyClient.js:895
+#: ../js/ui/telepathyClient.js:893
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Išsiųsta <b>%B %d</b>, <b>%A</b>"

 #. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
 #. shown when you get a chat message in a different year.
-#: ../js/ui/telepathyClient.js:900
+#: ../js/ui/telepathyClient.js:898
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Išsiųsta %Y <b>%B %d</b>, <b>%A</b>"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/telepathyClient.js:942
+#: ../js/ui/telepathyClient.js:940
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s nuo šiol vadinasi %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1044
+#: ../js/ui/telepathyClient.js:1042
 #, c-format
 msgid "Invitation to %s"
 msgstr "Kvietimas į %s"
@@ -1457,35 +1454,35 @@ msgstr "Kvietimas į %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/telepathyClient.js:1052
+#: ../js/ui/telepathyClient.js:1050
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s jus kviečia prisijungti prie %s"

-#: ../js/ui/telepathyClient.js:1054 ../js/ui/telepathyClient.js:1133
-#: ../js/ui/telepathyClient.js:1231
+#: ../js/ui/telepathyClient.js:1052 ../js/ui/telepathyClient.js:1131
+#: ../js/ui/telepathyClient.js:1229
 msgid "Decline"
 msgstr "Atmesti"

-#: ../js/ui/telepathyClient.js:1055 ../js/ui/telepathyClient.js:1134
-#: ../js/ui/telepathyClient.js:1232
+#: ../js/ui/telepathyClient.js:1053 ../js/ui/telepathyClient.js:1132
+#: ../js/ui/telepathyClient.js:1230
 msgid "Accept"
 msgstr "Priimti"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1085
+#: ../js/ui/telepathyClient.js:1083
 #, c-format
 msgid "Video call from %s"
 msgstr "Vaizdo skambutis nuo %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1088
+#: ../js/ui/telepathyClient.js:1086
 #, c-format
 msgid "Call from %s"
 msgstr "Skambutis nuo %s"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/telepathyClient.js:1095
+#: ../js/ui/telepathyClient.js:1093
 msgid "Answer"
 msgstr "Atsiliepti"

@@ -1494,110 +1491,110 @@ msgstr "Atsiliepti"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/telepathyClient.js:1127
+#: ../js/ui/telepathyClient.js:1125
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s jums siunčia %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/telepathyClient.js:1196
+#: ../js/ui/telepathyClient.js:1194
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s pageidauja matyti, kai esate prisijungę prie interneto"

-#: ../js/ui/telepathyClient.js:1289
+#: ../js/ui/telepathyClient.js:1287
 msgid "Network error"
 msgstr "Tinklo klaida"

-#: ../js/ui/telepathyClient.js:1291
+#: ../js/ui/telepathyClient.js:1289
 msgid "Authentication failed"
 msgstr "Nepavyko patvirtinti tapatybės"

-#: ../js/ui/telepathyClient.js:1293
+#: ../js/ui/telepathyClient.js:1291
 msgid "Encryption error"
 msgstr "Šifravimo klaida"

-#: ../js/ui/telepathyClient.js:1295
+#: ../js/ui/telepathyClient.js:1293
 msgid "Certificate not provided"
 msgstr "Liudijimas nepateiktas"

-#: ../js/ui/telepathyClient.js:1297
+#: ../js/ui/telepathyClient.js:1295
 msgid "Certificate untrusted"
 msgstr "Liudijimas nepatikimas"

-#: ../js/ui/telepathyClient.js:1299
+#: ../js/ui/telepathyClient.js:1297
 msgid "Certificate expired"
 msgstr "Liudijimo galiojimas pasibaigęs"

-#: ../js/ui/telepathyClient.js:1301
+#: ../js/ui/telepathyClient.js:1299
 msgid "Certificate not activated"
 msgstr "Liudijimas neaktyvuotas"

-#: ../js/ui/telepathyClient.js:1303
+#: ../js/ui/telepathyClient.js:1301
 msgid "Certificate hostname mismatch"
 msgstr "Liudijimo serverio vardo nesutapimas"

-#: ../js/ui/telepathyClient.js:1305
+#: ../js/ui/telepathyClient.js:1303
 msgid "Certificate fingerprint mismatch"
 msgstr "Liudijimo piršto atspaudo nesutapimas"

-#: ../js/ui/telepathyClient.js:1307
+#: ../js/ui/telepathyClient.js:1305
 msgid "Certificate self-signed"
 msgstr "Liudijimas pačių pasirašytas"

-#: ../js/ui/telepathyClient.js:1309
+#: ../js/ui/telepathyClient.js:1307
 msgid "Status is set to offline"
 msgstr "Nustatyta atsijungimo būsena"

-#: ../js/ui/telepathyClient.js:1311
+#: ../js/ui/telepathyClient.js:1309
 msgid "Encryption is not available"
 msgstr "Šifravimas negalimas"

-#: ../js/ui/telepathyClient.js:1313
+#: ../js/ui/telepathyClient.js:1311
 msgid "Certificate is invalid"
 msgstr "Liudijimas netinkamas"

-#: ../js/ui/telepathyClient.js:1315
+#: ../js/ui/telepathyClient.js:1313
 msgid "Connection has been refused"
 msgstr "Ryšys atmestas"

-#: ../js/ui/telepathyClient.js:1317
+#: ../js/ui/telepathyClient.js:1315
 msgid "Connection can't be established"
 msgstr "Nepavyko užmegzti ryšio"

-#: ../js/ui/telepathyClient.js:1319
+#: ../js/ui/telepathyClient.js:1317
 msgid "Connection has been lost"
 msgstr "Ryšys nutrūko"

-#: ../js/ui/telepathyClient.js:1321
+#: ../js/ui/telepathyClient.js:1319
 msgid "This account is already connected to the server"
 msgstr "Ši paskyra jau prijungta prie serverio"

-#: ../js/ui/telepathyClient.js:1323
+#: ../js/ui/telepathyClient.js:1321
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Ryšys pakeistas nauju ryšiu naudojant tą patį išteklių"

-#: ../js/ui/telepathyClient.js:1325
+#: ../js/ui/telepathyClient.js:1323
 msgid "The account already exists on the server"
 msgstr "Tokia paskyra serveryje jau yra"

-#: ../js/ui/telepathyClient.js:1327
+#: ../js/ui/telepathyClient.js:1325
 msgid "Server is currently too busy to handle the connection"
 msgstr "Šiuo metu serveris per daug užimtas šiai užklausai apdoroti"

-#: ../js/ui/telepathyClient.js:1329
+#: ../js/ui/telepathyClient.js:1327
 msgid "Certificate has been revoked"
 msgstr "Liudijimas atšauktas"

-#: ../js/ui/telepathyClient.js:1331
+#: ../js/ui/telepathyClient.js:1329
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Liudijimui naudojamas nesaugus šifravimo algoritmas arba jis kriptografiškai "
 "silpnas"

-#: ../js/ui/telepathyClient.js:1333
+#: ../js/ui/telepathyClient.js:1331
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -1605,26 +1602,26 @@ msgstr ""
 "Serverio liudijimo ilgis arba liudijimų eilės dydis viršija kriptografijos "
 "bibliotekos apribojimus"

-#: ../js/ui/telepathyClient.js:1335
+#: ../js/ui/telepathyClient.js:1333
 msgid "Internal error"
 msgstr "Vidinė klaida"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1345
+#: ../js/ui/telepathyClient.js:1343
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Nepavyko prisijungti prie %s"

-#: ../js/ui/telepathyClient.js:1354
+#: ../js/ui/telepathyClient.js:1352
 msgid "Reconnect"
 msgstr "Prisijungti iš naujo"

-#: ../js/ui/telepathyClient.js:1355
+#: ../js/ui/telepathyClient.js:1353
 msgid "Edit account"
 msgstr "Taisyti paskyrą"

-#: ../js/ui/telepathyClient.js:1401
+#: ../js/ui/telepathyClient.js:1399
 msgid "Unknown reason"
 msgstr "Nežinoma priežastis"

@@ -1650,7 +1647,7 @@ msgstr "Pranešimai"

 #: ../js/ui/userMenu.js:639
 msgid "Online Accounts"
-msgstr "Interneto paskyros"
+msgstr "Tinklo paskyros"

 #: ../js/ui/userMenu.js:643
 msgid "System Settings"
@@ -1709,7 +1706,7 @@ msgstr "Orakulė sako %s"

 #: ../js/ui/wanda.js:168
 msgid "Your favorite Easter Egg"
-msgstr "Jūsų mėgstamiausias Velykinis kiaušinis"
+msgstr "Jūsų mėgstamiausias vėlykinis kiaušinis"

 #: ../js/ui/windowAttentionHandler.js:19
 #, c-format
@@ -1718,7 +1715,7 @@ msgstr "„%s“ yra pasirengusi"

 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1089
+#: ../src/gvc/gvc-mixer-control.c:1100
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1728,7 +1725,7 @@ msgstr[2] "%u išvestys"

 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1099
+#: ../src/gvc/gvc-mixer-control.c:1110
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
@@ -1736,15 +1733,15 @@ msgstr[0] "%u įvestis"
 msgstr[1] "%u įvestys"
 msgstr[2] "%u įvestys"

-#: ../src/gvc/gvc-mixer-control.c:1397
+#: ../src/gvc/gvc-mixer-control.c:1408
 msgid "System Sounds"
 msgstr "Sistemos garsai"

-#: ../src/main.c:256
+#: ../src/main.c:255
 msgid "Print version"
 msgstr "Išvesti versijos numerį"

-#: ../src/main.c:262
+#: ../src/main.c:261
 msgid "Mode used by GDM for login screen"
 msgstr "Veiksena, naudojama GDM prisijungimo ekrane"

@@ -1777,7 +1774,7 @@ msgstr "Naudotojas užvėrė tapatybės patvirtinimo dialogą"
 #. * nautilus
 #: ../src/shell-util.c:97
 msgid "Home"
-msgstr "Namų aplankas"
+msgstr "Namai"

 #. Translators: this is the same string as the one found in
 #. * nautilus
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-04-24 15:39+0000\n"
-"PO-Revision-Date: 2012-05-10 09:57+0530\n"
+"POT-Creation-Date: 2012-03-30 17:59+0000\n"
+"PO-Revision-Date: 2012-04-02 11:33+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -47,6 +47,7 @@ msgid ""
 msgstr "आंतरिक डिबगिंग व Alt-F2 संवादचा वापर करून निंयत्रणकरीता प्रवेश देतो."

 #: ../data/org.gnome.shell.gschema.xml.in.h:3
+#| msgid "Uuids of extensions to disable"
 msgid "Uuids of extensions to enable"
 msgstr "सुरू करण्याजोगी एक्सटेंशन्स्चे Uuids"

@@ -58,10 +59,10 @@ msgid ""
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
 "GNOME शेल एक्सटेंशन्सकडे uuid गुणधर्म असते; हि कि एक्सटेंशन्स् दाखवते ज्यास "
-"लोड करणे आवश्यक "
-"आहे. लोड करण्याजोगी कोणत्याहि एक्सटेंशला सूचीत असणे आवश्यक आहे. org.gnome."
-"Shell वरील "
-"EnableExtension व DisableExtension DBus मेथडससह या सूचीत बदल करणे शक्य आहे."
+"लोड करणे आवश्यक आहे. "
+"लोड करण्याजोगी कोणत्याहि एक्सटेंशला सूचीत असणे आवश्यक आहे. "
+"org.gnome.Shell वरील EnableExtension व DisableExtension DBus मेथडससह या सूचीत "
+"बदल करणे शक्य आहे."

 #: ../data/org.gnome.shell.gschema.xml.in.h:5
 msgid "Whether to collect stats about applications usage"
@@ -109,8 +110,7 @@ msgid ""
 "The value here is from the TpConnectionPresenceType enumeration."
 msgstr ""
 "वापरकर्तातर्फे ठरवलेले शेवटचे IM हाजेरी साठवण्याकरीता आंतरिकपणे वापरले जाते. "
-"येथील मूल्य "
-"TpConnectionPresenceType एन्युमरेशनपासूनचे आहे."
+"येथील मूल्य TpConnectionPresenceType एन्युमरेशनपासूनचे आहे."

 #: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid ""
@@ -118,8 +118,8 @@ msgid ""
 "value here is from the GsmPresenceStatus enumeration."
 msgstr ""
 "वापरकर्तातर्फे ठरवलेले शेवटचे सत्र हाजेरी साठवण्याकरीता आंतरिकपणे वापरले जाते."
-" येथील मूल्य "
-"GsmPresenceStatus एन्युमरेशनपासूनचे आहे."
+" "
+"येथील मूल्य GsmPresenceStatus एन्युमरेशनपासूनचे आहे."

 #: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show the week date in the calendar"
@@ -138,44 +138,34 @@ msgid "Keybinding to open the application menu."
 msgstr "ॲप्लिकेशन मेन्यु उघडण्यासाठी किबाइंडिंग."

 #: ../data/org.gnome.shell.gschema.xml.in.h:18
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to toggle the screen recorder"
-msgstr "स्क्रीन रेकॉर्डरमधील बदलसाठी किबाइंडिंग"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
-#| msgid "Keybinding to open the application menu."
-msgid "Keybinding to start/stop the builtin screen recorder."
-msgstr "बिल्टइन स्क्रीन रेकॉर्डर सुरू किंवा थांबवण्यासाठी किबाइंडिंग."
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Which keyboard to use"
 msgstr "कुठले किबोर्ड वापरायचे"

-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid "The type of keyboard to use."
 msgstr "वापरण्याजोगी किबोर्डचे प्रकार."

-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Show time with seconds"
 msgstr "सेकंदात वेळ दाखवा"

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "If true, display seconds in time."
 msgstr "खरे असल्यास, वेळेत सेकंद दाखवा."

-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "Show date in clock"
 msgstr "घड्याळात दिनांक दाखवा"

-#: ../data/org.gnome.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid "If true, display date in the clock, in addition to time."
 msgstr "खरे असल्यास,वेळेबरोबर तारीख पण घड्याळात दाखवा."

-#: ../data/org.gnome.shell.gschema.xml.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.h:24
 msgid "Framerate used for recording screencasts."
 msgstr "स्क्रिनकास्ट्स् रेकॉर्ड करण्यासाठी वापरलेले फ्रेमरेट."

-#: ../data/org.gnome.shell.gschema.xml.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.h:25
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -184,12 +174,24 @@ msgstr ""
 "केलेल्या परिणामक "
 "सक्रीनकास्टचा फ्रेमरेट."

-#: ../data/org.gnome.shell.gschema.xml.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.h:26
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "स्क्रीनकास्ट एंकोड करण्यासाठी वापरलेले gstreamer पाइपलाइन"

-#: ../data/org.gnome.shell.gschema.xml.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.h:28
 #, 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."
 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 "
@@ -203,26 +205,21 @@ msgid ""
 "thread count on the system."
 msgstr ""
 "रेकॉर्डिंग्स् एंकोड करण्यासाठी GStreamer पाइपलाइन ठरवतो. gst-launch सुरू "
-"करण्यासाठी "
-"मांडणीचा वापर करतो. पाइपलाइनमध्ये जोडणी अशक्य सिंक पॅड असायला हवे जेथे "
-"रेकॉर्डेड व्हिडीओ "
-"रेकॉर्ड केले जाते. सहसा जोडणी अशक्य स्रोत पॅड असते; पॅडपासूनचे आऊटपुट, आऊटपुट "
-"फाइलमध्ये लिहले "
-"जाते. तरी पाइपलाइन स्वतःच्या आऊटपुटची काळजी घेतो - याचा वापर shout2send किंवा "
-"समानतर्फे icecast सर्व्हरकरीता आऊटपुट पाठवण्याकरीता केला जातो. रिकामे "
-"मूल्यकरीता सेट "
-"अशक्य किंवा शक्य केल्यावर, मूळ पाइपलाइनचा वापर केला जातो. हे सध्या 'vp8enc "
-"quality=8 "
-"speed=6 threads=%T ! queue ! webmmux' आहे व VP8 कोडेकचा वापर करून WEBM करीता "
-"रेकॉर्डिंग करतो. %T चा वापर प्रणालीवरील कमाल थ्रेड गणणा ओळखण्यासाठी "
-"प्लेसहोल्डर म्हणून "
-"केला जातो."
+"करण्यासाठी मांडणीचा वापर करतो. पाइपलाइनमध्ये जोडणी अशक्य सिंक पॅड असायला हवे "
+"जेथे रेकॉर्डेड व्हिडीओ रेकॉर्ड केले जाते. सहसा जोडणी अशक्य स्रोत पॅड असते; "
+"पॅडपासूनचे आऊटपुट, आऊटपुट फाइलमध्ये लिहले जाते. तरी पाइपलाइन स्वतःच्या "
+"आऊटपुटची काळजी घेतो - याचा वापर shout2send किंवा समानतर्फे icecast "
+"सर्व्हरकरीता आऊटपुट पाठवण्याकरीता केला जातो. रिकामे मूल्यकरीता सेट अशक्य "
+"किंवा शक्य केल्यावर, मूळ पाइपलाइनचा वापर केला जातो. हे सध्या 'vp8enc "
+"quality=8 speed=6 threads=%T ! queue ! webmmux' आहे व VP8 कोडेकचा वापर करून "
+"WEBM करीता रेकॉर्डिंग करतो. %T चा वापर प्रणालीवरील कमाल थ्रेड गणणा "
+"ओळखण्यासाठी प्लेसहोल्डर म्हणून केला जातो."

-#: ../data/org.gnome.shell.gschema.xml.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.h:29
 msgid "File extension used for storing the screencast"
 msgstr "स्क्रिनकास्ट साठवण्याकरीता वापरलेले फाइल एक्सटेंशन"

-#: ../data/org.gnome.shell.gschema.xml.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.h:30
 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 "
@@ -246,40 +243,42 @@ msgstr "<b>एक्सटेंशन</b>"
 msgid "Select an extension to configure using the combobox above."
 msgstr "वरील कॉम्बोबॉक्सचा वापर करून संरचनाकरीता एक्सटेंशनचा वापर करा."

-#: ../js/gdm/loginDialog.js:627
+#: ../js/gdm/loginDialog.js:624
+#| msgid "Searching..."
 msgid "Session..."
 msgstr "सत्र..."

-#: ../js/gdm/loginDialog.js:789
+#: ../js/gdm/loginDialog.js:786
 msgctxt "title"
 msgid "Sign In"
 msgstr "प्रवेश करा"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/loginDialog.js:834
+#: ../js/gdm/loginDialog.js:831
 msgid "(or swipe finger)"
 msgstr "(किंवा बोट फिरवा)"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:855
+#: ../js/gdm/loginDialog.js:852
 msgid "Not listed?"
 msgstr "सूचीत नाही?"

-#: ../js/gdm/loginDialog.js:1023 ../js/ui/endSessionDialog.js:401
-#: ../js/ui/extensionSystem.js:400 ../js/ui/networkAgent.js:153
+#: ../js/gdm/loginDialog.js:1020 ../js/ui/endSessionDialog.js:401
+#: ../js/ui/extensionSystem.js:399 ../js/ui/networkAgent.js:153
 #: ../js/ui/polkitAuthenticationAgent.js:175 ../js/ui/status/bluetooth.js:462
 msgid "Cancel"
 msgstr "रद्द करा"

-#: ../js/gdm/loginDialog.js:1028
+#: ../js/gdm/loginDialog.js:1025
 msgctxt "button"
 msgid "Sign In"
 msgstr "प्रवेश करा"

-#: ../js/gdm/loginDialog.js:1380
+#: ../js/gdm/loginDialog.js:1377
+#| msgid "New Window"
 msgid "Login Window"
 msgstr "प्रवेश पटल"

@@ -356,6 +355,7 @@ msgid "Open with %s"
 msgstr "%s सह उघडा"

 #: ../js/ui/autorunManager.js:586
+#| msgid "Reject"
 msgid "Eject"
 msgstr "बाहेर काढा"

@@ -591,11 +591,13 @@ msgstr "%A %B %e, %Y"

 #: ../js/ui/endSessionDialog.js:61
 #, c-format
+#| msgid "Log Out %s"
 msgctxt "title"
 msgid "Log Out %s"
 msgstr "%s पासून बाहेर पडा"

 #: ../js/ui/endSessionDialog.js:62
+#| msgid "Log Out"
 msgctxt "title"
 msgid "Log Out"
 msgstr "बाहेर पडा"
@@ -607,6 +609,7 @@ msgstr ""

 #: ../js/ui/endSessionDialog.js:65
 #, c-format
+#| msgid "%s will be logged out automatically in %d seconds."
 msgid "%s will be logged out automatically in %d second."
 msgid_plural "%s will be logged out automatically in %d seconds."
 msgstr[0] "%s स्वयं, %d सेकंदात बाहेर पडेल."
@@ -614,6 +617,7 @@ msgstr[1] "%s स्वयं, %d सेकंदात बाहेर पड

 #: ../js/ui/endSessionDialog.js:70
 #, c-format
+#| msgid "You will be logged out automatically in %d seconds."
 msgid "You will be logged out automatically in %d second."
 msgid_plural "You will be logged out automatically in %d seconds."
 msgstr[0] "%d सेकंदात तुम्ही स्वयं बाहेर पडाल."
@@ -624,11 +628,13 @@ msgid "Logging out of the system."
 msgstr "प्रणालीतून बाहेर पडत आहे."

 #: ../js/ui/endSessionDialog.js:76
+#| msgid "Log Out"
 msgctxt "button"
 msgid "Log Out"
 msgstr "बाहेर पडा"

 #: ../js/ui/endSessionDialog.js:81
+#| msgid "Power Off"
 msgctxt "title"
 msgid "Power Off"
 msgstr "बंद करा"
@@ -639,6 +645,7 @@ msgstr "ॲप्लिकेशन्स् बंद करण्यासा

 #: ../js/ui/endSessionDialog.js:84
 #, c-format
+#| msgid "The system will power off automatically in %d seconds."
 msgid "The system will power off automatically in %d second."
 msgid_plural "The system will power off automatically in %d seconds."
 msgstr[0] "प्रणाली स्वयं %d सेकंदात बंद होईल."
@@ -649,16 +656,19 @@ msgid "Powering off the system."
 msgstr "प्रणाली बंद करत आहे."

 #: ../js/ui/endSessionDialog.js:90 ../js/ui/endSessionDialog.js:107
+#| msgid "Restart"
 msgctxt "button"
 msgid "Restart"
 msgstr "पुनः सुरू करा"

 #: ../js/ui/endSessionDialog.js:92
+#| msgid "Power Off"
 msgctxt "button"
 msgid "Power Off"
 msgstr "बंद करा"

 #: ../js/ui/endSessionDialog.js:98
+#| msgid "Restart"
 msgctxt "title"
 msgid "Restart"
 msgstr "पुनः सुरू करा"
@@ -670,6 +680,7 @@ msgstr ""

 #: ../js/ui/endSessionDialog.js:101
 #, c-format
+#| msgid "The system will restart automatically in %d seconds."
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
 msgstr[0] "प्रणाली स्वयं %d सेकंदात पुनः सुरू होईल."
@@ -679,21 +690,21 @@ msgstr[1] "प्रणाली स्वयं %d सेकंदामध्
 msgid "Restarting the system."
 msgstr "प्रणाली पुनःसुरू करत आहे."

-#: ../js/ui/extensionSystem.js:404
+#: ../js/ui/extensionSystem.js:403
 msgid "Install"
 msgstr "प्रतिष्ठापीत करा"

-#: ../js/ui/extensionSystem.js:408
+#: ../js/ui/extensionSystem.js:407
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr " extensions.gnome.org पासून '%s' डाऊनलोड व प्रतिष्ठापीत करा?"

 #: ../js/ui/keyboard.js:327
+#| msgid "Retry"
 msgid "tray"
 msgstr "ट्रे"

-#: ../js/ui/keyboard.js:544 ../js/ui/status/keyboard.js:44
-#: ../js/ui/status/power.js:203
+#: ../js/ui/keyboard.js:544 ../js/ui/status/power.js:203
 msgid "Keyboard"
 msgstr "कळफलक"

@@ -716,10 +727,12 @@ msgid "%s has not emitted any errors."
 msgstr "%s ने कोणत्याहि त्रुटी दाखवले नाही."

 #: ../js/ui/lookingGlass.js:792
+#| msgid "Error"
 msgid "Hide Errors"
 msgstr "त्रुटी लपवा"

 #: ../js/ui/lookingGlass.js:796 ../js/ui/lookingGlass.js:847
+#| msgid "Error"
 msgid "Show Errors"
 msgstr "त्रुटी दाखवा"

@@ -729,7 +742,7 @@ msgstr "सुरू केले"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:808 ../src/gvc/gvc-mixer-control.c:1082
+#: ../js/ui/lookingGlass.js:808 ../src/gvc/gvc-mixer-control.c:1093
 msgid "Disabled"
 msgstr "बंद केले"

@@ -754,7 +767,7 @@ msgid "Web Page"
 msgstr "वेब पृष्ठ"

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/main.js:121
+#: ../js/ui/main.js:118
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "%d %t पासून स्क्रीनकास्ट"
@@ -764,18 +777,22 @@ msgid "Open"
 msgstr "उघडा"

 #: ../js/ui/messageTray.js:1217
+#| msgid "minute"
+#| msgid_plural "minutes"
 msgid "Unmute"
-msgstr "बंद करणे अशक्य करा"
+msgstr "मंद करणे अशक्य करा"

 #: ../js/ui/messageTray.js:1217
+#| msgid "Mouse"
 msgid "Mute"
-msgstr "बंद करा"
+msgstr "मंद करा"

 #: ../js/ui/messageTray.js:2490
 msgid "System Information"
 msgstr "प्रणाली माहिती"

 #: ../js/ui/networkAgent.js:148
+#| msgid "Connection"
 msgid "Connect"
 msgstr "जोडणी करा"

@@ -783,6 +800,7 @@ msgstr "जोडणी करा"
 #: ../js/ui/networkAgent.js:243 ../js/ui/networkAgent.js:255
 #: ../js/ui/networkAgent.js:282 ../js/ui/networkAgent.js:302
 #: ../js/ui/networkAgent.js:312
+#| msgid "Password:"
 msgid "Password: "
 msgstr "पासवर्ड: "

@@ -811,6 +829,7 @@ msgid "Service: "
 msgstr "सर्व्हिस: "

 #: ../js/ui/networkAgent.js:329
+#| msgid "Authentication Required"
 msgid "Authentication required by wireless network"
 msgstr "वायरलेस नेटवर्कतर्फे आवश्यक ओळखपटवणे"

@@ -826,10 +845,12 @@ msgid "Wired 802.1X authentication"
 msgstr "वायर्ड 802.1X ओळखपटवणे"

 #: ../js/ui/networkAgent.js:336
+#| msgid "Network Manager"
 msgid "Network name: "
 msgstr "नेटवर्क नाव: "

 #: ../js/ui/networkAgent.js:341
+#| msgid "authentication required"
 msgid "DSL authentication"
 msgstr "DSL ओळख पटवणे"

@@ -846,11 +867,13 @@ msgid "PIN: "
 msgstr "PIN: "

 #: ../js/ui/networkAgent.js:356
+#| msgid "Mobile broadband"
 msgid "Mobile broadband network password"
 msgstr "मोबाईल ब्रॉडबँड नेटवर्क पासवर्ड"

 #: ../js/ui/networkAgent.js:357
 #, c-format
+#| msgid "You're now connected to '%s'"
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' सह जोडणीकरीता पासवर्ड आवश्यक आहे."

@@ -877,6 +900,7 @@ msgid "Dash"
 msgstr "डॅश"

 #: ../js/ui/panel.js:592
+#| msgid "Quit %s"
 msgid "Quit"
 msgstr "बाहेर पडा"

@@ -944,7 +968,7 @@ msgstr "कृपया आदेश द्या:"
 msgid "Searching..."
 msgstr "शोधत आहे..."

-#: ../js/ui/searchDisplay.js:415
+#: ../js/ui/searchDisplay.js:414
 msgid "No matching results."
 msgstr "जुळवण्याजोगी परिणाम आढळले नाही."

@@ -961,6 +985,7 @@ msgid "Show Text"
 msgstr "मजकूर दाखवा"

 #: ../js/ui/shellEntry.js:79
+#| msgid "Large Text"
 msgid "Hide Text"
 msgstr "मजकूर लपवा"

@@ -969,6 +994,7 @@ msgid "Wrong password, please try again"
 msgstr "चुकिचा पासवर्ड, कृपया पुनः प्रयत्न करा"

 #: ../js/ui/status/accessibility.js:47
+#| msgid "Visibility"
 msgid "Accessibility"
 msgstr "ॲक्सेसिबिलिटि"

@@ -980,6 +1006,7 @@ msgstr "झूम"
 #. 'screen-reader-enabled');
 #. this.menu.addMenuItem(screenReader);
 #: ../js/ui/status/accessibility.js:63
+#| msgid "Keyboard"
 msgid "Screen Keyboard"
 msgstr "स्क्रीन किबोर्ड"

@@ -1031,6 +1058,7 @@ msgid "Send Files to Device..."
 msgstr "फाइल्स्ना साधनावर पाठवा..."

 #: ../js/ui/status/bluetooth.js:63
+#| msgid "Setup a New Device..."
 msgid "Set up a New Device..."
 msgstr "नविन साधनची मांडणी करा..."

@@ -1040,6 +1068,7 @@ msgstr "ब्ल्यूटूथ सेटिंग्स्"

 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
 #: ../js/ui/status/bluetooth.js:107 ../js/ui/status/network.js:256
+#| msgid "disabled"
 msgid "hardware disabled"
 msgstr "हार्डवेअर बंद केले"

@@ -1048,6 +1077,7 @@ msgid "Connection"
 msgstr "जोडणी"

 #: ../js/ui/status/bluetooth.js:214 ../js/ui/status/network.js:491
+#| msgid "connecting..."
 msgid "disconnecting..."
 msgstr "जोडणी खंडीत करत आहे..."

@@ -1102,7 +1132,7 @@ msgstr "नेहमी प्रवेश द्या"
 msgid "Grant this time only"
 msgstr "फक्त याचवेळी मान्य करा"

-#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1093
+#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1091
 msgid "Reject"
 msgstr "नकारा"

@@ -1143,10 +1173,12 @@ msgid "OK"
 msgstr "ठीक आहे"

 #: ../js/ui/status/keyboard.js:68
+#| msgid "Show Keyboard Layout..."
 msgid "Show Keyboard Layout"
 msgstr "किबोर्ड लेआऊट दाखवा"

 #: ../js/ui/status/keyboard.js:73
+#| msgid "Date and Time Settings"
 msgid "Region and Language Settings"
 msgstr "क्षेत्र व भाषा सेटिंग्स्"

@@ -1228,6 +1260,7 @@ msgid "Auto wireless"
 msgstr "स्वयं वायरलेस्"

 #: ../js/ui/status/network.js:1541
+#| msgid "Network Manager"
 msgid "Network"
 msgstr "नेटवर्क"

@@ -1256,10 +1289,12 @@ msgid "Network Settings"
 msgstr "जाळं संयोजना"

 #: ../js/ui/status/network.js:1739
+#| msgid "connection failed"
 msgid "Connection failed"
 msgstr "जोडणी अपयशी"

 #: ../js/ui/status/network.js:1740
+#| msgid "connection failed"
 msgid "Activation of network connection failed"
 msgstr "नेटवर्क जोडणी सुरू करणे अपयशी"

@@ -1380,6 +1415,7 @@ msgstr "आमंत्रण"

 #. We got the TpContact
 #: ../js/ui/telepathyClient.js:271
+#| msgid "Cancel"
 msgid "Call"
 msgstr "कॉल"

@@ -1389,10 +1425,12 @@ msgid "File Transfer"
 msgstr "फाइल स्थानांतरन"

 #: ../js/ui/telepathyClient.js:369
+#| msgid "Authorization request from %s"
 msgid "Subscription request"
 msgstr "सबस्क्रिप्शन विनंती"

 #: ../js/ui/telepathyClient.js:405
+#| msgid "Connection"
 msgid "Connection error"
 msgstr "जोडणी त्रुटी"

@@ -1419,35 +1457,36 @@ msgstr "%s व्यग्र आहे."
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:889
+#: ../js/ui/telepathyClient.js:887
 #, no-c-format
+#| msgid "Sent at %X on %A"
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "<b>%X</b> वेळी, <b>%A</b> ला पाठवले"

 #. Translators: this is a time format in the style of "Wednesday, May 25",
 #. shown when you get a chat message in the same year.
-#: ../js/ui/telepathyClient.js:895
+#: ../js/ui/telepathyClient.js:893
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "<b>%A</b> वेळी, <b>%B %d</b> ला पाठवले"

 #. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
 #. shown when you get a chat message in a different year.
-#: ../js/ui/telepathyClient.js:900
+#: ../js/ui/telepathyClient.js:898
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "<b>%A</b>, <b>%B %d</b>, %Y वेळी पाठवले"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/telepathyClient.js:942
+#: ../js/ui/telepathyClient.js:940
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ला %s म्हणून ओळखले जाते"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1044
+#: ../js/ui/telepathyClient.js:1042
 #, c-format
 msgid "Invitation to %s"
 msgstr "%s करीता आमंत्रण"
@@ -1455,35 +1494,35 @@ msgstr "%s करीता आमंत्रण"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/telepathyClient.js:1052
+#: ../js/ui/telepathyClient.js:1050
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s तुम्हाला %s सह जोडणीकरीता आमंत्रण देत आहे"

-#: ../js/ui/telepathyClient.js:1054 ../js/ui/telepathyClient.js:1133
-#: ../js/ui/telepathyClient.js:1231
+#: ../js/ui/telepathyClient.js:1052 ../js/ui/telepathyClient.js:1131
+#: ../js/ui/telepathyClient.js:1229
 msgid "Decline"
 msgstr "नकारा"

-#: ../js/ui/telepathyClient.js:1055 ../js/ui/telepathyClient.js:1134
-#: ../js/ui/telepathyClient.js:1232
+#: ../js/ui/telepathyClient.js:1053 ../js/ui/telepathyClient.js:1132
+#: ../js/ui/telepathyClient.js:1230
 msgid "Accept"
 msgstr "स्वीकारा"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1085
+#: ../js/ui/telepathyClient.js:1083
 #, c-format
 msgid "Video call from %s"
 msgstr "%s पासून व्हिडीओ कॉल्स्"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1088
+#: ../js/ui/telepathyClient.js:1086
 #, c-format
 msgid "Call from %s"
 msgstr "%s पासून कॉल"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/telepathyClient.js:1095
+#: ../js/ui/telepathyClient.js:1093
 msgid "Answer"
 msgstr "उत्तर"

@@ -1492,138 +1531,147 @@ msgstr "उत्तर"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/telepathyClient.js:1127
+#: ../js/ui/telepathyClient.js:1125
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s तुम्हाला %s पाठवत आहे"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/telepathyClient.js:1196
+#: ../js/ui/telepathyClient.js:1194
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "ऑनलाइन असल्यावर %s परवानगी दृष्यास्पद करायची"

-#: ../js/ui/telepathyClient.js:1289
+#: ../js/ui/telepathyClient.js:1287
+#| msgid "Network Manager"
 msgid "Network error"
 msgstr "नेटवर्क त्रुटी"

-#: ../js/ui/telepathyClient.js:1291
+#: ../js/ui/telepathyClient.js:1289
+#| msgid "Authentication Required"
 msgid "Authentication failed"
 msgstr "ओळख पटवणे अपयशी"

-#: ../js/ui/telepathyClient.js:1293
+#: ../js/ui/telepathyClient.js:1291
 msgid "Encryption error"
 msgstr "एंक्रिप्शन त्रुटी"

-#: ../js/ui/telepathyClient.js:1295
+#: ../js/ui/telepathyClient.js:1293
 msgid "Certificate not provided"
 msgstr "प्रमाणपत्र पुरवले नाही"

-#: ../js/ui/telepathyClient.js:1297
+#: ../js/ui/telepathyClient.js:1295
 msgid "Certificate untrusted"
 msgstr "प्रमाणपत्र अविश्वासर्ह आहे"

-#: ../js/ui/telepathyClient.js:1299
+#: ../js/ui/telepathyClient.js:1297
 msgid "Certificate expired"
 msgstr "प्रमाणपत्राची वेळसमाप्ति"

-#: ../js/ui/telepathyClient.js:1301
+#: ../js/ui/telepathyClient.js:1299
 msgid "Certificate not activated"
 msgstr "प्रमाणपत्र सुरू केले नाही"

-#: ../js/ui/telepathyClient.js:1303
+#: ../js/ui/telepathyClient.js:1301
 msgid "Certificate hostname mismatch"
 msgstr "प्रमाणपत्र यजमाननाव जुळत नाही"

-#: ../js/ui/telepathyClient.js:1305
+#: ../js/ui/telepathyClient.js:1303
 msgid "Certificate fingerprint mismatch"
 msgstr "प्रमाणपत्र फिंग्ररप्रिंट जुळत नाही"

-#: ../js/ui/telepathyClient.js:1307
+#: ../js/ui/telepathyClient.js:1305
 msgid "Certificate self-signed"
 msgstr "प्रमाणपत्र स्वयं स्वाक्षरि"

-#: ../js/ui/telepathyClient.js:1309
+#: ../js/ui/telepathyClient.js:1307
+#| msgid "%s is offline."
 msgid "Status is set to offline"
 msgstr "स्थिती ऑफलाइनकरीता ठरवली आहे"

-#: ../js/ui/telepathyClient.js:1311
+#: ../js/ui/telepathyClient.js:1309
 msgid "Encryption is not available"
 msgstr "एंक्रिप्शन अनुपलब्ध"

-#: ../js/ui/telepathyClient.js:1313
+#: ../js/ui/telepathyClient.js:1311
 msgid "Certificate is invalid"
 msgstr "प्रमाणपत्र अवैध आहे"

-#: ../js/ui/telepathyClient.js:1315
+#: ../js/ui/telepathyClient.js:1313
+#| msgid "Connection established"
 msgid "Connection has been refused"
 msgstr "जोडणी नकारली गेली"

-#: ../js/ui/telepathyClient.js:1317
+#: ../js/ui/telepathyClient.js:1315
+#| msgid "Connection established"
 msgid "Connection can't be established"
 msgstr "जोडणी स्थापीत करणे अशक्य"

-#: ../js/ui/telepathyClient.js:1319
+#: ../js/ui/telepathyClient.js:1317
+#| msgid "Connection established"
 msgid "Connection has been lost"
 msgstr "जोडणी खंडीत झाली"

-#: ../js/ui/telepathyClient.js:1321
+#: ../js/ui/telepathyClient.js:1319
 msgid "This account is already connected to the server"
 msgstr "हे खाते आधिपासूनच सर्व्हरसह जुळले आहे"

-#: ../js/ui/telepathyClient.js:1323
+#: ../js/ui/telepathyClient.js:1321
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "समान स्रोतचा वापर करून जोडणीला नविन जोडणीसह बदलाबदल केले आहे"

-#: ../js/ui/telepathyClient.js:1325
+#: ../js/ui/telepathyClient.js:1323
 msgid "The account already exists on the server"
 msgstr "खाते आधिपासूनच सर्व्हरवर अस्तित्वात आहे"

-#: ../js/ui/telepathyClient.js:1327
+#: ../js/ui/telepathyClient.js:1325
 msgid "Server is currently too busy to handle the connection"
 msgstr "जोडणी हाताळण्यासाठी सर्व्हर सध्या खूप व्यस्थ आहे"

-#: ../js/ui/telepathyClient.js:1329
+#: ../js/ui/telepathyClient.js:1327
 msgid "Certificate has been revoked"
 msgstr "प्रमाणपत्र रद्द केले"

-#: ../js/ui/telepathyClient.js:1331
+#: ../js/ui/telepathyClient.js:1329
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "प्रमाणपत्र असुरक्षित सिफर अल्गोरिदमचा वापर करते किंवा क्रिप्टोग्राफिकरित्या "
 "खूप कमजोर आहे"

-#: ../js/ui/telepathyClient.js:1333
+#: ../js/ui/telepathyClient.js:1331
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 "सर्व्हर प्रमाणपत्राची लांबी, किंवा सर्व्हर प्रमाणपत्र चैनचे गांभीर्य, "
-"क्रिप्टोग्राफि "
-"लाइब्ररितर्फे लादलेल्या मर्यादापेक्षा जास्त आहे"
+"क्रिप्टोग्राफि लाइब्ररितर्फे लादलेल्या मर्यादापेक्षा जास्त आहे"

-#: ../js/ui/telepathyClient.js:1335
+#: ../js/ui/telepathyClient.js:1333
 msgid "Internal error"
 msgstr "आंतरिक त्रुटी"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1345
+#: ../js/ui/telepathyClient.js:1343
 #, c-format
+#| msgid "connection failed"
 msgid "Connection to %s failed"
 msgstr "%s सह जोडणी अपयशी"

-#: ../js/ui/telepathyClient.js:1354
+#: ../js/ui/telepathyClient.js:1352
+#| msgid "Reject"
 msgid "Reconnect"
 msgstr "पुनःजोडणी करा"

-#: ../js/ui/telepathyClient.js:1355
+#: ../js/ui/telepathyClient.js:1353
+#| msgid "My Account"
 msgid "Edit account"
 msgstr "खाते संपादित करा"

-#: ../js/ui/telepathyClient.js:1401
+#: ../js/ui/telepathyClient.js:1399
+#| msgid "Unknown"
 msgid "Unknown reason"
 msgstr "अपरिचीत कारण"

@@ -1636,6 +1684,7 @@ msgid "Idle"
 msgstr "रिकामे"

 #: ../js/ui/userMenu.js:144
+#| msgid "unavailable"
 msgid "Unavailable"
 msgstr "अनुपलब्ध"

@@ -1644,10 +1693,12 @@ msgid "Power Off..."
 msgstr "बंद करा..."

 #: ../js/ui/userMenu.js:631
+#| msgid "Applications"
 msgid "Notifications"
 msgstr "सूचना"

 #: ../js/ui/userMenu.js:639
+#| msgid "My Account"
 msgid "Online Accounts"
 msgstr "ऑनलाइन खाते"

@@ -1677,8 +1728,7 @@ msgid ""
 "has been adjusted to let others know that you might not see their messages."
 msgstr ""
 "सूचना आता बंद केले आहे, चॅट संदेश समाविष्टीत. इतरांना तुमचे संदेश दिसणार नाही "
-"हे कळवण्यासाठी "
-"ऑनलाइन स्थिती सुस्थीत केली आहे."
+"हे कळवण्यासाठी ऑनलाइन स्थिती सुस्थीत केली आहे."

 #. Translators: this is the text displayed
 #. in the search entry when no search is
@@ -1717,7 +1767,7 @@ msgstr "'%s' सज्ज आहे"

 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1089
+#: ../src/gvc/gvc-mixer-control.c:1100
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1726,14 +1776,14 @@ msgstr[1] "%u आऊटपुट"

 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1099
+#: ../src/gvc/gvc-mixer-control.c:1110
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u इंपुट"
 msgstr[1] "%u इंपुट"

-#: ../src/gvc/gvc-mixer-control.c:1397
+#: ../src/gvc/gvc-mixer-control.c:1408
 msgid "System Sounds"
 msgstr "प्रणाली आवाज"

@@ -1751,6 +1801,7 @@ msgid "Failed to launch '%s'"
 msgstr "'%s' सुरू करण्यास अपयशी"

 #: ../src/shell-keyring-prompt.c:708
+#| msgid "Does not match"
 msgid "Passwords do not match."
 msgstr "पासवर्डस् जुळत नाही."

@@ -1773,6 +1824,7 @@ msgstr "ओळख पटवा संवाद वापरकर्त्या
 #. Translators: this is the same string as the one found in
 #. * nautilus
 #: ../src/shell-util.c:97
+#| msgid "Volume"
 msgid "Home"
 msgstr "होम"

--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 3.5.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 14:16+0200\n"
-"PO-Revision-Date: 2012-05-30 14:19+0200\n"
+"POT-Creation-Date: 2012-04-30 11:12+0200\n"
+"PO-Revision-Date: 2012-04-30 11:13+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -246,8 +246,8 @@ msgid "Not listed?"
 msgstr "Ikke listet?"

 #: ../js/gdm/loginDialog.js:1023 ../js/ui/endSessionDialog.js:401
-#: ../js/ui/extensionSystem.js:375 ../js/ui/networkAgent.js:153
-#: ../js/ui/polkitAuthenticationAgent.js:175 ../js/ui/status/bluetooth.js:431
+#: ../js/ui/extensionSystem.js:400 ../js/ui/networkAgent.js:153
+#: ../js/ui/polkitAuthenticationAgent.js:175 ../js/ui/status/bluetooth.js:462
 msgid "Cancel"
 msgstr "Avbryt"

@@ -260,31 +260,30 @@ msgstr "Logg inn"
 msgid "Login Window"
 msgstr "Innloggingsvindu"

-#: ../js/gdm/powerMenu.js:130 ../js/ui/userMenu.js:595
-#: ../js/ui/userMenu.js:599 ../js/ui/userMenu.js:647
+#: ../js/gdm/powerMenu.js:155 ../js/ui/userMenu.js:597
+#: ../js/ui/userMenu.js:599 ../js/ui/userMenu.js:668
 msgid "Suspend"
 msgstr "Hvilemodus"

-#: ../js/gdm/powerMenu.js:135
+#: ../js/gdm/powerMenu.js:160
 msgid "Restart"
 msgstr "Start på nytt"

-#: ../js/gdm/powerMenu.js:140 ../js/ui/userMenu.js:597
-#: ../js/ui/userMenu.js:599 ../js/ui/userMenu.js:646
+#: ../js/gdm/powerMenu.js:165
 msgid "Power Off"
 msgstr "Slå av"

-#: ../js/misc/util.js:93
+#: ../js/misc/util.js:92
 msgid "Command not found"
 msgstr "Kommando ikke funnet"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:124
+#: ../js/misc/util.js:119
 msgid "Could not parse command:"
 msgstr "Klarte ikke å lese kommando:"

-#: ../js/misc/util.js:132
+#: ../js/misc/util.js:127
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Kjøring av «%s» feilet:"
@@ -298,19 +297,19 @@ msgstr "Alle"
 msgid "APPLICATIONS"
 msgstr "PROGRAMMER"

-#: ../js/ui/appDisplay.js:374
+#: ../js/ui/appDisplay.js:375
 msgid "SETTINGS"
 msgstr "INNSTILLINGER"

-#: ../js/ui/appDisplay.js:679
+#: ../js/ui/appDisplay.js:680
 msgid "New Window"
 msgstr "Nytt vindu"

-#: ../js/ui/appDisplay.js:682
+#: ../js/ui/appDisplay.js:683
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"

-#: ../js/ui/appDisplay.js:683
+#: ../js/ui/appDisplay.js:684
 msgid "Add to Favorites"
 msgstr "Legg til i favoritter"

@@ -328,12 +327,12 @@ msgstr "%s ble fjernet fra dine favoritter."
 msgid "Removable Devices"
 msgstr "Avtagbare enheter"

-#: ../js/ui/autorunManager.js:553
+#: ../js/ui/autorunManager.js:560
 #, c-format
 msgid "Open with %s"
 msgstr "Åpne med %s"

-#: ../js/ui/autorunManager.js:579
+#: ../js/ui/autorunManager.js:586
 msgid "Eject"
 msgstr "Løs ut"

@@ -488,15 +487,15 @@ msgstr "Neste uke"
 msgid "Unknown"
 msgstr "Ukjent"

-#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:130
+#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:129
 msgid "Available"
 msgstr "Tilgjengelig"

-#: ../js/ui/contactDisplay.js:94 ../js/ui/userMenu.js:139
+#: ../js/ui/contactDisplay.js:94 ../js/ui/userMenu.js:138
 msgid "Away"
 msgstr "Borte"

-#: ../js/ui/contactDisplay.js:98 ../js/ui/userMenu.js:133
+#: ../js/ui/contactDisplay.js:98 ../js/ui/userMenu.js:132
 msgid "Busy"
 msgstr "Opptatt"

@@ -508,62 +507,62 @@ msgstr "Frakoblet"
 msgid "CONTACTS"
 msgstr "KONTAKTER"

-#: ../js/ui/dash.js:239 ../js/ui/messageTray.js:1239
+#: ../js/ui/dash.js:239 ../js/ui/messageTray.js:1207
 msgid "Remove"
 msgstr "Fjern"

-#: ../js/ui/dateMenu.js:101
+#: ../js/ui/dateMenu.js:103
 msgid "Date and Time Settings"
 msgstr "Innstillinger for dato og klokkeslett"

-#: ../js/ui/dateMenu.js:127
+#: ../js/ui/dateMenu.js:129
 msgid "Open Calendar"
 msgstr "Åpne kalender"

 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:185
+#: ../js/ui/dateMenu.js:187
 msgid "%a %b %e, %R:%S"
 msgstr "%a %e %b, %R.%S"

-#: ../js/ui/dateMenu.js:186
+#: ../js/ui/dateMenu.js:188
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"

 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:190
+#: ../js/ui/dateMenu.js:192
 msgid "%a %R:%S"
 msgstr "%a %R.%S"

-#: ../js/ui/dateMenu.js:191
+#: ../js/ui/dateMenu.js:193
 msgid "%a %R"
 msgstr "%a %R"

 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:198
+#: ../js/ui/dateMenu.js:200
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %e %b, %l.%M.%S %p"

-#: ../js/ui/dateMenu.js:199
+#: ../js/ui/dateMenu.js:201
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %e %b, %l.%M %p"

 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:203
+#: ../js/ui/dateMenu.js:205
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l.%M.%S %p"

-#: ../js/ui/dateMenu.js:204
+#: ../js/ui/dateMenu.js:206
 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:215
+#: ../js/ui/dateMenu.js:217
 msgid "%A %B %e, %Y"
 msgstr "%a %e %B, %Y"

@@ -659,11 +658,11 @@ msgstr[1] "Systemet vil starte på nytt automatisk om %d sekunder."
 msgid "Restarting the system."
 msgstr "Starter systemet på nytt."

-#: ../js/ui/extensionSystem.js:379
+#: ../js/ui/extensionSystem.js:404
 msgid "Install"
 msgstr "Installer"

-#: ../js/ui/extensionSystem.js:383
+#: ../js/ui/extensionSystem.js:408
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Last ned og installer «%s» fra extensions.gnome.org?"
@@ -672,7 +671,7 @@ msgstr "Last ned og installer «%s» fra extensions.gnome.org?"
 msgid "tray"
 msgstr "varslingsområde"

-#: ../js/ui/keyboard.js:545 ../js/ui/status/keyboard.js:44
+#: ../js/ui/keyboard.js:544 ../js/ui/status/keyboard.js:44
 #: ../js/ui/status/power.js:203
 msgid "Keyboard"
 msgstr "Tastatur"
@@ -734,24 +733,24 @@ msgid "Web Page"
 msgstr "Nettside"

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/main.js:121
+#: ../js/ui/main.js:120
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "Skjermvideo fra %d %t"

-#: ../js/ui/messageTray.js:1232
+#: ../js/ui/messageTray.js:1200
 msgid "Open"
 msgstr "Åpne"

-#: ../js/ui/messageTray.js:1249
+#: ../js/ui/messageTray.js:1217
 msgid "Unmute"
 msgstr "Fjern demping"

-#: ../js/ui/messageTray.js:1249
+#: ../js/ui/messageTray.js:1217
 msgid "Mute"
 msgstr "Demp"

-#: ../js/ui/messageTray.js:2522
+#: ../js/ui/messageTray.js:2490
 msgid "System Information"
 msgstr "Systeminformasjon"

@@ -840,35 +839,35 @@ msgstr "Et passord kreves for å koble til «%s»."
 msgid "Undo"
 msgstr "Angre"

-#: ../js/ui/overview.js:130
+#: ../js/ui/overview.js:132
 msgid "Overview"
 msgstr "Oversikt"

-#: ../js/ui/overview.js:200
+#: ../js/ui/overview.js:202
 msgid "Windows"
 msgstr "Vinduer"

-#: ../js/ui/overview.js:203
+#: ../js/ui/overview.js:205
 msgid "Applications"
 msgstr "Programmer"

 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: ../js/ui/overview.js:229
+#: ../js/ui/overview.js:231
 msgid "Dash"
 msgstr "Favoritter"

-#: ../js/ui/panel.js:564
+#: ../js/ui/panel.js:592
 msgid "Quit"
 msgstr "Avslutt"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:596
+#: ../js/ui/panel.js:624
 msgid "Activities"
 msgstr "Aktiviteter"

-#: ../js/ui/panel.js:962
+#: ../js/ui/panel.js:999
 msgid "Top Bar"
 msgstr "Topp-panel"

@@ -922,11 +921,11 @@ msgstr "toggle-switch-intl"
 msgid "Please enter a command:"
 msgstr "Oppgi en kommando:"

-#: ../js/ui/searchDisplay.js:321
+#: ../js/ui/searchDisplay.js:332
 msgid "Searching..."
 msgstr "Søker …"

-#: ../js/ui/searchDisplay.js:374
+#: ../js/ui/searchDisplay.js:422
 msgid "No matching results."
 msgstr "Ingen treff."

@@ -946,7 +945,7 @@ msgstr "Vis tekst"
 msgid "Hide Text"
 msgstr "Skjul tekst"

-#: ../js/ui/shellMountOperation.js:272
+#: ../js/ui/shellMountOperation.js:271
 msgid "Wrong password, please try again"
 msgstr "Feil passord. Prøv igjen"

@@ -998,9 +997,9 @@ msgid "Large Text"
 msgstr "Stor tekst"

 #: ../js/ui/status/bluetooth.js:31 ../js/ui/status/bluetooth.js:35
-#: ../js/ui/status/bluetooth.js:255 ../js/ui/status/bluetooth.js:308
-#: ../js/ui/status/bluetooth.js:339 ../js/ui/status/bluetooth.js:375
-#: ../js/ui/status/bluetooth.js:404 ../js/ui/status/network.js:890
+#: ../js/ui/status/bluetooth.js:258 ../js/ui/status/bluetooth.js:341
+#: ../js/ui/status/bluetooth.js:371 ../js/ui/status/bluetooth.js:407
+#: ../js/ui/status/bluetooth.js:436 ../js/ui/status/network.js:893
 msgid "Bluetooth"
 msgstr "Bluetooth"

@@ -1025,110 +1024,110 @@ msgstr "Innstillinger for Bluetooth"
 msgid "hardware disabled"
 msgstr "maskinvare slått av"

-#: ../js/ui/status/bluetooth.js:200
+#: ../js/ui/status/bluetooth.js:203
 msgid "Connection"
 msgstr "Tilkobling"

-#: ../js/ui/status/bluetooth.js:211 ../js/ui/status/network.js:491
+#: ../js/ui/status/bluetooth.js:214 ../js/ui/status/network.js:491
 msgid "disconnecting..."
 msgstr "kobler fra …"

-#: ../js/ui/status/bluetooth.js:224 ../js/ui/status/network.js:497
+#: ../js/ui/status/bluetooth.js:227 ../js/ui/status/network.js:497
 msgid "connecting..."
 msgstr "kobler til …"

-#: ../js/ui/status/bluetooth.js:242
+#: ../js/ui/status/bluetooth.js:245
 msgid "Send Files..."
 msgstr "Send filer …"

-#: ../js/ui/status/bluetooth.js:247
+#: ../js/ui/status/bluetooth.js:250
 msgid "Browse Files..."
 msgstr "Bla gjennom filer …"

-#: ../js/ui/status/bluetooth.js:256
+#: ../js/ui/status/bluetooth.js:259
 msgid "Error browsing device"
 msgstr "Feil under lesing av enhet"

-#: ../js/ui/status/bluetooth.js:257
+#: ../js/ui/status/bluetooth.js:260
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "Kan ikke bla gjennom forespurt enhet. Feilen er «%s»"

-#: ../js/ui/status/bluetooth.js:265
+#: ../js/ui/status/bluetooth.js:268
 msgid "Keyboard Settings"
 msgstr "Innstillinger for tastatur"

-#: ../js/ui/status/bluetooth.js:268
+#: ../js/ui/status/bluetooth.js:271
 msgid "Mouse Settings"
 msgstr "Innstillinger for mus"

-#: ../js/ui/status/bluetooth.js:273 ../js/ui/status/volume.js:59
+#: ../js/ui/status/bluetooth.js:276 ../js/ui/status/volume.js:59
 msgid "Sound Settings"
 msgstr "Innstillinger for lyd"

-#: ../js/ui/status/bluetooth.js:340
+#: ../js/ui/status/bluetooth.js:372
 #, c-format
 msgid "Authorization request from %s"
 msgstr "Forespørsel om autorisering fra %s"

-#: ../js/ui/status/bluetooth.js:346
+#: ../js/ui/status/bluetooth.js:378
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "Enhet %s vil ha tilgang til tjenesten «%s»"

-#: ../js/ui/status/bluetooth.js:348
+#: ../js/ui/status/bluetooth.js:380
 msgid "Always grant access"
 msgstr "Alltid gi tilgang"

-#: ../js/ui/status/bluetooth.js:349
+#: ../js/ui/status/bluetooth.js:381
 msgid "Grant this time only"
 msgstr "Gi tilgang kun denne ene gangen"

-#: ../js/ui/status/bluetooth.js:350 ../js/ui/telepathyClient.js:1090
+#: ../js/ui/status/bluetooth.js:382 ../js/ui/telepathyClient.js:1093
 msgid "Reject"
 msgstr "Avvis"

-#: ../js/ui/status/bluetooth.js:376
+#: ../js/ui/status/bluetooth.js:408
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Bekreftelse for tilkobling for %s"

-#: ../js/ui/status/bluetooth.js:382 ../js/ui/status/bluetooth.js:412
+#: ../js/ui/status/bluetooth.js:414 ../js/ui/status/bluetooth.js:444
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "Enhet %s vil koble seg sammen med denne datamaskinen"

-#: ../js/ui/status/bluetooth.js:383
+#: ../js/ui/status/bluetooth.js:415
 #, c-format
-msgid "Please confirm whether the PIN '%06d' matches the one on the device."
-msgstr "Vennligst bekreft om PIN «%06d» er lik den som brukes på enheten."
+msgid "Please confirm whether the PIN '%s' matches the one on the device."
+msgstr "Vennligst bekreft om PIN «%s» er lik den som brukes på enheten."

-#: ../js/ui/status/bluetooth.js:385
+#: ../js/ui/status/bluetooth.js:417
 msgid "Matches"
 msgstr "Stemmer overens"

-#: ../js/ui/status/bluetooth.js:386
+#: ../js/ui/status/bluetooth.js:418
 msgid "Does not match"
 msgstr "Stemmer ikke overens"

-#: ../js/ui/status/bluetooth.js:405
+#: ../js/ui/status/bluetooth.js:437
 #, c-format
 msgid "Pairing request for %s"
 msgstr "Forespørsel om tilkobling for %s"

-#: ../js/ui/status/bluetooth.js:413
+#: ../js/ui/status/bluetooth.js:445
 msgid "Please enter the PIN mentioned on the device."
 msgstr "Vennligst oppgi PIN som oppgitt på enheten."

-#: ../js/ui/status/bluetooth.js:430
+#: ../js/ui/status/bluetooth.js:461
 msgid "OK"
 msgstr "OK"

-#: ../js/ui/status/keyboard.js:72
+#: ../js/ui/status/keyboard.js:68
 msgid "Show Keyboard Layout"
 msgstr "Vis tastaturutforming"

-#: ../js/ui/status/keyboard.js:77
+#: ../js/ui/status/keyboard.js:73
 msgid "Region and Language Settings"
 msgstr "Innstillinger for region og språk"

@@ -1173,13 +1172,13 @@ msgstr "ikke tilgjengelig"
 msgid "connection failed"
 msgstr "tilkobling feilet"

-#: ../js/ui/status/network.js:585 ../js/ui/status/network.js:1497
+#: ../js/ui/status/network.js:585 ../js/ui/status/network.js:1505
 msgid "More..."
 msgstr "Mer …"

 #. 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:621 ../js/ui/status/network.js:1432
+#: ../js/ui/status/network.js:621 ../js/ui/status/network.js:1440
 msgid "Connected (private)"
 msgstr "Tilkoblet (privat)"

@@ -1187,72 +1186,72 @@ msgstr "Tilkoblet (privat)"
 msgid "Auto Ethernet"
 msgstr "Automatisk Ethernet"

-#: ../js/ui/status/network.js:754
+#: ../js/ui/status/network.js:757
 msgid "Auto broadband"
 msgstr "Automatisk bredbånd"

-#: ../js/ui/status/network.js:757
+#: ../js/ui/status/network.js:760
 msgid "Auto dial-up"
 msgstr "Automatisk oppringt"

 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:876 ../js/ui/status/network.js:1444
+#: ../js/ui/status/network.js:879 ../js/ui/status/network.js:1452
 #, c-format
 msgid "Auto %s"
 msgstr "Automatisk %s"

-#: ../js/ui/status/network.js:878
+#: ../js/ui/status/network.js:881
 msgid "Auto bluetooth"
 msgstr "Automatisk Bluetooth"

-#: ../js/ui/status/network.js:1446
+#: ../js/ui/status/network.js:1454
 msgid "Auto wireless"
 msgstr "Automatisk trådløst"

-#: ../js/ui/status/network.js:1533
+#: ../js/ui/status/network.js:1541
 msgid "Network"
 msgstr "Nettverk"

-#: ../js/ui/status/network.js:1540
+#: ../js/ui/status/network.js:1548
 msgid "Enable networking"
 msgstr "Slå på nettverk"

-#: ../js/ui/status/network.js:1552
+#: ../js/ui/status/network.js:1560
 msgid "Wired"
 msgstr "Kablet"

-#: ../js/ui/status/network.js:1563
+#: ../js/ui/status/network.js:1571
 msgid "Wireless"
 msgstr "Trådløst"

-#: ../js/ui/status/network.js:1573
+#: ../js/ui/status/network.js:1581
 msgid "Mobile broadband"
 msgstr "Mobilt bredbånd"

-#: ../js/ui/status/network.js:1583
+#: ../js/ui/status/network.js:1591
 msgid "VPN Connections"
 msgstr "VPN-tilkoblinger"

-#: ../js/ui/status/network.js:1594
+#: ../js/ui/status/network.js:1602
 msgid "Network Settings"
 msgstr "Innstillinger for nettverk"

-#: ../js/ui/status/network.js:1647
-msgid "Network Manager"
-msgstr "Nettverkshåndtering"
-
-#: ../js/ui/status/network.js:1734
+#: ../js/ui/status/network.js:1739
 msgid "Connection failed"
 msgstr "Tilkobling feilet"

-#: ../js/ui/status/network.js:1735
+#: ../js/ui/status/network.js:1740
 msgid "Activation of network connection failed"
 msgstr "Aktivering av nettverkstilkobling feilet"

-#: ../js/ui/status/network.js:1988
+#: ../js/ui/status/network.js:1993
 msgid "Networking is disabled"
 msgstr "Nettverk er slått av"

+#: ../js/ui/status/network.js:2117
+msgid "Network Manager"
+msgstr "Nettverkshåndtering"
+
 #: ../js/ui/status/power.js:59
 msgid "Battery"
 msgstr "Batteri"
@@ -1370,7 +1369,7 @@ msgstr "Ring"
 msgid "File Transfer"
 msgstr "Filoverføring"

-#: ../js/ui/telepathyClient.js:368
+#: ../js/ui/telepathyClient.js:369
 msgid "Subscription request"
 msgstr "Forespørsel om abbonering"

@@ -1378,22 +1377,22 @@ msgstr "Forespørsel om abbonering"
 msgid "Connection error"
 msgstr "Feil ved tilkobling"

-#: ../js/ui/telepathyClient.js:662
+#: ../js/ui/telepathyClient.js:663
 #, c-format
 msgid "%s is online."
 msgstr "%s er tilkoblet."

-#: ../js/ui/telepathyClient.js:666
+#: ../js/ui/telepathyClient.js:667
 #, c-format
 msgid "%s is offline."
 msgstr "%s er frakoblet."

-#: ../js/ui/telepathyClient.js:670
+#: ../js/ui/telepathyClient.js:671
 #, c-format
 msgid "%s is away."
 msgstr "«%s» er borte."

-#: ../js/ui/telepathyClient.js:673
+#: ../js/ui/telepathyClient.js:674
 #, c-format
 msgid "%s is busy."
 msgstr "%s er opptatt."
@@ -1401,35 +1400,35 @@ msgstr "%s er opptatt."
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:888
+#: ../js/ui/telepathyClient.js:889
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Sendt <b>%X</b> på <b>%A</b>"

 #. Translators: this is a time format in the style of "Wednesday, May 25",
 #. shown when you get a chat message in the same year.
-#: ../js/ui/telepathyClient.js:894
+#: ../js/ui/telepathyClient.js:895
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Sendt  <b>%A</b>, <b>%B %d</b>"

 #. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
 #. shown when you get a chat message in a different year.
-#: ../js/ui/telepathyClient.js:899
+#: ../js/ui/telepathyClient.js:900
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Sendt <b>%A</b>, <b>%B %d</b>, %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/telepathyClient.js:941
+#: ../js/ui/telepathyClient.js:942
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1041
+#: ../js/ui/telepathyClient.js:1044
 #, c-format
 msgid "Invitation to %s"
 msgstr "Invitasjon til %s"
@@ -1437,35 +1436,35 @@ msgstr "Invitasjon til %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example.
-#: ../js/ui/telepathyClient.js:1049
+#: ../js/ui/telepathyClient.js:1052
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer deg til å bli med i %s"

-#: ../js/ui/telepathyClient.js:1051 ../js/ui/telepathyClient.js:1130
-#: ../js/ui/telepathyClient.js:1194
+#: ../js/ui/telepathyClient.js:1054 ../js/ui/telepathyClient.js:1133
+#: ../js/ui/telepathyClient.js:1231
 msgid "Decline"
 msgstr "Avslå"

-#: ../js/ui/telepathyClient.js:1052 ../js/ui/telepathyClient.js:1131
-#: ../js/ui/telepathyClient.js:1195
+#: ../js/ui/telepathyClient.js:1055 ../js/ui/telepathyClient.js:1134
+#: ../js/ui/telepathyClient.js:1232
 msgid "Accept"
 msgstr "Godta"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1082
+#: ../js/ui/telepathyClient.js:1085
 #, c-format
 msgid "Video call from %s"
 msgstr "Videosamtale fra %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/telepathyClient.js:1085
+#: ../js/ui/telepathyClient.js:1088
 #, c-format
 msgid "Call from %s"
 msgstr "Samtale fra %s"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/telepathyClient.js:1092
+#: ../js/ui/telepathyClient.js:1095
 msgid "Answer"
 msgstr "Svar"

@@ -1474,110 +1473,110 @@ msgstr "Svar"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/telepathyClient.js:1124
+#: ../js/ui/telepathyClient.js:1127
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s sender deg %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/telepathyClient.js:1159
+#: ../js/ui/telepathyClient.js:1196
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vil ha rettigheter til å se når du er tilkoblet"

-#: ../js/ui/telepathyClient.js:1252
+#: ../js/ui/telepathyClient.js:1289
 msgid "Network error"
 msgstr "Nettverksfeil"

-#: ../js/ui/telepathyClient.js:1254
+#: ../js/ui/telepathyClient.js:1291
 msgid "Authentication failed"
 msgstr "Autentisering feilet"

-#: ../js/ui/telepathyClient.js:1256
+#: ../js/ui/telepathyClient.js:1293
 msgid "Encryption error"
 msgstr "Feil ved kryptering"

-#: ../js/ui/telepathyClient.js:1258
+#: ../js/ui/telepathyClient.js:1295
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"

-#: ../js/ui/telepathyClient.js:1260
+#: ../js/ui/telepathyClient.js:1297
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikatet"

-#: ../js/ui/telepathyClient.js:1262
+#: ../js/ui/telepathyClient.js:1299
 msgid "Certificate expired"
 msgstr "Sertifikatet er utløpt"

-#: ../js/ui/telepathyClient.js:1264
+#: ../js/ui/telepathyClient.js:1301
 msgid "Certificate not activated"
 msgstr "Sertifikatet er ikke aktivert"

-#: ../js/ui/telepathyClient.js:1266
+#: ../js/ui/telepathyClient.js:1303
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn for sertifikat"

-#: ../js/ui/telepathyClient.js:1268
+#: ../js/ui/telepathyClient.js:1305
 msgid "Certificate fingerprint mismatch"
 msgstr "Feil fingeravtrykk for sertifikat"

-#: ../js/ui/telepathyClient.js:1270
+#: ../js/ui/telepathyClient.js:1307
 msgid "Certificate self-signed"
 msgstr "Sertifikatet er selvsignert"

-#: ../js/ui/telepathyClient.js:1272
+#: ../js/ui/telepathyClient.js:1309
 msgid "Status is set to offline"
 msgstr "Status er satt til frakoblet"

-#: ../js/ui/telepathyClient.js:1274
+#: ../js/ui/telepathyClient.js:1311
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgjengelig"

-#: ../js/ui/telepathyClient.js:1276
+#: ../js/ui/telepathyClient.js:1313
 msgid "Certificate is invalid"
 msgstr "Sertifikatet er ugyldig"

-#: ../js/ui/telepathyClient.js:1278
+#: ../js/ui/telepathyClient.js:1315
 msgid "Connection has been refused"
 msgstr "Tilkobling ble nektet"

-#: ../js/ui/telepathyClient.js:1280
+#: ../js/ui/telepathyClient.js:1317
 msgid "Connection can't be established"
 msgstr "Tilkobling kan ikke etableres"

-#: ../js/ui/telepathyClient.js:1282
+#: ../js/ui/telepathyClient.js:1319
 msgid "Connection has been lost"
 msgstr "Tilkobling tapt"

-#: ../js/ui/telepathyClient.js:1284
+#: ../js/ui/telepathyClient.js:1321
 msgid "This account is already connected to the server"
 msgstr "Denne kontoen er allerede koblet til tjeneren"

-#: ../js/ui/telepathyClient.js:1286
+#: ../js/ui/telepathyClient.js:1323
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Tilkoblingen har blitt erstattet av en ny tilkobling som bruker samme ressurs"

-#: ../js/ui/telepathyClient.js:1288
+#: ../js/ui/telepathyClient.js:1325
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"

-#: ../js/ui/telepathyClient.js:1290
+#: ../js/ui/telepathyClient.js:1327
 msgid "Server is currently too busy to handle the connection"
 msgstr "Tjener er for opptatt til å håndtere tilkoblingen"

-#: ../js/ui/telepathyClient.js:1292
+#: ../js/ui/telepathyClient.js:1329
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er tilbaketrukket"

-#: ../js/ui/telepathyClient.js:1294
+#: ../js/ui/telepathyClient.js:1331
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikatet bruker en usikker sifferalgoritme eller er krytografisk svakt"

-#: ../js/ui/telepathyClient.js:1296
+#: ../js/ui/telepathyClient.js:1333
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -1585,70 +1584,74 @@ msgstr ""
 "Lengden eller dybden på tjenersertifikatet oversteg grensen som er satt i "
 "kryptografibiblioteket"

-#: ../js/ui/telepathyClient.js:1298
+#: ../js/ui/telepathyClient.js:1335
 msgid "Internal error"
 msgstr "Intern feil"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/telepathyClient.js:1308
+#: ../js/ui/telepathyClient.js:1345
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Tilkobling til %s feilet"

-#: ../js/ui/telepathyClient.js:1317
+#: ../js/ui/telepathyClient.js:1354
 msgid "Reconnect"
 msgstr "Koble til på nytt"

-#: ../js/ui/telepathyClient.js:1318
+#: ../js/ui/telepathyClient.js:1355
 msgid "Edit account"
 msgstr "Rediger konto"

-#: ../js/ui/telepathyClient.js:1364
+#: ../js/ui/telepathyClient.js:1401
 msgid "Unknown reason"
 msgstr "Ukjent årsak"

-#: ../js/ui/userMenu.js:136
+#: ../js/ui/userMenu.js:135
 msgid "Hidden"
 msgstr "Skjult"

-#: ../js/ui/userMenu.js:142
+#: ../js/ui/userMenu.js:141
 msgid "Idle"
 msgstr "Ledig"

-#: ../js/ui/userMenu.js:145
+#: ../js/ui/userMenu.js:144
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"

-#: ../js/ui/userMenu.js:556 ../js/ui/userMenu.js:656
-msgid "Switch User"
-msgstr "Bytt bruker"
+#: ../js/ui/userMenu.js:595 ../js/ui/userMenu.js:599 ../js/ui/userMenu.js:669
+msgid "Power Off..."
+msgstr "Slå av …"

-#: ../js/ui/userMenu.js:557
-msgid "Switch Session"
-msgstr "Bytt økt"
-
-#: ../js/ui/userMenu.js:632
+#: ../js/ui/userMenu.js:631
 msgid "Notifications"
 msgstr "Varslinger"

-#: ../js/ui/userMenu.js:641
+#: ../js/ui/userMenu.js:639
+msgid "Online Accounts"
+msgstr "Kontoer på nettet"
+
+#: ../js/ui/userMenu.js:643
 msgid "System Settings"
 msgstr "Systeminnstillinger"

-#: ../js/ui/userMenu.js:661
-msgid "Log Out"
-msgstr "Logg ut"
+#: ../js/ui/userMenu.js:650
+msgid "Lock Screen"
+msgstr "Lås skjerm"

-#: ../js/ui/userMenu.js:669
-msgid "Lock"
-msgstr "Lås"
+#: ../js/ui/userMenu.js:655
+msgid "Switch User"
+msgstr "Bytt bruker"

-#: ../js/ui/userMenu.js:687
+#: ../js/ui/userMenu.js:660
+msgid "Log Out..."
+msgstr "Logg ut …"
+
+#: ../js/ui/userMenu.js:688
 msgid "Your chat status will be set to busy"
 msgstr "Din pratestatus vil bli satt til opptatt"

-#: ../js/ui/userMenu.js:688
+#: ../js/ui/userMenu.js:689
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@@ -1714,23 +1717,15 @@ msgstr[1] "%u innganger"
 msgid "System Sounds"
 msgstr "Systemlyder"

-#: ../src/main.c:313
+#: ../src/main.c:255
 msgid "Print version"
 msgstr "Skriv ut versjon"

-#: ../src/main.c:319
+#: ../src/main.c:261
 msgid "Mode used by GDM for login screen"
 msgstr "Modus som brukes av GDM for innloggingsskjermen"

-#: ../src/main.c:325
-msgid "Use a specific mode, e.g. \"gdm\" for login screen"
-msgstr "Bruk spesifikt modus, f.eks «gdm» for innloggingsskjerm"
-
-#: ../src/main.c:331
-msgid "List possible modes"
-msgstr "Vis mulige modi"
-
-#: ../src/shell-app.c:622
+#: ../src/shell-app.c:619
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Klarte ikke å starte «%s»"
--- a/po/sl.po
+++ b/po/sl.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,8 +93,7 @@ gnome_shell_cflags =				\
 	-DGNOME_SHELL_LIBEXECDIR=\"$(libexecdir)\"	\
 	-DGNOME_SHELL_DATADIR=\"$(pkgdatadir)\"	\
 	-DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\" \
-	-DJSDIR=\"$(pkgdatadir)/js\"		\
-	-DMUTTER_TYPELIB_DIR=\"$(MUTTER_TYPELIB_DIR)\"
+	-DJSDIR=\"$(pkgdatadir)/js\"

 privlibdir = $(pkglibdir)
 privlib_LTLIBRARIES = libgnome-shell.la libgnome-shell-js.la
@@ -115,7 +114,6 @@ shell_public_headers_h =		\
 	shell-gtk-embed.h		\
 	shell-global.h			\
 	shell-idle-monitor.h		\
-	shell-invert-lightness-effect.h	\
 	shell-mobile-providers.h	\
 	shell-mount-operation.h		\
 	shell-network-agent.h		\
@@ -163,7 +161,6 @@ libgnome_shell_la_SOURCES =		\
 	shell-gtk-embed.c		\
 	shell-global.c			\
 	shell-idle-monitor.c		\
-	shell-invert-lightness-effect.c	\
 	shell-keyring-prompt.h		\
 	shell-keyring-prompt.c		\
 	shell-mobile-providers.c	\
@@ -194,7 +191,7 @@ libgnome_shell_la_gir_sources = \
 gnome_shell_real_SOURCES =		\
 	main.c
 gnome_shell_real_CPPFLAGS = $(gnome_shell_cflags)
-gnome_shell_real_LDADD = libgnome-shell.la libgnome-shell-js.la $(libgnome_shell_la_LIBADD)
+gnome_shell_real_LDADD = libgnome-shell.la $(libgnome_shell_la_LIBADD)
 gnome_shell_real_DEPENDENCIES = libgnome-shell.la

 EXTRA_DIST += test-gapplication.js
--- a/src/main.c
+++ b/src/main.c
@@ -24,12 +24,9 @@
 #include "shell-a11y.h"
 #include "shell-global.h"
 #include "shell-global-private.h"
-#include "shell-js.h"
 #include "shell-perf-log.h"
 #include "st.h"

-#include <jsapi.h>
-
 extern GType gnome_shell_plugin_get_type (void);

 #define SHELL_DBUS_SERVICE "org.gnome.Shell"
@@ -38,7 +35,6 @@ extern GType gnome_shell_plugin_get_type (void);
 #define OVERRIDES_SCHEMA "org.gnome.shell.overrides"

 static gboolean is_gdm_mode = FALSE;
-static char *session_mode = NULL;

 #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER 1
 #define DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER 4
@@ -177,18 +173,6 @@ shell_prefs_init (void)
                                         OVERRIDES_SCHEMA);
 }

-static void
-shell_introspection_init (void)
-{
-
-  g_irepository_prepend_search_path (MUTTER_TYPELIB_DIR);
-  g_irepository_prepend_search_path (GNOME_SHELL_PKGLIBDIR);
-#if HAVE_BLUETOOTH
-  g_irepository_prepend_search_path (BLUETOOTH_DIR);
-#endif
-
-}
-
 static void
 malloc_statistics_callback (ShellPerfLog *perf_log,
                            gpointer      data)
@@ -254,48 +238,6 @@ default_log_handler (const char     *log_domain,
    g_log_default_handler (log_domain, log_level, message, data);
 }

-static void
-shut_up (const char     *domain,
-         GLogLevelFlags  level,
-         const char     *message,
-         gpointer        user_data)
-{
-}
-
-static gboolean
-list_modes (const char  *option_name,
-            const char  *value,
-            gpointer     data,
-            GError     **error)
-{
-  ShellGlobal *global;
-  GjsContext *context;
-  const char *script;
-  int status;
-
-  /* Many of our imports require global to be set, so rather than
-   * tayloring our imports carefully here to avoid that dependency,
-   * we just set it.
-   * ShellGlobal has some GTK+ dependencies, so initialize GTK+; we
-   * don't really care if it fails though (e.g. when running from a tty),
-   * so we mute all warnings */
-  g_log_set_default_handler (shut_up, NULL);
-  gtk_init_check (NULL, NULL);
-
-  _shell_global_init (NULL);
-  global = shell_global_get ();
-  context = _shell_global_get_gjs_context (global);
-
-  shell_introspection_init ();
-
-  script = "imports.ui.environment.init();"
-           "imports.ui.sessionMode.listModes();";
-  if (!gjs_context_eval (context, script, -1, "<main>", &status, NULL))
-      g_message ("Retrieving list of available modes failed.");
-
-  exit (status);
-}
-
 static gboolean
 print_version (const gchar    *option_name,
               const gchar    *value,
@@ -314,23 +256,11 @@ GOptionEntry gnome_shell_options[] = {
    NULL
  },
  {
-    "gdm-mode", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE,
+    "gdm-mode", 0, 0, G_OPTION_ARG_NONE,
    &is_gdm_mode,
    N_("Mode used by GDM for login screen"),
    NULL
  },
-  {
-    "mode", 0, 0, G_OPTION_ARG_STRING,
-    &session_mode,
-    N_("Use a specific mode, e.g. \"gdm\" for login screen"),
-    "MODE"
-  },
-  {
-    "list-modes", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
-    list_modes,
-    N_("List possible modes"),
-    NULL
-  },
  { NULL }
 };

@@ -339,6 +269,7 @@ main (int argc, char **argv)
 {
  GOptionContext *ctx;
  GError *error = NULL;
+  ShellSessionType session_type;
  int ecode;
  TpDebugSender *sender;

@@ -377,7 +308,11 @@ main (int argc, char **argv)
  shell_a11y_init ();
  shell_perf_log_init ();
  shell_prefs_init ();
-  shell_introspection_init ();
+
+  g_irepository_prepend_search_path (GNOME_SHELL_PKGLIBDIR);
+#if HAVE_BLUETOOTH
+  g_irepository_prepend_search_path (BLUETOOTH_DIR);
+#endif

  /* Turn on telepathy-glib debugging but filter it out in
   * default_log_handler. This handler also exposes all the logs over D-Bus
@@ -388,10 +323,12 @@ main (int argc, char **argv)
  g_log_set_default_handler (default_log_handler, sender);

  /* Initialize the global object */
-  if (session_mode == NULL)
-    session_mode = is_gdm_mode ? "gdm" : "user";
+  if (is_gdm_mode)
+      session_type = SHELL_SESSION_GDM;
+  else
+      session_type = SHELL_SESSION_USER;

-  _shell_global_init ("session-mode", session_mode, NULL);
+  _shell_global_init ("session-type", session_type, NULL);

  ecode = meta_run ();

@@ -405,17 +342,3 @@ main (int argc, char **argv)

  return ecode;
 }
-
-/* HACK:
-   Add a dummy function that calls into libgnome-shell-js.so to ensure it's
-   linked to /usr/bin/gnome-shell even when linking with --as-needed.
-   This function is never actually called.
-   https://bugzilla.gnome.org/show_bug.cgi?id=670477
-*/
-void _shell_link_to_shell_js (void);
-
-void
-_shell_link_to_shell_js (void)
-{
-  shell_js_add_extension_importer (NULL, NULL, NULL, NULL);
-}
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -371,7 +371,7 @@ shell_app_get_name (ShellApp *app)

      name = meta_window_get_wm_class (window);
      if (!name)
-        name = C_("program", "Unknown");
+        name = _("Unknown");
      return name;
    }
 }
@@ -493,7 +493,7 @@ shell_app_activate_window (ShellApp     *app,
    return;
  else
    {
-      GSList *windows_reversed, *iter;
+      GSList *iter;
      ShellGlobal *global = shell_global_get ();
      MetaScreen *screen = shell_global_get_screen (global);
      MetaDisplay *display = meta_screen_get_display (screen);
@@ -511,16 +511,13 @@ shell_app_activate_window (ShellApp     *app,
      /* Now raise all the other windows for the app that are on
       * the same workspace, in reverse order to preserve the stacking.
       */
-      windows_reversed = g_slist_copy (windows);
-      windows_reversed = g_slist_reverse (windows_reversed);
-      for (iter = windows_reversed; iter; iter = iter->next)
+      for (iter = windows; iter; iter = iter->next)
        {
          MetaWindow *other_window = iter->data;

          if (other_window != window)
            meta_window_raise (other_window);
        }
-      g_slist_free (windows_reversed);

      /* If we have a transient that the user's interacted with more recently than
       * the window, pick that.
--- a/src/shell-global-private.h
+++ b/src/shell-global-private.h
@@ -16,4 +16,7 @@ GjsContext *_shell_global_get_gjs_context (ShellGlobal  *global);
 gboolean _shell_global_check_xdnd_event (ShellGlobal  *global,
                                         XEvent       *xev);

+void     _shell_global_set_session_type (ShellGlobal      *global,
+                                         ShellSessionType  session_type);
+
 #endif /* __SHELL_GLOBAL_PRIVATE_H__ */
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -59,7 +59,7 @@ struct _ShellGlobal {
  MetaScreen *meta_screen;
  GdkScreen *gdk_screen;

-  char *session_mode;
+  ShellSessionType session_type;

  /* We use this window to get a notification from GTK+ when
   * a widget in our process does a GTK+ grab.  See
@@ -97,7 +97,7 @@ struct _ShellGlobal {
 enum {
  PROP_0,

-  PROP_SESSION_MODE,
+  PROP_SESSION_TYPE,
  PROP_OVERLAY_GROUP,
  PROP_SCREEN,
  PROP_GDK_SCREEN,
@@ -143,9 +143,8 @@ shell_global_set_property(GObject         *object,
    case PROP_STAGE_INPUT_MODE:
      shell_global_set_stage_input_mode (global, g_value_get_enum (value));
      break;
-    case PROP_SESSION_MODE:
-      g_clear_pointer (&global->session_mode, g_free);
-      global->session_mode = g_ascii_strdown (g_value_get_string (value), -1);
+    case PROP_SESSION_TYPE:
+      global->session_type = g_value_get_enum (value);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -163,8 +162,8 @@ shell_global_get_property(GObject         *object,

  switch (prop_id)
    {
-    case PROP_SESSION_MODE:
-      g_value_set_string (value, shell_global_get_session_mode (global));
+    case PROP_SESSION_TYPE:
+      g_value_set_enum (value, shell_global_get_session_type (global));
      break;
    case PROP_OVERLAY_GROUP:
      g_value_set_object (value, meta_get_overlay_group_for_screen (global->meta_screen));
@@ -344,12 +343,13 @@ shell_global_class_init (ShellGlobalClass *klass)
                    G_TYPE_STRING);

  g_object_class_install_property (gobject_class,
-                                   PROP_SESSION_MODE,
-                                   g_param_spec_string ("session-mode",
-                                                        "Session Mode",
-                                                        "The session mode to use",
-                                                        "user",
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                   PROP_SESSION_TYPE,
+                                   g_param_spec_enum ("session-type",
+                                                      "Session Type",
+                                                      "The type of session",
+                                                      SHELL_TYPE_SESSION_TYPE,
+                                                      SHELL_SESSION_USER,
+                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
  g_object_class_install_property (gobject_class,
                                   PROP_OVERLAY_GROUP,
                                   g_param_spec_object ("overlay-group",
@@ -805,9 +805,90 @@ global_stage_after_paint (ClutterStage *stage,
                        "clutter.stagePaintDone");
 }

+static void
+update_font_options (GtkSettings  *settings,
+                     ClutterStage *stage)
+{
+  StThemeContext *context;
+  ClutterBackend *backend;
+  gint dpi;
+  gint hinting;
+  gchar *hint_style_str;
+  cairo_hint_style_t hint_style = CAIRO_HINT_STYLE_NONE;
+  gint antialias;
+  cairo_antialias_t antialias_mode = CAIRO_ANTIALIAS_NONE;
+  cairo_font_options_t *options;
+
+  g_object_get (settings,
+                "gtk-xft-dpi", &dpi,
+                "gtk-xft-antialias", &antialias,
+                "gtk-xft-hinting", &hinting,
+                "gtk-xft-hintstyle", &hint_style_str,
+                NULL);
+
+  context = st_theme_context_get_for_stage (stage);
+
+  if (dpi != -1)
+    /* GTK stores resolution as 1024 * dots/inch */
+    st_theme_context_set_resolution (context, dpi / 1024);
+  else
+    st_theme_context_set_default_resolution (context);
+
+  /* Clutter (as of 0.9) passes comprehensively wrong font options
+   * override whatever set_font_flags() did above.
+   *
+   * http://bugzilla.openedhand.com/show_bug.cgi?id=1456
+   */
+  backend = clutter_get_default_backend ();
+  options = cairo_font_options_create ();
+
+  cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
+
+  if (hinting >= 0 && !hinting)
+    {
+      hint_style = CAIRO_HINT_STYLE_NONE;
+    }
+  else if (hint_style_str)
+    {
+      if (strcmp (hint_style_str, "hintnone") == 0)
+        hint_style = CAIRO_HINT_STYLE_NONE;
+      else if (strcmp (hint_style_str, "hintslight") == 0)
+        hint_style = CAIRO_HINT_STYLE_SLIGHT;
+      else if (strcmp (hint_style_str, "hintmedium") == 0)
+        hint_style = CAIRO_HINT_STYLE_MEDIUM;
+      else if (strcmp (hint_style_str, "hintfull") == 0)
+        hint_style = CAIRO_HINT_STYLE_FULL;
+    }
+
+  g_free (hint_style_str);
+
+  cairo_font_options_set_hint_style (options, hint_style);
+
+  /* We don't want to turn on subpixel anti-aliasing; since Clutter
+   * doesn't currently have the code to support ARGB masks,
+   * generating them then squashing them back to A8 is pointless.
+   */
+  antialias_mode = (antialias < 0 || antialias) ? CAIRO_ANTIALIAS_GRAY
+                                                : CAIRO_ANTIALIAS_NONE;
+
+  cairo_font_options_set_antialias (options, antialias_mode);
+
+  clutter_backend_set_font_options (backend, options);
+  cairo_font_options_destroy (options);
+}
+
+static void
+settings_notify_cb (GtkSettings *settings,
+                    GParamSpec  *pspec,
+                    gpointer     data)
+{
+  update_font_options (settings, CLUTTER_STAGE (data));
+}
+
 static void
 shell_fonts_init (ClutterStage *stage)
 {
+  GtkSettings *settings;
  CoglPangoFontMap *fontmap;

  /* Disable text mipmapping; it causes problems on pre-GEM Intel
@@ -817,6 +898,19 @@ shell_fonts_init (ClutterStage *stage)
   */
  fontmap = COGL_PANGO_FONT_MAP (clutter_get_font_map ());
  cogl_pango_font_map_set_use_mipmapping (fontmap, FALSE);
+
+  settings = gtk_settings_get_default ();
+  g_object_connect (settings,
+                    "signal::notify::gtk-xft-dpi",
+                    G_CALLBACK (settings_notify_cb), stage,
+                    "signal::notify::gtk-xft-antialias",
+                    G_CALLBACK (settings_notify_cb), stage,
+                    "signal::notify::gtk-xft-hinting",
+                    G_CALLBACK (settings_notify_cb), stage,
+                    "signal::notify::gtk-xft-hintstyle",
+                    G_CALLBACK (settings_notify_cb), stage,
+                    NULL);
+  update_font_options (settings, stage);
 }

 /* This is an IBus workaround. The flow of events with IBus is that every time
@@ -1776,10 +1870,31 @@ shell_global_launch_calendar_server (ShellGlobal *global)
  g_free (calendar_server_exe);
 }

-const char *
-shell_global_get_session_mode (ShellGlobal *global)
+/**
+ * shell_global_get_session_type:
+ * @global: The #ShellGlobal.
+ *
+ * Gets the type of session gnome-shell provides.
+ *
+ * The type determines what UI elements are displayed,
+ * what keybindings work, and generally how the shell
+ * behaves.
+ *
+ * A session type of #SHELL_SESSION_USER means gnome-shell
+ * will enable the activities overview, status menu, run dialog,
+ * etc. This is the default.
+ *
+ * A session type of #SHELL_SESSION_GDM means gnome-shell
+ * will enable a login dialog and run in a more confined
+ * way. This type is suitable for the display manager.
+ *
+ * Returns: the type of session gnome-shell is providing.
+ */
+ShellSessionType
+shell_global_get_session_type (ShellGlobal  *global)
 {
-  g_return_val_if_fail (SHELL_IS_GLOBAL (global), "user");
+  g_return_val_if_fail (SHELL_IS_GLOBAL (global),
+                        SHELL_SESSION_USER);

-  return global->session_mode;
+  return global->session_type;
 }
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -141,7 +141,12 @@ void     shell_global_reexec_self               (ShellGlobal  *global);

 void     shell_global_launch_calendar_server    (ShellGlobal  *global);

-const char *     shell_global_get_session_mode  (ShellGlobal  *global);
+typedef enum {
+  SHELL_SESSION_USER,
+  SHELL_SESSION_GDM
+} ShellSessionType;
+
+ShellSessionType shell_global_get_session_type  (ShellGlobal  *global);

 G_END_DECLS

--- a/src/shell-invert-lightness-effect.c
+++ b/src/shell-invert-lightness-effect.c
@@ -1,214 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Copyright (C) 2010-2012 Inclusive Design Research Centre, OCAD University.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   Joseph Scheuhammer <clown@alum.mit.edu>
- */
-
-/**
- * SECTION:shell-invert-lightness-effect
- * @short_description: A colorization effect where lightness is inverted but
- * color is not.
- * @see_also: #ClutterEffect, #ClutterOffscreenEffect
- *
- * #ShellInvertLightnessEffect is a sub-class of #ClutterEffect that enhances
- * the appearance of a clutter actor.  Specifically it inverts the lightness
- * of a #ClutterActor (e.g., darker colors become lighter, white becomes black,
- * and white, black).
- */
-
-#define SHELL_INVERT_LIGHTNESS_EFFECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SHELL_TYPE_INVERT_LIGHTNESS_EFFECT, ShellInvertLightnessEffectClass))
-#define SHELL_IS_INVERT_EFFECT_CLASS(klass)           (G_TYPE_CHECK_CLASS_TYPE ((klass), SHELL_TYPE_INVERT_LIGHTNESS_EFFECT))
-#define SHELL_INVERT_LIGHTNESS_EFFECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SHELL_TYPE_INVERT_LIGHTNESS_EFFEC, ShellInvertLightnessEffectClass))
-
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-
-#include "shell-invert-lightness-effect.h"
-
-#include <cogl/cogl.h>
-
-struct _ShellInvertLightnessEffect
-{
-  ClutterOffscreenEffect parent_instance;
-
-  gint tex_width;
-  gint tex_height;
-
-  CoglPipeline *pipeline;
-};
-
-struct _ShellInvertLightnessEffectClass
-{
-  ClutterOffscreenEffectClass parent_class;
-
-  CoglPipeline *base_pipeline;
-};
-
-/* Lightness inversion in GLSL.
- */
-static const gchar *invert_lightness_source =
-  "cogl_texel = texture2D (cogl_sampler, cogl_tex_coord.st);\n"
-  "vec3 effect = vec3 (cogl_texel);\n"
-  "\n"
-  "float maxColor = max (cogl_texel.r, max (cogl_texel.g, cogl_texel.b));\n"
-  "float minColor = min (cogl_texel.r, min (cogl_texel.g, cogl_texel.b));\n"
-  "float lightness = (maxColor + minColor) / 2.0;\n"
-  "\n"
-  "float delta = (1.0 - lightness) - lightness;\n"
-  "effect.rgb = (effect.rgb + delta);\n"
-  "\n"
-  "cogl_texel = vec4 (effect, cogl_texel.a);\n";
-
-G_DEFINE_TYPE (ShellInvertLightnessEffect,
-               shell_invert_lightness_effect,
-               CLUTTER_TYPE_OFFSCREEN_EFFECT);
-
-static gboolean
-shell_invert_lightness_effect_pre_paint (ClutterEffect *effect)
-{
-  ShellInvertLightnessEffect *self = SHELL_INVERT_LIGHTNESS_EFFECT (effect);
-  ClutterEffectClass *parent_class;
-
-  if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)))
-    return FALSE;
-
-  if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
-    {
-      /* if we don't have support for GLSL shaders then we
-       * forcibly disable the ActorMeta
-       */
-      g_warning ("Unable to use the ShellInvertLightnessEffect: the "
-                 "graphics hardware or the current GL driver does not "
-                 "implement support for the GLSL shading language.");
-      clutter_actor_meta_set_enabled (CLUTTER_ACTOR_META (self), FALSE);
-      return FALSE;
-    }
-
-  parent_class =
-    CLUTTER_EFFECT_CLASS (shell_invert_lightness_effect_parent_class);
-  if (parent_class->pre_paint (effect))
-    {
-      ClutterOffscreenEffect *offscreen_effect =
-        CLUTTER_OFFSCREEN_EFFECT (effect);
-      CoglHandle texture;
-
-      texture = clutter_offscreen_effect_get_texture (offscreen_effect);
-      self->tex_width = cogl_texture_get_width (texture);
-      self->tex_height = cogl_texture_get_height (texture);
-
-      cogl_pipeline_set_layer_texture (self->pipeline, 0, texture);
-
-      return TRUE;
-    }
-  else
-    return FALSE;
-}
-
-static void
-shell_invert_lightness_effect_paint_target (ClutterOffscreenEffect *effect)
-{
-  ShellInvertLightnessEffect *self = SHELL_INVERT_LIGHTNESS_EFFECT (effect);
-  ClutterActor *actor;
-  guint8 paint_opacity;
-
-  actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (effect));
-  paint_opacity = clutter_actor_get_paint_opacity (actor);
-
-  cogl_pipeline_set_color4ub (self->pipeline,
-                              paint_opacity,
-                              paint_opacity,
-                              paint_opacity,
-                              paint_opacity);
-  cogl_push_source (self->pipeline);
-
-  cogl_rectangle (0, 0, self->tex_width, self->tex_height);
-
-  cogl_pop_source ();
-}
-
-static void
-shell_invert_lightness_effect_dispose (GObject *gobject)
-{
-  ShellInvertLightnessEffect *self = SHELL_INVERT_LIGHTNESS_EFFECT (gobject);
-
-  if (self->pipeline != NULL)
-    {
-      cogl_object_unref (self->pipeline);
-      self->pipeline = NULL;
-    }
-
-  G_OBJECT_CLASS (shell_invert_lightness_effect_parent_class)->dispose (gobject);
-}
-
-static void
-shell_invert_lightness_effect_class_init (ShellInvertLightnessEffectClass *klass)
-{
-  ClutterEffectClass *effect_class = CLUTTER_EFFECT_CLASS (klass);
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  ClutterOffscreenEffectClass *offscreen_class;
-
-  offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
-  offscreen_class->paint_target = shell_invert_lightness_effect_paint_target;
-
-  effect_class->pre_paint = shell_invert_lightness_effect_pre_paint;
-
-  gobject_class->dispose = shell_invert_lightness_effect_dispose;
-}
-
-static void
-shell_invert_lightness_effect_init (ShellInvertLightnessEffect *self)
-{
-  ShellInvertLightnessEffectClass *klass;
-  klass = SHELL_INVERT_LIGHTNESS_EFFECT_GET_CLASS (self);
-
-  if (G_UNLIKELY (klass->base_pipeline == NULL))
-    {
-      CoglSnippet *snippet;
-      CoglContext *ctx =
-        clutter_backend_get_cogl_context (clutter_get_default_backend ());
-
-      klass->base_pipeline = cogl_pipeline_new (ctx);
-
-      snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_TEXTURE_LOOKUP,
-                                  NULL,
-                                  NULL);
-      cogl_snippet_set_replace (snippet, invert_lightness_source);
-      cogl_pipeline_add_layer_snippet (klass->base_pipeline, 0, snippet);
-      cogl_object_unref (snippet);
-
-      cogl_pipeline_set_layer_null_texture (klass->base_pipeline,
-                                            0, /* layer number */
-                                            COGL_TEXTURE_TYPE_2D);
-    }
-
-  self->pipeline = cogl_pipeline_copy (klass->base_pipeline);
-}
-
-/**
- * shell_invert_lightness_effect_new:
- *
- * Creates a new #ShellInvertLightnessEffect to be used with
- * clutter_actor_add_effect()
- *
- * Return value: (transfer full): the newly created
- * #ShellInvertLightnessEffect or %NULL.  Use g_object_unref() when done.
- */
-ClutterEffect *
-shell_invert_lightness_effect_new (void)
-{
-  return g_object_new (SHELL_TYPE_INVERT_LIGHTNESS_EFFECT, NULL);
-}
--- a/src/shell-invert-lightness-effect.h
+++ b/src/shell-invert-lightness-effect.h
@@ -1,42 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Copyright © 2010-2012 Inclusive Design Research Centre, OCAD University.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   Joseph Scheuhammer <clown@alum.mit.edu>
- */
-#ifndef __SHELL_INVERT_LIGHTNESS_EFFECT_H__
-#define __SHELL_INVERT_LIGHTNESS_EFFECT_H__
-
-#define COGL_ENABLE_EXPERIMENTAL_API
-#include <clutter/clutter.h>
-
-G_BEGIN_DECLS
-
-#define SHELL_TYPE_INVERT_LIGHTNESS_EFFECT        (shell_invert_lightness_effect_get_type ())
-#define SHELL_INVERT_LIGHTNESS_EFFECT(obj)        (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_INVERT_LIGHTNESS_EFFECT, ShellInvertLightnessEffect))
-#define SHELL_IS_INVERT_LIGHTNESS_EFFECT(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHELL_TYPE_INVERT_LIGHTNESS_EFFECT))
-
-typedef struct _ShellInvertLightnessEffect        ShellInvertLightnessEffect;
-typedef struct _ShellInvertLightnessEffectClass   ShellInvertLightnessEffectClass;
-
-GType shell_invert_lightness_effect_get_type (void) G_GNUC_CONST;
-
-ClutterEffect *shell_invert_lightness_effect_new (void);
-
-G_END_DECLS
-
-#endif /* __SHELL_INVERT_LIGHTNESS_EFFECT_H__ */
--- a/src/shell-js.c
+++ b/src/shell-js.c
@@ -79,3 +79,15 @@ shell_js_add_extension_importer (const char  *target_object_script,
  JS_EndRequest (context);
  return ret;
 }
+
+/**
+ * shell_js_format_int_alternative_output:
+ * @intval:
+ *
+ * Returns: (transfer full):
+ */
+gchar *
+shell_js_format_int_alternative_output (gint intval)
+{
+  return g_strdup_printf ("%Id", intval);
+}
--- a/src/shell-js.h
+++ b/src/shell-js.h
@@ -11,6 +11,8 @@ gboolean shell_js_add_extension_importer (const char   *target_object_script,
                                          const char   *directory,
                                          GError      **error);

+gchar   *shell_js_format_int_alternative_output (gint intval);
+
 G_BEGIN_DECLS

 #endif /* __SHELL_JS_H__ */
--- a/src/shell-network-agent.c
+++ b/src/shell-network-agent.c
@@ -76,26 +76,6 @@ shell_agent_request_free (gpointer data)
  g_slice_free (ShellAgentRequest, request);
 }

-static void
-shell_agent_request_cancel (ShellAgentRequest *request)
-{
-  GError *error;
-  ShellNetworkAgent *self;
-
-  self = request->self;
-
-  error = g_error_new (NM_SECRET_AGENT_ERROR,
-                       NM_SECRET_AGENT_ERROR_AGENT_CANCELED,
-                       "Canceled by NetworkManager");
-  request->callback (NM_SECRET_AGENT (self), request->connection,
-                     NULL, error, request->callback_data);
-
-  g_signal_emit (self, signals[SIGNAL_CANCEL_REQUEST], 0, request->request_id);
-
-  g_hash_table_remove (self->priv->requests, request->request_id);
-  g_error_free (error);
-}
-
 static void
 shell_network_agent_init (ShellNetworkAgent *agent)
 {
@@ -361,17 +341,6 @@ shell_network_agent_get_secrets (NMSecretAgent                 *agent,
  ShellAgentRequest *request;
  NMSettingConnection *setting_connection;
  const char *connection_type;
-  char *request_id;
-
-  request_id = g_strdup_printf ("%s/%s", connection_path, setting_name);
-  if ((request = g_hash_table_lookup (self->priv->requests, request_id)) != NULL)
-    {
-      /* We already have a request pending for this (connection, setting)
-       * Cancel it before starting the new one.
-       * This will also free the request structure and associated resources.
-       */
-      shell_agent_request_cancel (request);
-    }

  setting_connection = nm_connection_get_setting_connection (connection);
  connection_type = nm_setting_connection_get_connection_type (setting_connection);
@@ -402,7 +371,7 @@ shell_network_agent_get_secrets (NMSecretAgent                 *agent,
  else
    request->vpn_entries = NULL;

-  request->request_id = request_id;
+  request->request_id = g_strdup_printf ("%s/%s", connection_path, setting_name);
  g_hash_table_replace (self->priv->requests, request->request_id, request);

  if ((flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW) ||
@@ -521,22 +490,30 @@ shell_network_agent_cancel_get_secrets (NMSecretAgent *agent,
 {
  ShellNetworkAgent *self = SHELL_NETWORK_AGENT (agent);
  ShellNetworkAgentPrivate *priv = self->priv;
-  gchar *request_id;
-  ShellAgentRequest *request;

-  request_id = g_strdup_printf ("%s/%s", connection_path, setting_name);
-  request = g_hash_table_lookup (priv->requests, request_id);
-  g_free (request_id);
+  gchar *request_id = g_strdup_printf ("%s/%s", connection_path, setting_name);
+  ShellAgentRequest *request = g_hash_table_lookup (priv->requests, request_id);
+  GError *error;

  if (!request)
    {
      /* We've already sent the result, but the caller cancelled the
       * operation before receiving that result.
       */
+      g_free (request_id);
      return;
    }

-  shell_agent_request_cancel (request);
+  error = g_error_new (NM_SECRET_AGENT_ERROR,
+                       NM_SECRET_AGENT_ERROR_AGENT_CANCELED,
+                       "Canceled by NetworkManager");
+  request->callback (agent, request->connection, NULL, error, request->callback_data);
+
+  g_signal_emit (self, signals[SIGNAL_CANCEL_REQUEST], 0, request_id);
+
+  g_hash_table_remove (priv->requests, request_id);
+  g_free (request_id);
+  g_error_free (error);
 }

 /************************* saving of secrets ****************************************/
--- a/src/shell-tp-client.c
+++ b/src/shell-tp-client.c
@@ -330,6 +330,34 @@ shell_tp_client_grab_contact_list_changed (ShellTpClient *self,

 /* Telepathy utility functions */

+
+/**
+ * shell_get_contact_events:
+ * @log_manager: A #TplLogManager
+ * @account: A #TpAccount
+ * @entity: A #TplEntity
+ * @num_events: The number of events to retrieve
+ * @callback: (scope async): User callback to run when the contact is ready
+ *
+ * Wrap tpl_log_manager_get_filtered_events_async because gjs cannot support
+ * multiple callbacks in the same function call.
+ */
+void
+shell_get_contact_events (TplLogManager *log_manager,
+                          TpAccount *account,
+                          TplEntity *entity,
+                          guint num_events,
+                          GAsyncReadyCallback callback)
+{
+  tpl_log_manager_get_filtered_events_async (log_manager,
+                                             account,
+                                             entity,
+                                             TPL_EVENT_MASK_TEXT,
+                                             num_events,
+                                             NULL, NULL,
+                                             callback, NULL);
+}
+
 /* gjs doesn't allow us to craft a GError so we need a C wrapper */
 void
 shell_decline_dispatch_op (TpAddDispatchOperationContext *context,
--- a/src/shell-tp-client.h
+++ b/src/shell-tp-client.h
@@ -7,6 +7,7 @@
 #include <glib-object.h>

 #include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-logger/telepathy-logger.h>

 G_BEGIN_DECLS

@@ -102,6 +103,12 @@ void shell_tp_client_grab_contact_list_changed (ShellTpClient *self,

 /* Telepathy utility functions */

+void shell_get_contact_events (TplLogManager *log_manager,
+                               TpAccount *account,
+                               TplEntity *entity,
+                               guint num_events,
+                               GAsyncReadyCallback callback);
+
 void shell_decline_dispatch_op (TpAddDispatchOperationContext *context,
                                const gchar *message);

--- a/src/shell-util.c
+++ b/src/shell-util.c
@@ -592,6 +592,29 @@ shell_util_get_week_start ()
  return week_start;
 }

+/**
+ * shell_write_soup_message_to_stream:
+ * @stream: a #GOutputStream
+ * @message: a #SoupMessage
+ * @error: location to store GError
+ *
+ * Write a string to a GOutputStream as binary data. This is a
+ * workaround for the lack of proper binary strings in GJS.
+ */
+void
+shell_write_soup_message_to_stream (GOutputStream *stream,
+                                    SoupMessage   *message,
+                                    GError       **error)
+{
+  SoupMessageBody *body;
+
+  body = message->response_body;
+
+  g_output_stream_write_all (stream,
+                             body->data, body->length,
+                             NULL, NULL, error);
+}
+
 /**
 * shell_write_string_to_stream:
 * @stream: a #GOutputStream
--- a/src/shell-util.h
+++ b/src/shell-util.h
@@ -25,6 +25,10 @@ char    *shell_util_normalize_and_casefold     (const char       *str);
 char    *shell_util_format_date                (const char       *format,
                                                gint64            time_ms);

+void     shell_write_soup_message_to_stream    (GOutputStream    *stream,
+                                                SoupMessage      *message,
+                                                GError          **error);
+
 gboolean shell_write_string_to_stream          (GOutputStream    *stream,
                                                const char       *str,
                                                GError          **error);
--- a/src/st/st-label.c
+++ b/src/st/st-label.c
@@ -490,7 +490,7 @@ st_label_accessible_get_name (AtkObject *obj)

      actor = CLUTTER_ACTOR (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj)));

-      if (actor == NULL || st_widget_has_style_class_name (ST_WIDGET (actor), "hidden"))
+      if (actor == NULL) /* State is defunct */
        name = NULL;
      else
        name = st_label_get_text (ST_LABEL (actor));
--- a/src/st/st-theme-context.c
+++ b/src/st/st-theme-context.c
@@ -28,6 +28,7 @@
 struct _StThemeContext {
  GObject parent;

+  double resolution;
  PangoFontDescription *font;
  StThemeNode *root_node;
  StTheme *theme;
@@ -37,6 +38,7 @@ struct _StThemeContextClass {
  GObjectClass parent_class;
 };

+#define DEFAULT_RESOLUTION 96.
 #define DEFAULT_FONT "sans-serif 10"

 enum
@@ -91,6 +93,7 @@ st_theme_context_class_init (StThemeContextClass *klass)
 static void
 st_theme_context_init (StThemeContext *context)
 {
+  context->resolution = DEFAULT_RESOLUTION;
  context->font = pango_font_description_from_string (DEFAULT_FONT);

  g_signal_connect (st_texture_cache_get_default (),
@@ -229,6 +232,66 @@ st_theme_context_get_theme (StThemeContext *context)
  return context->theme;
 }

+/**
+ * st_theme_context_set_resolution:
+ * @context: a #StThemeContext
+ * @resolution: resolution of the context (number of pixels in an "inch")
+ *
+ * Sets the resolution of the theme context. This is the scale factor
+ * used to convert between points and the length units pt, in, and cm.
+ * This does not necessarily need to correspond to the actual number
+ * resolution of the device. A value of 72. means that points and
+ * pixels are identical. The default value is 96.
+ */
+void
+st_theme_context_set_resolution (StThemeContext *context,
+                                 double          resolution)
+{
+  g_return_if_fail (ST_IS_THEME_CONTEXT (context));
+
+  if (resolution == context->resolution)
+    return;
+
+  context->resolution = resolution;
+  st_theme_context_changed (context);
+}
+
+/**
+ * st_theme_context_set_default_resolution:
+ * @context: a #StThemeContext
+ *
+ * Sets the resolution of the theme context to the default value of 96.
+ * See st_theme_context_set_resolution().
+ */
+void
+st_theme_context_set_default_resolution (StThemeContext *context)
+{
+  g_return_if_fail (ST_IS_THEME_CONTEXT (context));
+
+  if (context->resolution == DEFAULT_RESOLUTION)
+    return;
+
+  context->resolution = DEFAULT_RESOLUTION;
+  st_theme_context_changed (context);
+}
+
+/**
+ * st_theme_context_get_resolution:
+ * @context: a #StThemeContext
+ *
+ * Gets the current resolution of the theme context.
+ * See st_theme_context_set_resolution().
+ *
+ * Return value: the resolution (in dots-per-"inch")
+ */
+double
+st_theme_context_get_resolution (StThemeContext *context)
+{
+  g_return_val_if_fail (ST_IS_THEME_CONTEXT (context), DEFAULT_RESOLUTION);
+
+  return context->resolution;
+}
+
 /**
 * st_theme_context_set_font:
 * @context: a #StThemeContext
--- a/src/st/st-theme-context.h
+++ b/src/st/st-theme-context.h
@@ -56,6 +56,10 @@ void                        st_theme_context_set_theme      (StThemeContext
                                                             StTheme                    *theme);
 StTheme *                   st_theme_context_get_theme      (StThemeContext             *context);

+void                        st_theme_context_set_resolution (StThemeContext             *context,
+                                                             gdouble                     resolution);
+void                        st_theme_context_set_default_resolution (StThemeContext *context);
+double                      st_theme_context_get_resolution (StThemeContext             *context);
 void                        st_theme_context_set_font       (StThemeContext             *context,
                                                             const PangoFontDescription *font);
 const PangoFontDescription *st_theme_context_get_font       (StThemeContext             *context);
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@@ -820,7 +820,7 @@ get_length_from_term (StThemeNode *node,
      break;
    case POINTS:
      {
-        double resolution = clutter_backend_get_resolution (clutter_get_default_backend ());
+        double resolution = st_theme_context_get_resolution (node->context);
        *length = num->val * multiplier * (resolution / 72.);
      }
      break;
@@ -842,7 +842,7 @@ get_length_from_term (StThemeNode *node,
          }
        else
          {
-            double resolution = clutter_backend_get_resolution (clutter_get_default_backend ());
+            double resolution = st_theme_context_get_resolution (node->context);
            *length = num->val * multiplier * (resolution / 72.) * font_size;
          }
      }
@@ -2139,7 +2139,7 @@ font_size_from_term (StThemeNode *node,
 {
  if (term->type == TERM_IDENT)
    {
-      double resolution = clutter_backend_get_resolution (clutter_get_default_backend ());
+      double resolution = st_theme_context_get_resolution (node->context);
      /* We work in integers to avoid double comparisons when converting back
       * from a size in pixels to a logical size.
       */
@@ -2346,7 +2346,7 @@ st_theme_node_get_font (StThemeNode *node)
  parent_size = pango_font_description_get_size (node->font_desc);
  if (!pango_font_description_get_size_is_absolute (node->font_desc))
    {
-      double resolution = clutter_backend_get_resolution (clutter_get_default_backend ());
+      double resolution = st_theme_context_get_resolution (node->context);
      parent_size *= (resolution / 72.);
    }

--- a/src/st/test-theme.c
+++ b/src/st/test-theme.c
@@ -435,6 +435,7 @@ main (int argc, char **argv)
  stage = clutter_stage_new ();
  context = st_theme_context_get_for_stage (CLUTTER_STAGE (stage));
  st_theme_context_set_theme (context, theme);
+  st_theme_context_set_resolution (context, 96.);
  st_theme_context_set_font (context,
 				pango_font_description_from_string ("sans-serif 12"));
Author	SHA1	Message	Date
Rui Matos	d4802861ed	status/keyboard: Adapt to changes in the settings schema	2012-05-15 02:24:23 +02:00
Rui Matos	a8fa0b8146	candidatePanel: Use the Lang.Class framework	2012-05-03 13:20:01 +02:00
Rui Matos	cf0bb62f40	candidatePanel: Remove the PopupSeparatorMenuItem copy No reason to not use the real deal.	2012-05-03 13:20:01 +02:00
Rui Matos	de8106967d	candidatePanel: Remove hardcoded styling The styling should be done in the CSS file.	2012-05-03 13:19:58 +02:00
Rui Matos	1a24f061cf	candidatePanel: A candidate popup for IBus input methods This is an implementation of the org.freedesktop.IBus.Panel API which shows a shell style popup (BoxPointer) when using an IBus input method. The original code is from the ibus-gjs project[1] with minor modifications. [1] https://github.com/fujiwarat/ibus-gjs	2012-05-03 13:19:53 +02:00
Rui Matos	e038845458	status/keyboard: Add the input source switcher keybindings	2012-05-03 13:19:53 +02:00
Rui Matos	b03273c765	status/keyboard: Initial port to the new input sources settings	2012-05-03 13:19:53 +02:00