Bump version to 3.6.2

Update NEWS
Update .gitignore
2012-11-12 22:02:39 +01:00 · 2012-11-12 21:17:37 +01:00 · 2012-11-12 14:09:25 -05:00 · 2012-11-12 13:43:16 -05:00 · 2012-11-12 13:43:10 -05:00 · 2012-11-12 19:09:59 +01:00
87 changed files with 4306 additions and 4436 deletions
--- a/.gitignore
+++ b/.gitignore
@ -45,6 +45,7 @@ intltool-merge.in
 intltool-update.in
 libtool
 m4/
+man/gnome-shell.1
 omf.make
 po/*.gmo
 po/gnome-shell.pot
--- a/Makefile.am
+++ b/Makefile.am
@ -1,7 +1,11 @@
 # Point to our macro directory and pick up user flags from the environment
 ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}

-SUBDIRS = data js src browser-plugin tests po man docs
+SUBDIRS = data js src browser-plugin tests po docs
+
+if ENABLE_MAN
+SUBDIRS += man
+endif

 EXTRA_DIST =		\
 	.project	\
@ -21,4 +25,4 @@ distcheck-hook:
 	@echo "Checking disted files against files in git"
 	@$(srcdir)/tools/check-for-missing.py $(srcdir) $(distdir) $(DIST_EXCLUDE)

-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man
--- a/44
+++ b/44
@ -1,32 +1,34 @@
-3.7.1
+3.6.2
 =====
-* Add shortcut to open application view directly [Jeremy; #685738]
-* Expose '<Super>F10' shortcut in System Settings [Florian; #672909]
-* Clean up timestamp format in chat notifications [Carlos; #680989]
-* loginScreen: Add support for 'disable-restart-buttons' [Florian; #686247]
-* Update textures automatically on file changes [Florian; #679268]
 * Implement org.gnome.ScreenSaver.GetActiveTime [Giovanni; #686064]
-* Add missing translations for GSetting schema [Giovanni; #686413]
-* Hide workspace switcher completely when it's not necessary [Seif; #686483]
 * Explicitly load gnome-screensaver when not running GDM [Tim; #683060]
-* Port to GnomeIdleMonitor [Jasper; #682224]
 * Set Empathy as preferred handler when delegating channels [Xavier; #686296]
-* Allow testing GDM login dialog from the session [Giovanni; #683725]
-* Use all available space for windows in window picker [Jasper, Pierre-Eric;
-  #582650]
-* Use logind for suspend if available [Florian; #686482]
-* Misc. fixes and cleanups [Jasper, Florian, Adel, Rui; #677426, #680426,
-  #686233, #686241, #686318, #686240, #686484, #686002, #684650, #686487]
+* Tweak screenShield animations [Rui; #686745]
+* Restore Fittsability of summary items in message tray [Florian; #686474]
+* App search: Match GenericName too [Matthias; #687121]
+* Add setting to force log out menuitem [Matthias; #686057]
+* Fix auto-scroll to bottom in chat notifications [Sjoerd; #686571]
+* Update man page [Matthias; #680601]
+* Hide notifications when closed button is clicked [Jasper, Florian; #682237]
+* Fix screenshots on Big Endian [Owen; #685915]
+* Implement 'disable-user-list' in login screen [Ray; #660660]
+* Misc bugfixes [Jasper, Florian, Giovanni, Matthew, Matthias, Alejandro,
+  Sebastian; #686233, #686484, #686487, #686630, #686728, #686574, #686574,
+  #686574, #686879, #686763, #685239, #687189, #686736, #686583, #687132,
+  #687958, #687020, #687708, #686888, #686530, #684810, #688181]

 Contributors:
-  Jeremy Bicha, Giovanni Campagna, Xavier Claessens, Adel Gadllah, Seif Lotfy,
-  Tim Lunn, Rui Matos, Florian Müllner, Pierre-Eric Pelloux-Prayer,
-  Carlos Soriano, Jasper St. Pierre
+  Matthew Barnes, Giovanni Campagna, Xavier Claessens, Matthias Clasen,
+  Sebastian Keller, Tim Lunn, Rui Matos, Florian Müllner, Alejandro Piñeiro,
+  Sjoerd Simons, Jasper St. Pierre, Ray Strode, Owen Taylor

 Translations:
-  Andika Triwidada [id], Matej Urbančič [sl], Ihar Hrachyshka [be],
-  Daniel Mustieles [es], Fran Diéguez [gl], Takayuki KUSANO [ja],
-  Мирослав Николић [sr, sr@latin], Dušan Kazik [sk], Tom Tryfonidis [el]
+  Takayuki KUSANO [ja], Dušan Kazik [sk], Mattias Põldaru [et],
+  Tom Tryfonidis [el], Sweta Kothari [gu], Matej Urbančič [sl], Piotr Drąg [pl],
+  Fran Diéguez [gl], Aurimas Černius [lt], Kjartan Maraas [nb],
+  Ihar Hrachyshka [be], Мирослав Николић [sr, sr@latin], Gil Forcada [ca],
+  A S Alam [pa], Yuri Myasoedov [ru], Marek Černocký [cs], Sweta Kothari [gu],
+  Wolfgang Stöggl [de], Daniel Mustieles [es]

 3.6.1
 =====
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@ -153,6 +153,8 @@ NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin)
  /* global initialization routine, called once when plugin
     is loaded */

+  g_type_init ();
+
  g_debug ("plugin loaded");

  memcpy (&funcs, pfuncs, sizeof (funcs));
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.7.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.6.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -36,6 +36,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",

 PKG_PROG_PKG_CONFIG([0.22])

+AC_PATH_PROG([XSLTPROC], [xsltproc])
+
 GLIB_GSETTINGS

 # Get a value to substitute into gnome-shell.in
@ -52,7 +54,7 @@ AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
 if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
   AC_MSG_RESULT(yes)
   build_recorder=true
-   recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11 gtk+-3.0"
+   recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11"
   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes gl)
 else
   AC_MSG_RESULT(no)
@ -63,9 +65,9 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 CLUTTER_MIN_VERSION=1.11.11
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.33.2
-MUTTER_MIN_VERSION=3.7.1
+MUTTER_MIN_VERSION=3.6.2
 GTK_MIN_VERSION=3.3.9
-GIO_MIN_VERSION=2.35.0
+GIO_MIN_VERSION=2.31.6
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.5.3
 LIBEDATASERVERUI_MIN_VERSION=3.5.3
@ -74,7 +76,7 @@ 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.7.1
+GNOME_DESKTOP_REQUIRED_VERSION=3.5.1
 GNOME_MENUS_REQUIRED_VERSION=3.5.3

 # Collect more than 20 libraries for a prize!
@ -97,7 +99,8 @@ 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)
+                               gcr-3 >= $GCR_MIN_VERSION
+                               gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)

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

@ -119,7 +122,7 @@ CFLAGS=$saved_CFLAGS
 LIBS=$saved_LIBS

 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.8 x11)
+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.4)
@ -207,6 +210,18 @@ AC_SUBST(TYPELIBDIR)

 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])

+AC_ARG_ENABLE(man,
+              [AS_HELP_STRING([--enable-man],
+                              [generate man pages [default=yes]])],,
+              enable_man=yes)
+if test "$enable_man" != no; then
+  AC_PATH_PROG([XSLTPROC], [xsltproc])
+  if test -z "$XSLTPROC"; then
+    AC_MSG_ERROR([xsltproc is required for --enable-man])
+  fi
+fi
+AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+
 # Stay command-line compatible with the gnome-common configure option. Here
 # minimum/yes/maximum are the same, however.
 AC_ARG_ENABLE(compile_warnings,
--- a/data/50-gnome-shell-system.xml.in
+++ b/data/50-gnome-shell-system.xml.in
@ -8,11 +8,5 @@
 	<KeyListEntry name="toggle-message-tray"
                      _description="Show the message tray"/>

-	<KeyListEntry name="toggle-application-view"
-                      _description="Show all applications"/>
-
-	<KeyListEntry name="open-application-menu"
-                      _description="Open the application menu"/>
-
 </KeyListEntries>

--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@ -91,14 +91,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
        Keybinding to open the application menu.
      </_description>
    </key>
-    <key name="toggle-application-view" type="as">
-      <default>["&lt;Super&gt;a"]</default>
-      <_summary>Keybinding to open the "Show Applications" view</_summary>
-      <_description>
-        Keybinding to open the "Show Applications" view of the Activities
-        Overview.
-      </_description>
-    </key>
    <key name="toggle-message-tray" type="as">
      <default>["&lt;Super&gt;m"]</default>
      <_summary>Keybinding to toggle the visibility of the message tray</_summary>
@ -164,48 +156,47 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
    </key>
  </schema>

-  <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
-	  gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/">
    <key name="attach-modal-dialogs" type="b">
      <default>true</default>
-      <_summary>Attach modal dialog to the parent window</_summary>
-      <_description>
+      <summary>Attach modal dialog to the parent window</summary>
+      <description>
        This key overrides the key in org.gnome.mutter when running
        GNOME Shell.
-      </_description>
+      </description>
    </key>

    <key name="button-layout" type="s">
      <default>":close"</default>
-      <_summary>Arrangement of buttons on the titlebar</_summary>
-      <_description>
+      <summary>Arrangement of buttons on the titlebar</summary>
+      <description>
        This key overrides the key in org.gnome.desktop.wm.preferences when
        running GNOME Shell.
-      </_description>
+      </description>
    </key>

    <key name="edge-tiling" type="b">
      <default>true</default>
-      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
-      <_description>
+      <summary>Enable edge tiling when dropping windows on screen edges</summary>
+      <description>
        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
+      </description>
    </key>

    <key name="dynamic-workspaces" type="b">
      <default>true</default>
-      <_summary>Workspaces are managed dynamically</_summary>
-      <_description>
+      <summary>Workspaces are managed dynamically</summary>
+      <description>
        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
+      </description>
    </key>

    <key name="workspaces-only-on-primary" type="b">
      <default>true</default>
-      <_summary>Workspaces only on primary monitor</_summary>
-      <_description>
+      <summary>Workspaces only on primary monitor</summary>
+      <description>
        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
+      </description>
    </key>

    <key name="focus-change-on-pointer-rest" type="b">
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -39,6 +39,7 @@ stage {
 /* small */
 .app-well-menu,
 .contact-details-status,
+.run-dialog-label,
 .run-dialog-error-label {
    font-size: 9pt;
 }
@ -310,7 +311,7 @@ StScrollBar StButton#vhandle:active {
 .notification-icon-button:focus,
 .hotplug-notification-item:focus,
 .modal-dialog-button:focus {
-    border-width: 2px;
+    border: 2px solid #8b8b8b;
 }

 .dash-search-button:active,
@ -325,20 +326,17 @@ StScrollBar StButton#vhandle:active {
    background-gradient-end: rgba(255, 255, 255, 0.2);
 }

-.notification-button:insensitive,
 .notification-icon-button:insensitive,
-.modal-dialog-button:insensitive {
-    border-color: #666666;
+.notification-button:insensitive {
    color: #9f9f9f;
-    background-gradient-direction: none;
-    background-color: rgba(102, 102, 102, 0.15);
 }

 /* Entries */

 #searchEntry,
 .notification StEntry,
-.modal-dialog StEntry {
+.login-dialog-prompt-entry,
+.prompt-dialog-password-entry {
    color: rgb(64, 64, 64);
    caret-color: rgb(64, 64, 64);
    font-size: 12pt;
@ -348,7 +346,6 @@ StScrollBar StButton#vhandle:active {
 }

 #searchEntry,
-.run-dialog-entry,
 .notification StEntry {
    border: 2px solid rgba(245,245,245,0.2);
    background-gradient-start: rgba(5,5,6,0.1);
@ -361,7 +358,8 @@ StScrollBar StButton#vhandle:active {
 #searchEntry:focus,
 #searchEntry:hover,
 .notification StEntry:focus,
-.modal-dialog StEntry {
+.login-dialog-prompt-entry,
+.prompt-dialog-password-entry {
    border: 2px solid rgb(136,138,133);
    background-gradient-start: rgb(200,200,200);
    background-gradient-end: white;
@ -370,17 +368,12 @@ StScrollBar StButton#vhandle:active {
 }

 .notification StEntry:focus,
-.modal-dialog StEntry:focus {
+.prompt-dialog-password-entry:focus,
+.login-dialog-prompt-entry:focus {
    border: 2px solid #3465a4;
 }

 #searchEntry {
-    border-color: rgba(245,245,245,0.3);
-    color: rgb(192, 192, 192);
-    caret-color: rgb(192, 192, 192);
-}
-
-#searchEntry:hover {
    color: rgb(128, 128, 128);
    caret-color: rgb(128, 128, 128);
 }
@ -393,7 +386,8 @@ StScrollBar StButton#vhandle:active {
 }

 .notification StEntry,
-.modal-dialog StEntry {
+.prompt-dialog-password-entry,
+.login-dialog-prompt-entry {
    border-radius: 5px;
    padding: 4px 4px;
 }
@ -557,6 +551,7 @@ StScrollBar StButton#vhandle:active {
 }

 .status-chooser-combo.popup-combo-menu {
+    background-color: rgba(0,0,0,0.7);
    padding: .4em 0em;
    border-radius: 4px;
    border: 1px solid #5f5f5f;
@ -574,7 +569,7 @@ StScrollBar StButton#vhandle:active {
 /* Overview */

 #overview {
-    spacing: 40px;
+    spacing: 12px;
 }

 .window-caption {
@ -638,25 +633,13 @@ StScrollBar StButton#vhandle:active {
     * adjust down 8px */

    -shell-close-overlap-x: 14px;
-    -shell-close-overlap-y: -12px;
-}
-
-.notification-close:rtl {
-    /* as above, but starting out in the top left of the
-     * notification. */
-
-    -shell-close-overlap-x: -14px;
+    -shell-close-overlap-y: 12px;
 }

 .window-close:rtl {
    -st-background-image-shadow: 2px 2px 6px rgba(0,0,0,0.5);
 }

-.window-picker {
-    -horizontal-spacing: 40px;
-    -vertical-spacing: 40px;
-}
-
 /* Dash */

 #dash {
@ -694,11 +677,6 @@ StScrollBar StButton#vhandle:active {

 .search-entry-icon {
    icon-size: 1em;
-    color: #c0c0c0;
-}
-
-#searchEntry:hover .search-entry-icon,
-#searchEntry:focus .search-entry-icon {
    color: #8d8f8a;
 }

@ -1646,26 +1624,35 @@ StScrollBar StButton#vhandle:active {
    padding: 4px 32px 5px;
 }

+.modal-dialog-button:insensitive {
+    color: rgb(60, 60, 60);
+}
+
 .modal-dialog-button:focus {
    padding: 3px 31px 4px;
 }

 /* Run Dialog */

-.run-dialog-label {
-    font-size: 12pt;
-    font-weight: bold;
-    color: #999999;
-    padding-bottom: .4em;
-}
-
 .run-dialog-error-box {
    padding-top: 15px;
    spacing: 5px;
 }

-.modal-dialog .run-dialog-entry {
-    width: 20em;
+.run-dialog-entry {
+    font-weight: bold;
+    width: 23em;
+    selection-background-color: white;
+    selected-color: black;
+}
+
+.run-dialog {
+    border-radius: 16px;
+
+    padding-right: 21px;
+    padding-left: 21px;
+    padding-bottom: 15px;
+    padding-top: 15px;
 }

 .lightbox {
@ -2191,20 +2178,24 @@ StScrollBar StButton#vhandle:active {
    height: .75em;
 }

+
 .login-dialog .modal-dialog-button {
+    border: 1px solid #666666;
    border-radius: 5px;
    padding: 3px 18px;
 }

 .login-dialog .modal-dialog-button:focus {
    padding: 2px 17px;
+    border: 2px solid #8b8b8b;
 }

 .login-dialog .modal-dialog-button:default {
    background-gradient-start: #6793c4;
    background-gradient-end: #335d8f;
    background-gradient-direction: vertical;
-    border-color: #16335d;
+    padding: 2px 17px;
+    border: 2px solid #16335d;
 }

 .login-dialog .modal-dialog-button:default:focus {
@ -2222,13 +2213,6 @@ StScrollBar StButton#vhandle:active {
    background-gradient-end: #74a0d0;
 }

-.login-dialog .modal-dialog-button:default:insensitive {
-    border-color: #666666;
-    color: #9f9f9f;
-    background-gradient-direction: none;
-    background-color: rgba(102, 102, 102, 0.15);
-}
-
 .login-dialog-message-warning {
    color: orange;
 }
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@ -21,16 +21,7 @@ const GnomeShellIface = <interface name="org.gnome.Shell.Extensions">
 </signal>
 </interface>;

-const GnomeShellProxy = new Gio.DBusProxyClass({
-    Name: 'GnomeShellProxy',
-    Interface: GnomeShellIface,
-
-    _init: function() {
-	this.parent({ g_bus_type: Gio.BusType.SESSION,
-		      g_name: 'org.gnome.Shell',
-		      g_object_path: '/org/gnome/Shell' });
-    }
-});
+const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);

 function stripPrefix(string, prefix) {
    if (string.slice(0, prefix.length) == prefix)
@ -200,8 +191,7 @@ const Application = new Lang.Class({

        this._extensionPrefsBin.add(label);

-        this._shellProxy = new GnomeShellProxy();
-        this._shellProxy.init(null);
+        this._shellProxy = new GnomeShellProxy(Gio.DBus.session, 'org.gnome.Shell', '/org/gnome/Shell');
        this._shellProxy.connectSignal('ExtensionStatusChanged', Lang.bind(this, function(proxy, senderName, [uuid, state, error]) {
            if (ExtensionUtils.extensions[uuid] !== undefined)
                this._scanExtensions();
--- a/js/gdm/fingerprint.js
+++ b/js/gdm/fingerprint.js
@ -11,14 +11,16 @@ const FprintManagerIface = <interface name='net.reactivated.Fprint.Manager'>
 </method>
 </interface>;

-const FprintManager = new Gio.DBusProxyClass({
-    Name: 'FprintManager',
-    Interface: FprintManagerIface,
+const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface);

-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SYSTEM,
-                      g_name: 'net.reactivated.Fprint',
-                      g_object_path: '/net/reactivated/Fprint/Manager',
-                      g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-    }
-});
+function FprintManager() {
+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
+                                   g_interface_name: FprintManagerInfo.name,
+                                   g_interface_info: FprintManagerInfo,
+                                   g_name: 'net.reactivated.Fprint',
+                                   g_object_path: '/net/reactivated/Fprint/Manager',
+                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
+
+    self.init(null);
+    return self;
+}
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -39,14 +39,13 @@ const GdmUtil = imports.gdm.util;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
-const PanelMenu = imports.ui.panelMenu;
 const Tweener = imports.ui.tweener;
 const UserMenu = imports.ui.userMenu;

 const _RESIZE_ANIMATION_TIME = 0.25;
 const _SCROLL_ANIMATION_TIME = 0.5;
 const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
-const _LOGO_ICON_HEIGHT = 16;
+const _LOGO_ICON_NAME_SIZE = 48;

 let _loginDialog = null;

@ -83,36 +82,6 @@ function _smoothlyResizeActor(actor, width, height) {
    return hold;
 }

-const LogoMenuButton = new Lang.Class({
-    Name: 'LogoMenuButton',
-    Extends: PanelMenu.Button,
-
-    _init: function() {
-        this.parent(0.0, null, true);
-
-        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
-        this._settings.connect('changed::' + GdmUtil.LOGO_KEY,
-                               Lang.bind(this, this._updateLogo));
-
-        this._iconBin = new St.Bin();
-        this.actor.add_actor(this._iconBin);
-
-        this._updateLogo();
-    },
-
-    _updateLogo: function() {
-        let path = this._settings.get_string(GdmUtil.LOGO_KEY);
-        let icon = null;
-
-        if (path) {
-            let file = Gio.file_new_for_path(path);
-            let cache = St.TextureCache.get_default();
-            icon = cache.load_uri_async(file.get_uri(), -1, _LOGO_ICON_HEIGHT);
-        }
-        this._iconBin.set_child(icon);
-    }
-});
-
 const UserListItem = new Lang.Class({
    Name: 'UserListItem',

@ -669,31 +638,38 @@ const LoginDialog = new Lang.Class({
        this._userManager = AccountsService.UserManager.get_default()
        this._greeterClient = new Gdm.Client();

-        if (GLib.getenv('GDM_GREETER_TEST') != '1') {
-            this._greeter = this._greeterClient.get_greeter_sync(null);
+        this._greeter = this._greeterClient.get_greeter_sync(null);

-            this._greeter.connect('default-session-name-changed',
-                                  Lang.bind(this, this._onDefaultSessionChanged));
+        this._greeter.connect('default-session-name-changed',
+                              Lang.bind(this, this._onDefaultSessionChanged));

-            this._greeter.connect('session-opened',
-                                  Lang.bind(this, this._onSessionOpened));
-            this._greeter.connect('timed-login-requested',
-                                  Lang.bind(this, this._onTimedLoginRequested));
-        }
+        this._greeter.connect('session-opened',
+                              Lang.bind(this, this._onSessionOpened));
+        this._greeter.connect('timed-login-requested',
+                              Lang.bind(this, this._onTimedLoginRequested));

        this._userVerifier = new GdmUtil.ShellUserVerifier(this._greeterClient);
        this._userVerifier.connect('ask-question', Lang.bind(this, this._askQuestion));
        this._userVerifier.connect('show-message', Lang.bind(this, this._showMessage));
-        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
+        this._userVerifier.connect('reset', Lang.bind(this, this._reset));
        this._userVerifier.connect('show-login-hint', Lang.bind(this, this._showLoginHint));
        this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._hideLoginHint));
+        this._verifyingUser = false;

        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });

+        this._settings.connect('changed::' + GdmUtil.LOGO_KEY,
+                               Lang.bind(this, this._updateLogo));
        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,
                               Lang.bind(this, this._updateBanner));
        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,
                               Lang.bind(this, this._updateBanner));
+        this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,
+                               Lang.bind(this, this._updateDisableUserList));
+
+        this._logoBox = new St.Bin({ style_class: 'login-dialog-logo-box' });
+        this.contentLayout.add(this._logoBox);
+        this._updateLogo();

        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
                                           text: '' });
@ -701,7 +677,8 @@ const LoginDialog = new Lang.Class({
        this._updateBanner();

        this._titleLabel = new St.Label({ style_class: 'login-dialog-title',
-                                          text: C_("title", "Sign In") });
+                                          text: C_("title", "Sign In"),
+                                          visible: false });

        this.contentLayout.add(this._titleLabel,
                              { y_fill: false,
@ -769,7 +746,7 @@ const LoginDialog = new Lang.Class({
                                                x_align: St.Align.START,
                                                x_fill: true });

-        this._notListedButton.connect('clicked', Lang.bind(this, this._onNotListedClicked));
+        this._notListedButton.connect('clicked', Lang.bind(this, this._hideUserListAndLogIn));

        this.contentLayout.add(this._notListedButton,
                               { expand: false,
@ -795,6 +772,35 @@ const LoginDialog = new Lang.Class({

   },

+    _updateDisableUserList: function() {
+        let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY);
+
+        // If this is the first time around, set initial focus
+        if (this._disableUserList == undefined && disableUserList)
+            this.setInitialKeyFocus(this._promptEntry);
+
+        if (disableUserList != this._disableUserList) {
+            this._disableUserList = disableUserList;
+
+            if (!this._verifyingUser)
+               this._reset();
+        }
+   },
+
+    _updateLogo: function() {
+        this._logoBox.child = null;
+        let path = this._settings.get_string(GdmUtil.LOGO_KEY);
+
+        if (path) {
+            let file = Gio.file_new_for_path(path);
+            let uri = file.get_uri();
+
+            let textureCache = St.TextureCache.get_default();
+            this._logoBox.child = textureCache.load_uri_async(uri, -1, _LOGO_ICON_NAME_SIZE);
+        }
+
+    },
+
    _updateBanner: function() {
        let enabled = this._settings.get_boolean(GdmUtil.BANNER_MESSAGE_KEY);
        let text = this._settings.get_string(GdmUtil.BANNER_MESSAGE_TEXT_KEY);
@ -807,31 +813,15 @@ const LoginDialog = new Lang.Class({
        }
    },

-    _onReset: function(client, serviceName) {
+    _reset: function() {
        this._promptMessage.hide();
-
-        let tasks = [this._hidePrompt,
-
-                     new Batch.ConcurrentBatch(this, [this._fadeInTitleLabel,
-                                                      this._fadeInNotListedButton]),
-
-                     function() {
-                         this._sessionList.close();
-                         this._promptLoginHint.hide();
-                         this._userList.actor.show();
-                         this._userList.actor.opacity = 255;
-                         return this._userList.showItems();
-                     },
-
-                     function() {
-                         this._userList.actor.reactive = true;
-                         this._userList.actor.grab_key_focus();
-                     }];
-
        this._user = null;
+        this._verifyingUser = false;

-        let batch = new Batch.ConsecutiveBatch(this, tasks);
-        batch.run();
+        if (this._disableUserList)
+            this._hideUserListAndLogIn();
+        else
+            this._showUserList();
    },

    _onDefaultSessionChanged: function(client, sessionId) {
@ -886,6 +876,9 @@ const LoginDialog = new Lang.Class({
                         if (this._user && this._user.is_logged_in())
                             return null;

+                         if (!this._verifyingUser)
+                             return null;
+
                         return GdmUtil.fadeInActor(this._sessionList.actor);
                     },

@ -901,14 +894,18 @@ const LoginDialog = new Lang.Class({
    _showPrompt: function() {
        let hold = new Batch.Hold();

-        let buttons = [{ action: Lang.bind(this, this.cancel),
-                         label: _("Cancel"),
-                         key: Clutter.Escape },
-                       { action: Lang.bind(this, function() {
-                                     hold.release();
-                                 }),
-                         label: C_("button", "Sign In"),
-                         default: true }];
+        let cancelButtonInfo = { action: Lang.bind(this, this.cancel),
+                                 label: _("Cancel"),
+                                 key: Clutter.Escape };
+        let okButtonInfo = { action: Lang.bind(this, function() {
+                                         hold.release();
+                                     }),
+                             label: C_("button", "Sign In"),
+                             default: true };
+        let buttons = [];
+        if (!this._disableUserList || this._verifyingUser)
+            buttons.push(cancelButtonInfo);
+        buttons.push(okButtonInfo);

        let tasks = [function() {
                         return this._fadeInPrompt();
@ -961,6 +958,23 @@ const LoginDialog = new Lang.Class({
        return batch.run();
    },

+    _askForUsernameAndLogIn: function() {
+        this._promptLabel.set_text(_("Username: "));
+        this._promptEntry.set_text('');
+        this._promptEntry.clutter_text.set_password_char('');
+
+        let tasks = [this._showPrompt,
+
+                     function() {
+                         let userName = this._promptEntry.get_text();
+                         this._promptEntry.reactive = false;
+                         return this._beginVerificationForUser(userName);
+                     }];
+
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        return batch.run();
+    },
+
    _onSessionOpened: function(client, serviceName) {
        this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
    },
@ -1089,7 +1103,7 @@ const LoginDialog = new Lang.Class({
                             }));
    },

-    _onNotListedClicked: function() {
+    _hideUserListAndLogIn: function() {
        let tasks = [function() {
                         return this._userList.hideItems();
                     },
@ -1103,13 +1117,43 @@ const LoginDialog = new Lang.Class({
                     },

                     new Batch.ConcurrentBatch(this, [this._fadeOutTitleLabel,
-                                                      this._fadeOutNotListedButton]),
+                                                      this._fadeOutNotListedButton,
+                                                      this._fadeOutLogo]),

                     function() {
-                         let hold = new Batch.Hold();
+                         return this._askForUsernameAndLogIn();
+                     }];

-                         this._userVerifier.begin(null, hold);
-                         return hold;
+        let batch = new Batch.ConsecutiveBatch(this, tasks);
+        batch.run();
+    },
+
+    _fadeInLogo: function() {
+        return GdmUtil.fadeInActor(this._logoBox);
+    },
+
+    _fadeOutLogo: function() {
+        return GdmUtil.fadeOutActor(this._logoBox);
+    },
+
+    _showUserList: function() {
+        let tasks = [this._hidePrompt,
+
+                     new Batch.ConcurrentBatch(this, [this._fadeInTitleLabel,
+                                                      this._fadeInNotListedButton,
+                                                      this._fadeInLogo]),
+
+                     function() {
+                         this._sessionList.close();
+                         this._promptLoginHint.hide();
+                         this._userList.actor.show();
+                         this._userList.actor.opacity = 255;
+                         return this._userList.showItems();
+                     },
+
+                     function() {
+                         this._userList.actor.reactive = true;
+                         this._userList.actor.grab_key_focus();
                     }];

        let batch = new Batch.ConsecutiveBatch(this, tasks);
@ -1144,6 +1188,7 @@ const LoginDialog = new Lang.Class({
        let hold = new Batch.Hold();

        this._userVerifier.begin(userName, hold);
+        this._verifyingUser = true;
        return hold;
    },

@ -1164,7 +1209,8 @@ const LoginDialog = new Lang.Class({
                     },

                     new Batch.ConcurrentBatch(this, [this._fadeOutTitleLabel,
-                                                      this._fadeOutNotListedButton]),
+                                                      this._fadeOutNotListedButton,
+                                                      this._fadeOutLogo]),

                     function() {
                         return this._userList.shrinkToNaturalHeight();
@ -1196,6 +1242,8 @@ const LoginDialog = new Lang.Class({
            this._userList.addUser(users[i]);
        }

+        this._updateDisableUserList();
+
        this._userManager.connect('user-added',
                                  Lang.bind(this, function(userManager, user) {
                                      this._userList.addUser(user);
@ -1219,7 +1267,7 @@ const LoginDialog = new Lang.Class({
    _onOpened: function() {
        Main.ctrlAltTabManager.addGroup(this.dialogLayout,
                                        _("Login Window"),
-                                        'dialog-password',
+                                        'dialog-password-symbolic',
                                        { sortGroup: CtrlAltTab.SortGroup.MIDDLE });

    },
@ -1227,6 +1275,6 @@ const LoginDialog = new Lang.Class({
    close: function() {
        this.parent();

-        Main.ctrlAltTabManager.removeGroup(this._group);
+        Main.ctrlAltTabManager.removeGroup(this.dialogLayout);
    }
 });
--- a/js/gdm/powerMenu.js
+++ b/js/gdm/powerMenu.js
@ -18,12 +18,11 @@
 * 02111-1307, USA.
 */

-const Gio = imports.gi.Gio;
 const Lang = imports.lang;
+const UPowerGlib = imports.gi.UPowerGlib;

 const LoginManager = imports.misc.loginManager;

-const GdmUtil = imports.gdm.util;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

@ -34,21 +33,16 @@ const PowerMenuButton = new Lang.Class({
    _init: function() {
        /* Translators: accessible name of the power menu in the login screen */
        this.parent('system-shutdown-symbolic', _("Power"));
+        this._upClient = new UPowerGlib.Client();

-        LoginManager.getLoginManager(Lang.bind(this, function(manager) {
-            this._loginManager = manager;
-
-            this._updateHaveShutdown();
-            this._updateHaveRestart();
-            this._updateHaveSuspend();
-        }));
-
-        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
-        this._settings.connect('changed::disable-restart-buttons',
-                               Lang.bind(this, this._updateVisibility));
+        this._loginManager = LoginManager.getLoginManager();

        this._createSubMenu();

+        this._upClient.connect('notify::can-suspend',
+                               Lang.bind(this, this._updateHaveSuspend));
+        this._updateHaveSuspend();
+
        // ConsoleKit doesn't send notifications when shutdown/reboot
        // are disabled, so we update the menu item each time the menu opens
        this.menu.connect('open-state-changed', Lang.bind(this,
@ -56,26 +50,18 @@ const PowerMenuButton = new Lang.Class({
                if (open) {
                    this._updateHaveShutdown();
                    this._updateHaveRestart();
-                    this._updateHaveSuspend();
                }
            }));
        this._updateHaveShutdown();
        this._updateHaveRestart();
-        this._updateHaveSuspend();
    },

    _updateVisibility: function() {
        let shouldBeVisible = (this._haveSuspend || this._haveShutdown || this._haveRestart);
-        this.actor.visible = shouldBeVisible && !this._settings.get_boolean('disable-restart-buttons');
+        this.actor.visible = shouldBeVisible;
    },

    _updateHaveShutdown: function() {
-        if (!this._loginManager) {
-            this._haveShutdown = false;
-            this._powerOffItem.actor.visible = false;
-            return;
-        }
-
        this._loginManager.canPowerOff(Lang.bind(this, function(result) {
            this._haveShutdown = result;
            this._powerOffItem.actor.visible = this._haveShutdown;
@ -84,12 +70,6 @@ const PowerMenuButton = new Lang.Class({
    },

    _updateHaveRestart: function() {
-        if (!this._loginManager) {
-            this._haveRestart = false;
-            this._restartItem.actor.visible = false;
-            return;
-        }
-
        this._loginManager.canReboot(Lang.bind(this, function(result) {
            this._haveRestart = result;
            this._restartItem.actor.visible = this._haveRestart;
@ -98,17 +78,9 @@ const PowerMenuButton = new Lang.Class({
    },

    _updateHaveSuspend: function() {
-        if (!this._loginManager) {
-            this._haveSuspend = false;
-            this._suspendItem.actor.visible = false;
-            return;
-        }
-
-        this._loginManager.canSuspend(Lang.bind(this, function(result) {
-            this._haveSuspend = result;
-            this._suspendItem.actor.visible = this._haveSuspend;
-            this._updateVisibility();
-        }));
+        this._haveSuspend = this._upClient.get_can_suspend();
+        this._suspendItem.actor.visible = this._haveSuspend;
+        this._updateVisibility();
    },

    _createSubMenu: function() {
@ -131,10 +103,8 @@ const PowerMenuButton = new Lang.Class({
    },

    _onActivateSuspend: function() {
-        if (!this._haveSuspend)
-            return;
-
-        this._loginManager.suspend();
+        if (this._haveSuspend)
+            this._upClient.suspend_sync(null);
    },

    _onActivateRestart: function() {
--- a/js/gdm/realmd.js
+++ b/js/gdm/realmd.js
@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
@ -17,16 +16,7 @@ const ProviderIface = <interface name='org.freedesktop.realmd.Provider'>
        <arg name="realm" type="ao" direction="out"/>
    </method>
 </interface>;
-const Provider = new Gio.DBusProxyClass({
-    Name: 'RealmdProvider',
-    Interface: ProviderIface,
-
-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SYSTEM,
-                      g_name: 'org.freedesktop.realmd',
-                      g_object_path: '/org/freedesktop/realmd' });
-    }
-});
+const Provider = Gio.DBusProxy.makeProxyWrapper(ProviderIface);

 const ServiceIface = <interface name="org.freedesktop.realmd.Service">
    <method name="Cancel">
@ -41,16 +31,7 @@ const ServiceIface = <interface name="org.freedesktop.realmd.Service">
        <arg name="operation" type="s"/>
    </signal>
 </interface>;
-const Service = new Gio.DBusProxyClass({
-    Name: 'RealmdService',
-    Interface: ServiceIface,
-
-    _init: function(service) {
-        this.parent({ g_bus_type: Gio.BusType.SYSTEM,
-                      g_name: 'org.freedesktop.realmd',
-                      g_object_path: service });
-    }
-});
+const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface);

 const RealmIface = <interface name="org.freedesktop.realmd.Realm">
    <property name="Name" type="s" access="read"/>
@ -70,22 +51,16 @@ const RealmIface = <interface name="org.freedesktop.realmd.Realm">
        <arg name="options" type="a{sv}" direction="in"/>
    </method>
 </interface>;
-const Realm = new Gio.DBusProxyClass({
-    Name: 'RealmdRealm',
-    Interface: RealmIface,
-
-    _init: function(realm) {
-        this.parent({ g_bus_type: Gio.BusType.SYSTEM,
-                      g_name: 'org.freedesktop.realmd',
-                      g_object_path: realm });
-    }
-});
+const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface);

 const Manager = new Lang.Class({
    Name: 'Manager',

    _init: function(parentActor) {
-        this._aggregateProvider = new Provider();
+        this._aggregateProvider = Provider(Gio.DBus.system,
+                                           'org.freedesktop.realmd',
+                                           '/org/freedesktop/realmd',
+                                           Lang.bind(this, this._reloadRealms))
        this._realms = {};

        this._aggregateProvider.connect('g-properties-changed',
@ -93,16 +68,6 @@ const Manager = new Lang.Class({
                                            if ('Realms' in properties.deep_unpack())
                                                this._reloadRealms();
                                        }));
-
-        this._aggregateProvider.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(proxy, result) {
-            try {
-                proxy.init_finish(result);
-            } catch(e) {
-                return;
-            }
-
-            this._reloadRealms();
-        }));
    },

    _reloadRealms: function() {
@ -112,8 +77,10 @@ const Manager = new Lang.Class({
            return;

        for (let i = 0; i < realmPaths.length; i++) {
-            let realm = new Realm(realmPaths[i]);
-            realm.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, this._onRealmLoaded));
+            let realm = Realm(Gio.DBus.system,
+                              'org.freedesktop.realmd',
+                              realmPaths[i],
+                              Lang.bind(this, this._onRealmLoaded));
        }
    },

@ -130,10 +97,9 @@ const Manager = new Lang.Class({
        this._updateLoginFormat();
    },

-    _onRealmLoaded: function(realm, result) {
-        try {
-            realm.init_finish(result);
-        } catch(e) { return; }
+    _onRealmLoaded: function(realm, error) {
+        if (error)
+            return;

        this._reloadRealm(realm);

--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@ -23,6 +23,7 @@ const BANNER_MESSAGE_TEXT_KEY = 'banner-message-text';
 const ALLOWED_FAILURES_KEY = 'allowed-failures';

 const LOGO_KEY = 'logo';
+const DISABLE_USER_LIST_KEY = 'disable-user-list';

 function fadeInActor(actor) {
    if (actor.opacity == 255 && actor.visible)
@ -82,8 +83,6 @@ const ShellUserVerifier = new Lang.Class({
        this._settings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });

        this._fprintManager = new Fprint.FprintManager();
-        this._fprintManager.init(null);
-
        this._realmManager = new Realmd.Manager();

        this._failCounter = 0;
@ -139,14 +138,11 @@ const ShellUserVerifier = new Lang.Class({
        if (!this._settings.get_boolean(FINGERPRINT_AUTHENTICATION_KEY))
            return;

-        this._fprintManager.GetDefaultDeviceRemote(this._cancellable, Lang.bind(this, function(manager, result) {
-            try {
-                let device = manager.GetDefaultDeviceFinish(result);
-                this._haveFingerprintReader = !!device;
-            } catch(e) {
-                this._haveFingerprintReader = false;
-            }
-        }));
+        this._fprintManager.GetDefaultDeviceRemote(Gio.DBusCallFlags.NONE, this._cancellable, Lang.bind(this,
+            function(device, error) {
+                if (!error && device)
+                    this._haveFingerprintReader = true;
+            }));
    },

    _reportInitError: function(where, error) {
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@ -21,16 +21,11 @@ const PresenceStatus = {
    IDLE: 3
 };

-const Presence = new Gio.DBusProxyClass({
-    Name: 'GnomeSessionPresence',
-    Interface: PresenceIface,
-
-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SESSION,
-                      g_name: 'org.gnome.SessionManager',
-                      g_object_path: '/org/gnome/SessionManager/Presence' });
-    }
-});
+var PresenceProxy = Gio.DBusProxy.makeProxyWrapper(PresenceIface);
+function Presence(initCallback, cancellable) {
+    return new PresenceProxy(Gio.DBus.session, 'org.gnome.SessionManager',
+                             '/org/gnome/SessionManager/Presence', initCallback, cancellable);
+}

 // Note inhibitors are immutable objects, so they don't
 // change at runtime (changes always come in the form
@ -44,16 +39,10 @@ const InhibitorIface = <interface name="org.gnome.SessionManager.Inhibitor">
 </method>
 </interface>;

-const Inhibitor = new Gio.DBusProxyClass({
-    Name: 'GnomeSessionInhibitor',
-    Interface: InhibitorIface,
-
-    _init: function(inhibitor) {
-        this.parent({ g_bus_type: Gio.BusType.SESSION,
-                      g_name: 'org.gnome.SessionManager',
-                      g_object_path: inhibitor });
-    }
-});
+var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);
+function Inhibitor(objectPath, initCallback, cancellable) {
+    return new InhibitorProxy(Gio.DBus.session, 'org.gnome.SessionManager', objectPath, initCallback, cancellable);
+}

 // Not the full interface, only the methods we use
 const SessionManagerIface = <interface name="org.gnome.SessionManager">
@ -77,14 +66,7 @@ const SessionManagerIface = <interface name="org.gnome.SessionManager">
 </signal>
 </interface>;

-const SessionManager = new Gio.DBusProxyClass({
-    Name: 'GnomeSessionManager',
-    Interface: SessionManagerIface,
-
-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SESSION,
-                      g_name: 'org.gnome.SessionManager',
-                      g_object_path: '/org/gnome/SessionManager' });
-    },
-});
-
+var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface);
+function SessionManager(initCallback, cancellable) {
+    return new SessionManagerProxy(Gio.DBus.session, 'org.gnome.SessionManager', '/org/gnome/SessionManager', initCallback, cancellable);
+}
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@ -2,11 +2,8 @@

 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
-const GObject = imports.gi.GObject;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
-const UPowerGlib = imports.gi.UPowerGlib;

 const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'>
 <method name='PowerOff'>
@ -15,18 +12,12 @@ const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager
 <method name='Reboot'>
    <arg type='b' direction='in'/>
 </method>
-<method name='Suspend'>
-    <arg type='b' direction='in'/>
-</method>
 <method name='CanPowerOff'>
    <arg type='s' direction='out'/>
 </method>
 <method name='CanReboot'>
    <arg type='s' direction='out'/>
 </method>
-<method name='CanSuspend'>
-    <arg type='s' direction='out'/>
-</method>
 </interface>;

 const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session'>
@ -34,26 +25,8 @@ const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session
 <signal name='Unlock' />
 </interface>;

-const SystemdLoginManager = new Gio.DBusProxyClass({
-    Name: 'SystemdLoginManager',
-    Interface: SystemdLoginManagerIface,
-
-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SYSTEM,
-                      g_name: 'org.freedesktop.login1',
-                      g_object_path: '/org/freedesktop/login1' });
-    }
-});
-const SystemdLoginSession = new Gio.DBusProxyClass({
-    Name: 'SystemdLoginSession',
-    Interface: SystemdLoginSessionIface,
-
-    _init: function(session) {
-        this.parent({ g_bus_type: Gio.BusType.SYSTEM,
-                      g_name: 'org.freedesktop.login1',
-                      g_object_path: session });
-    }
-});
+const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
+const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);

 const ConsoleKitManagerIface = <interface name='org.freedesktop.ConsoleKit.Manager'>
 <method name='CanRestart'>
@ -80,128 +53,51 @@ const ConsoleKitSessionIface = <interface name='org.freedesktop.ConsoleKit.Sessi
 <signal name='Unlock' />
 </interface>;

-const ConsoleKitSession = new Gio.DBusProxyClass({
-    Name: 'ConsoleKitSession',
-    Interface: ConsoleKitSessionIface,
-
-    _init: function(session) {
-        this.parent({ g_bus_type: Gio.BusType.SYSTEM,
-                      g_name: 'org.freedesktop.ConsoleKit',
-                      g_object_path: session });
-    }
-});
-const ConsoleKitManager = new Gio.DBusProxyClass({
-    Name: 'ConsoleKitManager',
-    Interface: ConsoleKitManagerIface,
-
-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SYSTEM,
-                      g_name: 'org.freedesktop.ConsoleKit',
-                      g_object_path: '/org/freedesktop/ConsoleKit/Manager' });
-    }
-});
+const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
+const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);

 function haveSystemd() {
    return GLib.access("/sys/fs/cgroup/systemd", 0) >= 0;
 }

 let _loginManager = null;
-let _pendingAsyncCallbacks = [];

 /**
 * LoginManager:
 * An abstraction over systemd/logind and ConsoleKit.
 *
 */
-function getLoginManager(asyncCallback) {
+function getLoginManager() {
    if (_loginManager == null) {
-        if (_pendingAsyncCallbacks.length == 0) {
-            let manager;
-
-            if (haveSystemd())
-                manager = new LoginManagerSystemd();
-            else
-                manager = new LoginManagerConsoleKit();
-
-            manager.initAsync(null, function(obj, result) {
-                obj.initFinish(result);
-
-                _loginManager = manager;
-
-                _pendingAsyncCallbacks.forEach(function (f) { f(obj) });
-                _pendingAsyncCallbacks = [];
-            });
-
-            _pendingAsyncCallbacks = [asyncCallback];
-        } else {
-            _pendingAsyncCallbacks.push(asyncCallback);
-        }
-    } else {
-        GLib.idle_add(GLib.PRIORITY_DEFAULT, function() {
-            asyncCallback(_loginManager);
-        });
+        if (haveSystemd())
+            _loginManager = new LoginManagerSystemd();
+        else
+            _loginManager = new LoginManagerConsoleKit();
    }
+
+    return _loginManager;
 }

 const LoginManagerSystemd = new Lang.Class({
    Name: 'LoginManagerSystemd',
-    Extends: GObject.Object,

    _init: function() {
-        this.parent();
-
-        this._proxy = new SystemdLoginManager();
-    },
-
-    initAsync: function(cancellable, asyncCallback) {
-        let simpleResult = Gio.SimpleAsyncResult.new(this, asyncCallback, null);
-        simpleResult.set_check_cancellable(cancellable);
-
-        this._proxy.init_async(GLib.PRIORITY_DEFAULT, cancellable, Lang.bind(this, function(proxy, result) {
-            try {
-                proxy.init_finish(result);
-
-                if (cancellable && cancellable.is_cancelled())
-                    return;
-
-                this._fetchCurrentSession(cancellable, simpleResult);
-            } catch(e if e instanceof GLib.Error) {
-                simpleResult.set_from_error(e);
-                simpleResult.complete();
-            }
-        }));
-    },
-
-    initFinish: function(simpleResult) {
-        if (!simpleResult.propagate_error())
-            return simpleResult.get_op_res_gboolean();
-
-        return true;
-    },
-
-    _fetchCurrentSession: function(cancellable, simpleResult) {
-        this._currentSession = new SystemdLoginSession('/org/freedesktop/login1/session/' +
-                                                       GLib.getenv('XDG_SESSION_ID'));
-
-        this._currentSession.init_async(GLib.PRIORITY_DEFAULT, cancellable, Lang.bind(this, function(proxy, result) {
-            try {
-                proxy.init_finish(result);
-
-                simpleResult.set_op_res_gboolean(true);
-            } catch(e if e instanceof GLib.Error) {
-                simpleResult.set_from_error(e);
-            }
-
-            simpleResult.complete();
-        }));
+        this._proxy = new SystemdLoginManager(Gio.DBus.system,
+                                              'org.freedesktop.login1',
+                                              '/org/freedesktop/login1');
    },

    // Having this function is a bit of a hack since the Systemd and ConsoleKit
    // session objects have different interfaces - but in both cases there are
    // Lock/Unlock signals, and that's all we count upon at the moment.
-    //
-    // This is only valid after async initialization
    getCurrentSessionProxy: function() {
+        if (!this._currentSession) {
+            this._currentSession = new SystemdLoginSession(Gio.DBus.system,
+                                                           'org.freedesktop.login1',
+                                                           '/org/freedesktop/login1/session/' +
+                                                           GLib.getenv('XDG_SESSION_ID'));
+        }
+
        return this._currentSession;
    },

@ -210,126 +106,52 @@ const LoginManagerSystemd = new Lang.Class({
    },

    canPowerOff: function(asyncCallback) {
-        this._proxy.CanPowerOffRemote(null, function(proxy, result) {
-            let val = false;
-
-            try {
-                val = proxy.CanPowerOffFinish(result)[0] != 'no';
-            } catch(e) { }
-
-            asyncCallback(val);
+        this._proxy.CanPowerOffRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0] != 'no');
        });
    },

    canReboot: function(asyncCallback) {
-        this._proxy.CanRebootRemote(null, function(proxy, result) {
-            let val = false;
-
-            try {
-                val = proxy.CanRebootFinish(result)[0] != 'no';
-            } catch(e) { }
-
-            asyncCallback(val);
-        });
-    },
-
-    canSuspend: function(asyncCallback) {
-        this._proxy.CanSuspendRemote(null, function(proxy, result) {
-            let val = false;
-
-            try {
-                val = proxy.CanRebootFinish(result)[0] != 'no';
-            } catch(e) { }
-
-            asyncCallback(val);
+        this._proxy.CanRebootRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0] != 'no');
        });
    },

    powerOff: function() {
-        this._proxy.PowerOffRemote(true, null, null);
+        this._proxy.PowerOffRemote(true);
    },

    reboot: function() {
-        this._proxy.RebootRemote(true, null, null);
-    },
-
-    suspend: function() {
-        this._proxy.SuspendRemote(true, null, null);
+        this._proxy.RebootRemote(true);
    }
 });

 const LoginManagerConsoleKit = new Lang.Class({
    Name: 'LoginManagerConsoleKit',
-    Extends: GObject.Object,

    _init: function() {
-        this.parent();
-
-        this._proxy = new ConsoleKitManager();
-        this._upClient = new UPowerGlib.Client();
-    },
-
-    initAsync: function(cancellable, asyncCallback) {
-        let simpleResult = Gio.SimpleAsyncResult.new(this, asyncCallback, null);
-        simpleResult.set_check_cancellable(cancellable);
-
-        this._proxy.init_async(GLib.PRIORITY_DEFAULT, cancellable, Lang.bind(this, function(proxy, result) {
-            try {
-                proxy.init_finish(result);
-
-                if (cancellable && cancellable.is_cancelled())
-                    return;
-
-                this._fetchCurrentSession(cancellable, simpleResult);
-            } catch(e if e instanceof GLib.Error) {
-                simpleResult.set_from_error(e);
-                simpleResult.complete();
-            }
-        }));
-    },
-
-    initFinish: function(simpleResult) {
-        if (!simpleResult.propagate_error())
-            return simpleResult.get_op_res_gboolean();
-
-        return true;
-    },
-
-    _fetchCurrentSession: function(cancellable, simpleResult) {
-        this._proxy.GetCurrentSessionRemote(cancellable, Lang.bind(this, function(proxy, result) {
-            try {
-                let [currentSessionId] = proxy.GetCurrentSessionFinish(result);
-
-                if (cancellable && cancellable.is_cancelled())
-                    return;
-
-                this._createSessionProxy(currentSessionId, cancellable, simpleResult);
-            } catch(e if e instanceof GLib.Error) {
-                simpleResult.set_from_error(e);
-                simpleResult.complete();
-            }
-        }));
-    },
-
-    _createSessionProxy: function(currentSessionId, cancellable, simpleResult) {
-        this._currentSession = new ConsoleKitSession(currentSessionId);
-        this._currentSession.init_async(GLib.PRIORITY_DEFAULT, cancellable, Lang.bind(this, function(proxy, result) {
-            try {
-                proxy.init_finish(result);
-
-                simpleResult.set_op_res_gboolean(true);
-            } catch(e if e instanceof GLib.Error) {
-                simpleResult.set_from_error(e);
-            }
-
-            simpleResult.complete();
-        }));
+        this._proxy = new ConsoleKitManager(Gio.DBus.system,
+                                            'org.freedesktop.ConsoleKit',
+                                            '/org/freedesktop/ConsoleKit/Manager');
    },

    // Having this function is a bit of a hack since the Systemd and ConsoleKit
    // session objects have different interfaces - but in both cases there are
    // Lock/Unlock signals, and that's all we count upon at the moment.
    getCurrentSessionProxy: function() {
+        if (!this._currentSession) {
+            let [currentSessionId] = this._proxy.GetCurrentSessionSync();
+            this._currentSession = new ConsoleKitSession(Gio.DBus.system,
+                                                         'org.freedesktop.ConsoleKit',
+                                                         currentSessionId);
+        }
+
        return this._currentSession;
    },

@ -341,51 +163,35 @@ const LoginManagerConsoleKit = new Lang.Class({
        session.connectSignal('ActiveChanged', Lang.bind(this, function(object, senderName, [isActive]) {
            this._sessionActive = isActive;
        }));
-        [this._sessionActive] = session.IsActiveSync(null);
+        [this._sessionActive] = session.IsActiveSync();

        return this._sessionActive;
    },

    canPowerOff: function(asyncCallback) {
-        this._proxy.CanStopRemote(null, function(proxy, result) {
-            let val = false;
-
-            try {
-                [val] = proxy.CanStopFinish(result);
-            } catch(e) { }
-
-            asyncCallback(val);
+        this._proxy.CanStopRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0]);
        });
    },

    canReboot: function(asyncCallback) {
-        this._proxy.CanRestartRemote(null, function(proxy, result) {
-            let val = false;
-
-            try {
-                [val] = proxy.CanRestartFinish(result);
-            } catch(e) { }
-
-            asyncCallback(val);
+        this._proxy.CanRestartRemote(function(result, error) {
+            if (error)
+                asyncCallback(false);
+            else
+                asyncCallback(result[0]);
        });
    },

-    canSuspend: function(asyncCallback) {
-        Mainloop.idle_add(Lang.bind(this, function() {
-            asyncCallback(this._upClient.get_can_suspend());
-            return false;
-        }));
-    },
-
    powerOff: function() {
-        this._proxy.StopRemote(null, null);
+        this._proxy.StopRemote();
    },

    reboot: function() {
-        this._proxy.RestartRemote(null, null);
-    },
-
-    suspend: function() {
-        this._upClient.suspend_sync(null);
+        this._proxy.RestartRemote();
    }
+            
 });
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
@ -27,16 +26,7 @@ const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.M
 </signal>
 </interface>;

-const ModemGsmNetworkProxy = new Gio.DBusProxyClass({
-    Name: 'ModemGsmNetworkProxy',
-    Interface: ModemGsmNetworkInterface,
-
-    _init: function(modem) {
-        this.parent({ g_bus_type: Gio.BusType.SYSTEM,
-                      g_name: 'org.freedesktop.ModemManager',
-                      g_object_path: modem });
-    }
-});
+const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface);

 const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.Cdma">
 <method name="GetSignalQuality">
@ -50,16 +40,7 @@ const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.C
 </signal>
 </interface>;

-const ModemCdmaProxy = new Gio.DBusProxyClass({
-    Name: 'ModemCdmaProxy',
-    Interface: ModemCdmaInterface,
-
-    _init: function(modem) {
-        this.parent({ g_bus_type: Gio.BusType.SYSTEM,
-                      g_name: 'org.freedesktop.ModemManager',
-                      g_object_path: modem });
-    },
-});
+const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);

 let _providersTable;
 function _getProvidersTable() {
@ -73,18 +54,11 @@ const ModemGsm = new Lang.Class({
    Name: 'ModemGsm',

    _init: function(path) {
-        this._proxy = new ModemGsmNetworkProxy(path);
-        this._proxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(obj, result) {
-            obj.init_finish(result);
-
-            this._finishInit();
-        }));
+        this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);

        this.signal_quality = 0;
        this.operator_name = null;
-    },

-    _finishInit: function() {
        // Code is duplicated because the function have different signatures
        this._proxy.connectSignal('SignalQuality', Lang.bind(this, function(proxy, sender, [quality]) {
            this.signal_quality = quality;
@ -94,19 +68,24 @@ const ModemGsm = new Lang.Class({
            this.operator_name = this._findOperatorName(name, code);
            this.emit('notify::operator-name');
        }));
-        this._proxy.GetRegistrationInfoRemote(null, Lang.bind(this, function(proxy, result) {
-            let [status, code, name] = proxy.GetRegistrationInfoFinish(result);
+        this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function([result], err) {
+            if (err) {
+                log(err);
+                return;
+            }
+
+            let [status, code, name] = result;
            this.operator_name = this._findOperatorName(name, code);
            this.emit('notify::operator-name');
        }));
-        this._proxy.GetSignalQualityRemote(null, Lang.bind(this, function(proxy, result) {
-            try {
-                [this.signal_quality] = proxy.GetSignalQualityFinish(result);
-            } catch(e) {
+        this._proxy.GetSignalQualityRemote(Lang.bind(this, function(result, err) {
+            if (err) {
                // it will return an error if the device is not connected
                this.signal_quality = 0;
+            } else {
+                let [quality] = result;
+                this.signal_quality = quality;
            }
-
            this.emit('notify::signal-quality');
        }));
    },
@ -178,18 +157,10 @@ const ModemCdma = new Lang.Class({
    Name: 'ModemCdma',

    _init: function(path) {
-        this._proxy = new ModemCdmaProxy(path);
-        this._proxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(obj, result) {
-            obj.init_finish(result);
-
-            this._finishInit();
-        }));
+        this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path);

        this.signal_quality = 0;
        this.operator_name = null;
-    },
-
-    _finishInit: function() {
        this._proxy.connectSignal('SignalQuality', Lang.bind(this, function(proxy, sender, params) {
            this.signal_quality = params[0];
            this.emit('notify::signal-quality');
@ -199,31 +170,30 @@ const ModemCdma = new Lang.Class({
            if (this.operator_name == null)
                this._refreshServingSystem();
        }));
-        this._proxy.GetSignalQualityRemote(null, Lang.bind(this, function(proxy, result) {
-            try {
-                [this.signal_quality] = proxy.GetSignalQualityFinish(result);
-            } catch(e) {
+        this._proxy.GetSignalQualityRemote(Lang.bind(this, function(result, err) {
+            if (err) {
                // it will return an error if the device is not connected
                this.signal_quality = 0;
+            } else {
+                let [quality] = result;
+                this.signal_quality = quality;
            }
-
            this.emit('notify::signal-quality');
        }));
    },

    _refreshServingSystem: function() {
-        this._proxy.GetServingSystemRemote(null, Lang.bind(this, function(proxy, result) {
-            try {
-                let [bandClass, band, name] = proxy.GetServingSystemFinish(result);
-                if (name.length > 0)
-                    this.operator_name = this._findProviderForSid(name);
-                else
-                    this.operator_name = null;
-            } catch(e) {
+        this._proxy.GetServingSystemRemote(Lang.bind(this, function([result], err) {
+            if (err) {
                // it will return an error if the device is not connected
                this.operator_name = null;
+            } else {
+                let [bandClass, band, id] = result;
+                if (name.length > 0)
+                    this.operator_name = this._findProviderForSid(id);
+                else
+                    this.operator_name = null;
            }
-
            this.emit('notify::operator-name');
        }));
    },
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const St = imports.gi.St;
@ -201,17 +200,19 @@ const CalendarServerIface = <interface name="org.gnome.Shell.CalendarServer">
 <signal name="Changed" />
 </interface>;

-const CalendarServer = new Gio.DBusProxyClass({
-    Name: 'CalendarServer',
-    Interface: CalendarServerIface,
+const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);

-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SESSION,
-                      g_name: 'org.gnome.Shell.CalendarServer',
-                      g_object_path: '/org/gnome/Shell/CalendarServer',
-                      g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
-    }
-});
+function CalendarServer() {
+    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
+                                   g_interface_name: CalendarServerInfo.name,
+                                   g_interface_info: CalendarServerInfo,
+                                   g_name: 'org.gnome.Shell.CalendarServer',
+                                   g_object_path: '/org/gnome/Shell/CalendarServer',
+                                   g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
+
+    self.init(null);
+    return self;
+}

 function _datesEqual(a, b) {
    if (a < b)
@ -241,15 +242,11 @@ const DBusEventSource = new Lang.Class({
        this._dbusProxy = new CalendarServer();
        this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));

-        this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(proxy, result) {
-            try {
-                proxy.init_finish(result);
-            } catch(e) {
-                return;
-            }
-
-            this._resetCache();
-            this.emit('changed');
+        this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
+            if (this._dbusProxy.g_name_owner)
+                this._onNameAppeared();
+            else
+                this._onNameVanished();
        }));
    },

@ -259,32 +256,36 @@ const DBusEventSource = new Lang.Class({
        this._lastRequestEnd = null;
    },

+    _onNameAppeared: function(owner) {
+        this._resetCache();
+        this._loadEvents(true);
+    },
+
+    _onNameVanished: function(oldOwner) {
+        this._resetCache();
+        this.emit('changed');
+    },
+
    _onChanged: function() {
        this._loadEvents(false);
    },

-    _onEventsReceived: function(proxy, result) {
-        let appointments;
-        try {
-            [appointments] = proxy.call_finish(result).deep_unpack();
-        } catch(e if e instanceof GLib.Error) {
-            // ignore errors coming from DBus
-            appointments = [];
-        }
-
+    _onEventsReceived: function([appointments]) {
        let newEvents = [];
-        for (let n = 0; n < appointments.length; n++) {
-            let a = appointments[n];
-            let date = new Date(a[4] * 1000);
-            let end = new Date(a[5] * 1000);
-            let summary = a[1];
-            let allDay = a[3];
-            let event = new CalendarEvent(date, end, summary, allDay);
-            newEvents.push(event);
+        if (appointments != null) {
+            for (let n = 0; n < appointments.length; n++) {
+                let a = appointments[n];
+                let date = new Date(a[4] * 1000);
+                let end = new Date(a[5] * 1000);
+                let summary = a[1];
+                let allDay = a[3];
+                let event = new CalendarEvent(date, end, summary, allDay);
+                newEvents.push(event);
+            }
+            newEvents.sort(function(event1, event2) {
+                return event1.date.getTime() - event2.date.getTime();
+            });
        }
-        newEvents.sort(function(event1, event2) {
-            return event1.date.getTime() - event2.date.getTime();
-        });

        this._events = newEvents;
        this.emit('changed');
@ -292,19 +293,14 @@ const DBusEventSource = new Lang.Class({

    _loadEvents: function(forceReload) {
        if (this._curRequestBegin && this._curRequestEnd){
-            /* Can't use GetEventsRemote because we need to pass the
-               flags here */
            let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
            if (forceReload)
-                 callFlags = Gio.DBusCallFlags.NONE;
-            this._dbusProxy.call("GetEvents",
-                                 GLib.Variant.new("(xxb)", [this._curRequestBegin.getTime() / 1000,
-                                                            this._curRequestEnd.getTime() / 1000,
-                                                            forceReload]),
-                                 callFlags,
-                                 -1,
-                                 null,
-                                 Lang.bind(this, this._onEventsReceived));
+                callFlags = Gio.DBusCallFlags.NONE;
+            this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
+                                            this._curRequestEnd.getTime() / 1000,
+                                            forceReload,
+                                            Lang.bind(this, this._onEventsReceived),
+                                            callFlags);
        }
    },

@ -397,6 +393,7 @@ const Calendar = new Lang.Class({
            this._eventSourceChangedId = this._eventSource.connect('changed', Lang.bind(this, function() {
                this._update(false);
            }));
+            this._update(true);
        }
    },

--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@ -33,9 +33,7 @@ const AutomountManager = new Lang.Class({
                                    Lang.bind(this, this._InhibitorsChanged));
        this._inhibited = false;

-        LoginManager.getLoginManager(Lang.bind(this, function(manager) {
-            this._loginManager = manager;
-        }));
+        this._loginManager = LoginManager.getLoginManager();
        this._volumeMonitor = Gio.VolumeMonitor.get();
    },

@ -87,7 +85,7 @@ const AutomountManager = new Lang.Class({
    _onDriveConnected: function() {
        // if we're not in the current ConsoleKit session,
        // or screensaver is active, don't play sounds
-        if (!this._loginManager || !this._loginManager.sessionActive)
+        if (!this._loginManager.sessionActive)
            return;

        global.play_theme_sound(0, 'device-added-media');
@ -96,7 +94,7 @@ const AutomountManager = new Lang.Class({
    _onDriveDisconnected: function() {
        // if we're not in the current ConsoleKit session,
        // or screensaver is active, don't play sounds
-        if (!this._loginManager || !this._loginManager.sessionActive)
+        if (!this._loginManager.sessionActive)
            return;

        global.play_theme_sound(0, 'device-removed-media');        
@ -105,7 +103,7 @@ const AutomountManager = new Lang.Class({
    _onDriveEjectButton: function(monitor, drive) {
        // TODO: this code path is not tested, as the GVfs volume monitor
        // doesn't emit this signal just yet.
-        if (!this._loginManager || !this._loginManager.sessionActive)
+        if (!this._loginManager.sessionActive)
            return;

        // we force stop/eject in this case, so we don't have to pass a
@ -145,7 +143,7 @@ const AutomountManager = new Lang.Class({
        if (params.checkSession) {
            // if we're not in the current ConsoleKit session,
            // don't attempt automount
-            if (!this._loginManager || !this._loginManager.sessionActive)
+            if (!this._loginManager.sessionActive)
                return;
        }

--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@ -2,7 +2,6 @@

 const Lang = imports.lang;
 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const St = imports.gi.St;

 const LoginManager = imports.misc.loginManager;
@ -46,12 +45,14 @@ function isMountRootHidden(root) {
 }

 function isMountNonLocal(mount) {
-    // If the mount doesn't have an associated volume, that means it's
-    // an uninteresting filesystem. Most devices that we care about will
-    // have a mount, like media players and USB sticks.
+    // If the mount doesn't have an associated volume, that means it could
+    // be a remote filesystem. For certain kinds of local filesystems,
+    // like digital cameras and music players, there's no associated
+    // gvfs volume, so err on the side of caution and assume it's a local
+    // filesystem to allow the prompt.
    let volume = mount.get_volume();
    if (volume == null)
-        return true;
+        return false;

    return (volume.get_identifier("class") == "network");
 }
@ -83,16 +84,12 @@ const HotplugSnifferIface = <interface name="org.gnome.Shell.HotplugSniffer">
 </method>
 </interface>;

-const HotplugSniffer = new Gio.DBusProxyClass({
-    Name: 'HotplugSnifferProxy',
-    Interface: HotplugSnifferIface,
-
-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SESSION,
-                      g_name: 'org.gnome.Shell.HotplugSniffer',
-                      g_object_path: '/org/gnome/Shell/HotplugSniffer' });
-    }
-});
+const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
+function HotplugSniffer() {
+    return new HotplugSnifferProxy(Gio.DBus.session,
+                                   'org.gnome.Shell.HotplugSniffer',
+                                   '/org/gnome/Shell/HotplugSniffer');
+}

 const ContentTypeDiscoverer = new Lang.Class({
    Name: 'ContentTypeDiscoverer',
@ -132,14 +129,10 @@ const ContentTypeDiscoverer = new Lang.Class({
            let root = mount.get_root();

            let hotplugSniffer = new HotplugSniffer();
-            hotplugSniffer.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(proxy, result) {
-                proxy.init_finish(result);
-
-                proxy.SniffURIRemote(root.get_uri(), null, Lang.bind(this, function(proxy, result) {
-                    let [contentTypes] = proxy.SniffURIFinish(result);
-                    this._emitCallback(mount, contentTypes);
-                }));
-            }));
+            hotplugSniffer.SniffURIRemote(root.get_uri(),
+                 Lang.bind(this, function([contentTypes]) {
+                     this._emitCallback(mount, contentTypes);
+                 }));
        }
    },

@ -171,9 +164,7 @@ const AutorunManager = new Lang.Class({
    Name: 'AutorunManager',

    _init: function() {
-        LoginManager.getLoginManager(Lang.bind(this, function(manager) {
-            this._loginManager = manager;
-        }));
+        this._loginManager = LoginManager.getLoginManager();

        this._volumeMonitor = Gio.VolumeMonitor.get();

@ -226,7 +217,7 @@ const AutorunManager = new Lang.Class({
    _onMountAdded: function(monitor, mount) {
        // don't do anything if our session is not the currently
        // active one
-        if (!this._loginManager || !this._loginManager.sessionActive)
+        if (!this._loginManager.sessionActive)
            return;

        this._processMount(mount, true);
@ -555,8 +546,9 @@ const AutorunTransientSource = new Lang.Class({
        this.notify(this._notification);
    },

-    getIcon: function() {
-        return this.mount.get_icon();
+    createIcon: function(size) {
+        return new St.Icon({ gicon: this.mount.get_icon(),
+                             icon_size: size });
    }
 });

--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@ -49,7 +49,7 @@ const AuthenticationDialog = new Lang.Class({
        let messageBox = new St.BoxLayout({ style_class: 'prompt-dialog-message-layout',
                                            vertical: true });
        mainContentBox.add(messageBox,
-                           { y_align: St.Align.START });
+                           { expand: true, y_align: St.Align.START });

        this._subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
                                            text: _("Authentication Required") });
--- a/js/ui/components/recorder.js
+++ b/js/ui/components/recorder.js
@ -41,7 +41,7 @@ const Recorder = new Lang.Class({
            recorder.set_framerate(this._recorderSettings.get_int('framerate'));
            /* Translators: this is a filename used for screencast recording */
            // xgettext:no-c-format
-            recorder.set_file_template(_("Screencast from %d %t") + '.' + this._recorderSettings.get_string('file-extension'));
+            recorder.set_filename(_("Screencast from %d %t") + '.' + this._recorderSettings.get_string('file-extension'));
            let pipeline = this._recorderSettings.get_string('pipeline');

            if (!pipeline.match(/^\s*$/))
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@ -509,42 +509,51 @@ const ChatSource = new Lang.Class({
        this._notification.appendAliasChange(oldAlias, newAlias);
    },

-    getIcon: function() {
+    createIcon: function(size) {
+        this._iconBox = new St.Bin({ style_class: 'avatar-box' });
+        this._iconBox._size = size;
+        let textureCache = St.TextureCache.get_default();
        let file = this._contact.get_avatar_file();
+
        if (file) {
-            return new Gio.FileIcon({ file: file });
+            let uri = file.get_uri();
+            this._iconBox.child = textureCache.load_uri_async(uri, this._iconBox._size, this._iconBox._size);
        } else {
-            return new Gio.ThemedIcon({ name: 'avatar-default' });
+            this._iconBox.child = new St.Icon({ icon_name: 'avatar-default',
+                                                icon_size: this._iconBox._size });
        }
+
+        return this._iconBox;
    },

-    getSecondaryIcon: function() {
-        let iconName;
+    createSecondaryIcon: function() {
+        let iconBox = new St.Bin();
+        iconBox.child = new St.Icon({ style_class: 'secondary-icon' });
        let presenceType = this._contact.get_presence_type();

        switch (presenceType) {
            case Tp.ConnectionPresenceType.AVAILABLE:
-                iconName = 'user-available';
+                iconBox.child.icon_name = 'user-available';
                break;
            case Tp.ConnectionPresenceType.BUSY:
-                iconName = 'user-busy';
+                iconBox.child.icon_name = 'user-busy';
                break;
            case Tp.ConnectionPresenceType.OFFLINE:
-                iconName = 'user-offline';
+                iconBox.child.icon_name = 'user-offline';
                break;
            case Tp.ConnectionPresenceType.HIDDEN:
-                iconName = 'user-invisible';
+                iconBox.child.icon_name = 'user-invisible';
                break;
            case Tp.ConnectionPresenceType.AWAY:
-                iconName = 'user-away';
+                iconBox.child.icon_name = 'user-away';
                break;
            case Tp.ConnectionPresenceType.EXTENDED_AWAY:
-                iconName = 'user-idle';
+                iconBox.child.icon_name = 'user-idle';
                break;
            default:
-                iconName = 'user-offline';
+                iconBox.child.icon_name = 'user-offline';
       }
-       return new Gio.ThemedIcon({ name: iconName });
+       return iconBox;
    },

    _updateAvatarIcon: function() {
@ -726,7 +735,7 @@ const ChatSource = new Lang.Class({

        title = GLib.markup_escape_text(this.title, -1);

-        this._notification.update(this._notification.title, null, { customContent: true, secondaryGIcon: this.getSecondaryIcon() });
+        this._notification.update(this._notification.title, null, { customContent: true, secondaryIcon: this.createSecondaryIcon() });

        if (message)
            msg += ' <i>(' + GLib.markup_escape_text(message, -1) + ')</i>';
@ -754,7 +763,7 @@ const ChatNotification = new Lang.Class({
    Extends: MessageTray.Notification,

    _init: function(source) {
-        this.parent(source, source.title, null, { customContent: true, secondaryGIcon: source.getSecondaryIcon() });
+        this.parent(source, source.title, null, { customContent: true, secondaryIcon: source.createSecondaryIcon() });
        this.setResident(true);

        this._responseEntry = new St.Entry({ style_class: 'chat-response',
@ -771,16 +780,18 @@ const ChatNotification = new Lang.Class({
            this.emit('unfocused');
        }));

-        this._oldMaxScrollAdjustment = 0;
        this._createScrollArea();
        this._lastGroup = null;
        this._lastGroupActor = null;

+        // Keep track of the bottom position for the current adjustment and
+        // force a scroll to the bottom if things change while we were at the
+        // bottom
+        this._oldMaxScrollValue = this._scrollArea.vscroll.adjustment.value;
        this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
-            let currentValue = adjustment.value + adjustment.page_size;
-            if (currentValue == this._oldMaxScrollAdjustment)
+            if (adjustment.value == this._oldMaxScrollValue)
                this.scrollTo(St.Side.BOTTOM);
-            this._oldMaxScrollAdjustment = adjustment.upper;
+            this._oldMaxScrollValue = Math.max(adjustment.lower, adjustment.upper - adjustment.page_size);
        }));

        this._inputHistory = new History.HistoryManager({ entry: this._responseEntry.clutter_text });
@ -932,32 +943,24 @@ const ChatNotification = new Lang.Class({

        let format;

-        // Show only the hour if date is on today
-        if(daysAgo < 1){
-            format = "<b>%H:%M</b>";
-        }
-        // Show the word "Yesterday" and time if date is on yesterday
-        else if(daysAgo <2){
-            /* Translators: this is a time format string followed by the word "Yesterday". i.e. "14:30 on Yesterday"*/
-            // xgettext:no-c-format
-            format = _("<b>%H:%M</b> on Yesterday");
-        }
        // Show a week day and time if date is in the last week
-        else if (daysAgo < 7) {
-            /* Translators: this is a time format string followed by a week day name. i.e. "14:30 on Monday*/
+        if (daysAgo < 1 || (daysAgo < 7 && now.getDay() != date.getDay())) {
+            /* 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. */
            // xgettext:no-c-format
-            format = _("<b>%H:%M</b> on <b>%A</b>");
+            format = _("Sent at <b>%X</b> on <b>%A</b>");

        } else if (date.getYear() == now.getYear()) {
-            /* Translators: this is a time format in the style of "14:30 on Wednesday, May 25",
-             shown when you get a chat message in the same year */
+            /* Translators: this is a time format in the style of "Wednesday, May 25",
+             shown when you get a chat message in the same year. */
            // xgettext:no-c-format
-            format = _("<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>");
+            format = _("Sent on <b>%A</b>, <b>%B %d</b>");
        } else {
-            /* Translators: this is a time format in the style of "14:30 on Wednesday, May 25, 2012",
-             shown when you get a chat message in a different year */
+            /* 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. */
            // xgettext:no-c-format
-            format = _("<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>, %Y");
+            format = _("Sent on <b>%A</b>, <b>%B %d</b>, %Y");
        }

        return date.toLocaleFormat(format);
@ -970,7 +973,8 @@ const ChatNotification = new Lang.Class({
        let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate),
                                       group: 'meta',
                                       styles: ['chat-meta-message'],
-                                       childProps: { expand: true, x_fill: false },
+                                       childProps: { expand: true, x_fill: false,
+                                                     x_align: St.Align.END },
                                       noTimestamp: true,
                                       timestamp: lastMessageTime });

@ -1071,8 +1075,9 @@ const ApproverSource = new Lang.Class({
        this.parent();
    },

-    getIcon: function() {
-        return this._gicon;
+    createIcon: function(size) {
+        return new St.Icon({ gicon: this._gicon,
+                             icon_size: size });
    }
 });

--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -142,6 +142,7 @@ const DashItemContainer = new Lang.Class({

    setLabelText: function(text) {
        this._labelText = text;
+        this.child.accessible_name = text;
    },

    hideLabel: function () {
@ -259,7 +260,6 @@ const ShowAppsIcon = new Lang.Class({

        this.setChild(this.toggleButton);
        this.setDragApp(null);
-        this.toggleButton.label_actor = this.label;
    },

    _createIcon: function(size) {
@ -507,9 +507,11 @@ const Dash = new Lang.Class({
        let item = new DashItemContainer();
        item.setChild(display.actor);

+        // Override default AppWellIcon label_actor, now the
+        // accessible_name is set at DashItemContainer.setLabelText
+        display.actor.label_actor = null;
        item.setLabelText(app.get_name());
-        // Override default AppWellIcon label_actor
-        display.actor.label_actor = item.label;
+
        display.icon.setIconSize(this.iconSize);
        this._hookUpLabel(item);

@ -619,8 +621,10 @@ const Dash = new Lang.Class({
            icon.setIconSize(this.iconSize);

            // Don't animate the icon size change when the overview
-            // is not visible or when initially filling the dash
-            if (!Main.overview.visible || !this._shownInitially)
+            // is transitioning, not visible or when initially filling
+            // the dash
+            if (!Main.overview.visible || Main.overview.animationInProgress ||
+                !this._shownInitially)
                continue;

            let [targetWidth, targetHeight] = icon.icon.get_size();
@ -744,8 +748,9 @@ const Dash = new Lang.Class({
        for (let i = 0; i < removedActors.length; i++) {
            let item = removedActors[i]._delegate;

-            // Don't animate item removal when the overview is hidden
-            if (Main.overview.visible)
+            // Don't animate item removal when the overview is transitioning
+            // or hidden
+            if (Main.overview.visible && !Main.overview.animationInProgress)
                item.animateOutAndDestroy();
            else
                item.destroy();
@ -760,8 +765,9 @@ const Dash = new Lang.Class({
            return;
        }

-        // Don't animate item addition when the overview is hidden
-        if (!Main.overview.visible)
+        // Don't animate item addition when the overview is transitioning
+        // or hidden
+        if (!Main.overview.visible || Main.overview.animationInProgress)
            return;

        for (let i = 0; i < addedItems.length; i++)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -105,7 +105,7 @@ const restartDialogContent = {
    endDescription: _("Restarting the system."),
    confirmButtons: [{ signal: 'ConfirmedReboot',
                       label:  C_("button", "Restart") }],
-    iconName: 'view-refresh-symbolic',
+    iconName: 'system-shutdown-symbolic',
    iconStyleClass: 'end-session-dialog-shutdown-icon'
 };

@ -218,34 +218,6 @@ function init() {
    _endSessionDialog = new EndSessionDialog();
 }

-const EndSessionExporter = new Gio.DBusImplementerClass({
-    Name: 'EndSessionExporter',
-    Interface: EndSessionDialogIface,
-
-    _init: function() {
-        this.parent();
-
-        this.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
-    },
-
-    OpenAsync: function(parameters, invocation) {
-        this.emit('open', parameters, invocation);
-    },
-
-    close: function() {
-        this.emit_signal('Closed');
-    },
-
-    cancel: function() {
-        this.emit_signal('Canceled');
-    },
-
-    confirm: function(type) {
-        this.emit_signal(type);
-    },
-});
-Signals.addSignalMethods(EndSessionExporter.prototype);
-
 const EndSessionDialog = new Lang.Class({
    Name: 'EndSessionDialog',
    Extends: ModalDialog.ModalDialog,
@ -323,8 +295,8 @@ const EndSessionDialog = new Lang.Class({
                                              scrollView.hide();
                                      }));

-        this._exporter = new EndSessionExporter();
-        this._exporter.connect('open', Lang.bind(this, this._onOpenRequest));
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
    },

    _onDestroy: function() {
@ -415,19 +387,19 @@ const EndSessionDialog = new Lang.Class({

    close: function() {
        this.parent();
-        this._exporter.close();
+        this._dbusImpl.emit_signal('Closed', null);
    },

    cancel: function() {
        this._stopTimer();
-        this._exporter.cancel();
+        this._dbusImpl.emit_signal('Canceled', null);
        this.close(global.get_current_time());
    },

    _confirm: function(signal) {
        this._fadeOutDialog();
        this._stopTimer();
-        this._exporter.confirm(signal);
+        this._dbusImpl.emit_signal(signal, null);
    },

    _onOpened: function() {
@ -480,7 +452,7 @@ const EndSessionDialog = new Lang.Class({
        this._updateContent();
    },

-    _onOpenRequest: function(exporter, parameters, invocation) {
+    OpenAsync: function(parameters, invocation) {
        let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters;
        this._totalSecondsToStayOpen = totalSecondsToStayOpen;
        this._inhibitors = [];
@ -494,10 +466,7 @@ const EndSessionDialog = new Lang.Class({
        }

        for (let i = 0; i < inhibitorObjectPaths.length; i++) {
-            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i]);
-            inhibitor.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(proxy, result) {
-                proxy.init_finish(result);
-
+            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], Lang.bind(this, function(proxy, error) {
                this._onInhibitorLoaded(proxy);
            }));

--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@ -2,6 +2,7 @@

 const Caribou = imports.gi.Caribou;
 const Clutter = imports.gi.Clutter;
+const DBus = imports.dbus;
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
@ -190,14 +191,13 @@ const Key = new Lang.Class({
    }
 });

-const Keyboard = new Gio.DBusImplementerClass({
+const Keyboard = new Lang.Class({
    // HACK: we can't set Name, because it collides with Name dbus property
    // Name: 'Keyboard',
-    Interface: CaribouKeyboardIface,

    _init: function () {
-        this.parent();
-        this.export(Gio.DBus.session, '/org/gnome/Caribou/Keyboard');
+        this._impl = Gio.DBusExportedObject.wrapJSObject(CaribouKeyboardIface, this);
+        this._impl.export(Gio.DBus.session, '/org/gnome/Caribou/Keyboard');

        this.actor = null;
        this._focusInTray = false;
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@ -104,7 +104,7 @@ const LayoutManager = new Lang.Class({
        this.primaryMonitor = null;
        this.primaryIndex = -1;
        this._hotCorners = [];
-        this._background = null;
+        this._rootPixmap = null;
        this._leftPanelBarrier = 0;
        this._rightPanelBarrier = 0;
        this._trayBarrier = 0;
@ -333,30 +333,30 @@ const LayoutManager = new Lang.Class({
        // to the greeter. Otherwise, we'll just animate the panel,
        // as usual.
        if (Main.sessionMode.isGreeter) {
-            this._background = Meta.BackgroundActor.new_for_screen(global.screen);
-            if (this._background != null) {
-                Main.uiGroup.add_actor(this._background);
-                Tweener.addTween(this._background,
+            this._rootPixmap = global.create_xrootpmap_texture();
+            if (this._rootPixmap != null) {
+                Main.uiGroup.add_actor(this._rootPixmap);
+                Tweener.addTween(this._rootPixmap,
                                 { opacity: 0,
                                   time: PLYMOUTH_TRANSITION_TIME,
                                   transition: 'linear',
-                                   onComplete: this._fadeBackgroundComplete,
+                                   onComplete: this._fadeRootpmapComplete,
                                   onCompleteScope: this });
                plymouthTransitionRunning = true;
            }
        }

        if (!plymouthTransitionRunning)
-            this._fadeBackgroundComplete();
+            this._fadeRootpmapComplete();
    },

-    _fadeBackgroundComplete: function() {
+    _fadeRootpmapComplete: function() {
        // Don't animate the strut
        this._chrome.freezeUpdateRegions();

-        if (this._background != null) {
-            this._background.destroy();
-            this._background = null;
+        if (this._rootPixmap != null) {
+            this._rootPixmap.destroy();
+            this._rootPixmap = null;
        }

        Tweener.addTween(this.panelBox,
--- a/js/ui/magnifierDBus.js
+++ b/js/ui/magnifierDBus.js
@ -96,15 +96,14 @@ const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}>
 // '/org/gnome/Magnifier/ZoomRegion/zoomer1', etc.
 let _zoomRegionInstanceCount = 0;

-const ShellMagnifier = new Gio.DBusImplementerClass({
+const ShellMagnifier = new Lang.Class({
    Name: 'ShellMagnifier',
-    Interface: MagnifierIface,

    _init: function() {
-        this.parent();
-        this.export(Gio.DBus.session, MAG_SERVICE_PATH);
-
        this._zoomers = {};
+
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(MagnifierIface, this);
+        this._dbusImpl.export(Gio.DBus.session, MAG_SERVICE_PATH);
    },

    /**
@ -333,15 +332,14 @@ const ShellMagnifier = new Gio.DBusImplementerClass({
 * @zoomerObjectPath:   String that is the path to a DBus ZoomRegion.
 * @zoomRegion:         The actual zoom region associated with the object path.
 */
-const ShellMagnifierZoomRegion = new Gio.DBusImplementerClass({
+const ShellMagnifierZoomRegion = new Lang.Class({
    Name: 'ShellMagnifierZoomRegion',
-    Interface: ZoomRegionIface,

    _init: function(zoomerObjectPath, zoomRegion) {
-        this.parent();
-        this.export(Gio.DBus.session, zoomerObjectPath);
-
        this._zoomRegion = zoomRegion;
+
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ZoomRegionIface, this);
+        this._dbusImpl.export(Gio.DBus.session, zoomerObjectPath);
    },

    /**
@ -419,6 +417,6 @@ const ShellMagnifierZoomRegion = new Gio.DBusImplementerClass({
    },

    destroy: function() {
-        this.unexport();
+        this._dbusImpl.unexport();
    }
 });
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Atk = imports.gi.Atk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
@ -36,6 +35,8 @@ const LONGER_SUMMARY_TIMEOUT = 4;
 const HIDE_TIMEOUT = 0.2;
 const LONGER_HIDE_TIMEOUT = 0.6;

+const NOTIFICATION_ICON_SIZE = 24;
+
 // We delay hiding of the tray if the mouse is within MOUSE_LEFT_ACTOR_THRESHOLD
 // range from the point where it left the tray.
 const MOUSE_LEFT_ACTOR_THRESHOLD = 20;
@ -142,9 +143,14 @@ const URLHighlighter = new Lang.Class({
                let url = this._urls[urlId].url;
                if (url.indexOf(':') == -1)
                    url = 'http://' + url;
-
-                Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context());
-                return true;
+                try {
+                    Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context());
+                    return true;
+                } catch (e) {
+                    // TODO: remove this after gnome 3 release
+                    Util.spawn(['gvfs-open', url]);
+                    return true;
+                }
            }
            return false;
        }));
@ -236,8 +242,13 @@ function makeCloseButton() {

    closeButton.connect('style-changed', function() {
        let themeNode = closeButton.get_theme_node();
-        closeButton.translation_x = themeNode.get_length('-shell-close-overlap-x');
-        closeButton.translation_y = themeNode.get_length('-shell-close-overlap-y');
+
+        // libcroco doesn't support negative units
+        let direction = closeButton.get_text_direction() == Clutter.TextDirection.RTL ? -1 : 1;
+        closeButton.translation_x = direction * themeNode.get_length('-shell-close-overlap-x');
+
+        // libcroco doesn't support negative units
+        closeButton.translation_y = -themeNode.get_length('-shell-close-overlap-y');
    });

    return closeButton;
@ -283,12 +294,9 @@ function makeCloseButton() {
 // If @params contains a 'body' parameter, then that text will be added to
 // the content area (as with addBody()).
 //
-// By default, the icon shown is the same as the source's.
-// However, if @params contains a 'gicon' parameter, the passed in gicon
-// will be used.
-//
-// You can add a secondary icon to the banner with 'secondaryGIcon'. There
-// is no fallback for this icon.
+// By default, the icon shown is created by calling
+// source.createIcon(). However, if @params contains an 'icon'
+// parameter, the passed in icon will be used.
 //
 // If @params contains a 'titleMarkup', 'bannerMarkup', or
 // 'bodyMarkup' parameter with the value %true, then the corresponding
@ -303,8 +311,6 @@ function makeCloseButton() {
 const Notification = new Lang.Class({
    Name: 'Notification',

-    ICON_SIZE: 24,
-
    IMAGE_SIZE: 125,

    _init: function(source, title, banner, params) {
@ -388,8 +394,8 @@ const Notification = new Lang.Class({
    update: function(title, banner, params) {
        params = Params.parse(params, { customContent: false,
                                        body: null,
-                                        gicon: null,
-                                        secondaryGIcon: null,
+                                        icon: null,
+                                        secondaryIcon: null,
                                        titleMarkup: false,
                                        bannerMarkup: false,
                                        bodyMarkup: false,
@ -399,12 +405,12 @@ const Notification = new Lang.Class({

        let oldFocus = global.stage.key_focus;

-        if (this._icon && (params.gicon || params.clear)) {
+        if (this._icon && (params.icon || params.clear)) {
            this._icon.destroy();
            this._icon = null;
        }

-        if (this._secondaryIcon && (params.secondaryGIcon || params.clear)) {
+        if (this._secondaryIcon && (params.secondaryIcon || params.clear)) {
            this._secondaryIcon.destroy();
            this._secondaryIcon = null;
        }
@ -434,14 +440,8 @@ const Notification = new Lang.Class({
        if (!this._scrollArea && !this._actionArea && !this._imageBin)
            this._table.remove_style_class_name('multi-line-notification');

-        if (params.gicon) {
-            this._icon = new St.Icon({ gicon: params.gicon,
-                                       icon_size: this.ICON_SIZE });
-        } else {
-            this._icon = this.source.createIcon(this.ICON_SIZE);
-        }
-
-        if (this._icon) {
+        if (!this._icon) {
+            this._icon = params.icon || this.source.createIcon(NOTIFICATION_ICON_SIZE);
            this._table.add(this._icon, { row: 0,
                                          col: 0,
                                          x_expand: false,
@ -450,10 +450,11 @@ const Notification = new Lang.Class({
                                          y_align: St.Align.START });
        }

-        if (params.secondaryGIcon) {
-            this._secondaryIcon = new St.Icon({ gicon: params.secondaryGIcon,
-                                                style_class: 'secondary-icon' });
-            this._bannerBox.add_actor(this._secondaryIcon);
+        if (!this._secondaryIcon) {
+            this._secondaryIcon = params.secondaryIcon;
+
+            if (this._secondaryIcon)
+                this._bannerBox.add_actor(this._secondaryIcon);
        }

        this.title = title;
@ -1116,14 +1117,10 @@ const Source = new Lang.Class({
    // Provides a sane default implementation, override if you need
    // something more fancy.
    createIcon: function(size) {
-        return new St.Icon({ gicon: this.getIcon(),
+        return new St.Icon({ icon_name: this.iconName,
                             icon_size: size });
    },

-    getIcon: function() {
-        return new Gio.ThemedIcon({ name: this.iconName });
-    },
-
    _ensureMainIcon: function() {
        if (this._mainIcon)
            return;
@ -1365,16 +1362,13 @@ const MessageTray = new Lang.Class({
    Name: 'MessageTray',

    _init: function() {
-        this._presence = new GnomeSession.Presence();
-        this._presence.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(proxy, result) {
-            proxy.init_finish(result);
-
+        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
            this._onStatusChanged(proxy.status);
-            this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
-                this._onStatusChanged(status);
-            }));
        }));
        this._busy = false;
+        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
+            this._onStatusChanged(status);
+        }));

        this.actor = new St.Widget({ name: 'message-tray',
                                     reactive: true,
@ -1444,10 +1438,10 @@ const MessageTray = new Lang.Class({
        this._closeButton.connect('clicked', Lang.bind(this, this._onCloseClicked));
        this._notificationWidget.add_actor(this._closeButton);

-        this._idleMonitorBecameActiveId = 0;
+        this._idleMonitorWatchId = 0;
        this._userActiveWhileNotificationShown = false;

-        this.idleMonitor = new GnomeDesktop.IdleMonitor();
+        this.idleMonitor = Shell.IdleMonitor.get();

        this._grabHelper = new GrabHelper.GrabHelper(this.actor);
        this._grabHelper.addActor(this._summaryBoxPointer.actor);
@ -2159,26 +2153,20 @@ const MessageTray = new Lang.Class({
                    });
    },

-    _onIdleMonitorBecameActive: function() {
-        this.idleMonitor.disconnect(this._idleMonitorBecameActiveId);
-        this._idleMonitorBecameActiveId = 0;
-
+    _onIdleMonitorWatch: function(monitor, id, userBecameIdle) {
+        this.idleMonitor.remove_watch(this._idleMonitorWatchId);
+        this._idleMonitorWatchId = 0;
+        if (!userBecameIdle)
+            this._updateNotificationTimeout(2000);
        this._userActiveWhileNotificationShown = true;
-        this._updateNotificationTimeout(2000);
        this._updateState();
    },

    _showNotification: function() {
        this._notification = this._notificationQueue.shift();
-
-        let userIdle = this.idleMonitor.get_idletime() > IDLE_TIME;
-        if (userIdle) {
-            this._userActiveWhileNotificationShown = false;
-            this._idleMonitorBecameActiveId = this.idleMonitor.connect('became-active', Lang.bind(this, this._onIdleMonitorBecameActive));
-        } else {
-            this._userActiveWhileNotificationShown = true;
-        }
-
+        this._userActiveWhileNotificationShown = this.idleMonitor.get_idletime() <= IDLE_TIME;
+        this._idleMonitorWatchId = this.idleMonitor.add_watch(IDLE_TIME,
+                                                              Lang.bind(this, this._onIdleMonitorWatch));
        this._notificationClickedId = this._notification.connect('done-displaying',
                                                                 Lang.bind(this, this._escapeTray));
        this._notification.connect('unfocused', Lang.bind(this, function() {
@ -2291,11 +2279,6 @@ const MessageTray = new Lang.Class({
    _hideNotification: function() {
        this._grabHelper.ungrab({ actor: this._notification.actor });

-        if (this._idleMonitorBecameActiveId) {
-            this.idleMonitor.disconnect(this._idleMonitorBecameActiveId);
-            this._idleMonitorBecameActiveId = 0;
-        }
-
        if (this._notificationExpandedId) {
            this._notification.disconnect(this._notificationExpandedId);
            this._notificationExpandedId = 0;
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -20,6 +20,7 @@ const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

 const OPEN_AND_CLOSE_TIME = 0.1;
+const FADE_IN_BUTTONS_TIME = 0.33;
 const FADE_OUT_DIALOG_TIME = 1.0;

 const State = {
@ -116,6 +117,8 @@ const ModalDialog = new Lang.Class({
    },

    setButtons: function(buttons) {
+        let hadChildren = this._buttonLayout.get_children() > 0;
+
        this._buttonLayout.destroy_all_children();
        this._actionKeys = {};

@ -166,7 +169,21 @@ const ModalDialog = new Lang.Class({
                this._actionKeys[key] = action;
        }

-        this.emit('buttons-set');
+        // Fade in buttons if there weren't any before
+        if (!hadChildren && buttons.length > 0) {
+            this._buttonLayout.opacity = 0;
+            Tweener.addTween(this._buttonLayout,
+                             { opacity: 255,
+                               time: FADE_IN_BUTTONS_TIME,
+                               transition: 'easeOutQuad',
+                               onComplete: Lang.bind(this, function() {
+                                   this.emit('buttons-set');
+                               })
+                             });
+        } else {
+            this.emit('buttons-set');
+        }
+
    },

    _onKeyReleaseEvent: function(object, event) {
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -25,19 +25,10 @@ const BusIface = <interface name="org.freedesktop.DBus">
 </method>
 </interface>;

-const Bus = new Gio.DBusProxyClass({
-    Name: 'SessionBusProxy',
-    Interface: BusIface,
-
-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SESSION,
-                      g_name: 'org.freedesktop.DBus',
-                      g_object_path: '/org/freedesktop/DBus',
-                      g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES |
-                                Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS |
-                                Gio.DBusProxyFlags.DO_NOT_AUTO_START) });
-    }
-});
+var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface);
+function Bus() {
+    return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
+}

 const NotificationDaemonIface = <interface name="org.freedesktop.Notifications">
 <method name="Notify">
@ -112,20 +103,17 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
    'ibus-ui-gtk': 'keyboard'
 };

-const NotificationDaemon = new Gio.DBusImplementerClass({
+const NotificationDaemon = new Lang.Class({
    Name: 'NotificationDaemon',
-    Interface: NotificationDaemonIface,

    _init: function() {
-        this.parent();
-        this.export(Gio.DBus.session, '/org/freedesktop/Notifications');
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(NotificationDaemonIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications');

        this._sources = [];
        this._senderToPid = {};
        this._notifications = {};
        this._busProxy = new Bus();
-        // This is synchronous but fast because of the flags we use.
-        this._busProxy.init(null);

        this._trayManager = new Shell.TrayManager();
        this._trayIconAddedId = this._trayManager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
@ -328,20 +316,18 @@ const NotificationDaemon = new Gio.DBusImplementerClass({
            return invocation.return_value(GLib.Variant.new('(u)', [id]));;
        }

-        this._busProxy.GetConnectionUnixProcessIDRemote(sender, null, Lang.bind(this, function (proxy, result) {
+        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this, function (result, excp) {
            // The app may have updated or removed the notification
            ndata = this._notifications[id];
            if (!ndata)
                return;

-            let pid;
-            try {
-                [pid] = proxy.GetConnectionUnixProcessIDFinish(result);
-            } catch(excp) {
+            if (excp) {
                logError(excp, 'Call to GetConnectionUnixProcessID failed');
                return;
            }

+            let [pid] = result;
            source = this._getSource(appName, pid, ndata, sender, null);

            // We only store sender-pid entries for persistent sources.
@ -370,10 +356,12 @@ const NotificationDaemon = new Gio.DBusImplementerClass({
             ndata.actions, ndata.hints, ndata.notification];

        let gicon = this._iconForNotificationData(icon, hints);
+        let iconActor = new St.Icon({ gicon: gicon,
+                                      icon_size: MessageTray.NOTIFICATION_ICON_SIZE });

        if (notification == null) {
            notification = new MessageTray.Notification(source, summary, body,
-                                                        { gicon: gicon,
+                                                        { icon: iconActor,
                                                          bannerMarkup: true });
            ndata.notification = notification;
            notification.connect('destroy', Lang.bind(this,
@ -398,7 +386,7 @@ const NotificationDaemon = new Gio.DBusImplementerClass({
                    this._emitActionInvoked(ndata.id, actionId);
                }));
        } else {
-            notification.update(summary, body, { gicon: gicon,
+            notification.update(summary, body, { icon: iconActor,
                                                 bannerMarkup: true,
                                                 clear: true });
        }
@ -501,11 +489,13 @@ const NotificationDaemon = new Gio.DBusImplementerClass({
    },

    _emitNotificationClosed: function(id, reason) {
-        this.emit_signal('NotificationClosed', id, reason);
+        this._dbusImpl.emit_signal('NotificationClosed',
+                                   GLib.Variant.new('(uu)', [id, reason]));
    },

    _emitActionInvoked: function(id, action) {
-        this.emit_signal('ActionInvoked', id, action);
+        this._dbusImpl.emit_signal('ActionInvoked',
+                                   GLib.Variant.new('(us)', [id, action]));
    },

    _onTrayIconAdded: function(o, icon) {
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -23,8 +23,8 @@ const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
 // Time for initial animation going into Overview mode
 const ANIMATION_TIME = 0.25;

-// XXX -- grab this automatically. Hard to do.
-const DASH_MAX_WIDTH = 96;
+// We split the screen vertically between the dash and the view selector.
+const DASH_SPLIT_FRACTION = 0.1;

 const DND_WINDOW_SWITCH_TIMEOUT = 1250;

@ -502,7 +502,7 @@ const Overview = new Lang.Class({
        let searchX = (primary.width - searchWidth) / 2;
        let searchY = contentY + this._spacing;

-        let dashWidth = DASH_MAX_WIDTH;
+        let dashWidth = Math.round(DASH_SPLIT_FRACTION * primary.width);
        let dashY = searchY + searchHeight + this._spacing;
        let dashX;
        if (rtl) {
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -247,10 +247,6 @@ const AppMenuButton = new Lang.Class({
        this._container.connect('get-preferred-height', Lang.bind(this, this._getContentPreferredHeight));
        this._container.connect('allocate', Lang.bind(this, this._contentAllocate));

-        let textureCache = St.TextureCache.get_default();
-        textureCache.connect('icon-theme-changed',
-                             Lang.bind(this, this._onIconThemeChanged));
-
        this._iconBox = new Shell.Slicer({ name: 'appMenuIcon' });
        this._iconBox.connect('style-changed',
                              Lang.bind(this, this._onIconBoxStyleChanged));
@ -336,15 +332,6 @@ const AppMenuButton = new Lang.Class({
        this._updateIconBoxClip();
    },

-    _onIconThemeChanged: function() {
-        if (this._iconBox.child == null)
-            return;
-
-        this._iconBox.child.destroy();
-        let icon = this._targetApp.get_faded_icon(2 * PANEL_ICON_SIZE);
-        this._iconBox.set_child(icon);
-    },
-
    _updateIconBoxClip: function() {
        let allocation = this._iconBox.allocation;
        if (this._iconBottomClip > 0)
@ -914,7 +901,6 @@ const PANEL_ITEM_IMPLEMENTATIONS = {
    'volume': imports.ui.status.volume.Indicator,
    'battery': imports.ui.status.power.Indicator,
    'lockScreen': imports.ui.status.lockScreenMenu.Indicator,
-    'logo': imports.gdm.loginDialog.LogoMenuButton,
    'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
    'powerMenu': imports.gdm.powerMenu.PowerMenuButton,
    'userMenu': imports.ui.userMenu.UserMenuButton
--- a/js/ui/pointerWatcher.js
+++ b/js/ui/pointerWatcher.js
@ -2,7 +2,6 @@

 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Shell = imports.gi.Shell;

 // We stop polling if the user is idle for more than this amount of time
@ -41,9 +40,9 @@ const PointerWatcher = new Lang.Class({
    Name: 'PointerWatcher',

    _init: function() {
-        let idleMonitor = new GnomeDesktop.IdleMonitor();
-        idleMonitor.connect('became-active', Lang.bind(this, this._onIdleMonitorBecameActive));
-        idleMonitor.add_watch(IDLE_TIME, Lang.bind(this, this._onIdleMonitorBecameIdle));
+        let idleMonitor = Shell.IdleMonitor.get();
+        idleMonitor.add_watch(IDLE_TIME,
+                              Lang.bind(this, this._onIdleMonitorWatch));
        this._idle = idleMonitor.get_idletime() > IDLE_TIME;
        this._watches = [];
        this.pointerX = null;
@ -79,14 +78,11 @@ const PointerWatcher = new Lang.Class({
        }
    },

-    _onIdleMonitorBecameActive: function(monitor) {
-        this._idle = false;
-        this._updatePointer();
-        this._updateTimeout();
-    },
+    _onIdleMonitorWatch: function(monitor, id, userBecameIdle) {
+        this._idle = userBecameIdle;
+        if (!userBecameIdle)
+            this._updatePointer();

-    _onIdleMonitorBecameIdle: function(monitor) {
-        this._idle = true;
        this._updateTimeout();
    },

--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@ -29,15 +29,8 @@ const SearchProviderIface = <interface name="org.gnome.Shell.SearchProvider">
 </method>
 </interface>;

-var SearchProviderProxy = new Gio.DBusProxyClass({
-    Name: 'SearchProviderProxy',
-    Interface: SearchProviderIface,
+var SearchProviderProxy = Gio.DBusProxy.makeProxyWrapper(SearchProviderIface);

-    _init: function(params) {
-        params.g_bus_type = Gio.BusType.SESSION;
-        this.parent(params);
-    }
-});

 function loadRemoteSearchProviders(addProviderCallback) {
    let dataDirs = GLib.get_system_data_dirs();
@ -97,22 +90,13 @@ function loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallb
                                                          icon,
                                                          busName,
                                                          objectPath);
-                remoteProvider.initAsync(null, function(obj, result) {
-                    try {
-                        remoteProvider.initFinish(result);
-                    } catch(e) {
-                        log('Failed to add search provider "%s": %s'.format(title, e.toString()));
-                        return;
-                    }
-
-                    addProviderCallback(remoteProvider);
-                });
-
                loadedProviders[objectPath] = remoteProvider;
            } catch(e) {
                log('Failed to add search provider "%s": %s'.format(title, e.toString()));
                continue;
            }
+
+            addProviderCallback(remoteProvider);
        }
    }));

@ -123,41 +107,13 @@ const RemoteSearchProvider = new Lang.Class({
    Extends: Search.SearchProvider,

    _init: function(title, icon, dbusName, dbusPath) {
+        this._proxy = new SearchProviderProxy(Gio.DBus.session,
+                                              dbusName, dbusPath);
+
        this.parent(title.toUpperCase());
-
-        this._proxy = new SearchProviderProxy({ g_name: dbusName,
-                                                g_object_path: dbusPath });
        this._cancellable = new Gio.Cancellable();
    },

-    initAsync: function(cancellable, asyncCallback) {
-        // Can't pass "this" as source object, because RemoteSearchProvider
-        // is not a GObject.Object (and in gjs you can't inherit from a JS
-        // type that in turn inherits from GObject)
-
-        let simpleResult = Gio.SimpleAsyncResult.new(null, asyncCallback, null);
-        simpleResult.set_check_cancellable(cancellable);
-
-        this._proxy.init_async(GLib.PRIORITY_DEFAULT, cancellable, Lang.bind(this, function(proxy, result) {
-            try {
-                proxy.init_finish(result);
-
-                simpleResult.set_op_res_gboolean(true);
-            } catch(e if e instanceof GLib.Error) {
-                simpleResult.set_from_error(e);
-            }
-
-            simpleResult.complete();
-        }));
-    },
-
-    initFinish: function(simpleResult) {
-        if (!simpleResult.propagate_error())
-            return simpleResult.get_op_res_gboolean();
-
-        return false;
-    },
-
    createIcon: function(size, meta) {
        if (meta['gicon']) {
            return new St.Icon({ gicon: Gio.icon_new_for_string(meta['gicon']),
@ -175,17 +131,10 @@ const RemoteSearchProvider = new Lang.Class({
                             icon_size: size });
    },

-    _getResultsFinished: function(proxy, result) {
-        try {
-            // We rely on a small implementation detail of the
-            // GDBus bindings here: all *Finish are equal
-
-            let [results] = proxy.GetInitialResultSetFinish(result);
-            this.searchSystem.pushResults(this, results);
-        } catch(e) {
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
-                log('Received error from search provider %s: %s'.format(this.title, String(e)));
-        }
+    _getResultsFinished: function(results, error) {
+        if (error)
+            return;
+        this.searchSystem.pushResults(this, results[0]);
    },

    getInitialResultSet: function(terms) {
@ -193,8 +142,8 @@ const RemoteSearchProvider = new Lang.Class({
        this._cancellable.reset();
        try {
            this._proxy.GetInitialResultSetRemote(terms,
-                                                  this._cancellable,
-                                                  Lang.bind(this, this._getResultsFinished));
+                                                  Lang.bind(this, this._getResultsFinished),
+                                                  this._cancellable);
        } catch(e) {
            log('Error calling GetInitialResultSet for provider %s: %s'.format( this.title, e.toString()));
            this.searchSystem.pushResults(this, []);
@ -206,30 +155,30 @@ const RemoteSearchProvider = new Lang.Class({
        this._cancellable.reset();
        try {
            this._proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
-                                                    this._cancellable,
-                                                    Lang.bind(this, this._getResultsFinished))
+                                                    Lang.bind(this, this._getResultsFinished),
+                                                    this._cancellable);
        } catch(e) {
            log('Error calling GetSubsearchResultSet for provider %s: %s'.format(this.title, e.toString()));
            this.searchSystem.pushResults(this, []);
        }
    },

-    _getResultMetasFinished: function(proxy, result, callback) {
-        try {
-            let [metas] = results.GetResultMetasFinish(result);
-            let resultMetas = [];
-            for (let i = 0; i < metas.length; i++) {
-                for (let prop in metas[i])
-                    metas[i][prop] = metas[i][prop].deep_unpack();
-                resultMetas.push({ id: metas[i]['id'],
-                                   name: metas[i]['name'],
-                                   createIcon: Lang.bind(this,
-                                                         this.createIcon, metas[i]) });
-            }
-            callback(resultMetas);
-        } catch(e) {
+    _getResultMetasFinished: function(results, error, callback) {
+        if (error) {
            callback([]);
+            return;
        }
+        let metas = results[0];
+        let resultMetas = [];
+        for (let i = 0; i < metas.length; i++) {
+            for (let prop in metas[i])
+                metas[i][prop] = metas[i][prop].deep_unpack();
+            resultMetas.push({ id: metas[i]['id'],
+                               name: metas[i]['name'],
+                               createIcon: Lang.bind(this,
+                                                     this.createIcon, metas[i]) });
+        }
+        callback(resultMetas);
    },

    getResultMetas: function(ids, callback) {
@ -237,8 +186,8 @@ const RemoteSearchProvider = new Lang.Class({
        this._cancellable.reset();
        try {
            this._proxy.GetResultMetasRemote(ids,
-                                             this._cancellable,
-                                             Lang.bind(this, this._getResultMetasFinished, callback));
+                                             Lang.bind(this, this._getResultMetasFinished, callback),
+                                             this._cancellable);
        } catch(e) {
            log('Error calling GetResultMetas for provider %s: %s'.format(this.title, e.toString()));
            callback([]);
@ -246,7 +195,7 @@ const RemoteSearchProvider = new Lang.Class({
    },

    activateResult: function(id) {
-        this._proxy.ActivateResultRemote(id, null, null);
+        this._proxy.ActivateResultRemote(id);
    }
 });

--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -202,12 +202,11 @@ const RunDialog = new Lang.Class({


        let label = new St.Label({ style_class: 'run-dialog-label',
-                                   text: _("Enter a Command") });
+                                   text: _("Please enter a command:") });

        this.contentLayout.add(label, { y_align: St.Align.START });

-        let entry = new St.Entry({ style_class: 'run-dialog-entry',
-                                   can_focus: true });
+        let entry = new St.Entry({ style_class: 'run-dialog-entry' });
        ShellEntry.addContextMenu(entry);

        entry.label_actor = label;
@ -237,10 +236,6 @@ const RunDialog = new Lang.Class({

        this._errorBox.hide();

-        this.setButtons([{ action: Lang.bind(this, this.close),
-                           label: _("Close"),
-                           key: Clutter.Escape }]);
-
        this._pathCompleter = new Gio.FilenameCompleter();
        this._commandCompleter = new CommandCompleter();
        this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
@ -251,12 +246,20 @@ const RunDialog = new Lang.Class({
            let symbol = e.get_key_symbol();
            if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
                this.popModal();
-                this._run(o.get_text(),
-                          e.get_state() & Clutter.ModifierType.CONTROL_MASK);
-                if (!this._commandError ||
-                    !this.pushModal())
+                if (e.get_state() & Clutter.ModifierType.CONTROL_MASK)
+                    this._run(o.get_text(), true);
+                else
+                    this._run(o.get_text(), false);
+                if (!this._commandError)
                    this.close();
-
+                else {
+                    if (!this.pushModal())
+                        this.close();
+                }
+                return true;
+            }
+            if (symbol == Clutter.Escape) {
+                this.close();
                return true;
            }
            if (symbol == Clutter.slash) {
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -9,6 +9,7 @@ const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
+const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const TweenerEquations = imports.tweener.equations;

@ -418,11 +419,10 @@ const ScreenShield = new Lang.Class({

        this._screenSaverDBus = new ShellDBus.ScreenSaverDBus(this);

-        LoginManager.getLoginManager(Lang.bind(this, function(manager) {
-            this._loginSession = manager.getCurrentSessionProxy();
-            this._loginSession.connectSignal('Lock', Lang.bind(this, function() { this.lock(false); }));
-            this._loginSession.connectSignal('Unlock', Lang.bind(this, function() { this.unlock(); }));
-        }));
+        this._loginManager = LoginManager.getLoginManager();
+        this._loginSession = this._loginManager.getCurrentSessionProxy();
+        this._loginSession.connectSignal('Lock', Lang.bind(this, function() { this.lock(false); }));
+        this._loginSession.connectSignal('Unlock', Lang.bind(this, function() { this.unlock(); }));

        this._settings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });

@ -437,6 +437,8 @@ const ScreenShield = new Lang.Class({
                                               { inhibitEvents: true,
                                                 fadeInTime: STANDARD_FADE_TIME,
                                                 fadeFactor: 1 });
+
+        this.idleMonitor = Shell.IdleMonitor.get();
    },

    _onLockScreenKeyRelease: function(actor, event) {
@ -546,35 +548,49 @@ const ScreenShield = new Lang.Class({
    },

    _onStatusChanged: function(status) {
-        if (status == GnomeSession.PresenceStatus.IDLE) {
-            if (this._dialog) {
-                this._dialog.cancel();
-                if (!this._isGreeter) {
-                    this._dialog = null;
+        if (status != GnomeSession.PresenceStatus.IDLE)
+            return;
+
+        if (this._dialog) {
+            this._dialog.cancel();
+            if (!this._isGreeter) {
+                this._dialog = null;
+            }
+        }
+
+        if (!this._isModal) {
+            Main.pushModal(this.actor);
+            this._isModal = true;
+        }
+
+        if (!this._isActive) {
+            this._lightbox.show();
+
+            if (this._activationTime == 0)
+                this._activationTime = GLib.get_monotonic_time();
+
+            // What we want is a negative transition to 0, so we install a watch for
+            // 1 second and trigger it if the idle_time becomes lower than that
+            // The correct fix will come in GNOME 3.8 with GnomeDesktop.IdleMonitor
+            this._becameActiveId = this.idleMonitor.add_watch(1000, Lang.bind(this, function() {
+                if (this.idleMonitor.get_idletime() >= 1000)
+                    return;
+
+                this.idleMonitor.remove_watch(this._becameActiveId);
+
+                let lightboxWasShown = this._lightbox.shown;
+                this._lightbox.hide();
+
+                let shouldLock = lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY);
+                if (shouldLock || this._isLocked) {
+                    this.lock(false);
+                } else if (this._isActive) {
+                    this.unlock();
                }
-            }
+            }));

-            if (!this._isModal) {
-                Main.pushModal(this.actor);
-                this._isModal = true;
-            }
-
-            if (!this._isActive) {
-                this._lightbox.show();
-
-                if (this._activationTime == 0)
-                    this._activationTime = GLib.get_monotonic_time();
-            }
-        } else {
-            let lightboxWasShown = this._lightbox.shown;
-            this._lightbox.hide();
-
-            let shouldLock = lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY);
-            if (shouldLock || this._isActive) {
-                this.lock(false);
-            } else if (this._isModal) {
-                this.unlock();
-            }
+            this._isActive = true;
+            this.emit('lock-status-changed');
        }
    },

@ -642,13 +658,15 @@ const ScreenShield = new Lang.Class({
    _ensureUnlockDialog: function(onPrimary) {
        if (!this._dialog) {
            let constructor = Main.sessionMode.unlockDialog;
-            this._dialog = new constructor(this._lockDialogGroup);
-            if (!this._dialog) {
+            if (!constructor) {
                // This session mode has no locking capabilities
                this.unlock();
                return;
            }

+            this._dialog = new constructor(this._lockDialogGroup);
+
+
            let time = global.get_current_time();
            this._dialog.connect('loaded', Lang.bind(this, function() {
                if (!this._dialog.open(time, onPrimary)) {
@ -831,6 +849,7 @@ const ScreenShield = new Lang.Class({

        this._activationTime = 0;
        this._isActive = false;
+        this._isLocked = false;
        this.emit('lock-status-changed');
    },

@ -855,6 +874,7 @@ const ScreenShield = new Lang.Class({
        this._resetLockScreen(animate, animate);

        this._isActive = true;
+        this._isLocked = true;
        this.emit('lock-status-changed');
    },
 });
@ -876,7 +896,6 @@ const ScreenShieldFallback = new Lang.Class({
                                          g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START |
                                                    Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES),
                                        });
-        // This is synchronous but it is the fallback case.
        this._proxy.init(null);

        this._proxy.connect('g-signal', Lang.bind(this, this._onSignal));
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@ -80,23 +80,15 @@ const PerfHelperIface = <interface name="org.gnome.Shell.PerfHelper">
 <method name="DestroyWindows" />
 </interface>;

-const PerfHelper = new Gio.DBusProxyClass({
-    Name: 'PerfHelperProxy',
-    Interface: PerfHelperIface,
-
-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SESSION,
-                      g_name: 'org.gnome.Shell.PerfHelper',
-                      g_object_path: '/org/gnome/Shell/PerfHelper' });
-    }
-});
+var PerfHelperProxy = Gio.DBusProxy.makeProxyWrapper(PerfHelperIface);
+function PerfHelper() {
+    return new PerfHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PerfHelper', '/org/gnome/Shell/PerfHelper');
+}

 let _perfHelper = null;
 function _getPerfHelper() {
-    if (_perfHelper == null) {
+    if (_perfHelper == null)
        _perfHelper = new PerfHelper();
-        _perfHelper.init(null);
-    }

    return _perfHelper;
 }
@ -119,8 +111,7 @@ function createTestWindow(width, height, alpha, maximized) {
    let perfHelper = _getPerfHelper();

    perfHelper.CreateWindowRemote(width, height, alpha, maximized,
-                                  null,
-                                  function(proxy, result) {
+                                  function(result, excp) {
                                      if (cb)
                                          cb();
                                  });
@ -140,7 +131,7 @@ function waitTestWindows() {
    let cb;
    let perfHelper = _getPerfHelper();

-    perfHelper.WaitWindowsRemote(null, function(proxy, result) {
+    perfHelper.WaitWindowsRemote(function(result, excp) {
                                     if (cb)
                                         cb();
                                 });
@ -163,7 +154,7 @@ function destroyTestWindows() {
    let cb;
    let perfHelper = _getPerfHelper();

-    perfHelper.DestroyWindowsRemote(null, function(proxy, result) {
+    perfHelper.DestroyWindowsRemote(function(result, excp) {
                                        if (cb)
                                            cb();
                                    });
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -2,7 +2,6 @@

 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const Shell = imports.gi.Shell;
@ -76,8 +75,6 @@ const SearchProvider = new Lang.Class({
    Name: 'SearchProvider',

    _init: function(title) {
-        this.parent();
-
        this.title = title;
        this.searchSystem = null;
    },
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@ -39,7 +39,7 @@ const _modes = {
        unlockDialog: imports.gdm.loginDialog.LoginDialog,
        components: ['polkitAgent'],
        panel: {
-            left: ['logo'],
+            left: [],
            center: ['dateMenu'],
            right: ['a11y', 'display', 'keyboard',
                    'volume', 'battery', 'powerMenu']
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@ -67,16 +67,14 @@ const ScreenSaverIface = <interface name="org.gnome.ScreenSaver">
 </signal>
 </interface>;

-const GnomeShell = new Gio.DBusImplementerClass({
+const GnomeShell = new Lang.Class({
    Name: 'GnomeShellDBus',
-    Interface: GnomeShellIface,

    _init: function() {
-        this.parent();
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell');

-        this.export(Gio.DBus.session, '/org/gnome/Shell');
-
-        this._extensionsService = new GnomeShellExtensions();
+        this._extensionsSerivce = new GnomeShellExtensions();
    },

    /**
@ -238,14 +236,12 @@ const GnomeShellExtensionsIface = <interface name="org.gnome.Shell.Extensions">
 <property name="ShellVersion" type="s" access="read" />
 </interface>;

-const GnomeShellExtensions = new Gio.DBusImplementerClass({
+const GnomeShellExtensions = new Lang.Class({
    Name: 'GnomeShellExtensionsDBus',
-    Interface: GnomeShellExtensionsIface,

    _init: function() {
-        this.parent();
-
-        this.export(Gio.DBus.session, '/org/gnome/Shell');
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellExtensionsIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell');
        ExtensionSystem.connect('extension-state-changed',
                                Lang.bind(this, this._extensionStateChanged));
    },
@ -339,23 +335,25 @@ const GnomeShellExtensions = new Gio.DBusImplementerClass({
    ShellVersion: Config.PACKAGE_VERSION,

    _extensionStateChanged: function(_, newState) {
-        this.emit_signal('ExtensionStatusChanged', newState.uuid, newState.state, newState.error);
+        this._dbusImpl.emit_signal('ExtensionStatusChanged',
+                                   GLib.Variant.new('(sis)', [newState.uuid, newState.state, newState.error]));
    }
 });

-const ScreenSaverDBus = new Gio.DBusImplementerClass({
+const ScreenSaverDBus = new Lang.Class({
    Name: 'ScreenSaverDBus',
-    Interface: ScreenSaverIface,

    _init: function(screenShield) {
        this.parent();

        this._screenShield = screenShield;
        screenShield.connect('lock-status-changed', Lang.bind(this, function(shield) {
-            this.emit_signal('ActiveChanged', shield.locked);
+            this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.locked]));
        }));

-        this.export(Gio.DBus.session, '/org/gnome/ScreenSaver');
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreenSaverIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/ScreenSaver');
+
        Gio.DBus.session.own_name('org.gnome.ScreenSaver', Gio.BusNameOwnerFlags.REPLACE, null, null);
    },

--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@ -554,16 +554,14 @@ const ShellMountOperationType = {
    SHOW_PROCESSES: 3
 };

-const GnomeShellMountOpHandler = new Gio.DBusImplementerClass({
+const GnomeShellMountOpHandler = new Lang.Class({
    Name: 'GnomeShellMountOpHandler',
-    Interface: GnomeShellMountOpIface,

    _init: function() {
-        this.parent();
-
-        this.export(Gio.DBus.session, '/org/gtk/MountOperationHandler');
-        Gio.DBus.session.own_name('org.gtk.MountOperationHandler',
-                                  Gio.BusNameOwnerFlags.REPLACE, null, null);
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellMountOpIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/gtk/MountOperationHandler');
+        Gio.bus_own_name_on_connection(Gio.DBus.session, 'org.gtk.MountOperationHandler',
+                                       Gio.BusNameOwnerFlags.REPLACE, null, null);

        this._dialog = null;
        this._volumeMonitor = Gio.VolumeMonitor.get();
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -233,11 +233,20 @@ const NMWirelessSectionTitleMenuItem = new Lang.Class({
    }
 });

-const NMConnectionBased = new Lang.Class({
-    Name: 'NMConnectionBased',
+const NMDevice = new Lang.Class({
+    Name: 'NMDevice',
    Abstract: true,

-    _init: function(connections) {
+    _init: function(client, device, connections) {
+        this.device = device;
+        if (device) {
+            this.device._delegate = this;
+            this._stateChangedId = this.device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));
+        } else
+            this._stateChangedId = 0;
+
+        // protected
+        this._client = client;
        this._connections = [ ];
        for (let i = 0; i < connections.length; i++) {
            if (!connections[i].get_uuid())
@ -255,115 +264,26 @@ const NMConnectionBased = new Lang.Class({
            this._connections.push(obj);
        }
        this._connections.sort(this._connectionSortFunction);
-    },
-
-    checkConnection: function(connection) {
-        let pos = this._findConnection(connection.get_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)
-            this.removeConnection(connection);
-        if (valid)
-            this.addConnection(connection);
-    },
-
-    addConnection: function(connection) {
-        // record the connection
-        let obj = {
-            connection: connection,
-            name: connection.get_id(),
-            uuid: connection.get_uuid(),
-            timestamp: connection._timestamp,
-            item: null,
-        };
-        Util.insertSorted(this._connections, obj, this._connectionSortFunction);
-
-        this._queueCreateSection();
-    },
-
-    removeConnection: function(connection) {
-        let pos = this._findConnection(connection.get_uuid());
-        if (pos == -1) {
-            // this connection was never added, nothing to do here
-            return;
-        }
-
-        let obj = this._connections[pos];
-        if (obj.item)
-            obj.item.destroy();
-        this._connections.splice(pos, 1);
-
-        if (this._connections.length <= 1) {
-            // We need to show the automatic connection again
-            // (or in the case of NMDeviceWired, we want to hide
-            // the only explicit connection)
-            this._queueCreateSection();
-        }
-    },
-
-    _findConnection: function(uuid) {
-        for (let i = 0; i < this._connections.length; i++) {
-            let obj = this._connections[i];
-            if (obj.uuid == uuid)
-                return i;
-        }
-        return -1;
-    },
-
-    _connectionSortFunction: function(one, two) {
-        if (one.timestamp == two.timestamp)
-            return GLib.utf8_collate(one.name, two.name);
-
-        return two.timestamp - one.timestamp;
-    },
-});
-Signals.addSignalMethods(NMConnectionBased.prototype);
-
-const NMDevice = new Lang.Class({
-    Name: 'NMDevice',
-    Abstract: true,
-    Extends: NMConnectionBased,
-
-    _init: function(client, device, connections) {
-        this.device = device;
-        this.device._delegate = this;
-        this._stateChangedId = this.device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));
-
-        // protected
-        this._client = client;
-        this.parent(connections);
        this._activeConnection = null;
        this._activeConnectionItem = null;
        this._autoConnectionItem = null;
        this._overflowItem = null;

-        this.statusItem = new PopupMenu.PopupSwitchMenuItem(this._getDescription(), this.connected, { style_class: 'popup-subtitle-menu-item' });
-        this._statusChanged = this.statusItem.connect('toggled', Lang.bind(this, function(item, state) {
-            let ok;
-            if (state)
-                ok = this.activate();
-            else
-                ok = this.deactivate();
+        if (this.device) {
+            this.statusItem = new PopupMenu.PopupSwitchMenuItem(this._getDescription(), this.connected, { style_class: 'popup-subtitle-menu-item' });
+            this._statusChanged = this.statusItem.connect('toggled', Lang.bind(this, function(item, state) {
+                let ok;
+                if (state)
+                    ok = this.activate();
+                else
+                    ok = this.deactivate();

-            if (!ok)
-                item.setToggleState(!state);
-        }));
+                if (!ok)
+                    item.setToggleState(!state);
+            }));

-        this._updateStatusItem();
+            this._updateStatusItem();
+        }
        this.section = new PopupMenu.PopupMenuSection();

        this._deferredWorkId = Main.initializeDeferredWork(this.section.actor, Lang.bind(this, this._createSection));
@ -432,10 +352,6 @@ const NMDevice = new Lang.Class({
        return this.device.state == NetworkManager.DeviceState.ACTIVATED;
    },

-    clearActiveConnection: function(activeConnection) {
-        this.setActiveConnection(null);
-    },
-
    setActiveConnection: function(activeConnection) {
        if (activeConnection == this._activeConnection)
            // nothing to do
@ -453,13 +369,80 @@ const NMDevice = new Lang.Class({
        this._queueCreateSection();
    },

+    checkConnection: function(connection) {
+        let pos = this._findConnection(connection.get_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)
+            this.removeConnection(connection);
+        if (valid)
+            this.addConnection(connection);
+    },
+
+    addConnection: function(connection) {
+        // record the connection
+        let obj = {
+            connection: connection,
+            name: connection.get_id(),
+            uuid: connection.get_uuid(),
+            timestamp: connection._timestamp,
+            item: null,
+        };
+        Util.insertSorted(this._connections, obj, this._connectionSortFunction);
+
+        this._clearSection();
+        this._queueCreateSection();
+    },
+
+    removeConnection: function(connection) {
+        let pos = this._findConnection(connection.get_uuid());
+        if (pos == -1) {
+            // this connection was never added, nothing to do here
+            return;
+        }
+
+        let obj = this._connections[pos];
+        if (obj.item)
+            obj.item.destroy();
+        this._connections.splice(pos, 1);
+
+        if (this._connections.length <= 1) {
+            // We need to show the automatic connection again
+            // (or in the case of NMDeviceWired, we want to hide
+            // the only explicit connection)
+            this._clearSection();
+            this._queueCreateSection();
+        }
+    },
+
    connectionValid: function(connection) {
        return this.device.connection_valid(connection);
    },

+    _connectionSortFunction: function(one, two) {
+        if (one.timestamp == two.timestamp)
+            return GLib.utf8_collate(one.name, two.name);
+
+        return two.timestamp - one.timestamp;
+    },
+
    setEnabled: function(enabled) {
        // do nothing by default, we want to keep the conneciton list visible
-        // in the majority of cases (wired, wwan)
+        // in the majority of cases (wired, wwan, vpn)
    },

    getStatusLabel: function() {
@ -517,6 +500,15 @@ const NMDevice = new Lang.Class({
        throw new TypeError('Invoking pure virtual function NMDevice.createAutomaticConnection');
    },

+    _findConnection: function(uuid) {
+        for (let i = 0; i < this._connections.length; i++) {
+            let obj = this._connections[i];
+            if (obj.uuid == uuid)
+                return i;
+        }
+        return -1;
+    },
+
    _queueCreateSection: function() {
        this._clearSection();
        Main.queueDeferredWork(this._deferredWorkId);
@ -660,6 +652,8 @@ const NMDevice = new Lang.Class({
        return out;
    }
 });
+Signals.addSignalMethods(NMDevice.prototype);
+

 const NMDeviceWired = new Lang.Class({
    Name: 'NMDeviceWired',
@ -874,6 +868,95 @@ const NMDeviceBluetooth = new Lang.Class({
    }
 });

+
+// Not a real device, but I save a lot code this way
+const NMDeviceVPN = new Lang.Class({
+    Name: 'NMDeviceVPN',
+    Extends: NMDevice,
+
+    _init: function(client, device, connections) {
+        // Disable autoconnections
+        this._autoConnectionName = null;
+        this.category = NMConnectionCategory.VPN;
+
+        this.parent(client, null, connections);
+    },
+
+    connectionValid: function(connection) {
+        return connection._type == NetworkManager.SETTING_VPN_SETTING_NAME;
+    },
+
+    get empty() {
+        return this._connections.length == 0;
+    },
+
+    get connected() {
+        if (!this._activeConnection)
+            return false;
+
+        return this._activeConnection.vpn_state == NetworkManager.VPNConnectionState.ACTIVATED;
+    },
+
+    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');
+    },
+
+    _shouldShowConnectionList: function() {
+        return true;
+    },
+
+    deactivate: function() {
+        if (this._activeConnection)
+            this._client.deactivate_connection(this._activeConnection);
+    },
+
+    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');
+    }
+});
+
 const NMDeviceWireless = new Lang.Class({
    Name: 'NMDeviceWireless',
    Extends: NMDevice,
@ -1474,151 +1557,6 @@ const NMDeviceWireless = new Lang.Class({
    },
 });

-const NMVPNSection = new Lang.Class({
-    Name: 'NMVPNSection',
-    Extends: NMConnectionBased,
-    category: NMConnectionCategory.VPN,
-
-    _init: function(client, connections) {
-        this.parent(connections);
-        this._client = client;
-
-        this.section = new PopupMenu.PopupMenuSection();
-        this._deferredWorkId = Main.initializeDeferredWork(this.section.actor, Lang.bind(this, this._createSection));
-    },
-
-    get empty() {
-        return this._connections.length == 0;
-    },
-
-    connectionValid: function(connection) {
-        // filtering is done by NMApplet code
-        return true;
-    },
-
-    getStatusLabel: function(activeConnection) {
-        switch(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';
-        }
-    },
-
-    clearActiveConnection: function(activeConnection) {
-        let pos = this._findConnection(activeConnection.uuid);
-        if (pos < 0)
-            return;
-
-        let obj = this._connections[pos];
-        obj.active.disconnect(obj.stateChangedId);
-        obj.active = null;
-
-        if (obj.item) {
-            obj.item.setToggleState(false);
-            obj.item.setStatus(null);
-        }
-    },
-
-    setActiveConnection: function(activeConnection) {
-        let pos = this._findConnection(activeConnection.uuid);
-        if (pos < 0)
-            return;
-
-        let obj = this._connections[pos];
-        obj.active = activeConnection;
-        obj.stateChangedId = obj.active.connect('vpn-state-changed',
-                                                Lang.bind(this, this._connectionStateChanged));
-
-        if (obj.item) {
-            obj.item.setToggleState(obj.active.vpn_state ==
-                                    NetworkManager.VPNConnectionState.ACTIVATED);
-            obj.item.setStatus(this.getStatusLabel(obj.active));
-        }
-    },
-
-    _queueCreateSection: function() {
-        this.section.removeAll();
-        Main.queueDeferredWork(this._deferredWorkId);
-    },
-
-    _createConnectionItem: function(obj) {
-        let menuItem = new PopupMenu.PopupSwitchMenuItem(obj.name, false,
-                                                         { style_class: 'popup-subtitle-menu-item' });
-        menuItem.connect('toggled', Lang.bind(this, function(menuItem) {
-            if (menuItem.state) {
-                this._client.activate_connection(obj.connection, null, null, null);
-                // Immediately go back to disconnected, until NM tells us to change
-                menuItem.setToggleState(false);
-            } else if (obj.active) {
-                this._client.deactivate_connection(obj.active);
-            }
-        }));
-
-        if (obj.active) {
-            menuItem.setToggleState(obj.active.vpn_state ==
-                                    NetworkManager.VPNConnectionState.ACTIVATED);
-            menuItem.setStatus(this.getStatusLabel(obj.active));
-        }
-
-        return menuItem;
-    },
-
-    _createSection: function() {
-        if (this._connections.length > 0) {
-            this.section.actor.show();
-
-            for(let j = 0; j < this._connections.length; ++j) {
-                let obj = this._connections[j];
-                obj.item = this._createConnectionItem(obj);
-
-                if (j >= NUM_VISIBLE_NETWORKS) {
-                    if (!this._overflowItem) {
-                        this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
-                        this.section.addMenuItem(this._overflowItem);
-                    }
-                    this._overflowItem.menu.addMenuItem(obj.item);
-                } else
-                    this.section.addMenuItem(obj.item);
-            }
-        } else {
-            this.section.actor.hide()
-        }
-    },
-
-    _connectionStateChanged: function(vpnConnection, 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);
-        }
-
-        let pos = this._findConnection(vpnConnection.uuid);
-        if (pos >= 0) {
-            let obj = this._connections[pos];
-            if (obj.item) {
-                obj.item.setToggleState(vpnConnection.vpn_state ==
-                                        NetworkManager.VPNConnectionState.ACTIVATED);
-                obj.item.setStatus(this.getStatusLabel(vpnConnection));
-            }
-        } else {
-            log('Could not find connection for vpn-state-changed handler');
-        }
-    },
-});
-
 const NMApplet = new Lang.Class({
    Name: 'NMApplet',
    Extends: PanelMenu.SystemStatusButton,
@ -1629,44 +1567,7 @@ const NMApplet = new Lang.Class({
        this.secondaryIcon = this.addIcon(new Gio.ThemedIcon({ name: 'network-vpn-symbolic' }));
        this.secondaryIcon.hide();

-        // Device types
-        this._dtypes = { };
-        this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
-        this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
-        this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
-        this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
-        // TODO: WiMax support
-
-        // Connection types
-        this._ctypes = { };
-        this._ctypes[NetworkManager.SETTING_WIRELESS_SETTING_NAME] = NMConnectionCategory.WIRELESS;
-        this._ctypes[NetworkManager.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED;
-        this._ctypes[NetworkManager.SETTING_PPPOE_SETTING_NAME] = NMConnectionCategory.WIRED;
-        this._ctypes[NetworkManager.SETTING_PPP_SETTING_NAME] = NMConnectionCategory.WIRED;
-        this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.WWAN;
-        this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
-        this._ctypes[NetworkManager.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN;
-        this._ctypes[NetworkManager.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN;
-
-        NMClient.Client.new_async(null, Lang.bind(this, this._clientGot));
-        NMClient.RemoteSettings.new_async(null, null, Lang.bind(this, this._remoteSettingsGot));
-    },
-
-    _clientGot: function(obj, result) {
-        this._client = NMClient.Client.new_finish(result);
-
-        this._tryLateInit();
-    },
-
-    _remoteSettingsGot: function(obj, result) {
-        this._settings = NMClient.RemoteSettings.new_finish(result);
-
-        this._tryLateInit();
-    },
-
-    _tryLateInit: function() {
-        if (!this._client || !this._settings)
-            return;
+        this._client = NMClient.Client.new();

        this._statusSection = new PopupMenu.PopupMenuSection();
        this._statusItem = new PopupMenu.PopupMenuItem('', { reactive: false });
@ -1721,23 +1622,56 @@ const NMApplet = new Lang.Class({
        this.menu.addMenuItem(this._devices.wwan.section);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

-        this._vpnSection = new NMVPNSection(this._client, this._connections);
-        this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed));
-        this.menu.addMenuItem(this._vpnSection.section);
+        this._devices.vpn = {
+            section: new PopupMenu.PopupMenuSection(),
+            device: this._makeWrapperDevice(NMDeviceVPN, null),
+            item: new NMWiredSectionTitleMenuItem(_("VPN Connections"))
+        };
+        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();
+        this.menu.addMenuItem(this._devices.vpn.section);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');

-        this._readConnections();
-        this._readDevices();
-        this._syncNMState();
+        // Device types
+        this._dtypes = { };
+        this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
+        this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
+        this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
+        this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
+        // TODO: WiMax support

-        this._client.connect('notify::manager-running', Lang.bind(this, this._syncNMState));
-        this._client.connect('notify::networking-enabled', Lang.bind(this, this._syncNMState));
-        this._client.connect('notify::state', Lang.bind(this, this._syncNMState));
-        this._client.connect('notify::active-connections', Lang.bind(this, this._updateIcon));
-        this._client.connect('device-added', Lang.bind(this, this._deviceAdded));
-        this._client.connect('device-removed', Lang.bind(this, this._deviceRemoved));
-        this._settings.connect('new-connection', Lang.bind(this, this._newConnection));
+        // Connection types
+        this._ctypes = { };
+        this._ctypes[NetworkManager.SETTING_WIRELESS_SETTING_NAME] = NMConnectionCategory.WIRELESS;
+        this._ctypes[NetworkManager.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED;
+        this._ctypes[NetworkManager.SETTING_PPPOE_SETTING_NAME] = NMConnectionCategory.WIRED;
+        this._ctypes[NetworkManager.SETTING_PPP_SETTING_NAME] = NMConnectionCategory.WIRED;
+        this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.WWAN;
+        this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
+        this._ctypes[NetworkManager.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN;
+        this._ctypes[NetworkManager.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN;
+
+        this._settings = NMClient.RemoteSettings.new(null);
+        this._connectionsReadId = this._settings.connect('connections-read', Lang.bind(this, function() {
+            this._readConnections();
+            this._readDevices();
+            this._syncNMState();
+
+            // Connect to signals late so that early signals don't find in inconsistent state
+            // and connect only once (this signal handler can be called again if NetworkManager goes up and down)
+            if (!this._inited) {
+                this._inited = true;
+                this._client.connect('notify::manager-running', Lang.bind(this, this._syncNMState));
+                this._client.connect('notify::networking-enabled', Lang.bind(this, this._syncNMState));
+                this._client.connect('notify::state', Lang.bind(this, this._syncNMState));
+                this._client.connect('notify::active-connections', Lang.bind(this, this._updateIcon));
+                this._client.connect('device-added', Lang.bind(this, this._deviceAdded));
+                this._client.connect('device-removed', Lang.bind(this, this._deviceRemoved));
+                this._settings.connect('new-connection', Lang.bind(this, this._newConnection));
+            }
+        }));
    },

    _ensureSource: function() {
@ -1765,6 +1699,18 @@ 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;
@ -1801,9 +1747,10 @@ const NMApplet = new Lang.Class({
           or this._source will be cleared */
        this._ensureSource();

-        let gicon = new Gio.ThemedIcon({ name: iconName });
+        let icon = new St.Icon({ icon_name: iconName,
+                                 icon_size: MessageTray.NOTIFICATION_ICON_SIZE });
        device._notification = new MessageTray.Notification(this._source, title, text,
-                                                            { gicon: gicon });
+                                                            { icon: icon });
        device._notification.setUrgency(urgency);
        device._notification.setTransient(true);
        device._notification.connect('destroy', function() {
@ -1812,20 +1759,17 @@ const NMApplet = new Lang.Class({
        this._source.notify(device._notification);
    },

-    _onActivationFailed: 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-symbolic',
-                              _("Connection failed"),
-                              _("Activation of network connection failed"),
-                              MessageTray.Urgency.HIGH);
-    },
-
    _makeWrapperDevice: function(wrapperClass, device) {
        let wrapper = new wrapperClass(this._client, device, this._connections);

-        wrapper._activationFailedId = wrapper.connect('activation-failed',
-                                                      Lang.bind(this, this._onActivationFailed));
+        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-symbolic',
+                                  _("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);
        }));
@ -1908,7 +1852,7 @@ const NMApplet = new Lang.Class({
        for (let i = 0; i < closedConnections.length; i++) {
            let active = closedConnections[i];
            if (active._primaryDevice) {
-                active._primaryDevice.clearActiveConnection(active);
+                active._primaryDevice.setActiveConnection(null);
                active._primaryDevice = null;
            }
            if (active._inited) {
@ -1975,7 +1919,7 @@ const NMApplet = new Lang.Class({
                        }
                    }
                } else
-                    a._primaryDevice = this._vpnSection;
+                    a._primaryDevice = this._devices.vpn.device

                if (a._primaryDevice)
                    a._primaryDevice.setActiveConnection(a);
@ -2057,7 +2001,8 @@ const NMApplet = new Lang.Class({
        let section = connection._section;

        if (section == NMConnectionCategory.VPN) {
-            this._vpnSection.removeConnection(connection);
+            this._devices.vpn.device.removeConnection(connection);
+            this._syncSectionTitle(section);
        } else if (section != NMConnectionCategory.INVALID) {
            let devices = this._devices[section].devices;
            for (let i = 0; i < devices.length; i++)
@ -2080,7 +2025,8 @@ const NMApplet = new Lang.Class({
        if (section == NMConnectionCategory.INVALID)
            return;
        if (section == NMConnectionCategory.VPN) {
-            this._vpnSection.checkConnection(connection);
+            this._devices.vpn.device.checkConnection(connection);
+            this._syncSectionTitle(section);
        } else {
            let devices = this._devices[section].devices;
            for (let i = 0; i < devices.length; i++) {
@ -2106,6 +2052,7 @@ const NMApplet = new Lang.Class({
        this._syncSectionTitle(NMConnectionCategory.WIRED);
        this._syncSectionTitle(NMConnectionCategory.WIRELESS);
        this._syncSectionTitle(NMConnectionCategory.WWAN);
+        this._syncSectionTitle(NMConnectionCategory.VPN);
    },

    _syncNMState: function() {
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;

@ -46,16 +45,7 @@ const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
 <property name="Icon" type="s" access="read" />
 </interface>;

-const PowerManagerProxy = new Gio.DBusProxyClass({
-    Name: 'PowerManagerProxy',
-    Interface: PowerManagerInterface,
-
-    _init: function() {
-        this.parent({ g_bus_type: Gio.BusType.SESSION,
-                      g_name: BUS_NAME,
-                      g_object_path: OBJECT_PATH });
-    }
-});
+const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface);

 const Indicator = new Lang.Class({
    Name: 'PowerIndicator',
@ -64,7 +54,7 @@ const Indicator = new Lang.Class({
    _init: function() {
        this.parent('battery-missing-symbolic', _("Battery"));

-        this._proxy = new PowerManagerProxy();
+        this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);

        this._deviceItems = [ ];
        this._hasPrimary = false;
@ -83,26 +73,18 @@ const Indicator = new Lang.Class({

        this._proxy.connect('g-properties-changed',
                            Lang.bind(this, this._devicesChanged));
-        this._proxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(proxy, result) {
-            proxy.init_finish(result);
-
-            this._devicesChanged();
-        }));
+        this._devicesChanged();
    },

    _readPrimaryDevice: function() {
-        this._proxy.GetPrimaryDeviceRemote(null, Lang.bind(this, function(proxy, result) {
-            let device_id, device_type, icon, percentage, state, seconds;
-            try {
-                [[device_id, device_type, icon, percentage, state, seconds]] =
-                    proxy.GetPrimaryDeviceFinish(result);
-            } catch(e) {
+        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
+            if (error) {
                this._hasPrimary = false;
                this._primaryDeviceId = null;
                this._batteryItem.actor.hide();
                return;
            }
-
+            let [[device_id, device_type, icon, percentage, state, seconds]] = result;
            if (device_type == UPDeviceType.BATTERY) {
                this._hasPrimary = true;
                let time = Math.round(seconds / 60);
@ -114,7 +96,7 @@ const Indicator = new Lang.Class({
                    let minutes = time % 60;
                    let hours = Math.floor(time / 60);
                    let timestring;
-                    if (time > 60) {
+                    if (time >= 60) {
                        if (minutes == 0) {
                            timestring = ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
                        } else {
@ -139,18 +121,16 @@ const Indicator = new Lang.Class({
    },

    _readOtherDevices: function() {
-        this._proxy.GetDevicesRemote(null, Lang.bind(this, function(proxy, result) {
+        this._proxy.GetDevicesRemote(Lang.bind(this, function(result, error) {
            this._deviceItems.forEach(function(i) { i.destroy(); });
            this._deviceItems = [];

-            let devices;
-            try {
-                [devices] = proxy.GetDevicesFinish(result);
-            } catch(e) {
+            if (error) {
                return;
            }

            let position = 0;
+            let [devices] = result;
            for (let i = 0; i < devices.length; i++) {
                let [device_id, device_type] = devices[i];
                if (device_type == UPDeviceType.AC_POWER || device_id == this._primaryDeviceId)
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@ -5,7 +5,6 @@ const Clutter = imports.gi.Clutter;
 const Gdm  = imports.gi.Gdm;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Signals = imports.signals;
@ -196,7 +195,9 @@ const UnlockDialog = new Lang.Class({
            return false;
        }));

-        this._idleMonitor = new GnomeDesktop.IdleMonitor();
+        this._idleMonitor = Shell.IdleMonitor.get();
+        // this dialog is only created after user activity (curtain drag or
+        // escape key press), so the timeout will fire after IDLE_TIMEOUT seconds of inactivity
        this._idleWatchId = this._idleMonitor.add_watch(IDLE_TIMEOUT * 1000, Lang.bind(this, this._escape));
    },

--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@ -9,11 +9,11 @@ const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Tp = imports.gi.TelepathyGLib;
+const UPowerGlib = imports.gi.UPowerGlib;
 const Atk = imports.gi.Atk;

 const BoxPointer = imports.ui.boxpointer;
 const GnomeSession = imports.misc.gnomeSession;
-const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@ -74,6 +74,11 @@ const UserAvatarWidget = new Lang.Class({
            let file = Gio.File.new_for_path(iconFile);
            this.actor.child = null;
            this.actor.style = 'background-image: url("%s");'.format(iconFile);
+
+            // AccountsService uses a fixed location for avatar images, so
+            // we need to clear out all cached data to pick up image changes,
+            // see https://bugzilla.gnome.org/show_bug.cgi?id=679268
+            this.actor.clear_background_image();
        } else {
            this.actor.style = null;
            this.actor.child = new St.Icon({ icon_name: 'avatar-default-symbolic',
@ -188,19 +193,15 @@ const IMStatusChooserItem = new Lang.Class({
        item = new IMStatusItem(_("Idle"), 'user-idle-symbolic');
        this._combo.addMenuItem(item, IMStatus.IDLE);

-        item = new IMStatusItem(_("Offline"), 'user-offline-symbolic');
+        item = new IMStatusItem(_("Unavailable"), 'user-offline-symbolic');
        this._combo.addMenuItem(item, IMStatus.OFFLINE);

        this._combo.connect('active-item-changed',
                            Lang.bind(this, this._changeIMStatus));

        this._presence = new GnomeSession.Presence();
-        this._presence.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(obj, result) {
-            obj.init_finish(result);
-
-            this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
-                this._sessionStatusChanged(status);
-            }));
+        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
+            this._sessionStatusChanged(status);
        }));

        this._sessionPresenceRestored = false;
@ -484,33 +485,13 @@ const UserMenuButton = new Lang.Class({
        this._userManager = AccountsService.UserManager.get_default();

        this._user = this._userManager.get_user(GLib.get_user_name());
-
        this._presence = new GnomeSession.Presence();
-        this._presence.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(proxy, result) {
-            proxy.init_finish(result);
-
-            this._updateSwitch(this._presence.status);
-            this._presence.connectSignal('StatusChanged', Lang.bind(this, function (proxy, senderName, [status]) {
-                this._updateSwitch(status);
-            }));
-        }));
-
-        let session = new GnomeSession.SessionManager();
-        session.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(proxy, result) {
-            // This should never fail.
-            proxy.init_finish(result);
-
-            this._session = proxy;
-            this._updateHaveShutdown();
-        }));
+        this._session = new GnomeSession.SessionManager();
        this._haveShutdown = true;
-        this._haveSuspend = true;

        this._accountMgr = Tp.AccountManager.dup();

-        LoginManager.getLoginManager(Lang.bind(this, function(manager) {
-            this._loginManager = manager;
-        }));
+        this._upClient = new UPowerGlib.Client();
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        this._iconBox = new St.Bin();
@ -556,6 +537,11 @@ const UserMenuButton = new Lang.Class({

        this._createSubMenu();

+        this._updateSwitch(this._presence.status);
+        this._presence.connectSignal('StatusChanged', Lang.bind(this, function (proxy, senderName, [status]) {
+            this._updateSwitch(status);
+        }));
+
        this._userManager.connect('notify::is-loaded',
                                  Lang.bind(this, this._updateMultiUser));
        this._userManager.connect('notify::has-multiple-users',
@ -585,15 +571,14 @@ const UserMenuButton = new Lang.Class({
        // the lockdown setting changes, which should be close enough.
        this.menu.connect('open-state-changed', Lang.bind(this,
            function(menu, open) {
-                if (!open)
-                    return;
-
-                this._updateHaveShutdown();
-                this._updateHaveSuspend();
+                if (open)
+                    this._updateHaveShutdown();
            }));
        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
                                       Lang.bind(this, this._updateHaveShutdown));

+        this._upClient.connect('notify::can-suspend', Lang.bind(this, this._updateSuspendOrPowerOff));
+
        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
        this._sessionUpdated();
    },
@ -655,37 +640,19 @@ const UserMenuButton = new Lang.Class({
    },

    _updateHaveShutdown: function() {
-        if (!this._session) {
-            this._haveShutdown = false;
-            return;
-        }
-
-        this._session.CanShutdownRemote(null, Lang.bind(this, function(proxy, result) {
-            try {
-                [this._haveShutdown] = proxy.CanShutdownFinish(result);
-            } catch(e) {
-                this._haveShutdown = false;
-            }
-
-            this._updateInstallUpdates();
-            this._updateSuspendOrPowerOff();
-        }));
-    },
-
-    _updateHaveSuspend: function() {
-        if (!this._loginManager) {
-            this._haveSuspend = false;
-            return;
-        }
-
-        this._loginManager.canSuspend(Lang.bind(this,
-            function(result) {
-                this._haveSuspend = result;
-                this._updateSuspendOrPowerOff();
-        }));
+        this._session.CanShutdownRemote(Lang.bind(this,
+            function(result, error) {
+                if (!error) {
+                    this._haveShutdown = result[0];
+                    this._updateInstallUpdates();
+                    this._updateSuspendOrPowerOff();
+                }
+            }));
    },

    _updateSuspendOrPowerOff: function() {
+        this._haveSuspend = this._upClient.get_can_suspend();
+
        if (!this._suspendOrPowerOffItem)
            return;

@ -867,17 +834,14 @@ const UserMenuButton = new Lang.Class({

    _onQuitSessionActivate: function() {
        Main.overview.hide();
-
-        if (this._session)
-            this._session.LogoutRemote(0, null, null);
+        this._session.LogoutRemote(0);
    },

    _onInstallUpdatesActivate: function() {
        Main.overview.hide();
        Util.spawn(['pkexec', '/usr/libexec/pk-trigger-offline-update']);

-        if (this._haveShutdown)
-            this._session.RebootRemote(null, null);
+        this._session.RebootRemote();
    },

    _onSuspendOrPowerOffActivate: function() {
@ -885,19 +849,19 @@ const UserMenuButton = new Lang.Class({

        if (this._haveShutdown &&
            this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
-            this._session.ShutdownRemote(null, null);
-        } else if (this._haveSuspend) {
+            this._session.ShutdownRemote();
+        } else {
            if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY)) {
                let tmpId = Main.screenShield.connect('lock-screen-shown', Lang.bind(this, function() {
                    Main.screenShield.disconnect(tmpId);

-                    this._loginManager.suspend();
+                    this._upClient.suspend_sync(null);
                }));

                this.menu.close(BoxPointer.PopupAnimation.NONE);
                Main.screenShield.lock(true);
            } else {
-                this._loginManager.suspend();
+                this._upClient.suspend_sync(null);
            }
        }
    }
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@ -20,7 +19,6 @@ const Tweener = imports.ui.tweener;
 const Wanda = imports.ui.wanda;
 const WorkspacesView = imports.ui.workspacesView;

-const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';

 const FocusTrap = new Lang.Class({
    Name: 'FocusTrap',
@ -143,16 +141,6 @@ const ViewSelector = new Lang.Class({
        // accessing the properties.
        this.constrainHeight = new Clutter.BindConstraint({ source: this._pageArea,
                                                            coordinate: Clutter.BindCoordinate.HEIGHT });
-
-        global.display.add_keybinding('toggle-application-view',
-                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                                      Meta.KeyBindingFlags.NONE,
-                                      Lang.bind(this, this._showWithAppsPage));
-    },
-
-    _showWithAppsPage: function() {
-        Main.overview.show();
-        this._showAppsButton.set_checked(true);
    },

    show: function() {
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -33,13 +33,21 @@ const DRAGGING_WINDOW_OPACITY = 100;
 const BUTTON_LAYOUT_SCHEMA = 'org.gnome.shell.overrides';
 const BUTTON_LAYOUT_KEY = 'button-layout';

-// When calculating a layout, we calculate the scale of windows and the percent
-// of the available area the new layout uses. If the values for the new layout,
-// when weighted with the values as below, are worse than the previous layout's,
-// we stop looking for a new layout and use the previous layout.
-// Otherwise, we keep looking for a new layout.
-const LAYOUT_SCALE_WEIGHT = 1;
-const LAYOUT_SPACE_WEIGHT = 0.1;
+// Define a layout scheme for small window counts. For larger
+// counts we fall back to an algorithm. We need more schemes here
+// unless we have a really good algorithm.
+
+// Each triplet is [xCenter, yCenter, scale] where the scale
+// is relative to the width of the workspace.
+const POSITIONS = {
+        1: [[0.5, 0.5, 0.95]],
+        2: [[0.25, 0.5, 0.48], [0.75, 0.5, 0.48]],
+        3: [[0.25, 0.25, 0.48],  [0.75, 0.25, 0.48],  [0.5, 0.75, 0.48]],
+        4: [[0.25, 0.25, 0.47],   [0.75, 0.25, 0.47], [0.75, 0.75, 0.47], [0.25, 0.75, 0.47]],
+        5: [[0.165, 0.25, 0.32], [0.495, 0.25, 0.32], [0.825, 0.25, 0.32], [0.25, 0.75, 0.32], [0.75, 0.75, 0.32]]
+};
+// Used in _orderWindowsPermutations, 5! = 120 which is probably the highest we can go
+const POSITIONING_PERMUTATIONS_MAX = 5;

 function _interpolate(start, end, step) {
    return start + (end - start) * step;
@ -159,24 +167,6 @@ const WindowClone = new Lang.Class({
        this._selected = false;
    },

-    get slot() {
-        let x, y, w, h;
-
-        if (this.inDrag) {
-            x = this.dragOrigX;
-            y = this.dragOrigY;
-            w = this.actor.width * this.dragOrigScale;
-            h = this.actor.height * this.dragOrigScale;
-        } else {
-            x = this.actor.x;
-            y = this.actor.y;
-            w = this.actor.width * this.actor.scale_x;
-            h = this.actor.height * this.actor.scale_y;
-        }
-
-        return [x, y, w, h];
-    },
-
    setStackAbove: function (actor) {
        this._stackAbove = actor;
        if (this.inDrag || this._zooming)
@ -453,11 +443,6 @@ const WindowOverlay = new Lang.Class({
        this._updateCaptionId = metaWindow.connect('notify::title',
            Lang.bind(this, function(w) {
                this.title.text = w.title;
-                // we need this for the next call to get_preferred_width
-                // to return useful results
-                this.title.set_size(-1, -1);
-
-                this._repositionSelf();
            }));

        let button = new St.Button({ style_class: 'window-close' });
@ -519,16 +504,15 @@ const WindowOverlay = new Lang.Class({
                           transition: 'easeOutQuad' });
    },

+    chromeWidth: function () {
+        return this.closeButton.width - this.closeButton._overlap;
+    },
+
    chromeHeights: function () {
        return [this.closeButton.height - this.closeButton._overlap,
                this.title.height + this.title._spacing];
    },

-    _repositionSelf: function() {
-        let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
-        this.updatePositions(cloneX, cloneY, cloneWidth, cloneHeight, false);
-    },
-
    /**
     * @cloneX: x position of windowClone
     * @cloneY: y position of windowClone
@ -566,8 +550,9 @@ const WindowOverlay = new Lang.Class({
        else
            button.set_position(Math.floor(buttonX), Math.floor(buttonY));

-        let [titleMinWidth, titleNatWidth] = title.get_preferred_width(-1);
-        let titleWidth = Math.max(titleMinWidth, Math.min(titleNatWidth, cloneWidth));
+        if (!title.fullWidth)
+            title.fullWidth = title.width;
+        let titleWidth = Math.min(title.fullWidth, cloneWidth);

        let titleX = cloneX + (cloneWidth - titleWidth) / 2;
        let titleY = cloneY + cloneHeight + title._spacing;
@ -683,280 +668,6 @@ const WindowPositionFlags = {
    ANIMATE: 1 << 1
 };

-const LayoutStrategy = new Lang.Class({
-    Name: 'LayoutStrategy',
-    Abstract: true,
-
-    _init: function(monitor, rowSpacing, columnSpacing, bottomPadding) {
-        this._monitor = monitor;
-        this._rowSpacing = rowSpacing;
-        this._columnSpacing = columnSpacing;
-        this._bottomPadding = bottomPadding;
-    },
-
-    _newRow: function() {
-        // Row properties:
-        //
-        // * x, y are the position of row, relative to area
-        //
-        // * width, height are the scaled versions of fullWidth, fullHeight
-        //
-        // * width also has the spacing in between windows. It's not in
-        //   fullWidth, as the spacing is constant, whereas fullWidth is
-        //   meant to be scaled
-        //
-        // * neither height/fullHeight have any sort of spacing or padding
-        //
-        // * if cellWidth is present, all windows in the row will occupy
-        //   the space of cellWidth, centered.
-        return { x: 0, y: 0,
-                 width: 0, height: 0,
-                 fullWidth: 0, fullHeight: 0,
-                 cellWidth: 0,
-                 windows: [] };
-    },
-
-    // Compute the size and fancy scale for @window using the
-    // base scale, @scale.
-    //
-    // Returns a list structure: [ scaledWidth, scaledHeight, fancyScale ]
-    // where scaledWidth and scaledHeight are the window's
-    // width and height, scaled by fancyScale for convenience.
-    _computeWindowSizeAndScale: function(window, scale) {
-        let width = window.actor.width;
-        let height = window.actor.height;
-        let ratio;
-
-        if (width > height)
-            ratio = width / this._monitor.width;
-        else
-            ratio = height / this._monitor.height;
-
-        let fancyScale = (2 / (1 + ratio)) * scale;
-        return [width * fancyScale, height * fancyScale, fancyScale];
-    },
-
-    // Compute the size of each row, by assigning to the properties
-    // row.width, row.height, row.fullWidth, row.fullHeight, and
-    // (optionally) row.cellWidth, for each row in @layout.rows.
-    // This method is intended to be called by subclasses.
-    _computeRowSizes: function(layout) {
-        throw new Error('_computeRowSizes not implemented');
-    },
-
-    // Compute strategy-specific window slots for each window in
-    // @windows, given the @layout. The strategy may also use @layout
-    // as strategy-specific storage.
-    //
-    // This must calculate:
-    //  * maxColumns - The maximum number of columns used by the layout.
-    //  * gridWidth - The total width used by the grid, unscaled, unspaced.
-    //  * gridHeight - The totial height used by the grid, unscaled, unspaced.
-    //  * rows - A list of rows, which should be instantiated by _newRow.
-    computeLayout: function(windows, layout) {
-        throw new Error('computeLayout not implemented');
-    },
-
-    // Given @layout, compute the overall scale and space of the layout.
-    // The scale is the individual, non-fancy scale of each window, and
-    // the space is the percentage of the available area eventually
-    // used by the layout.
-
-    // This method does not return anything, but instead installs
-    // the properties "scale" and "space" on @layout directly.
-    //
-    // Make sure to call this methods before calling computeWindowSlots(),
-    // as it depends on the scale property installed in @layout here.
-    computeScaleAndSpace: function(layout) {
-        let area = layout.area;
-
-        let hspacing = (layout.maxColumns - 1) * this._columnSpacing;
-        let vspacing = (layout.numRows - 1) * this._rowSpacing + this._bottomPadding;
-
-        let spacedWidth = area.width - hspacing;
-        let spacedHeight = area.height - vspacing;
-
-        let horizontalScale = spacedWidth / layout.gridWidth;
-        let verticalScale = spacedHeight / layout.gridHeight;
-
-        // Thumbnails should be less than 70% of the original size
-        let scale = Math.min(horizontalScale, verticalScale, WINDOW_CLONE_MAXIMUM_SCALE);
-
-        let scaledLayoutWidth = layout.gridWidth * scale + hspacing;
-        let scaledLayoutHeight = layout.gridHeight * scale + vspacing;
-        let space = (scaledLayoutWidth * scaledLayoutHeight) / (area.width * area.height);
-
-        layout.scale = scale;
-        layout.space = space;
-    },
-
-    computeWindowSlots: function(layout, area) {
-        this._computeRowSizes(layout);
-
-        let { rows: rows, scale: scale, state: state } = layout;
-
-        let slots = [];
-
-        let y = 0;
-        for (let i = 0; i < rows.length; i++) {
-            let row = rows[i];
-            row.x = area.x + (area.width - row.width) / 2;
-            row.y = area.y + y;
-            y += row.height + this._rowSpacing;
-        }
-
-        let height = y - this._rowSpacing + this._bottomPadding;
-        let baseY = (area.height - height) / 2;
-
-        for (let i = 0; i < rows.length; i++) {
-            let row = rows[i];
-            row.y += baseY;
-            let baseX = row.x;
-            for (let j = 0; j < row.windows.length; j++) {
-                let window = row.windows[j];
-
-                let [width, height, s] = this._computeWindowSizeAndScale(window, scale);
-                let y = row.y + row.height - height;
-
-                let x = baseX;
-                if (row.cellWidth) {
-                    x += (row.cellWidth - width) / 2;
-                    width = row.cellWidth;
-                }
-
-                slots.push([x, y, s]);
-                baseX += width + this._columnSpacing;
-            }
-        }
-        return slots;
-    }
-});
-
-const UnalignedLayoutStrategy = new Lang.Class({
-    Name: 'UnalignedLayoutStrategy',
-    Extends: LayoutStrategy,
-
-    _computeRowSizes: function(layout) {
-        let { rows: rows, scale: scale } = layout;
-        for (let i = 0; i < rows.length; i++) {
-            let row = rows[i];
-            row.width = row.fullWidth * scale + (row.windows.length - 1) * this._columnSpacing;
-            row.height = row.fullHeight * scale;
-        }
-    },
-
-    _keepSameRow: function(row, window, width, idealRowWidth) {
-        if (row.fullWidth + width <= idealRowWidth)
-            return true;
-
-        let oldRatio = row.fullWidth / idealRowWidth;
-        let newRatio = (row.fullWidth + width) / idealRowWidth;
-
-        if (Math.abs(1 - newRatio) < Math.abs(1 - oldRatio))
-            return true;
-
-        return false;
-    },
-
-    computeLayout: function(windows, layout) {
-        let numRows = layout.numRows;
-
-        let rows = [];
-        let totalWidth = 0;
-        for (let i = 0; i < windows.length; i++) {
-            totalWidth += windows[i].actor.width;
-        }
-
-        let idealRowWidth = totalWidth / numRows;
-        let windowIdx = 0;
-        for (let i = 0; i < numRows; i++) {
-            let col = 0;
-            let row = this._newRow();
-            rows.push(row);
-
-            for (; windowIdx < windows.length; windowIdx++) {
-                let window = windows[windowIdx];
-                let [width, height] = this._computeWindowSizeAndScale(window, 1);
-                row.fullHeight = Math.max(row.fullHeight, height);
-
-                // either new width is < idealWidth or new width is nearer from idealWidth then oldWidth
-                if (this._keepSameRow(row, window, width, idealRowWidth) || (i == numRows - 1)) {
-                    row.windows.push(window);
-                    row.fullWidth += width;
-                } else {
-                    break;
-                }
-            }
-        }
-
-        let gridHeight = 0;
-        let maxRow;
-        for (let i = 0; i < numRows; i++) {
-            let row = rows[i];
-            if (!maxRow || row.fullWidth > maxRow.fullWidth)
-                maxRow = row;
-            gridHeight += row.fullHeight;
-        }
-
-        layout.rows = rows;
-        layout.maxColumns = maxRow.windows.length;
-        layout.gridWidth = maxRow.fullWidth;
-        layout.gridHeight = gridHeight;
-    }
-});
-
-const GridLayoutStrategy = new Lang.Class({
-    Name: 'GridLayoutStrategy',
-    Extends: LayoutStrategy,
-
-    _computeRowSizes: function(layout) {
-        let { rows: rows, scale: scale } = layout;
-
-        let gridWidth = layout.numColumns * layout.maxWindowWidth;
-        let hspacing = (layout.numColumns - 1) * this._columnSpacing;
-        for (let i = 0; i < rows.length; i++) {
-            let row = rows[i];
-            row.fullWidth = layout.gridWidth;
-            row.fullHeight = layout.maxWindowHeight;
-
-            row.width = row.fullWidth * scale + hspacing;
-            row.height = row.fullHeight * scale;
-            row.cellWidth = layout.maxWindowWidth * scale;
-        }
-    },
-
-    computeLayout: function(windows, layout) {
-        let { numRows: numRows, numColumns: numColumns } = layout;
-        let rows = [];
-        let windowIdx = 0;
-
-        let maxWindowWidth = 0;
-        let maxWindowHeight = 0;
-        for (let i = 0; i < numRows; i++) {
-            let row = this._newRow();
-            rows.push(row);
-            for (; windowIdx < windows.length; windowIdx++) {
-                if (row.windows.length >= numColumns)
-                    break;
-
-                let window = windows[windowIdx];
-                row.windows.push(window);
-
-                let [width, height] = this._computeWindowSizeAndScale(window, 1);
-                maxWindowWidth = Math.max(maxWindowWidth, width);
-                maxWindowHeight = Math.max(maxWindowHeight, height);
-            }
-        }
-
-        layout.rows = rows;
-        layout.maxColumns = numColumns;
-        layout.gridWidth = numColumns * maxWindowWidth;
-        layout.gridHeight = numRows * maxWindowHeight;
-        layout.maxWindowWidth = maxWindowWidth;
-        layout.maxWindowHeight = maxWindowHeight;
-    }
-});
-
 /**
 * @metaWorkspace: a #Meta.Workspace, or null
 */
@ -978,7 +689,7 @@ const Workspace = new Lang.Class({
        // Without this the drop area will be overlapped.
        this._windowOverlaysGroup.set_size(0, 0);

-        this.actor = new St.Widget({ style_class: 'window-picker' });
+        this.actor = new Clutter.Group();
        this.actor.set_size(0, 0);

        this._dropRect = new Clutter.Rectangle({ opacity: 0 });
@ -1018,8 +729,6 @@ const Workspace = new Lang.Class({

        this._positionWindowsFlags = 0;
        this._positionWindowsId = 0;
-
-        this._currentLayout = null;
    },

    setGeometry: function(x, y, width, height) {
@ -1054,6 +763,225 @@ const Workspace = new Lang.Class({
        return this._windows.length == 0;
    },

+    // Only use this for n <= 20 say
+    _factorial: function(n) {
+        let result = 1;
+        for (let i = 2; i <= n; i++)
+            result *= i;
+        return result;
+    },
+
+    /**
+     * _permutation:
+     * @permutationIndex: An integer from [0, list.length!)
+     * @list: (inout): Array of objects to permute; will be modified in place
+     *
+     * Given an integer between 0 and length of array, re-order the array in-place
+     * into a permutation denoted by the index.
+     */
+    _permutation: function(permutationIndex, list) {
+        for (let j = 2; j <= list.length; j++) {
+            let firstIndex = (permutationIndex % j);
+            let secondIndex = j - 1;
+            // Swap
+            let tmp = list[firstIndex];
+            list[firstIndex] = list[secondIndex];
+            list[secondIndex] = tmp;
+            permutationIndex = Math.floor(permutationIndex / j);
+        }
+    },
+
+    /**
+     * _forEachPermutations:
+     * @list: Array
+     * @func: Function which takes a single array argument
+     *
+     * Call @func with each permutation of @list as an argument.
+     */
+    _forEachPermutations: function(list, func) {
+        let nCombinations = this._factorial(list.length);
+        for (let i = 0; i < nCombinations; i++) {
+            let listCopy = list.concat();
+            this._permutation(i, listCopy);
+            func(listCopy);
+        }
+    },
+
+    /**
+     * _computeWindowMotion:
+     * @actor: A #WindowClone's #ClutterActor
+     * @slot: An element of #POSITIONS
+     * @slotGeometry: Layout of @slot
+     *
+     * Returns a number corresponding to how much perceived motion
+     * would be involved in moving the window to the given slot.
+     * Currently this is the square of the distance between the
+     * centers.
+     */
+    _computeWindowMotion: function (actor, slot) {
+        let [xCenter, yCenter, fraction] = slot;
+        let xDelta, yDelta, distanceSquared;
+        let actorWidth, actorHeight;
+
+        let x = actor.x;
+        let y = actor.y;
+        let scale = actor.scale_x;
+
+        if (actor._delegate.inDrag) {
+            x = actor._delegate.dragOrigX;
+            y = actor._delegate.dragOrigY;
+            scale = actor._delegate.dragOrigScale;
+        }
+
+        actorWidth = actor.width * scale;
+        actorHeight = actor.height * scale;
+        xDelta = x + actorWidth / 2.0 - xCenter * this._width - this._x;
+        yDelta = y + actorHeight / 2.0 - yCenter * this._height - this._y;
+        distanceSquared = xDelta * xDelta + yDelta * yDelta;
+
+        return distanceSquared;
+    },
+
+    /**
+     * _orderWindowsPermutations:
+     *
+     * Iterate over all permutations of the windows, and determine the
+     * permutation which has the least total motion.
+     */
+    _orderWindowsPermutations: function (clones, slots) {
+        let minimumMotionPermutation = null;
+        let minimumMotion = -1;
+        let permIndex = 0;
+        this._forEachPermutations(clones, Lang.bind(this, function (permutation) {
+            let motion = 0;
+            for (let i = 0; i < permutation.length; i++) {
+                let cloneActor = permutation[i].actor;
+                let slot = slots[i];
+
+                let delta = this._computeWindowMotion(cloneActor, slot);
+
+                motion += delta;
+
+                // Bail out early if we're already larger than the
+                // previous best
+                if (minimumMotionPermutation != null &&
+                    motion > minimumMotion)
+                    continue;
+            }
+
+            if (minimumMotionPermutation == null || motion < minimumMotion) {
+                minimumMotionPermutation = permutation;
+                minimumMotion = motion;
+            }
+            permIndex++;
+        }));
+        return minimumMotionPermutation;
+    },
+
+    /**
+     * _orderWindowsGreedy:
+     *
+     * Iterate over available slots in order, placing into each one the window
+     * we find with the smallest motion to that slot.
+     */
+    _orderWindowsGreedy: function(clones, slots) {
+        let result = [];
+        let slotIndex = 0;
+        // Copy since we mutate below
+        let clonesCopy = clones.concat();
+        for (let i = 0; i < slots.length; i++) {
+            let slot = slots[i];
+            let minimumMotionIndex = -1;
+            let minimumMotion = -1;
+            for (let j = 0; j < clonesCopy.length; j++) {
+                let cloneActor = clonesCopy[j].actor;
+                let delta = this._computeWindowMotion(cloneActor, slot);
+                if (minimumMotionIndex == -1 || delta < minimumMotion) {
+                    minimumMotionIndex = j;
+                    minimumMotion = delta;
+                }
+            }
+            result.push(clonesCopy[minimumMotionIndex]);
+            clonesCopy.splice(minimumMotionIndex, 1);
+        }
+        return result;
+    },
+
+    /**
+     * _orderWindowsByMotionAndStartup:
+     * @windows: Array of #MetaWindow
+     * @slots: Array of slots
+     *
+     * Returns a copy of @windows, ordered in such a way that they require least motion
+     * to move to the final screen coordinates of @slots.  Ties are broken in a stable
+     * fashion by the order in which the windows were created.
+     */
+    _orderWindowsByMotionAndStartup: function(clones, slots) {
+        clones.sort(function(w1, w2) {
+            return w2.metaWindow.get_stable_sequence() - w1.metaWindow.get_stable_sequence();
+        });
+        if (clones.length <= POSITIONING_PERMUTATIONS_MAX)
+            return this._orderWindowsPermutations(clones, slots);
+        else
+            return this._orderWindowsGreedy(clones, slots);
+    },
+
+    /**
+     * _getSlotGeometry:
+     * @slot: A layout slot
+     *
+     * Returns: the screen-relative [x, y, width, height]
+     * of a given window layout slot.
+     */
+    _getSlotGeometry: function(slot) {
+        let [xCenter, yCenter, fraction] = slot;
+
+        let width = this._width * fraction;
+        let height = this._height * fraction;
+
+        let x = this._x + xCenter * this._width - width / 2 ;
+        let y = this._y + yCenter * this._height - height / 2;
+
+        return [x, y, width, height];
+    },
+
+    /**
+     * _computeWindowLayout:
+     * @metaWindow: A #MetaWindow
+     * @slot: A layout slot
+     *
+     * Given a window and slot to fit it in, compute its
+     * screen-relative [x, y, scale] where scale applies
+     * to both X and Y directions.
+     */
+    _computeWindowLayout: function(metaWindow, slot) {
+        let [x, y, width, height] = this._getSlotGeometry(slot);
+
+        let rect = metaWindow.get_outer_rect();
+        let buttonOuterHeight, captionHeight;
+        let buttonOuterWidth = 0;
+
+        if (this._windowOverlays[0]) {
+            [buttonOuterHeight, captionHeight] = this._windowOverlays[0].chromeHeights();
+            buttonOuterWidth = this._windowOverlays[0].chromeWidth();
+        } else
+            [buttonOuterHeight, captionHeight] = [0, 0];
+
+        let scale = Math.min((width - buttonOuterWidth) / rect.width,
+                             (height - buttonOuterHeight - captionHeight) / rect.height,
+                             WINDOW_CLONE_MAXIMUM_SCALE);
+
+        x = Math.floor(x + (width - scale * rect.width) / 2);
+
+        // We want to center the window in case we have just one
+        if (metaWindow.get_workspace().n_windows == 1)
+            y = Math.floor(y + (height - scale * rect.height) / 2);
+        else
+            y = Math.floor(y + height - rect.height * scale - captionHeight);
+
+        return [x, y, scale];
+    },
+
    setReservedSlot: function(clone) {
        if (this._reservedSlot == clone)
            return;
@ -1062,7 +990,6 @@ const Workspace = new Lang.Class({
            clone = null;

        this._reservedSlot = clone;
-        this._currentLayout = null;
        this.positionWindows(WindowPositionFlags.ANIMATE);
    },

@ -1093,11 +1020,6 @@ const Workspace = new Lang.Class({
        }

        let clones = this._windows.slice();
-
-        clones.sort(function(a, b) {
-            return a.metaWindow.get_stable_sequence() - b.metaWindow.get_stable_sequence();
-        });
-
        if (this._reservedSlot)
            clones.push(this._reservedSlot);

@ -1105,7 +1027,8 @@ const Workspace = new Lang.Class({
        let animate = flags & WindowPositionFlags.ANIMATE;

        // Start the animations
-        let slots = this._computeAllWindowSlots(clones);
+        let slots = this._computeAllWindowSlots(clones.length);
+        clones = this._orderWindowsByMotionAndStartup(clones, slots);

        let currentWorkspace = global.screen.get_active_workspace();
        let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
@ -1122,11 +1045,10 @@ const Workspace = new Lang.Class({
            if (clone.inDrag)
                continue;

-            let [x, y, scale] = slot;
+            let [x, y, scale] = this._computeWindowLayout(metaWindow, slot);

            if (overlay && initialPositioning)
                overlay.hide();
-
            if (animate && isOnCurrentWorkspace) {
                if (!metaWindow.showing_on_its_workspace()) {
                    /* Hidden windows should fade in and grow
@ -1150,8 +1072,6 @@ const Workspace = new Lang.Class({

                this._animateClone(clone, overlay, x, y, scale, initialPositioning);
            } else {
-                // cancel any active tweens (otherwise they might override our changes)
-                Tweener.removeTweens(clone.actor);
                clone.actor.set_position(x, y);
                clone.actor.set_scale(scale, scale);
                this._updateWindowOverlayPositions(clone, overlay, x, y, scale, false);
@ -1193,11 +1113,11 @@ const Workspace = new Lang.Class({
    },

    _updateWindowOverlayPositions: function(clone, overlay, x, y, scale, animate) {
-        if (!overlay)
-            return;
-
        let [cloneWidth, cloneHeight] = clone.actor.get_size();
-        overlay.updatePositions(x, y, cloneWidth * scale, cloneHeight * scale, animate);
+        cloneWidth = scale * cloneWidth;
+        cloneHeight = scale * cloneHeight;
+        if (overlay)
+            overlay.updatePositions(x, y, cloneWidth, cloneHeight, animate);
    },

    _showWindowOverlay: function(clone, overlay, fade) {
@ -1291,7 +1211,6 @@ const Workspace = new Lang.Class({
        this._cursorX = x;
        this._cursorY = y;

-        this._currentLayout = null;
        this._repositionWindowsId = Mainloop.timeout_add(750,
            Lang.bind(this, this._delayedWindowRepositioning));
    },
@ -1344,7 +1263,6 @@ const Workspace = new Lang.Class({
            clone.actor.set_position (this._x, this._y);
        }

-        this._currentLayout = null;
        this.positionWindows(WindowPositionFlags.ANIMATE);
    },

@ -1382,8 +1300,6 @@ const Workspace = new Lang.Class({

    // Animate the full-screen to Overview transition.
    zoomToOverview : function() {
-        this._currentLayout = null;
-
        // Position and scale the windows.
        if (Main.overview.animationInProgress)
            this.positionWindows(WindowPositionFlags.ANIMATE | WindowPositionFlags.INITIAL);
@ -1548,108 +1464,29 @@ const Workspace = new Lang.Class({
        }
    },

-    _isBetterLayout: function(oldLayout, newLayout) {
-        if (oldLayout.scale === undefined)
-            return true;
+    _computeWindowSlot : function(windowIndex, numberOfWindows) {
+        if (numberOfWindows in POSITIONS)
+            return POSITIONS[numberOfWindows][windowIndex];

-        let spacePower = (newLayout.space - oldLayout.space) * LAYOUT_SPACE_WEIGHT;
-        let scalePower = (newLayout.scale - oldLayout.scale) * LAYOUT_SCALE_WEIGHT;
+        // If we don't have a predefined scheme for this window count,
+        // arrange the windows in a grid pattern.
+        let gridWidth = Math.ceil(Math.sqrt(numberOfWindows));
+        let gridHeight = Math.ceil(numberOfWindows / gridWidth);

-        if (newLayout.scale > oldLayout.scale && newLayout.space > oldLayout.space) {
-            // Win win -- better scale and better space
-            return true;
-        } else if (newLayout.scale > oldLayout.scale && newLayout.space <= oldLayout.space) {
-            // Keep new layout only if scale gain outweights aspect space loss
-            return scalePower > spacePower;
-        } else if (newLayout.scale <= oldLayout.scale && newLayout.space > oldLayout.space) {
-            // Keep new layout only if aspect space gain outweights scale loss
-            return spacePower > scalePower;
-        } else {
-            // Lose -- worse scale and space
-            return false;
-        }
+        let fraction = 0.95 * (1. / gridWidth);
+
+        let xCenter = (.5 / gridWidth) + ((windowIndex) % gridWidth) / gridWidth;
+        let yCenter = (.5 / gridHeight) + Math.floor((windowIndex / gridWidth)) / gridHeight;
+
+        return [xCenter, yCenter, fraction];
    },

-    _computeLayout: function(windows, area, rowSpacing, columnSpacing, bottomPadding) {
-        // We look for the largest scale that allows us to fit the
-        // largest row/tallest column on the workspace.
-
-        let lastLayout = {};
-
-        for (let numRows = 1; ; numRows++) {
-            let numColumns = Math.ceil(windows.length / numRows);
-
-            // If adding a new row does not change column count just stop
-            // (for instance: 9 windows, with 3 rows -> 3 columns, 4 rows ->
-            // 3 columns as well => just use 3 rows then)
-            if (numColumns == lastLayout.numColumns)
-                break;
-
-            let strategyClass = numRows > 2 ? GridLayoutStrategy : UnalignedLayoutStrategy;
-            let strategy = new strategyClass(this._monitor, rowSpacing, columnSpacing, bottomPadding);
-
-            let layout = { area: area, strategy: strategy, numRows: numRows, numColumns: numColumns };
-            strategy.computeLayout(windows, layout);
-            strategy.computeScaleAndSpace(layout);
-
-            if (!this._isBetterLayout(lastLayout, layout))
-                break;
-
-            lastLayout = layout;
+    _computeAllWindowSlots: function(totalWindows) {
+        let slots = [];
+        for (let i = 0; i < totalWindows; i++) {
+            slots.push(this._computeWindowSlot(i, totalWindows));
        }
-
-        return lastLayout;
-    },
-
-    _rectEqual: function(one, two) {
-        if (one == two)
-            return true;
-
-        return (one.x == two.x &&
-                one.y == two.y &&
-                one.width == two.width &&
-                one.height == two.height);
-    },
-
-    _computeAllWindowSlots: function(windows) {
-        let totalWindows = windows.length;
-        let node = this.actor.get_theme_node();
-
-        // Window grid spacing
-        let columnSpacing = node.get_length('-horizontal-spacing');
-        let rowSpacing = node.get_length('-vertical-spacing');
-
-        if (!totalWindows)
-            return [];
-
-        let closeButtonHeight, captionHeight;
-        if (this._windowOverlays.length) {
-            // All of the overlays have the same chrome sizes,
-            // so just pick the first one.
-            let overlay = this._windowOverlays[0];
-            [closeButtonHeight, captionHeight] = overlay.chromeHeights();
-        } else {
-            [closeButtonHeight, captionHeight] = [0, 0];
-        }
-
-        rowSpacing += captionHeight;
-
-        let area = { x: this._x, y: this._y, width: this._width, height: this._height };
-        area.y += closeButtonHeight;
-        area.height -= closeButtonHeight;
-
-        if (!this._currentLayout)
-            this._currentLayout = this._computeLayout(windows, area, rowSpacing, columnSpacing, captionHeight);
-
-        let layout = this._currentLayout;
-        let strategy = layout.strategy;
-
-        if (!this._rectEqual(area, layout.area)) {
-            layout.area = area;
-            strategy.computeScaleAndSpace(layout);
-        }
-
-        return strategy.computeWindowSlots(layout, area);
+        return slots;
    },

    _onCloneSelected : function (clone, time) {
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -51,6 +51,7 @@ const WorkspacesView = new Lang.Class({
        this._clipY = 0;
        this._clipWidth = 0;
        this._clipHeight = 0;
+        this._workspaceRatioSpacing = 0;
        this._spacing = 0;
        this._animating = false; // tweening
        this._scrolling = false; // swipe-scrolling
@ -71,7 +72,6 @@ const WorkspacesView = new Lang.Class({
            this._workspaces[w].actor.reparent(this.actor);
        this._workspaces[activeWorkspaceIndex].actor.raise_top();

-        this._extraWorkspaces = [];
        this._updateExtraWorkspaces();

        // Position/scale the desktop windows and their children after the
@ -83,6 +83,8 @@ const WorkspacesView = new Lang.Class({
                                 Lang.bind(this, function() {
                for (let w = 0; w < this._workspaces.length; w++)
                    this._workspaces[w].zoomToOverview();
+                if (!this._extraWorkspaces)
+                    return;
                for (let w = 0; w < this._extraWorkspaces.length; w++)
                    this._extraWorkspaces[w].zoomToOverview();
        }));
@ -122,6 +124,7 @@ const WorkspacesView = new Lang.Class({
        if (!this._settings.get_boolean('workspaces-only-on-primary'))
            return;

+        this._extraWorkspaces = [];
        let monitors = Main.layoutManager.monitors;
        for (let i = 0; i < monitors.length; i++) {
            if (i == Main.layoutManager.primaryIndex)
@ -136,20 +139,23 @@ const WorkspacesView = new Lang.Class({
    },

    _destroyExtraWorkspaces: function() {
+        if (!this._extraWorkspaces)
+            return;
+
        for (let m = 0; m < this._extraWorkspaces.length; m++)
            this._extraWorkspaces[m].destroy();
-        this._extraWorkspaces = [];
+        this._extraWorkspaces = null;
    },

-    setGeometry: function(x, y, width, height) {
+    setGeometry: function(x, y, width, height, spacing) {
      if (this._x == x && this._y == y &&
          this._width == width && this._height == height)
          return;
-
        this._width = width;
        this._height = height;
        this._x = x;
        this._y = y;
+        this._workspaceRatioSpacing = spacing;

        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].setGeometry(x, y, width, height);
@ -185,6 +191,8 @@ const WorkspacesView = new Lang.Class({

        for (let w = 0; w < this._workspaces.length; w++)
            this._workspaces[w].zoomFromOverview();
+        if (!this._extraWorkspaces)
+            return;
        for (let w = 0; w < this._extraWorkspaces.length; w++)
            this._extraWorkspaces[w].zoomFromOverview();
    },
@ -196,6 +204,8 @@ const WorkspacesView = new Lang.Class({
    syncStacking: function(stackIndices) {
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].syncStacking(stackIndices);
+        if (!this._extraWorkspaces)
+            return;
        for (let i = 0; i < this._extraWorkspaces.length; i++)
            this._extraWorkspaces[i].syncStacking(stackIndices);
    },
@ -224,7 +234,7 @@ const WorkspacesView = new Lang.Class({

            Tweener.removeTweens(workspace.actor);

-            let y = (w - active) * (this._height + this._spacing);
+            let y = (w - active) * (this._height + this._spacing + this._workspaceRatioSpacing);

            if (showAnimation) {
                let params = { y: y,
@ -366,6 +376,9 @@ const WorkspacesView = new Lang.Class({
            this._firstDragMotion = false;
            for (let i = 0; i < this._workspaces.length; i++)
                this._workspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
+            if (!this._extraWorkspaces)
+                return DND.DragMotionResult.CONTINUE;
+
            for (let i = 0; i < this._extraWorkspaces.length; i++)
                this._extraWorkspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
        }
@ -379,6 +392,9 @@ const WorkspacesView = new Lang.Class({

        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].setReservedSlot(null);
+
+        if (!this._extraWorkspaces)
+            return;
        for (let i = 0; i < this._extraWorkspaces.length; i++)
            this._extraWorkspaces[i].setReservedSlot(null);
    },
@ -525,16 +541,6 @@ const WorkspacesDisplay = new Lang.Class({
        this._notifyOpacityId = 0;
        this._swipeScrollBeginId = 0;
        this._swipeScrollEndId = 0;
-
-        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
-        this._settings.connect('changed::dynamic-workspaces',
-            Lang.bind(this, this._updateSwitcherVisibility));
-    },
-
-    _updateSwitcherVisibility: function() {
-        this._thumbnailsBox.actor.visible =
-            this._settings.get_boolean('dynamic-workspaces') ||
-                global.screen.n_workspaces > 1;
    },

    show: function() {
@ -557,7 +563,6 @@ const WorkspacesDisplay = new Lang.Class({

        this._controls.show();
        this._thumbnailsBox.show();
-        this._updateSwitcherVisibility();

        this._updateWorkspacesViews();

@ -859,23 +864,28 @@ const WorkspacesDisplay = new Lang.Class({
        let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);

        let clipWidth = width - controlsVisible;
-        let clipHeight = fullHeight;
+        let clipHeight = (fullHeight / fullWidth) * clipWidth;
        let clipX = rtl ? x + controlsVisible : x;
        let clipY = y + (fullHeight - clipHeight) / 2;

        let widthAdjust = this._zoomOut ? controlsNatural : controlsVisible;
-        widthAdjust += Main.overview._spacing;
        width -= widthAdjust;
        if (rtl)
            x += widthAdjust;

+        height = (fullHeight / fullWidth) * width;
+        let difference = fullHeight - height;
+        y += difference / 2;
+
+
        let monitors = Main.layoutManager.monitors;
        let m = 0;
        for (let i = 0; i < monitors.length; i++) {
            if (i == this._primaryIndex) {
                this._workspacesViews[m].setClipRect(clipX, clipY,
                                                     clipWidth, clipHeight);
-                this._workspacesViews[m].setGeometry(x, y, width, height);
+                this._workspacesViews[m].setGeometry(x, y, width, height,
+                                                     difference);
                m++;
            } else if (!this._workspacesOnlyOnPrimary) {
                this._workspacesViews[m].setClipRect(monitors[i].x,
@ -885,7 +895,7 @@ const WorkspacesDisplay = new Lang.Class({
                this._workspacesViews[m].setGeometry(monitors[i].x,
                                                     monitors[i].y,
                                                     monitors[i].width,
-                                                     monitors[i].height);
+                                                     monitors[i].height, 0);
                m++;
            }
        }
@ -965,7 +975,6 @@ const WorkspacesDisplay = new Lang.Class({
        for (let i = 0; i < this._workspacesViews.length; i++)
            this._workspacesViews[i].updateWorkspaces(oldNumWorkspaces,
                                                      newNumWorkspaces);
-        this._updateSwitcherVisibility();
    },

    _updateZoom : function() {
--- a/man/Makefile.am
+++ b/man/Makefile.am
@ -1 +1,19 @@
-dist_man_MANS = gnome-shell.1
+XSLTPROC_FLAGS = \
+        --nonet \
+        --stringparam man.output.quietly 1 \
+        --stringparam funcsynopsis.style ansi \
+        --stringparam man.th.extra1.suppress 1 \
+        --stringparam man.authors.section.enabled 0 \
+        --stringparam man.copyright.section.enabled 0
+
+.xml.1:
+	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+man_MANS = \
+	gnome-shell.1
+
+xml_files = $(man_MANS:.1=.xml)
+
+EXTRA_DIST = $(xml_files)
+
+DISTCLEANFILES = $(man_MANS)
--- a/man/gnome-shell.1
+++ b/man/gnome-shell.1
@ -1,94 +0,0 @@
-.\" Copyright (c) 2009, Marcelo Jorge Vieira (metal) <metal@alucinados.com>
-.\"
-.\" This is free documentation; you can redistribute it and/or
-.\" modify it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2 of
-.\" the License, or (at your option) any later version.
-.\"
-.\" The GNU General Public License's references to "object code"
-.\" and "executables" are to be interpreted as the output of any
-.\" document formatting or typesetting system, including
-.\" intermediate and printed output.
-.\"
-.\" This manual 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 General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public
-.\" License along with this manual; if not, write to the Free
-.\" Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-.\" Boston, MA  02111-1301  USA.
-.TH GNOME-SHELL 1
-.SH NAME
-gnome-shell \- Graphical shell for the GNOME desktop
-
-.SH SYNOPSIS
-.B gnome-shell [options]
-
-.SH DESCRIPTION
-GNOME Shell provides core user interface functions for the GNOME 3
-desktop, like switching to windows and launching applications. GNOME
-Shell takes advantage of the capabilities of modern graphics hardware
-and introduces innovative user interface concepts to provide a
-visually attractive and easy to use experience.
-
-.SH OPTIONS
-
-.TP
-.B \-\-replace
-Replace the running window manager
-.br
-
-.TP
-.B \-\-sm-disable
-Disable connection to the session manager
-.br
-
-.TP
-.B \-\-sm-client-id=ID
-Specify session management ID
-.br
-
-.TP
-.B \-\-sm-save-file=FILE
-Initialize session from savefile
-.br
-
-.TP
-.B \-\-screen=SCREEN
-X screen to use
-.br
-
-.TP
-.B \-d, \-\-display=DISPLAY
-X display to use
-.br
-
-.TP
-.B \-\-sync
-Make X calls synchronous
-.br
-
-.TP
-.B \-\-version
-Print version and exit
-.br
-
-.TP
-.B \-\-help
-Display help and exit
-.br
-
-.SH BUGS
-The bug tracker can be reached by visiting the website
-\fIhttps://bugzilla.gnome.org/buglist.cgi?product=gnome-shell\fR
-
-Before sending a bug report, please verify that you have the latest
-version of gnome-shell. Many bugs (major and minor) are fixed at each
-release, and if yours is out of date, the problem may already have
-been solved.
-
-.SH ADDITIONAL INFORMATION
-
-For further information, visit the website \fIhttp://live.gnome.org/GnomeShell\fR
--- a/man/gnome-shell.xml
+++ b/man/gnome-shell.xml
@ -0,0 +1,159 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<refentry id="gnome-shell">
+
+        <refentryinfo>
+                <title>gnome-shell</title>
+                <productname>gnome-shell</productname>
+
+                <authorgroup>
+                        <author>
+                                <contrib>wrote the original gnome-shell man page</contrib>
+                                <firstname>Marcelo Jorge</firstname>
+                                <surname>Vieira</surname>
+                                <email>metal@alucinados.com</email>
+                        </author>
+                </authorgroup>
+
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>gnome-shell</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>gnome-shell</refname>
+                <refpurpose>Graphical shell for the GNOME desktop</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>gnome-shell <arg choice="opt" rep="repeat">OPTION</arg></command>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para>GNOME shell provides core user
+                interface functions for the GNOME 3 desktop, like switching
+                to windows and launching applications. GNOME shell takes
+                advantage of the capabilities of modern graphics hardware
+                and introduces innovative user interface concepts to provide
+                a visually attractive and easy to use experience.</para>
+
+                <para>gnome-shell is a required component of
+                the GNOME desktop, i.e. it is listed in the
+                RequiredComponents field of
+                <filename>/usr/share/gnome-session/sessions/gnome.session</filename>.
+                It is started in the window manager phase of the session.
+                </para>
+
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+
+                        <varlistentry>
+                                <term><option>-r</option>, <option>--replace</option></term>
+
+                                <listitem><para>Replace the running window manager</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sm-disable</option></term>
+
+                                <listitem><para>Disable connection to the session manager</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sm-client-id=<replaceable>ID</replaceable></option></term>
+
+                                <listitem><para>Specify session management <replaceable>ID</replaceable></para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sm-save-file=<replaceable>FILE</replaceable></option></term>
+
+                                <listitem><para>Initialize session from <replaceable>FILE</replaceable></para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--screen=<replaceable>SCREEN</replaceable></option></term>
+
+                                <listitem><para>X screen to use</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-d</option>, <option>--display=<replaceable>DISPLAY</replaceable></option></term>
+
+                                <listitem><para>X Display to use</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--sync</option></term>
+
+                                <listitem><para>Make X calls synchronous</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--version</option></term>
+
+                                <listitem><para>Print version and exit</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Display help and exit</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--mode=<replaceable>MODE</replaceable></option></term>
+
+                                <listitem><para>Use a specific mode, e.g. "gdm" for login screen</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--list-modes</option></term>
+
+                                <listitem><para>List possible modes and exit</para></listitem>
+                        </varlistentry>
+
+                </variablelist>
+
+        </refsect1>
+
+        <refsect1>
+                <title>Files</title>
+
+                <para>
+                        <filename>/usr/share/gnome-session/sessions/gnome.session</filename>,
+                        <filename>/usr/share/applications/gnome-shell.desktop</filename>.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+
+                <para>The bug tracker can be reached by visiting the
+                website <ulink url="https://bugzilla.gnome.org/buglist.cgi?product=gnome-shell">https://bugzilla.gnome.org/buglist.cgi?product=gnome-shell</ulink>.
+                Before sending a bug report, please verify that you have
+                the latest version of gnome-shell. Many bugs (major and
+                minor) are fixed at each release, and if yours is out of
+                date, the problem may already have been solved.</para>
+
+        </refsect1>
+
+        <refsect1>
+                <title>Additional Information</title>
+
+                <para>For further information, visit the website
+                <ulink url="http://live.gnome.org/GnomeShell">http://live.gnome.org/GnomeShell</ulink>.</para>
+        </refsect1>
+
+</refentry>
--- a/po/be.po
+++ b/po/be.po
@ -5,8 +5,8 @@ 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-10-15 23:38+0000\n"
-"PO-Revision-Date: 2012-10-16 12:05+0300\n"
+"POT-Creation-Date: 2012-11-02 07:11+0000\n"
+"PO-Revision-Date: 2012-11-02 15:12+0300\n"
 "Last-Translator: Kasia Bondarava <kasia.bondarava@gmail.com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
 "Language: be\n"
@ -34,14 +34,6 @@ msgstr "Сістэма"
 msgid "Show the message tray"
 msgstr "Паказаць абшар апавяшчэнняў"

-#: ../data/50-gnome-shell-system.xml.in.h:3
-msgid "Show all applications"
-msgstr "Паказаць усе праграмы"
-
-#: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Open the application menu"
-msgstr "Адкрыць праграмнае меню"
-
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "Абалонка GNOME"
@ -144,30 +136,33 @@ msgstr ""
 "камунікатара карыстальніка. Гэта значэнне - з пераліку GsmPresenceStatus."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Заўсёды паказваць элемент для выхаду з сеанса ў карыстальніцкім меню."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Гэта настройка дазваляе выключыць аўтаматычнае хаванне элемента для выхаду "
+"з сеанса ў аднакарыстальніцкім, аднасеансавым рэжыме."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Паказваць тыдзень у календары"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Калі ўключана, паказваць тыдзень у календары ў ISO-фармаце."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Клавіятурны скарот для адкрыцця праграмнага меню"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Клавіятурны скарот для адкрыцця праграмнага меню."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Клавіятурны скарот для рэжыму \"Паказаць праграмы\""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr "Клавіятурны скарот для рэжыму \"Паказаць праграмы\" у Аглядзе Заняткаў."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Клавіятурны скарот для ўключэння/выключэння абшару апавяшчэнняў"
@ -300,8 +295,8 @@ msgstr "Акно ўваходу"
 msgid "Power"
 msgstr "Праца сістэмы"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Прыпыніць камп'ютар"

@ -309,8 +304,8 @@ msgstr "Прыпыніць камп'ютар"
 msgid "Restart"
 msgstr "Перазапусціць сістэму"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Выключыць камп'ютар"

@ -693,35 +688,35 @@ msgstr "Абязгучыць"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:950
 #, no-c-format
 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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:956
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Адпраўлена ў <b>%A</b>, <b>%d %B</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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:961
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Адпраўлена ў <b>%A</b>, <b>%d %B</b>, %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, 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/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Запрашэнне ў %s"
@ -729,42 +724,42 @@ 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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "Удзельнік %s запрашае вас далучыцца да %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "Адмовіцца"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "Прыняць"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1131
 #, c-format
 msgid "Video call from %s"
 msgstr "Відэазванок ад %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "Званок ад %s"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Адмовіць"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "Адказаць"

@ -773,108 +768,108 @@ msgstr "Адказаць"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1173
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s пасылае вам %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1208
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s просіць дазволу на прагляд вашага сеткавага стану"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Сеткавая памылка"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Няўдалая ідэнтыфікацыя"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Памылка шыфравання"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "Сертыфікат не пададзены"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "Сертыфікат не заслугоўвае даверу"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "Сертыфікат састарэў"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "Сертыфікат не актывізаваны"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "Назва камп'ютара ў сертыфікаце не адпавядае патрэбнай"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "Адбітак сертыфіката не адпавядае патрэбнаму"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Сертыфікат уласнаручна падпісаны"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "Уключаны рэжым па-за сеткай"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "Шыфраванне недаступнае"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "Хібны сертыфікат"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "Адмоўлена ў злучэнні"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "Не ўдалося ўсталяваць злучэнне"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "Злучэнне страчана"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "Гэты конт ужо злучаны з серверам"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1334
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Злучэнне заменена новым для таго ж самага рэсурсу"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Такі конт ужо існуе на серверы"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер надта заняты і не можа абслужыць гэта злучэнне"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "Сертыфікат быў адкліканы"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Для сертыфіката выкарыстаны слабы або небяспечны алгарытм шыфравання"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -882,26 +877,26 @@ msgstr ""
 "Даўжыня сертыфіката сервера або глыбіня яго ланцуга перавышае абмежаванне, "
 "выстаўленае крыптаграфічнай бібліятэкай"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "Унутраная памылка"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "не ўдалося злучыцца з %s"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Перазлучыцца"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Рэдагаваць конт"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Невядомая прычына"

@ -1088,23 +1083,23 @@ msgstr "Паглядзець выточны код"
 msgid "Web Page"
 msgstr "Сеціўная старонка"

-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Адкрыць"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Выдаліць"

-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Абшар апавяшчэнняў"

-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Сістэмная інфармацыя"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Невядомая"
@ -1160,11 +1155,11 @@ msgstr "Увядзіце загад:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %d %B"

-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1172,7 +1167,7 @@ msgstr[0] "%d новае паведамленне"
 msgstr[1] "%d новыя паведамленні"
 msgstr[2] "%d новых паведамленняў"

-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1632,59 +1627,59 @@ msgstr "Мікрафон"
 msgid "Log in as another user"
 msgstr "Увайсці іншым карыстальнікам"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Даступны"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Заняты"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Нябачны"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Адсутны"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Бяздзейны"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Недаступны"

-#: ../js/ui/userMenu.js:740
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Апавяшчэнні"

-#: ../js/ui/userMenu.js:748
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Сістэмныя настройкі"

-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Перамяніць карыстальніка"

-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Выйсці з сеанса"

-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Заблакіраваць"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Усталяваць абнаўленні і перазагрузіць камп'ютар"

-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Вам прызначаны стан занятасці для чату"

-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:804
 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."
@ -1693,15 +1688,15 @@ msgstr ""
 "сеціўны стан абноўлены інфармацыяй аб тым, што вы можаце не ўбачыць чужых "
 "паведамленняў у час."

-#: ../js/ui/viewSelector.js:87
+#: ../js/ui/viewSelector.js:85
 msgid "Windows"
 msgstr "Вокны"

-#: ../js/ui/viewSelector.js:91
+#: ../js/ui/viewSelector.js:89
 msgid "Applications"
 msgstr "Праграмы"

-#: ../js/ui/viewSelector.js:95
+#: ../js/ui/viewSelector.js:93
 msgid "Search"
 msgstr "Пошук"

@ -1772,7 +1767,7 @@ msgstr "Ужыць асаблівы рэжым, напрыклад, \"gdm\" дл
 msgid "List possible modes"
 msgstr "Вывесці спіс магчымых рэжымаў"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Не ўдалося запусціць \"%s\""
@ -1796,3 +1791,4 @@ msgstr "Прадвызначана"
 #: ../src/shell-polkit-authentication-agent.c:343
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Карыстальнік праігнараваў дыялогавае акенца ідэнтыфікацыі"
+
--- a/po/ca.po
+++ b/po/ca.po
@ -10,14 +10,14 @@ msgstr ""
 "Project-Id-Version: HEAD\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-09-25 10:59+0000\n"
-"PO-Revision-Date: 2012-09-25 07:47+0100\n"
+"POT-Creation-Date: 2012-10-31 16:48+0000\n"
+"PO-Revision-Date: 2012-11-03 16:22+0100\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Gtranslator 2.91.5\n"

@ -141,50 +141,63 @@ msgstr ""
 "l'usuari. El valor prové de l'enumeració «GsmPresenceStatus»."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Mostra sempre l'element de menú «Surt» en el menú d'usuari."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Aquesta clau sobreescriu l'ocultació automàtica de l'element de menú «Surt» "
+"en el menú d'usuari en el cas que només hi hagi un sol usuari i una sola "
+"sessió."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Mostra el número de la setmana en el calendari"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Si és «true» (cert) es mostra el número de la setmana en el calendari."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Vinculació per obrir el menú d'aplicació"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "La vinculació per obrir el menú d'aplicació."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "La vinculació per commutar la visibilitat de la safata de missatges"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "La vinculació per commutar la visibilitat de la safata de missatges."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
 msgstr "La vinculació per commutar l'enregistrador de pantalla"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "La vinculació per iniciar/aturar l'enregistrador de pantalla."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "Quin tipus de teclat s'ha d'utilitzar"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "El tipus de teclat que s'utilitzarà."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "Imatges per segon per enregistrar els screencasts."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@ -192,11 +205,11 @@ msgstr ""
 "Les imatges per segon, en fotogrames per segon, de l'screencast enregistrat "
 "per l'eina d'enregistrament del GNOME Shell."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "El conducte GStreamer per enregistrar els screencasts"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -223,11 +236,11 @@ msgstr ""
 "WEBM i utilitza el còdec VP8. El %T és una variable per estimar el nombre de "
 "fils d'execució paral·lels òptims del sistema."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "Extensió de fitxer per desar l'screencast"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 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 "
@ -250,11 +263,11 @@ msgstr "Extensió"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Seleccioneu una extensió amb el quadre combinat per configurar-la."

-#: ../js/gdm/loginDialog.js:528
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "Sessió..."

-#: ../js/gdm/loginDialog.js:676
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "Entrada"
@ -262,23 +275,23 @@ msgstr "Entrada"
 #. 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:743
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "No esteu llistat?"

-#: ../js/gdm/loginDialog.js:896 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:166
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "Cancel·la"

-#: ../js/gdm/loginDialog.js:901
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "Entra"

-#: ../js/gdm/loginDialog.js:1240
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "Finestra d'entrada"

@ -287,8 +300,8 @@ msgstr "Finestra d'entrada"
 msgid "Power"
 msgstr "Apaga"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:663 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:778
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Atura temporalment"

@ -296,8 +309,8 @@ msgstr "Atura temporalment"
 msgid "Restart"
 msgstr "Reinicia"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:665 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:777
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Apaga"

@ -348,7 +361,7 @@ msgstr "CONFIGURACIÓ"
 msgid "New Window"
 msgstr "Finestra nova"

-#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:271
+#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:290
 msgid "Remove from Favorites"
 msgstr "Suprimeix dels preferits"

@ -512,16 +525,16 @@ msgstr "Aquesta setmana"
 msgid "Next week"
 msgstr "La setmana que ve"

-#: ../js/ui/components/autorunManager.js:278
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "Dispositius extraïbles"

-#: ../js/ui/components/autorunManager.js:575
+#: ../js/ui/components/autorunManager.js:594
 #, c-format
 msgid "Open with %s"
 msgstr "Obre amb %s"

-#: ../js/ui/components/autorunManager.js:601
+#: ../js/ui/components/autorunManager.js:620
 msgid "Eject"
 msgstr "Expulsa"

@ -678,35 +691,35 @@ msgstr "Silencia"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:950
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Enviat a les <b>%X</b> del <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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:956
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Enviat el <b>%A %d de %B</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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:961
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Enviat el <b>%A %d de %B</b> de %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, c-format
 msgid "%s is now known as %s"
 msgstr "En/na %s ara es diu %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Us han convidat a entrar a %s"
@ -714,42 +727,42 @@ msgstr "Us han convidat a entrar a %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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "En/na %s us convida a entrar a %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "Declina"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "Accepta"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1131
 #, c-format
 msgid "Video call from %s"
 msgstr "Videotrucada de %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "Trucada de %s"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Rebutja"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "Contesta"

@ -758,112 +771,112 @@ msgstr "Contesta"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1173
 #, c-format
 msgid "%s is sending you %s"
 msgstr "En/na %s us envia %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1208
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vol poder saber quan esteu en línia"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Error de la xarxa"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Error d'encriptació"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "No s'ha proporcionat el certificat"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "El certificat no és de confiança"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "El certificat ha vençut"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "El certificat no està activat"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "No coincideix el nom de la màquina del certificat"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "No coincideix l'empremta digital del certificat"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Certificat signat per un mateix"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "S'ha establert l'estat a fora de línia"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "L'encriptació no està disponible"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "El certificat no és vàlid"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "S'ha rebutjat la connexió"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "No es pot establir la connexió"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "S'ha perdut la connexió"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "Aquest compte ja està connectat al servidor"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1334
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "S'ha reemplaçat la connexió per una altra de nova fent servir el mateix "
 "recurs"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Ja existeix aquest compte al servidor"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr "El servidor està massa ocupat per gestionar la connexió"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "S'ha revocat el certificat"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "El certificat utilitza un algorisme criptògraf no segur o la seva fortalesa "
 "criptogràfica és feble"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -871,30 +884,30 @@ msgstr ""
 "La llargada del certificat del servidor o la profunditat de la cadena de "
 "certificació excedeix els límits de la biblioteca criptogràfica"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "S'ha produït un error intern"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Ha fallat la connexió a %s"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Torna a connectar"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Edita el compte"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Motiu desconegut"

-#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
+#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "Mostra les aplicacions"

@ -902,14 +915,14 @@ msgstr "Mostra les aplicacions"
 msgid "Date and Time Settings"
 msgstr "Configuració de la data i l'hora"

-#: ../js/ui/dateMenu.js:109
+#: ../js/ui/dateMenu.js:111
 msgid "Open Calendar"
 msgstr "Obre el calendari"

 #. 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:175
+#: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%A %d de %B, %Y"

@ -1068,23 +1081,23 @@ msgstr "Mostra el codi font"
 msgid "Web Page"
 msgstr "Pàgina web"

-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Obre"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Suprimeix"

-#: ../js/ui/messageTray.js:2088
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Safata de missatges"

-#: ../js/ui/messageTray.js:2551
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Informació de l'ordinador"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Desconegut"
@ -1140,7 +1153,7 @@ msgstr "Introduïu una ordre:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A %d de %B"

@ -1190,7 +1203,7 @@ msgstr "Contrasenya"
 msgid "Remember Password"
 msgstr "Recorda la contrasenya"

-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:169
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "Desbloqueja"

@ -1601,67 +1614,63 @@ msgstr "Volum"
 msgid "Microphone"
 msgstr "Micròfon"

-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "Entra amb un altre usuari"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Disponible"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Ocupat"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Invisible"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Absent"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Inactiu"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "No disponible"

-#: ../js/ui/userMenu.js:618 ../js/ui/userMenu.js:759
-msgid "Switch User"
-msgstr "Canvia d'usuari"
-
-#: ../js/ui/userMenu.js:619
-msgid "Switch Session"
-msgstr "Canvia de sessió"
-
-#: ../js/ui/userMenu.js:743
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Notificacions"

-#: ../js/ui/userMenu.js:751
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Paràmetres del sistema"

-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "Canvia d'usuari"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Surt"

-#: ../js/ui/userMenu.js:769
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Bloqueja"

-#: ../js/ui/userMenu.js:784
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Instal·la les actualitzacions i reinicia"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "L'estat del xat s'establirà a ocupat"

-#: ../js/ui/userMenu.js:803
+#: ../js/ui/userMenu.js:804
 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."
@ -1682,7 +1691,7 @@ msgstr "Aplicacions"
 msgid "Search"
 msgstr "Cerca"

-#: ../js/ui/wanda.js:119
+#: ../js/ui/wanda.js:117
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1691,12 +1700,12 @@ msgstr ""
 "No hi ha cap consell per avui:\n"
 "%s"

-#: ../js/ui/wanda.js:123
+#: ../js/ui/wanda.js:121
 #, c-format
 msgid "%s the Oracle says"
 msgstr "L'oracle diu %s"

-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "El vostre ou de pasqua preferit"

@ -1731,23 +1740,23 @@ msgstr[1] "%u entrades"
 msgid "System Sounds"
 msgstr "Sons del sistema"

-#: ../src/main.c:330
+#: ../src/main.c:332
 msgid "Print version"
 msgstr "Mostra la versió"

-#: ../src/main.c:336
+#: ../src/main.c:338
 msgid "Mode used by GDM for login screen"
 msgstr "El mode que utilitzarà el GDM per a la pantalla d'entrada"

-#: ../src/main.c:342
+#: ../src/main.c:344
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "Utilitza un mode específic, p. ex. «gdm» per la pantalla d'entrada"

-#: ../src/main.c:348
+#: ../src/main.c:350
 msgid "List possible modes"
 msgstr "Llista els modes possibles"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "No s'ha pogut iniciar «%s»"
@ -1772,6 +1781,9 @@ msgstr "Predeterminat"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "L'usuari ha descartat el diàleg d'autenticació"

+#~ msgid "Switch Session"
+#~ msgstr "Canvia de sessió"
+
 #~ msgid "Failed to unmount '%s'"
 #~ msgstr "No s'ha pogut desmuntar «%s»"

--- a/po/cs.po
+++ b/po/cs.po
@ -1,18 +1,20 @@
 # Czech translation of gnome-shell.
 # Copyright (C) 2009, 2010, 2011 the author(s) of gnome-shell.
 # This file is distributed under the same license as the gnome-shell package.
+#
 # Andre Klapper <ak-47@gmx.net>, 2009.
 # Petr Kovar <pknbe@volny.cz>, 2009, 2010, 2011, 2012.
 # Adam Matoušek <adydas95@gmail.com>, 2012
 # Marek Černocký <marek@manet.cz>, 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-25 00:06+0000\n"
-"PO-Revision-Date: 2012-09-24 18:30+0200\n"
-"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
+"POT-Creation-Date: 2012-10-31 16:48+0000\n"
+"PO-Revision-Date: 2012-11-04 17:40+0200\n"
+"Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@ -137,50 +139,62 @@ msgstr ""
 "sezení. Tato hodnota pochází z výčtu GsmPresenceStatus."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "V nabídce uživatele vždy zobrazovat položku „Odhlásit“."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Tento klíč ruší automatické skrývání položky nabídky „Odhlásit“ v situacích s "
+"jedním uživatelem a jedním sezením."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Zobrazovat v kalendáři čísla týdnů"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Je-li zapnuto, zobrazovat v kalendáři čísla týdnů dle ISO."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Klávesová zkratka na otevření nabídky aplikace"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Klávesová zkratka na otevření nabídky aplikace."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Klávesová zkratka k přepnutí viditelnosti lišty zpráv"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Klávesová zkratka k přepnutí viditelnosti lišty zpráv."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Klávesová zkratka k záznamu obrazovky"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "Klávesová zkratka k započnutí nebo ukončení záznamu dění na obrazovce."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "Která klávesnice se má používat"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "Typ klávesnice, který se má používat."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "Frekvence snímků při nahrávání dění na obrazovce."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@ -188,11 +202,11 @@ msgstr ""
 "Frekvence snímků za sekundu výsledné nahrávky dění na obrazovce, která byla "
 "nahrána záznamovým programem GNOME Shell."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Roura systému gstreamer určená ke kódování nahrávky dění na obrazovce"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -217,11 +231,11 @@ msgstr ""
 "nahráváním do WEBM s kodekem VP8. %T je použito jako zástupný symbol odhadu "
 "nejvhodnějšího počtu vláken na systému."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "Přípona souboru s nahrávkou dění na obrazovce"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 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,11 +260,11 @@ msgid "Select an extension to configure using the combobox above."
 msgstr ""
 "Pomocí rozbalovacího seznamu výše zvolte rozšíření, které chete nastavit."

-#: ../js/gdm/loginDialog.js:527
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "Sezení…"

-#: ../js/gdm/loginDialog.js:675
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "Přihlášení"
@ -258,23 +272,23 @@ msgstr "Přihlášení"
 #. 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:742
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "Nejste na seznamu?"

-#: ../js/gdm/loginDialog.js:895 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:166
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "Zrušit"

-#: ../js/gdm/loginDialog.js:900
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "Přihlásit se"

-#: ../js/gdm/loginDialog.js:1239
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "Přihlašovací okno"

@ -283,8 +297,8 @@ msgstr "Přihlašovací okno"
 msgid "Power"
 msgstr "Vypnout"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:663 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:778
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Uspat do paměti"

@ -292,8 +306,8 @@ msgstr "Uspat do paměti"
 msgid "Restart"
 msgstr "Restartovat"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:665 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:777
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Vypnout"

@ -344,7 +358,7 @@ msgstr "NASTAVENÍ"
 msgid "New Window"
 msgstr "Nové okno"

-#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:271
+#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:290
 msgid "Remove from Favorites"
 msgstr "Odstranit z oblíbených"

@ -509,16 +523,16 @@ msgstr "Tento týden"
 msgid "Next week"
 msgstr "Následující týden"

-#: ../js/ui/components/autorunManager.js:278
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "Výměnná zařízení"

-#: ../js/ui/components/autorunManager.js:575
+#: ../js/ui/components/autorunManager.js:594
 #, c-format
 msgid "Open with %s"
 msgstr "Otevřít s %s"

-#: ../js/ui/components/autorunManager.js:601
+#: ../js/ui/components/autorunManager.js:620
 msgid "Eject"
 msgstr "Vysunout"

@ -675,35 +689,35 @@ msgstr "Ztlumit"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:950
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Čas odeslání: <b>%X</b>, den odeslání: <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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:956
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Den odeslání: <b>%A</b>, <b>%e. %B</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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:961
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Den odeslání: <b>%A</b>, <b>%e. %B</b> %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je teď znám jako %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Pozvánka na připojení k %s"
@ -711,42 +725,42 @@ msgstr "Pozvánka na připojení k %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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vás zve do %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "Odmítnout"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "Přijmout"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1131
 #, c-format
 msgid "Video call from %s"
 msgstr "Videohovor od %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "Hovor od %s"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Odmítnout"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "Zvednout"

@ -755,110 +769,110 @@ msgstr "Zvednout"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1173
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s vám posílá %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1208
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vás žádá o oprávnění vidět, že jste dostupní"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Chyba sítě"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Ověření selhalo"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Chyba šifrování"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "Certifikát neposkytnut"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "Nedůvěryhodný certifikát"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "Platnost certifikátu vypršela"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "Certifikát není aktivován"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "Název počítače certifikátu nesouhlasí"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "Otisk prstu certifikátu nesouhlasí"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Certifikát je podepsán sám sebou"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "Stav nastaven na „Odhlášen“"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "Šifrování není dostupné"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "Certifikát je neplatný"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "Spojení bylo odmítnuto"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "Spojení nemohlo bát navázáno"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "Spojení bylo ztraceno"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "Tento účet je již připojen k serveru"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1334
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Spojení bylo nahrazeno novým spojením, které používá stejný zdroj"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Takový účet již na serveru existuje"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je právě příliš zaneprázdněn na to, aby obsloužil spojení"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "Certifikát byl odvolán"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikát používá nepříliš bezpečný šifrovací algoritmus nebo je z "
 "kryptografického hlediska slabý"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -866,30 +880,30 @@ msgstr ""
 "Délka certifikátu serveru nebo délka zřetězených certifikátů serveru "
 "přesáhla omezení dané kryptografickou knihovnou"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "Vnitřní chyba"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Připojení k „%s“ selhalo"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Znovu připojit"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Upravit účet"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Neznámý důvod"

-#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
+#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "Zobrazit aplikace"

@ -897,7 +911,7 @@ msgstr "Zobrazit aplikace"
 msgid "Date and Time Settings"
 msgstr "Nastavení data a času"

-#: ../js/ui/dateMenu.js:109
+#: ../js/ui/dateMenu.js:111
 msgid "Open Calendar"
 msgstr "Otevřít kalendář"

@ -905,7 +919,7 @@ msgstr "Otevřít kalendář"
 #. 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:175
+#: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%A, %e. %B, %Y"

@ -1011,11 +1025,11 @@ msgstr "Instalovat"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Stáhnout a nainstalovat „%s“ z extensions.gnome.org?"

-#: ../js/ui/keyboard.js:327
+#: ../js/ui/keyboard.js:337
 msgid "tray"
 msgstr "panel"

-#: ../js/ui/keyboard.js:561 ../js/ui/status/keyboard.js:195
+#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "Klávesnice"
@ -1068,23 +1082,23 @@ msgstr "Zobrazit zdroj"
 msgid "Web Page"
 msgstr "Webová stránka"

-#: ../js/ui/messageTray.js:1080
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Otevřít"

-#: ../js/ui/messageTray.js:1087
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Odstranit"

-#: ../js/ui/messageTray.js:2055
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Lišta zpráv"

-#: ../js/ui/messageTray.js:2511
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Informace o systému"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Neznámé"
@ -1140,7 +1154,7 @@ msgstr "Zadejte prosím příkaz:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"

@ -1192,7 +1206,7 @@ msgstr "Heslo"
 msgid "Remember Password"
 msgstr "Pamatovat si heslo"

-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:169
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "Odemknout"

@ -1310,7 +1324,7 @@ msgstr "Nastavení klávesnice"
 msgid "Mouse Settings"
 msgstr "Nastavení myši"

-#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:236
+#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:234
 msgid "Sound Settings"
 msgstr "Nastavení zvuku"

@ -1599,7 +1613,7 @@ msgid "Unknown"
 msgstr "Neznámé"

 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:223
+#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:221
 msgid "Volume"
 msgstr "Hlasitost"

@ -1607,67 +1621,63 @@ msgstr "Hlasitost"
 msgid "Microphone"
 msgstr "Mikrofon"

-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "Přihlásit se jako jiný uživatel"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Přítomen"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Zaneprázdněn"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Neviditelný"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Nepřítomen"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Nečinný"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Nedostupný"

-#: ../js/ui/userMenu.js:618 ../js/ui/userMenu.js:759
-msgid "Switch User"
-msgstr "Přepnout uživatele"
-
-#: ../js/ui/userMenu.js:619
-msgid "Switch Session"
-msgstr "Přepnout sezení"
-
-#: ../js/ui/userMenu.js:743
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Upozornění"

-#: ../js/ui/userMenu.js:751
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Nastavení systému"

-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "Přepnout uživatele"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Odhlásit se"

-#: ../js/ui/userMenu.js:769
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Uzamknout"

-#: ../js/ui/userMenu.js:784
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Nainstalovat aktualizace a restartovat"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Váš stav v konverzacích byl nastaven na „Zaneprázdněn“"

-#: ../js/ui/userMenu.js:803
+#: ../js/ui/userMenu.js:804
 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."
@ -1687,7 +1697,7 @@ msgstr "Aplikace"
 msgid "Search"
 msgstr "Hledat"

-#: ../js/ui/wanda.js:119
+#: ../js/ui/wanda.js:117
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1696,12 +1706,12 @@ msgstr ""
 "Promiňte, dnes žádné moudro:\n"
 "%s"

-#: ../js/ui/wanda.js:123
+#: ../js/ui/wanda.js:121
 #, c-format
 msgid "%s the Oracle says"
 msgstr "%s říká Prorok"

-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "Vaše oblíbené velikonoční vajíčko"

@ -1738,23 +1748,23 @@ msgstr[2] "%u vstupů"
 msgid "System Sounds"
 msgstr "Systémové zvuky"

-#: ../src/main.c:330
+#: ../src/main.c:332
 msgid "Print version"
 msgstr "Vypsat verzi"

-#: ../src/main.c:336
+#: ../src/main.c:338
 msgid "Mode used by GDM for login screen"
 msgstr "Režim použitý GDM pro přihlašovací obrazovku"

-#: ../src/main.c:342
+#: ../src/main.c:344
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "Použít pro přihlašovací obrazovku určitý mód, např. „gdm“."

-#: ../src/main.c:348
+#: ../src/main.c:350
 msgid "List possible modes"
 msgstr "Vypsat možné režimy"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Nelze spustit „%s“"
@ -1778,39 +1788,3 @@ msgstr "Výchozí"
 #: ../src/shell-polkit-authentication-agent.c:343
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Dialogové okno ověření bylo uživatelem zrušeno"
-
-#~ msgid "Failed to unmount '%s'"
-#~ msgstr "Nelze odpojit „%s“"
-
-#~ msgid "Retry"
-#~ msgstr "Opakovat"
-
-#~ msgid "PLACES & DEVICES"
-#~ msgstr "MÍSTA A ZAŘÍZENÍ"
-
-#~ msgid "Home"
-#~ msgstr "Domovská složka"
-
-#~ msgid "%1$s: %2$s"
-#~ msgstr "%1$s: %2$s"
-
-#~ msgid "disabled OpenSearch providers"
-#~ msgstr "zakázaní poskytovatelé OpenSearch"
-
-#~ msgid "Show time with seconds"
-#~ msgstr "Zobrazovat čas včetně sekund"
-
-#~ msgid "If true, display seconds in time."
-#~ msgstr "Je-li zapnuto, zobrazovat čas včetně sekund."
-
-#~ msgid "Show date in clock"
-#~ msgstr "Zobrazovat v hodinách datum"
-
-#~ msgid "If true, display date in the clock, in addition to time."
-#~ msgstr "Je-li zapnuto, zobrazovat v hodinách kromě času i datum."
-
-#~ msgid "Offline"
-#~ msgstr "Odpojen"
-
-#~ msgid "CONTACTS"
-#~ msgstr "KONTAKTY"
--- a/po/de.po
+++ b/po/de.po
@ -19,9 +19,9 @@ 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-10-14 16:48+0000\n"
-"PO-Revision-Date: 2012-10-10 23:10+0100\n"
-"Last-Translator: Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>\n"
+"POT-Creation-Date: 2012-11-06 04:39+0000\n"
+"PO-Revision-Date: 2012-11-06 20:04+0100\n"
+"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@ -148,56 +148,68 @@ msgstr ""
 "Aufzählung entnommen."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Den Menüeintrag »Abmelden« immer im Benutzermenü anzeigen."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Dieser Schlüssel überschreibt das automatische Verbergen des Menüeintrags "
+"»Abmelden« in Einzelbenutzer, Einzelsitzungssituationen."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Wochentag im Kalender anzeigen"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr ""
 "Wenn dieser Wert gesetzt ist, wird der ISO-Wochentag im Kalender angezeigt."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Tastenkombination zum Öffnen des Anwendungsmenüs"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Tastenkombination zum Öffnen des Anwendungsmenüs."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr ""
 "Tastenkombination zum Umschalten der Sichtbarkeit des Benachrichtigungsfeldes"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr ""
 "Tastenkombination zum Umschalten der Sichtbarkeit des "
 "Benachrichtigungsfeldes."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Tastenkombination zum Umschalten des Bildschirmaufzeichners"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr ""
 "Tastenkombination zum Starten/Entfernen des eingebauten "
 "Bildschirmaufzeichners."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "Zu verwendende Tastatur"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "Der Typ der zu verwendenden Tastatur"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "Bildwiederholungsrate zur Aufnahme von Screencasts"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@ -206,11 +218,11 @@ msgstr ""
 "der GNOME-Shell aufgezeichnet werden soll, in Einzelbildern pro Sekunde."

 # hmm Enkodieren oder Kodieren?
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Die GStreamer-Weiterleitung zur Enkodierung des Screencasts"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -238,11 +250,11 @@ msgstr ""
 "aufzeichnet. %T wird als Platzhalter für die vermutete optimale Thread-"
 "Anzahl auf dem System verwendet."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "Die Dateiendung zum Speichern des Screencast"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 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 "
@ -303,8 +315,8 @@ msgstr "Anmeldefenster"
 msgid "Power"
 msgstr "Ausschalten"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Bereitschaft"

@ -312,8 +324,8 @@ msgstr "Bereitschaft"
 msgid "Restart"
 msgstr "Neu starten"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Ausschalten"

@ -698,35 +710,35 @@ msgstr "Stumm"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:952
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Gesendet am <b>%A</b> um <b>%X</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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:958
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Gesendet am <b>%A</b>, <b>%d. %B</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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:963
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Gesendet am <b>%A</b>, <b>%d. %B</b> %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:992
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1092
 #, c-format
 msgid "Invitation to %s"
 msgstr "Einladung zum Betreten von %s"
@ -734,42 +746,42 @@ msgstr "Einladung zum Betreten von %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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1100
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s lädt Sie ein, %s beizutreten"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1102
+#: ../js/ui/components/telepathyClient.js:1181
+#: ../js/ui/components/telepathyClient.js:1244
 msgid "Decline"
 msgstr "Ablehnen"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1103
+#: ../js/ui/components/telepathyClient.js:1182
+#: ../js/ui/components/telepathyClient.js:1245
 msgid "Accept"
 msgstr "Annehmen"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1133
 #, c-format
 msgid "Video call from %s"
 msgstr "Video-Anruf von %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1136
 #, c-format
 msgid "Call from %s"
 msgstr "Anruf von %s"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1141
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Abweisen"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1143
 msgid "Answer"
 msgstr "Antworten"

@ -778,113 +790,113 @@ msgstr "Antworten"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1175
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s sendet Ihnen %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s bittet um das Recht, Ihre Online-Verfügbarkeit sehen zu dürfen"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Network error"
 msgstr "Netzwerkfehler"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Authentication failed"
 msgstr "Legitimierung fehlgeschlagen"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Encryption error"
 msgstr "Verschlüsselungsfehler"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate not provided"
 msgstr "Zertifikat wurde nicht bereitgestellt"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate untrusted"
 msgstr "Zertifikat nicht vertrauenswürdig"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate expired"
 msgstr "Zertifikat abgelaufen"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate not activated"
 msgstr "Zertifikat nicht aktiviert"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate hostname mismatch"
 msgstr "Rechnername des Zertifikats stimmt nicht überein"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingerabdruck des Zertifikats stimmt nicht überein"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Certificate self-signed"
 msgstr "Selbstsigniertes Zertifikat"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Status is set to offline"
 msgstr "Der Status ist auf »Abgemeldet« gesetzt"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Encryption is not available"
 msgstr "Verschlüsselung ist nicht verfügbar"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Certificate is invalid"
 msgstr "Zertifikat ist ungültig"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection has been refused"
 msgstr "Verbindungsaufbau wurde verweigert"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection can't be established"
 msgstr "Verbindung kann nicht hergestellt werden"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "Connection has been lost"
 msgstr "Verbindung wurde unterbrochen"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1334
 msgid "This account is already connected to the server"
 msgstr "Dieses Konto ist bereits mit dem Server verbunden"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1336
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Die Verbindung wurde durch eine neue Verbindung mit der gleichen Ressource "
 "ersetzt"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "The account already exists on the server"
 msgstr "Dieses Konto ist bereits auf dem Server vorhanden"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Der Server ist derzeit überlastet und kann die Verbindung nicht annehmen"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Certificate has been revoked"
 msgstr "Zertifikat wurde zurückgezogen"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Das Zertifikat verwendet einen unsicheren Chiffrier-Algorithmus oder ist "
 "kryptografisch schwach"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1346
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -893,26 +905,26 @@ msgstr ""
 "überschreiten die durch die kryptografische Bibliothek gegebenen "
 "Beschränkungen"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Internal error"
 msgstr "Interner Fehler"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1358
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Verbindung zu %s ist fehlgeschlagen"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Reconnect"
 msgstr "Erneut verbinden"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Edit account"
 msgstr "Konto bearbeiten"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1413
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"

@ -1095,23 +1107,23 @@ msgstr "Quelle zeigen"
 msgid "Web Page"
 msgstr "Webseite"

-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Öffnen"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Entfernen"

-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Benachrichtigungsfeld"

-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Systeminformationen"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Unbekannt"
@ -1171,18 +1183,18 @@ msgstr "Bitte geben Sie einen Befehl ein:"
 # %B - ausgeschriebener Name des Monats, abhängig von der gesetzten Umgebung
 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %d. %B"

-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"

-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1638,59 +1650,59 @@ msgstr "Mikrofon"
 msgid "Log in as another user"
 msgstr "Als anderer Benutzer anmelden"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Verfügbar"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Beschäftigt"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Unsichtbar"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Abwesend"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Untätig"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Nicht verfügbar"

-#: ../js/ui/userMenu.js:740
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Benachrichtigungen"

-#: ../js/ui/userMenu.js:748
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Systemeinstellungen"

-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Benutzer wechseln"

-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Abmelden"

-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Sperren"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Aktualisierungen installieren und neustarten"

-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Ihr Anwesenheitsstatus wird auf »Beschäftigt« gesetzt"

-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:804
 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."
@ -1777,7 +1789,7 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Die möglichen Modi auflisten"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "»%s« konnte nicht gestartet werden"
--- a/po/es.po
+++ b/po/es.po
@ -10,15 +10,15 @@ 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-10-15 23:38+0000\n"
-"PO-Revision-Date: 2012-10-16 11:06+0200\n"
+"POT-Creation-Date: 2012-11-06 19:11+0000\n"
+"PO-Revision-Date: 2012-11-08 12:31+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.5\n"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
@ -37,16 +37,6 @@ msgstr "Sistema"
 msgid "Show the message tray"
 msgstr "Mostrar la bandeja de mensajes"

-#: ../data/50-gnome-shell-system.xml.in.h:3
-#| msgid "Show Applications"
-msgid "Show all applications"
-msgstr "Mostrar todas las aplicaciones"
-
-#: ../data/50-gnome-shell-system.xml.in.h:4
-#| msgid "Keybinding to open the application menu"
-msgid "Open the application menu"
-msgstr "Abrir el menú de la aplicación"
-
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
@ -149,34 +139,34 @@ msgstr ""
 "del usuario. El valor aquí es de la GsmPresenceStatus."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr ""
+"Mostrar siempre el elemento de menú «Cerrar sesión» en el menú del usuario."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Esta clave omite la ocultación automática del elemento de menú «Cerrar "
+"sesión» en situación de un único usuario o una única sesión."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Mostrar la fecha de la semana en el calendario"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Si es cierta, muestra la fecha de semana ISO en el calendario."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Asociación de teclas para abrir el menú de la aplicación"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Asociación de teclas para abrir el menú de la aplicación."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Asociación de teclas para la vista «Mostrar aplicaciones»"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-#| msgid "Keybinding to open the application menu."
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr ""
-"Asociación de teclas para abrir la vista «Mostrar aplicaciones» de la vista "
-"de actividades."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Asociación de teclas cambiar la visibilidad de la bandeja de mensajes"
@ -232,16 +222,17 @@ msgid ""
 "used as a placeholder for a guess at the optimal thread count on the system."
 msgstr ""
 "Establece la tubería GStreamer usada para codificar grabaciones. Sigue la "
-"sintaxis usada para gst-launch. La tubería debería tener un sumidero («sink») "
-"desconectado donde grabar el vídeo que se está grabando. Generalmente tendrá "
-"un punto de origen desconectado; la salida de ese punto se escribirá en el "
-"archivo de salida. Sin embargo, la tubería también puede tomar parte en su "
-"propia salida; esto se puede usar para enviar la salida a un servidor "
-"«icecast» a través de shout2send o similar. Cuando no está establecido o lo "
-"está a un valor vacío, se usará la tubería predeterminada. Actualmente es "
-"«'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 "
-"threads=%T ! queue ! webmmux» y graba en WEBM usando el códec VP8. Se usa %T "
-"como marcador de posición para el número de hilos óptimos en el sistema."
+"sintaxis usada para gst-launch. La tubería debería tener un sumidero "
+"(«sink») desconectado donde grabar el vídeo que se está grabando. "
+"Generalmente tendrá un punto de origen desconectado; la salida de ese punto "
+"se escribirá en el archivo de salida. Sin embargo, la tubería también puede "
+"tomar parte en su propia salida; esto se puede usar para enviar la salida a "
+"un servidor «icecast» a través de shout2send o similar. Cuando no está "
+"establecido o lo está a un valor vacío, se usará la tubería predeterminada. "
+"Actualmente es «'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 "
+"deadline=1000000 threads=%T ! queue ! webmmux» y graba en WEBM usando el "
+"códec VP8. Se usa %T como marcador de posición para el número de hilos "
+"óptimos en el sistema."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
@ -308,8 +299,8 @@ msgstr "Ventana de inicio de sesión"
 msgid "Power"
 msgstr "Energía"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Suspender"

@ -317,8 +308,8 @@ msgstr "Suspender"
 msgid "Restart"
 msgstr "Reiniciar"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Apagar"

@ -599,8 +590,8 @@ msgstr "La red inalámbrica requiere autenticación"
 #: ../js/ui/components/networkAgent.js:310
 #, 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 ""
 "Se necesitan contraseñas o claves de cifrado para acceder a la red "
 "inalámbrica «%s»."
@ -699,35 +690,35 @@ msgstr "Silenciar"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:952
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Enviado el <b>%A</b> a las <b>%H:%M</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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:958
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Enviado el <b>%A</b>, <b>%d de %B</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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:963
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Enviado el <b>%A</b>, <b>%d de %B</b> de %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:992
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1092
 #, c-format
 msgid "Invitation to %s"
 msgstr "Invitación a %s"
@ -735,42 +726,42 @@ msgstr "Invitación a %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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1100
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s le está invitando a unirse a %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1102
+#: ../js/ui/components/telepathyClient.js:1181
+#: ../js/ui/components/telepathyClient.js:1244
 msgid "Decline"
 msgstr "Rechazar"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1103
+#: ../js/ui/components/telepathyClient.js:1182
+#: ../js/ui/components/telepathyClient.js:1245
 msgid "Accept"
 msgstr "Aceptar"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1133
 #, c-format
 msgid "Video call from %s"
 msgstr "Videollamada de %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1136
 #, c-format
 msgid "Call from %s"
 msgstr "Llamada de %s"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1141
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Rechazar"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1143
 msgid "Answer"
 msgstr "Responder"

@ -779,112 +770,112 @@ msgstr "Responder"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1175
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s le está enviando %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s solicita permiso para ver cuándo está en línea"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Network error"
 msgstr "Error de la red"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Authentication failed"
 msgstr "Falló la autenticación"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Encryption error"
 msgstr "Error de cifrado"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate not provided"
 msgstr "Certificado no proporcionado"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate untrusted"
 msgstr "No se confía en el certificado"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate expired"
 msgstr "Certificado caducado"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate not activated"
 msgstr "Certificado no activado"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate hostname mismatch"
 msgstr "El nombre del servidor dle certificado no coincide"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate fingerprint mismatch"
 msgstr "La huella del certificado no coincide"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Certificate self-signed"
 msgstr "Certificado autofirmado"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Status is set to offline"
 msgstr "El estado está establecido a «desconectado»"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Encryption is not available"
 msgstr "El cifrado no está disponible"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Certificate is invalid"
 msgstr "El certificado no es válido"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection has been refused"
 msgstr "Se ha rechazado la conexión"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection can't be established"
 msgstr "No se puede establecer la conexión"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "Connection has been lost"
 msgstr "Se ha perdido la conexión"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1334
 msgid "This account is already connected to the server"
 msgstr "Esta cuenta ya está conectada al servidor"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1336
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Se ha sustituido la conexión por una nueva conexión usando el mismo recurso"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "The account already exists on the server"
 msgstr "La cuenta ya existe en el servidor"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Actualmente el servidor está muy ocupado intentando gestionar la conexión"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Certificate has been revoked"
 msgstr "Se ha revocado el certificado"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "El certificado usa un algoritmo de cifrado inseguro o es criptográficamente "
 "débil"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1346
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -893,30 +884,30 @@ msgstr ""
 "certificado del servidor exceden los límites impuestos por la biblioteca de "
 "criptografía"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Internal error"
 msgstr "Error interno"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1358
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Falló la conexión a %s"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Reconnect"
 msgstr "Reconectar"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Edit account"
 msgstr "Editar cuenta"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1413
 msgid "Unknown reason"
 msgstr "Razón desconocida"

-#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
+#: ../js/ui/dash.js:254 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "Mostrar aplicaciones"

@ -1092,23 +1083,23 @@ msgstr "Ver fuente"
 msgid "Web Page"
 msgstr "Página web"

-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Abrir"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Quitar"

-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Bandeja de mensajes"

-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Información del sistema"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Desconocido"
@ -1164,18 +1155,18 @@ msgstr "Introduzca un comando:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"

-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d mensaje nuevo"
 msgstr[1] "%d mensajes nuevos"

-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1367,7 +1358,8 @@ msgstr "El dispositivo «%s» quiere emparejarse con este equipo"
 #: ../js/ui/status/bluetooth.js:379
 #, c-format
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
-msgstr "Confirme que el PIN mostrado en «%06d» coincide con el del dispositivo."
+msgstr ""
+"Confirme que el PIN mostrado en «%06d» coincide con el del dispositivo."

 #: ../js/ui/status/bluetooth.js:381
 msgid "Matches"
@ -1629,59 +1621,59 @@ msgstr "Micrófono"
 msgid "Log in as another user"
 msgstr "Iniciar sesión como otro usuario"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Disponible"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Ocupado"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Invisible"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Ausente"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Inactivo"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "No disponible"

-#: ../js/ui/userMenu.js:740
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Notificaciones"

-#: ../js/ui/userMenu.js:748
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Configuración del sistema"

-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Cambiar de usuario"

-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Cerrar la sesión"

-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Bloquear"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Instalar actualizaciones y reiniciar"

-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Su estado del chat se establecerá a «ocupado»"

-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:804
 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."
@ -1690,15 +1682,15 @@ msgstr ""
 "chat. Su estado en línea se ha ajustado para que otros sepan que puede no "
 "leer sus mensajes."

-#: ../js/ui/viewSelector.js:87
+#: ../js/ui/viewSelector.js:85
 msgid "Windows"
 msgstr "Ventanas"

-#: ../js/ui/viewSelector.js:91
+#: ../js/ui/viewSelector.js:89
 msgid "Applications"
 msgstr "Aplicaciones"

-#: ../js/ui/viewSelector.js:95
+#: ../js/ui/viewSelector.js:93
 msgid "Search"
 msgstr "Buscar"

@ -1769,7 +1761,7 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Listar los modos posibles"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Falló al lanzar «%s»"
@ -2169,8 +2161,8 @@ msgstr "El usuario rechazó el diálogo de autenticación"
 #~ "If true and format is either \"12-hour\" or \"24-hour\", display seconds "
 #~ "in time."
 #~ msgstr ""
-#~ "Si es cierta y el formato es «12-horas» o «24-horas», muestra los segundos "
-#~ "en la hora."
+#~ "Si es cierta y el formato es «12-horas» o «24-horas», muestra los "
+#~ "segundos en la hora."

 #~ msgid ""
 #~ "This key specifies the format used by the panel clock when the format key "
@ -2187,18 +2179,19 @@ msgstr "El usuario rechazó el diálogo de autenticación"
 #~ msgid ""
 #~ "This key specifies the hour format used by the panel clock. Possible "
 #~ "values are \"12-hour\", \"24-hour\", \"unix\" and \"custom\". If set to "
-#~ "\"unix\", the clock will display time in seconds since Epoch, i.e. 1970-"
-#~ "01-01. If set to \"custom\", the clock will display time according to the "
-#~ "format specified in the custom_format key. Note that if set to either "
-#~ "\"unix\" or \"custom\", the show_date and show_seconds keys are ignored."
+#~ "\"unix\", the clock will display time in seconds since Epoch, i.e. "
+#~ "1970-01-01. If set to \"custom\", the clock will display time according "
+#~ "to the format specified in the custom_format key. Note that if set to "
+#~ "either \"unix\" or \"custom\", the show_date and show_seconds keys are "
+#~ "ignored."
 #~ msgstr ""
 #~ "Esta clave especifica el formato de la hora especificado por el reloj del "
-#~ "panel. Los valores posibles son «12-hour» (12 horas), «24-hour» (24 horas), "
-#~ "«unix» y «custom» (personalizado).Si se establece a «unix» el reloj mostrará "
-#~ "la hora en segundos desde la época (1 de enero de 1970). Si se establece "
-#~ "a «custom» el reloj mostrará la hora según el formato especificado en la "
-#~ "clave «custom_format». Note que si se establece a «unix» o «custom» se "
-#~ "ignoran las claves «show_date» y «show_seconds»."
+#~ "panel. Los valores posibles son «12-hour» (12 horas), «24-hour» (24 "
+#~ "horas), «unix» y «custom» (personalizado).Si se establece a «unix» el "
+#~ "reloj mostrará la hora en segundos desde la época (1 de enero de 1970). "
+#~ "Si se establece a «custom» el reloj mostrará la hora según el formato "
+#~ "especificado en la clave «custom_format». Note que si se establece a "
+#~ "«unix» o «custom» se ignoran las claves «show_date» y «show_seconds»."

 #~ msgid "Clock Format"
 #~ msgstr "Formato del reloj"
--- a/po/et.po
+++ b/po/et.po
@ -13,8 +13,8 @@ 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-09-22 22:24+0000\n"
-"PO-Revision-Date: 2012-09-23 08:48+0300\n"
+"POT-Creation-Date: 2012-10-17 17:06+0000\n"
+"PO-Revision-Date: 2012-10-18 00:49+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
@ -223,11 +223,15 @@ msgstr "Katkesta"

 msgctxt "button"
 msgid "Sign In"
-msgstr "Logi sisse"
+msgstr "Sisselogimine"

 msgid "Login Window"
 msgstr "Sisselogimisaken"

+#. Translators: accessible name of the power menu in the login screen
+msgid "Power"
+msgstr "Vool"
+
 msgid "Suspend"
 msgstr "Uinak"

@ -332,7 +336,7 @@ msgstr "K"
 #. Translators: Calendar grid abbreviation for Thursday
 msgctxt "grid thursday"
 msgid "T"
-msgstr "N"
+msgstr "T"

 #. Translators: Calendar grid abbreviation for Friday
 msgctxt "grid friday"
@ -342,7 +346,7 @@ msgstr "R"
 #. Translators: Calendar grid abbreviation for Saturday
 msgctxt "grid saturday"
 msgid "S"
-msgstr "L"
+msgstr "P"

 #. Translators: Event list abbreviation for Sunday.
 #. *
@ -382,7 +386,7 @@ msgstr "R"
 #. Translators: Event list abbreviation for Saturday
 msgctxt "list saturday"
 msgid "S"
-msgstr "L"
+msgstr "P"

 #. Translators: Text to show if there are no events
 msgid "Nothing Scheduled"
@ -538,19 +542,19 @@ msgstr "Heli maha"
 #. locale, without seconds.
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
-msgstr "Saadetud: <b>%A</b>, <b>%X</b>"
+msgstr "Saadeti: <b>%a</b>, <b>%X</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.
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
-msgstr "Saadeti <b>%A</b>, <b>%B %d</b>"
+msgstr "Saadeti: <b>%a</b>, <b>d. %B</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.
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
-msgstr "Saadeti <b>%A</b>, <b>%B %d</b>, %Y"
+msgstr "Saadeti: <b>%a</b>, <b>d. %B</b>, %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
@ -748,11 +752,11 @@ msgstr "Süsteemist väljalogimine"

 msgctxt "button"
 msgid "Log Out"
-msgstr "Logi välja"
+msgstr "Väljalogimine"

 msgctxt "title"
 msgid "Power Off"
-msgstr "Väljalülitamine"
+msgstr "Lülita välja"

 msgid "Click Power Off to quit these applications and power off the system."
 msgstr ""
@ -778,7 +782,7 @@ msgstr "Lülita välja"

 msgctxt "title"
 msgid "Restart"
-msgstr "Taaskäivitamine"
+msgstr "Taaskäivita"

 msgid "Click Restart to quit these applications and restart the system."
 msgstr ""
@ -1277,20 +1281,17 @@ msgstr "Jõude"
 msgid "Unavailable"
 msgstr "Pole saadaval"

-msgid "Switch User"
-msgstr "Vaheta kasutajat"
-
-msgid "Switch Session"
-msgstr "Vaheta seanssi"
-
 msgid "Notifications"
 msgstr "Märguanded"

 msgid "System Settings"
 msgstr "Süsteemi sätted"

+msgid "Switch User"
+msgstr "Vaheta kasutajat"
+
 msgid "Log Out"
-msgstr "Logi välja"
+msgstr "Väljalogimine"

 msgid "Lock"
 msgstr "Lukusta"
@ -1389,6 +1390,27 @@ msgstr "Vaikimisi"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Kasutaja katkestas autentimisdialoogi"

+#, fuzzy
+#~ msgid "Show all applications"
+#~ msgstr "Rakenduste kuvamine"
+
+#, fuzzy
+#~ msgid "Open the application menu"
+#~ msgstr "Rakenduste menüü avamise kiirklahv"
+
+#, fuzzy
+#~ msgid "Keybinding to open the \"Show Applications\" view"
+#~ msgstr "Rakenduste menüü avamise kiirklahv"
+
+#, fuzzy
+#~ msgid ""
+#~ "Keybinding to open the \"Show Applications\" view of the Activities "
+#~ "Overview."
+#~ msgstr "Kiirklahv  rakenduste menüü avamiseks."
+
+#~ msgid "Switch Session"
+#~ msgstr "Vaheta seanssi"
+
 #~ msgid "disabled OpenSearch providers"
 #~ msgstr "keelatud OpenSearch pakkujad"

--- a/po/gl.po
+++ b/po/gl.po
@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-16 13:35+0200\n"
-"PO-Revision-Date: 2012-10-16 14:22+0200\n"
+"POT-Creation-Date: 2012-11-01 11:16+0100\n"
+"PO-Revision-Date: 2012-11-01 11:21+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@ -39,14 +39,6 @@ msgstr "Sistema"
 msgid "Show the message tray"
 msgstr "Mostrar a bandexa de mensaxes"

-#: ../data/50-gnome-shell-system.xml.in.h:3
-msgid "Show all applications"
-msgstr "Mostrar todos os aplicativos"
-
-#: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Open the application menu"
-msgstr "Abrir o menú de aplicativo"
-
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
@ -148,32 +140,33 @@ msgstr ""
 "usuario. O valor aquí é da GsmPresenceStatus."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Mostrar sempre o elemento de menú «Saír da sesión» no menú de usuario."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Esta chave sobrescribe a ocultación automática do elemento de menú «Saír da "
+"sesión» en situacións con un único usuario ou única sesión."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Mostrar a data da semana no calendario"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Se é verdadeiro, móstrase a data da semana ISO no calendario."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Combinación de teclas para abrir o menú de aplicativo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Combinación de teclas para abrir o menú de aplicativo."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Combinación de teclas para abrir a vista «Mostrar aplicativos»"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr ""
-"Combinación de teclas para abrir a vista \"Mostrar aplicativos\" da Vista xera "
-"de Actividades."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Combinación de teclas para mostrar/ocultar a área de mensaxes"
@ -306,8 +299,8 @@ msgstr "Xanela de inicio de sesión"
 msgid "Power"
 msgstr "Apagar"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Suspender"

@ -315,8 +308,8 @@ msgstr "Suspender"
 msgid "Restart"
 msgstr "Reiniciar"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Apagar"

@ -697,35 +690,35 @@ msgstr "Silenciar"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:950
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Enviado ás <b>%X</b> o <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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:956
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Enviado ás <b>%X</b> o <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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:961
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Enviado ás <b>%X</b> o <b>%B %d</b>, %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Agora %s chámase %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Convite a %s"
@ -733,42 +726,42 @@ msgstr "Convite a %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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s estalle convidando a unirse a %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "Rexeitar"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "Aceptar"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1131
 #, c-format
 msgid "Video call from %s"
 msgstr "Videochamada de %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "Chamada de %s"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Rexeitar"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "Responder"

@ -777,112 +770,112 @@ msgstr "Responder"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1173
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s esta enviándolle %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1208
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s solicítalle permiso para ver cando está en liña"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Erro da rede"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Erro de cifrado"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "Certificado non fornecido"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "Non se confía no certificado"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "Certificado caducado"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "Certificado non activado"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "O nome do servidor do certificado non coincide"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "A pegada do certificado non coincide"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Certificado autoasinado"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "O estado está definido a «desconectado»"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "O cifrado non está dispoñíbel"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "O certificado non é válido"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "Rexeitouse a conexión"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "Non é posíbel estabelecer a conexión"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "Perdeuse a conexión"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "Esta cuenta xa está conectada ao servidor"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1334
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Substituíuse a conexión por unha nova conexión empregando o mesmo recurso"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Esta conta xa existe no servidor"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Nestes intres o servidor está moi ocupado tentando xestionar a conexión"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "Revogouse o certificado"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado usa un algoritmo de cifrado inseguro ou é criptográficamente "
 "débil"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -891,26 +884,26 @@ msgstr ""
 "certificado do servidor excede os límites impostos pola biblioteca de "
 "criptografía."

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "Erro interno"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Fallou a conexión a %s"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Reconectar"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Editar conta"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Razón descoñecida"

@ -1089,23 +1082,23 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Páxina web"

-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Abrir"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Retirar"

-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Bandexa de mensaxes"

-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Información do sistema"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Descoñecido"
@ -1161,18 +1154,18 @@ msgstr "Escriba unha orde:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"

-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d mensaxe nova"
 msgstr[1] "%d mensaxes novas"

-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1626,59 +1619,59 @@ msgstr "Micrófono"
 msgid "Log in as another user"
 msgstr "Iniciar sesión como outro usuario"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Dispoñíbel"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Ocupado"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Invisíbel"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Ausente"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Inactivo"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Non dispoñíbel"

-#: ../js/ui/userMenu.js:740
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Notificacións"

-#: ../js/ui/userMenu.js:748
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Preferencias do sistema"

-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Cambiar de usuario"

-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Saír da sesión"

-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Bloquear"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Instalar actualizacións e reiniciar"

-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "O seu estado de conversa definirase como «ocupado»"

-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:804
 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."
@ -1687,15 +1680,15 @@ msgstr ""
 "conversa. O seu estado de conexión axustouse para que outros saiban que non "
 "quere ver as súas mensaxes."

-#: ../js/ui/viewSelector.js:87
+#: ../js/ui/viewSelector.js:85
 msgid "Windows"
 msgstr "Xanelas"

-#: ../js/ui/viewSelector.js:91
+#: ../js/ui/viewSelector.js:89
 msgid "Applications"
 msgstr "Aplicativos"

-#: ../js/ui/viewSelector.js:95
+#: ../js/ui/viewSelector.js:93
 msgid "Search"
 msgstr "Buscar"

@ -1766,7 +1759,7 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Listar os modos posíbeis"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Produciuse un erro ao iniciar «%s»"
--- a/po/gu.po
+++ b/po/gu.po
@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: gu\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-09-18 04:20+0000\n"
-"PO-Revision-Date: 2012-09-18 16:59+0530\n"
+"POT-Creation-Date: 2012-11-04 19:00+0000\n"
+"PO-Revision-Date: 2012-11-05 12:23+0530\n"
 "Last-Translator: \n"
 "Language-Team: gu_IN <kde-i18n-doc@kde.org>\n"
 "Language: \n"
@ -20,6 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Lokalize 1.0\n"

+#: ../data/50-gnome-shell-screenshot.xml.in.h:1
+msgid "Screenshots"
+msgstr "સ્ક્રીનશોટ"
+
+#: ../data/50-gnome-shell-screenshot.xml.in.h:2
+msgid "Record a screencast"
+msgstr "સ્ક્રીનકાસ્ટ રેકોર્ડ કરો"
+
+#: ../data/50-gnome-shell-system.xml.in.h:1
+msgid "System"
+msgstr "સિસ્ટમ"
+
+#: ../data/50-gnome-shell-system.xml.in.h:2
+msgid "Show the message tray"
+msgstr "સંદેશો ટ્રેને બતાવો"
+
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "GNOME શેલ"
@ -45,7 +61,7 @@ msgstr "Alt-F2 માંથી ડેવલપર અને ટેસ્ટર
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
-msgstr ""
+msgstr "Alt-F2 સંવાદની મદદથી આંતરિક ડિબગીંગ અને મોનિટરીંગ સાધનોને વાપરવા પરવાનગી આપે છે."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "Uuids of extensions to enable"
@ -58,10 +74,13 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
+"GNOME Shell ઍક્સટેન્શન પાસે uuid ગુણધર્મ છે; આ કી ઍક્સટેન્શનની યાદી કરે છે કે જેને લાવેલ "
+"હોવુ જોઇએ. કોઇપણ ઍક્સટેન્શન કે જેને આ યાદીમાં લાવવાની જરૂર છે. તમે પણ org.gnome.Shell પર "
+"EnableExtension અને DisableExtension DBus પદ્દતિઓ સાથે આ યાદીને કુશળતાપૂર્વક વાપરી શકો છો."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Whether to collect stats about applications usage"
-msgstr ""
+msgstr "શું કાર્યક્રમ વપરાશ વિશે આંકડા એકત્ર કરવા જોઇએ"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:6
 msgid ""
@ -70,6 +89,10 @@ msgid ""
 "want to disable this for privacy reasons. Please note that doing so won't "
 "remove already saved data."
 msgstr ""
+"શેલ સામાન્ય રીતે મોટાભાગનાં એકને હાજર રાખવા માટે ક્રમમાં સક્રિય કાર્યક્રમોને મોનિટર કરવામાં "
+"આવે છે (દા.ત. લૉન્ચર). જ્યારે આ માહિતીને ખાનગી રાખવામાં આવશે, તમે ખાનગી કારણો માટે આને "
+"નિષ્ક્રિય કરવા માંગી શકો છો. મહેરબાની કરીને આવુ કરવાનું નોંધો તેથી પહેલેથી સંગ્રહેલ "
+"માહિતીને દૂર કરાતુ નથી."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
@ -79,7 +102,7 @@ msgstr "પસંદીદા કાર્યક્રમો માટે ડે
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
-msgstr ""
+msgstr "કાર્યક્રમો આ ઓળખકર્તાઓ સાથે સંકળાયેલ છે તે પસંદીદા વિસ્તારમાં દેખાશે."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "History for command (Alt-F2) dialog"
@ -94,75 +117,87 @@ msgid ""
 "Internally used to store the last IM presence explicitly set by the user. "
 "The value here is from the TpConnectionPresenceType enumeration."
 msgstr ""
+"વપરાશકર્તા દ્દારા છેલ્લુ IM સુયોજનને સંગ્રહવા આંતરિક રીતે વાપરેલ છે. અહિંયા કિંમત "
+"TpConnectionPresenceType ઍન્યુમરેશનમાંથી છે."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:12
 msgid ""
 "Internally used to store the last session presence status for the user. The "
 "value here is from the GsmPresenceStatus enumeration."
 msgstr ""
+"વપરાશકર્તા માટે છેલ્લી સત્રની હાજર પરિસ્થિતિને સંગ્રહવા આંતરિક રીતે વાપરેલ છે. કિંમત અહિંયા "
+"GsmPresenceStatus ઍન્યુમરેશનમાંથી છે."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "હંમેશા વપરાશકર્તા મેનુમાં 'બહાર નીકળો' મેનુવસ્તુને બતાવે છે."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"આ કી એકજ વપરાશકર્તામાં 'બહાર નીકળો' મેનુવસ્તુને આપમેળે છુપાવવા આ કીને ઓવરરાઇડ કરવામાં આવી "
+"છે."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "કૅલેન્ડરમાં અઠવાડિયા તારીખને બતાવો"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "જો true હોય તો, કૅલેન્ડરમાં ISO અઠવાડિયાની તારીખને દર્શાવો."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "કાર્યક્રમ મેનુને ખોલવા માટે કિબાઇન્ડીંગ"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "કાર્યક્રમ મેનુને ખોલવા માટે કિબાઇન્ડીંગ."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-#, fuzzy
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 #| msgid "Keybinding to open the application menu"
 msgid "Keybinding to toggle the visibility of the message tray"
-msgstr "કાર્યક્રમ મેનુને ખોલવા માટે કિબાઇન્ડીંગ"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-#, fuzzy
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to toggle the visibility of the message tray."
-msgstr "કાર્યક્રમ મેનુને ખોલવા માટે કિબાઇન્ડીંગ"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
-#, fuzzy
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to toggle the screen recorder"
-msgstr "કાર્યક્રમ મેનુને ખોલવા માટે કિબાઇન્ડીંગ"
+msgstr "સંદેશા ટ્રેની દૃશ્યતાને ટૉગલ કરવા માટે કીબાઇન્ડીંગ"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:20
-#| msgid "Keybinding to open the application menu."
+msgid "Keybinding to toggle the visibility of the message tray."
+msgstr "સંદેશા ટ્રેની દૃશ્યતાને ટૉગલ કરવા માટે કીબાઇન્ડીંગ."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+msgid "Keybinding to toggle the screen recorder"
+msgstr "સ્ક્રીન રેકોર્ડરને ટૉગલ કરવા માટે કીબાઇન્ડીંગ"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "બિલ્ટઇન સ્ક્રીન રેકોર્ડરને શરૂ/બંધ કરવા માટે કfબાઇન્ડીંગ."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "ક્યુ કિબોર્ડ વાપરવુ છે"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "વાપરવા માટે કિબોર્ડનો પ્રકાર."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "રેકોર્ડીંગ સ્ક્રીનકાસ્ટ માટે વાપરેલ ફ્રેમરેટ."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
 msgstr ""
+"પરિણામી સ્ક્રીનકાસ્ટની framerate એ દરેક સેકંડે ફ્રેમમાં GNOME Shell નાં સ્ક્રીનકાસ્ટ "
+"રેકોર્ડર દ્દારા અહેવાલ થયેલ છે."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "સ્ક્રીનકાસ્ટને એનકોડ કરવા માટે વાપરેલ gstreamer પાઇપલાઇન"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -176,17 +211,28 @@ msgid ""
 "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  મારફતે અથવા તેનાં જેવા મારફતે icecast સર્વરમાં આઉટપુટને મોકલવા વાપરી "
+"શકાય છે. જ્યારે ખાલી ફાઇલને સુયોજિત અથવા અસુયોજિત કરો, મૂળભૂત પાઇપલાઇન વાપરેલ હે. આ હાલમાં "
+"'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 "
+"threads=%T ! queue ! webmmux' છે અને VP8 કોડેકની મદદતી WEBM માં રેકોર્ડ થાય છે. %T એ સિસ્ટમ "
+"પર ઓપ્ટીમલ થ્રેડ ગણતરી પર ધારવા માટે પ્લેસહોલ્ડરને વાપરેલ છે."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "સ્ક્રીનકાસ્ટને સંગ્રહ કરવા માટે વાપરેલ ફાઇલ ઍક્સટેન્શન"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 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 ""
+"રેકોર્ડ થયેલ સ્ક્રીનકાસ્ટ માટે ફાઇલનામ વર્તમાન તારીખ પર આધારિત અનન્ય ફાઇલનામ હશે, અને આ "
+"ઍક્સટેન્શનને વાપરો. તેને બદલેલ હોવુ જોઇએ જ્યારે વિવિધ પાત્ર બંધારણમાં રેકોર્ડ કરી રહ્યા છે."

 #: ../js/extensionPrefs/main.js:124
 #, c-format
@ -201,11 +247,11 @@ msgstr "ઍક્સટેન્શન"
 msgid "Select an extension to configure using the combobox above."
 msgstr "ઉપર કોમ્બોબોક્સની મદદથી રૂપરેખાંકિત કરવા માટે ઍક્સટેન્શનને પસંદ કરો."

-#: ../js/gdm/loginDialog.js:526
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "સત્ર..."

-#: ../js/gdm/loginDialog.js:675
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "પ્રવેશો"
@ -213,47 +259,56 @@ 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:742
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "શું યાદી થયેલ નથી?"

-#: ../js/gdm/loginDialog.js:895 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:137
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "રદ કરો"

-#: ../js/gdm/loginDialog.js:900
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "પ્રવેશો"

-#: ../js/gdm/loginDialog.js:1239
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "પ્રવેશ વિન્ડો"

-#: ../js/gdm/powerMenu.js:88 ../js/ui/userMenu.js:657 ../js/ui/userMenu.js:661
-#: ../js/ui/userMenu.js:772
+#. Translators: accessible name of the power menu in the login screen
+#: ../js/gdm/powerMenu.js:35
+msgid "Power"
+msgstr "પાવર"
+
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "અટકાવો"

-#: ../js/gdm/powerMenu.js:93
+#: ../js/gdm/powerMenu.js:94
 msgid "Restart"
 msgstr "પુન:શરૂ કરો"

-#: ../js/gdm/powerMenu.js:98 ../js/ui/userMenu.js:659 ../js/ui/userMenu.js:661
-#: ../js/ui/userMenu.js:771
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "પાવર બંધ"

+#: ../js/gdm/util.js:148
+msgid "Authentication error"
+msgstr "સત્તાધિકરણ ભૂલ"
+
 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:247
+#: ../js/gdm/util.js:265
 msgid "(or swipe finger)"
 msgstr "(અથવા સ્વાઇપ આંગળી)"

-#: ../js/gdm/util.js:272
+#: ../js/gdm/util.js:290
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(દા.ત., વપરાશકર્તા અથવા %s)"
@ -290,7 +345,7 @@ msgstr "SETTINGS"
 msgid "New Window"
 msgstr "નવી વિન્ડો"

-#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:271
+#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:290
 msgid "Remove from Favorites"
 msgstr "પસંદીદાઓ માંથી દૂર કરો"

@ -454,16 +509,16 @@ msgstr "આ અઠવાડિયે"
 msgid "Next week"
 msgstr "આગળનું અઠવાડિયું"

-#: ../js/ui/components/autorunManager.js:278
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "દૂર કરી શકાય તેવા ઉપકરણો"

-#: ../js/ui/components/autorunManager.js:575
+#: ../js/ui/components/autorunManager.js:594
 #, c-format
 msgid "Open with %s"
 msgstr "%s સાથે ખોલો"

-#: ../js/ui/components/autorunManager.js:601
+#: ../js/ui/components/autorunManager.js:620
 msgid "Eject"
 msgstr "રદ કરો"

@ -618,35 +673,35 @@ msgstr "મૂંગુ"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:952
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "<b>%A</b> પર <b>%X</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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:958
 #, 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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:963
 #, 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/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:992
 #, 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/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1092
 #, c-format
 msgid "Invitation to %s"
 msgstr "%s માં આમંત્રણ"
@ -654,42 +709,42 @@ 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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1100
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s એ તમને %s માં જોડાવા માટે આમંત્રણ આપી રહ્યા છે"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1102
+#: ../js/ui/components/telepathyClient.js:1181
+#: ../js/ui/components/telepathyClient.js:1244
 msgid "Decline"
 msgstr "ના પાડવી"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1103
+#: ../js/ui/components/telepathyClient.js:1182
+#: ../js/ui/components/telepathyClient.js:1245
 msgid "Accept"
 msgstr "સ્વીકારો"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1133
 #, c-format
 msgid "Video call from %s"
 msgstr "%s માંથી વિડીયો કોલ"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1136
 #, c-format
 msgid "Call from %s"
 msgstr "%s માંથી કોલ"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1141
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "રદ કરો"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1143
 msgid "Answer"
 msgstr "જવાબ"

@ -698,136 +753,137 @@ msgstr "જવાબ"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1175
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s એ %s માં મોકલી રહ્યા છે"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ને જોવા માટે પરવાનગી આપવાનું ગમે થે જ્યારે તમે ઓનલાઇન હોય"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Network error"
 msgstr "નેટવર્ક ભૂલ"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Authentication failed"
 msgstr "સત્તાધિકરણ નિષ્ક્રિય"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Encryption error"
 msgstr "એનક્રિપ્શન ભૂલ"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate not provided"
 msgstr "પ્રમાણપત્ર પૂરુ પાડેલ નથી"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate untrusted"
 msgstr "પ્રમાણપત્ર વિશ્ર્વાસપાત્ર નથી"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate expired"
 msgstr "પ્રમાણપત્ર નિવૃત્ત થયેલ છે"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate not activated"
 msgstr "પ્રમાણપત્ર સક્રિય થયેલ નથી"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate hostname mismatch"
 msgstr "પ્રમાણપત્ર યજમાનનામ બંધબેસતુ નથી"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate fingerprint mismatch"
 msgstr "પ્રમાણપજ્ઞ ફિંગરપ્રિન્ટ બંધબેસતુ નથી"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Certificate self-signed"
 msgstr "જાતે હસ્તાક્ષર થયેલ પ્રમાણપત્ર"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Status is set to offline"
 msgstr "સ્થિતિ ઓફલાઇન તરીકે સુયોજિત છે"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Encryption is not available"
 msgstr "એનક્રિપ્શન ઉપલબ્ધ નથી"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Certificate is invalid"
 msgstr "પ્રમાણપત્ર અમાન્ય છે"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection has been refused"
 msgstr "જોડાણને નામંજૂર કરી દેવામાં આવ્યુ છે"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection can't be established"
 msgstr "જોડાણ સ્થાપિત કરી શકાતુ નથી"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "Connection has been lost"
 msgstr "જોડાણ ખોવાઈ ગયેલ છે"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1334
 msgid "This account is already connected to the server"
 msgstr "આ ખાતુ પહેલેથી જ સર્વર સાથે જોડાયેલ છે"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "સરખા સ્ત્રોતની મદદથી જોડાણને નવાં જોડાણ દ્દારા બદલી દેવામાં આવ્યુ છે"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "The account already exists on the server"
 msgstr "ખાતુ પહેલેથી સર્વર પર અસ્તિત્વ ધરાવે છે"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Server is currently too busy to handle the connection"
 msgstr "સર્વર એ જોડાણને સંચાલિત કરવા માટે હાલમાં વ્યસ્ત છે"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Certificate has been revoked"
 msgstr "પ્રમાણપત્રને રદ કરી દેવામાં આવ્યુ છે"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1344
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
+msgstr "પ્રમાણપત્ર અસુરક્ષિત સાઇફર અલ્ગોરિધમને વાપરે છે અથવા ક્રિપ્ટોગ્રાફિકલી નબળુ છે"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1346
 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/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Internal error"
 msgstr "આંતરિક ભૂલ"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1358
 #, c-format
 msgid "Connection to %s failed"
 msgstr "%s માટે જોડાણ નિષ્ફળ"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Reconnect"
 msgstr "પુન:જોડાવો"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Edit account"
 msgstr "ખાતામાં ફેરફાર કરો"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1413
 msgid "Unknown reason"
 msgstr "અજ્ઞાત કારણ"

-#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
-#| msgid "Applications"
+#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "કાર્યક્રમો બતાવો"

@ -835,14 +891,14 @@ msgstr "કાર્યક્રમો બતાવો"
 msgid "Date and Time Settings"
 msgstr "તારીખ અને સમય સુયોજનો"

-#: ../js/ui/dateMenu.js:109
+#: ../js/ui/dateMenu.js:111
 msgid "Open Calendar"
 msgstr "કૅલેન્ડરને ખોલો"

 #. 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:175
+#: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%A %B %e, %Y"

@ -859,8 +915,7 @@ msgstr "બહાર નીકળો"

 #: ../js/ui/endSessionDialog.js:63
 msgid "Click Log Out to quit these applications and log out of the system."
-msgstr ""
-"આ કાર્યક્રમોને બહાર નીકળવા માટે બહાર નીકળો પર ક્લિક કરો અને સિસ્ટમમાંથી બહાર નીકળો."
+msgstr "આ કાર્યક્રમોને બહાર નીકળવા માટે બહાર નીકળો પર ક્લિક કરો અને સિસ્ટમમાંથી બહાર નીકળો."

 #: ../js/ui/endSessionDialog.js:65
 #, c-format
@ -892,8 +947,7 @@ msgstr "પાવર બંધ"

 #: ../js/ui/endSessionDialog.js:82
 msgid "Click Power Off to quit these applications and power off the system."
-msgstr ""
-"આ કાર્યક્રમોને બહાર નીકાળવા માટે પાવર બંધ કરો પર ક્લિક કરો અને સિસ્ટમનો પાવર બંધ કરો"
+msgstr "આ કાર્યક્રમોને બહાર નીકાળવા માટે પાવર બંધ કરો પર ક્લિક કરો અને સિસ્ટમનો પાવર બંધ કરો"

 #: ../js/ui/endSessionDialog.js:84
 #, c-format
@ -923,8 +977,7 @@ msgstr "પુન:શરૂ કરો"

 #: ../js/ui/endSessionDialog.js:99
 msgid "Click Restart to quit these applications and restart the system."
-msgstr ""
-"આ કાર્યક્રમોમાંથી બહાર નીકળવા માટે પુન:શરૂ કરો પર ક્લિક કરો અને સિસ્ટમને પુન:શરૂ કરો."
+msgstr "આ કાર્યક્રમોમાંથી બહાર નીકળવા માટે પુન:શરૂ કરો પર ક્લિક કરો અને સિસ્ટમને પુન:શરૂ કરો."

 #: ../js/ui/endSessionDialog.js:101
 #, c-format
@ -946,11 +999,11 @@ msgstr "સ્થાપિત કરો"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "extensions.gnome.org માંથી '%s' ને સ્થાપિત અને ડાઉનલોડ કરો?"

-#: ../js/ui/keyboard.js:327
+#: ../js/ui/keyboard.js:337
 msgid "tray"
 msgstr "ટ્રે"

-#: ../js/ui/keyboard.js:561 ../js/ui/status/keyboard.js:146
+#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "કિબોર્ડ"
@ -1003,23 +1056,23 @@ msgstr "સ્ત્રોત દર્શાવો"
 msgid "Web Page"
 msgstr "વેબ પાનું"

-#: ../js/ui/messageTray.js:1080
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "ખોલો"

-#: ../js/ui/messageTray.js:1087
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "દૂર કરો"

-#: ../js/ui/messageTray.js:2041
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "સંદેશો ટ્રે"

-#: ../js/ui/messageTray.js:2483
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "સિસ્ટમ જાણકારી"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "અજ્ઞાત"
@ -1075,22 +1128,19 @@ msgstr "મહેરબાની કરીને આદેશને દાખલ

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:78
-#| msgctxt "calendar heading"
-#| msgid "%A, %B %d"
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %B %d"

-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d નવો સંદેશો"
 msgstr[1] "%d નવા સંદેશા"

-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
-#| msgid "Notifications"
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d નવી સૂચના"
@ -1101,7 +1151,6 @@ msgid "Searching..."
 msgstr "શોધી રહ્યા છે..."

 #: ../js/ui/searchDisplay.js:323
-#| msgid "No matching results."
 msgid "No results."
 msgstr "પરિણામો નથી."

@ -1122,16 +1171,14 @@ msgid "Hide Text"
 msgstr "લખાણ છુપાડો"

 #: ../js/ui/shellMountOperation.js:368
-#| msgid "Password:"
 msgid "Password"
 msgstr "પાસવર્ડ"

 #: ../js/ui/shellMountOperation.js:389
-#| msgid "Remember Passphrase"
 msgid "Remember Password"
 msgstr "પાસવર્ડને યાદ રાખો"

-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:140
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "તાળું ખોલો"

@ -1249,7 +1296,7 @@ msgstr "કીબોર્ડ સુયોજનો"
 msgid "Mouse Settings"
 msgstr "માઉસ સુયોજનો"

-#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:236
+#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:234
 msgid "Sound Settings"
 msgstr "સાઇન્ડ સુયોજનો"

@ -1282,10 +1329,9 @@ msgid "Device %s wants to pair with this computer"
 msgstr "ઉપકરણ %s આ કમ્પ્યૂટર સાથે જોડી કરવા માંગે છે"

 #: ../js/ui/status/bluetooth.js:379
-#, fuzzy, c-format
-#| msgid "Please confirm whether the PIN '%s' matches the one on the device."
+#, c-format
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
-msgstr "મહેરબાની કરીને ખાતરી કરો કે શું PIN '%s' એ ઉપકરણ પર એક સાથે બંધબેસે છે."
+msgstr "મહેરબાની કરીને ખાતરી કરો કે શું PIN '%06d'  એ ઉપકરણ પર એક સાથે બંધબેસે છે."

 #: ../js/ui/status/bluetooth.js:381
 msgid "Matches"
@ -1308,11 +1354,11 @@ msgstr "મહેરબાની કરીને ઉપકરણ પર દર
 msgid "OK"
 msgstr "બરાબર"

-#: ../js/ui/status/keyboard.js:170
+#: ../js/ui/status/keyboard.js:228
 msgid "Show Keyboard Layout"
 msgstr "કીબોર્ડ લેઆઉટને બતાવો"

-#: ../js/ui/status/keyboard.js:175
+#: ../js/ui/status/keyboard.js:233
 msgid "Region and Language Settings"
 msgstr "વિસ્તાર અને ભાષા સુયોજનો"

@ -1535,7 +1581,7 @@ msgid "Unknown"
 msgstr "અજ્ઞાત"

 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:223
+#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:221
 msgid "Volume"
 msgstr "વોલ્યુમ"

@ -1543,72 +1589,69 @@ msgstr "વોલ્યુમ"
 msgid "Microphone"
 msgstr "માઇક્રોફોન"

-#: ../js/ui/unlockDialog.js:147
-#| msgid "Login as another user"
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "બીજા વપરાશકર્તા તરીકે પ્રવેશો"

-#: ../js/ui/userMenu.js:174
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "ઉપલબ્ધ"

-#: ../js/ui/userMenu.js:177
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "વ્યસ્ત"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "અદૃશ્ય"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "દૂર"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "નિષ્ક્રિય"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "બિનઉપલબ્ધ"

-#: ../js/ui/userMenu.js:612 ../js/ui/userMenu.js:753
-msgid "Switch User"
-msgstr "વપરાશકર્તાને બદલો"
-
-#: ../js/ui/userMenu.js:613
-msgid "Switch Session"
-msgstr "સત્ર બદલો"
-
-#: ../js/ui/userMenu.js:737
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "સૂચનાઓ"

-#: ../js/ui/userMenu.js:745
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "સિસ્ટમ સુયોજનો"

-#: ../js/ui/userMenu.js:758
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "વપરાશકર્તાને બદલો"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "બહાર નીકળો"

-#: ../js/ui/userMenu.js:763
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "તાળુ"

-#: ../js/ui/userMenu.js:778
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "સુધારા સ્થાપિત કરો અને પુન:શરૂ કરો"

-#: ../js/ui/userMenu.js:796
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "તમારી વાર્તાલાપ પરિસ્થિતિ વ્યસ્ત તરીકે સુયોજિત હશે"

-#: ../js/ui/userMenu.js:797
+#: ../js/ui/userMenu.js:804
 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."
 msgstr ""
+"સૂચનાઓ હવે નિષ્ક્રિય થયેલ છે, વાર્તાલાપ સંદેશાને સમાવી રહ્યા છે, બીજાને જણાવવા માટે તમારી "
+"ઓનલાઇન સ્થિતિને ગોઠવી દેવામાં આવી છે કે જે તમે તેનાં સંદેશાને જોઇ શકશો નહિં."

 #: ../js/ui/viewSelector.js:85
 msgid "Windows"
@ -1622,7 +1665,7 @@ msgstr "કાર્યક્રમો"
 msgid "Search"
 msgstr "શોધો"

-#: ../js/ui/wanda.js:119
+#: ../js/ui/wanda.js:117
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1631,12 +1674,12 @@ msgstr ""
 "માફ કરો, આજે તમારા માટે શાણપણ નથી:\n"
 "%s"

-#: ../js/ui/wanda.js:123
+#: ../js/ui/wanda.js:121
 #, c-format
 msgid "%s the Oracle says"
-msgstr ""
+msgstr "%s એ એવી કિંમત છે જે Oracle કહે છે"

-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "તમારા મનગમતા ઇસ્ટર ઇંડા"

@ -1671,23 +1714,23 @@ msgstr[1] "%u ઇનપુટો"
 msgid "System Sounds"
 msgstr "સિસ્ટમ અવાજો"

-#: ../src/main.c:330
+#: ../src/main.c:332
 msgid "Print version"
 msgstr "ા"

-#: ../src/main.c:336
+#: ../src/main.c:338
 msgid "Mode used by GDM for login screen"
 msgstr "લૉગિન સ્ક્રીન માટે GDM દ્દારા વાપરેલ સ્થિતિ"

-#: ../src/main.c:342
+#: ../src/main.c:344
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "ખાસ સ્થિતિને વાપરો, દા.ત. પ્રવેશ સ્ક્રીન માટે \"gdm\""

-#: ../src/main.c:348
+#: ../src/main.c:350
 msgid "List possible modes"
 msgstr "શક્ય સ્થિતિઓની યાદી કરો"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "'%s' ને શરૂ કરવામાં નિષ્ફળતા"
@ -1710,7 +1753,10 @@ msgstr "મૂળભૂત"

 #: ../src/shell-polkit-authentication-agent.c:343
 msgid "Authentication dialog was dismissed by the user"
-msgstr ""
+msgstr "સત્તાધિકરણ વપરાશકર્તા દ્દારા અસ્વીકાર થયેલ છે"
+
+#~ msgid "Switch Session"
+#~ msgstr "સત્ર બદલો"

 #~ msgid "disabled OpenSearch providers"
 #~ msgstr "નિષ્ક્રિય થયેલ OpenSearch પ્રબંધક"
@ -1733,9 +1779,6 @@ msgstr ""
 #~ msgid "Home"
 #~ msgstr "ઘર"

-#~ msgid "File System"
-#~ msgstr "ફાઇલ સિસ્ટમ"
-
 #~ msgid "%1$s: %2$s"
 #~ msgstr "%1$s: %2$s"

--- a/po/id.po
+++ b/po/id.po
@ -10,8 +10,8 @@ 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-10-15 23:38+0000\n"
-"PO-Revision-Date: 2012-10-16 07:11+0700\n"
+"POT-Creation-Date: 2012-09-25 00:06+0000\n"
+"PO-Revision-Date: 2012-09-25 09:53+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.3\n"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
 msgid "Screenshots"
@ -38,14 +38,6 @@ msgstr "Sistem"
 msgid "Show the message tray"
 msgstr "Tampilkan baki pesan"

-#: ../data/50-gnome-shell-system.xml.in.h:3
-msgid "Show all applications"
-msgstr "Tampilkan semua aplikasi"
-
-#: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Open the application menu"
-msgstr "Buka menu aplikasi"
-
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
@ -163,45 +155,34 @@ msgid "Keybinding to open the application menu."
 msgstr "Kombinasi tombol untuk membuka menu aplikasi."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Kombinasi tombol untuk membuka tilikan \"Tampilkan Aplikasi\""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr ""
-"Kombinasi tombol untuk membuka tilikan Ringkasan Aktivitas \"Tampilkan "
-"Aplikasi\"."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Kombinasi tombol untuk kenampakan baki pesan"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Kombinasi tombol untuk kenampakan baki pesan."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Kombinasi tombol untuk perekaman layar"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "Kombinasi tombol mulai/menghentikan perekam layar bawaan."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Which keyboard to use"
 msgstr "Papan tik mana yang akan dipakai"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "The type of keyboard to use."
 msgstr "Jenis papan tik yang akan dipakai."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Framerate used for recording screencasts."
 msgstr "Laju gambar untuk menyimpan tangkapan layar."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@ -209,11 +190,11 @@ msgstr ""
 "Laju frame dari hasil screencast yang direkam oleh perekam screencast GNOME "
 "Shell dalam frame per detik."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Jalur pipa gstreamer yang dipakai untuk mengode screencast"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -239,11 +220,11 @@ msgstr ""
 "dan merekam ke WEBM memakai kodek VP8. %T digunakan sebagai pewakil untuk "
 "perkiraan jumlah thread optimal pada sistem."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "File extension used for storing the screencast"
 msgstr "Ekstensi berkas untuk menyimpan tangkapan layar"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 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 "
@ -266,11 +247,11 @@ msgstr "Ekstensi"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Pilih ekstensi yang ingin dikonfigurasi pada kotak di atas."

-#: ../js/gdm/loginDialog.js:529
+#: ../js/gdm/loginDialog.js:527
 msgid "Session..."
 msgstr "Sesi..."

-#: ../js/gdm/loginDialog.js:677
+#: ../js/gdm/loginDialog.js:675
 msgctxt "title"
 msgid "Sign In"
 msgstr "Masuk"
@ -278,33 +259,34 @@ msgstr "Masuk"
 #. 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:736
+#: ../js/gdm/loginDialog.js:742
 msgid "Not listed?"
 msgstr "Tak masuk daftar?"

-#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:895 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:166
 msgid "Cancel"
 msgstr "Batal"

-#: ../js/gdm/loginDialog.js:894
+#: ../js/gdm/loginDialog.js:900
 msgctxt "button"
 msgid "Sign In"
 msgstr "Masuk"

-#: ../js/gdm/loginDialog.js:1215
+#: ../js/gdm/loginDialog.js:1239
 msgid "Login Window"
 msgstr "Jendela Log Masuk"

 #. Translators: accessible name of the power menu in the login screen
 #: ../js/gdm/powerMenu.js:35
+#| msgid "Power Off"
 msgid "Power"
 msgstr "Daya"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:663 ../js/ui/userMenu.js:667
+#: ../js/ui/userMenu.js:778
 msgid "Suspend"
 msgstr "Suspensi"

@ -312,8 +294,8 @@ msgstr "Suspensi"
 msgid "Restart"
 msgstr "Nyalakan Ulang"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:665 ../js/ui/userMenu.js:667
+#: ../js/ui/userMenu.js:777
 msgid "Power Off"
 msgstr "Matikan"

@ -364,7 +346,7 @@ msgstr "PENGATURAN"
 msgid "New Window"
 msgstr "Jendela Baru"

-#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:290
+#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:271
 msgid "Remove from Favorites"
 msgstr "Hapus dari Favorit"

@ -528,16 +510,16 @@ msgstr "Minggu ini"
 msgid "Next week"
 msgstr "Minggu depan"

-#: ../js/ui/components/autorunManager.js:297
+#: ../js/ui/components/autorunManager.js:278
 msgid "Removable Devices"
 msgstr "Perangkat Yang Dapat Dicabut"

-#: ../js/ui/components/autorunManager.js:594
+#: ../js/ui/components/autorunManager.js:575
 #, c-format
 msgid "Open with %s"
 msgstr "Buka dengan %s"

-#: ../js/ui/components/autorunManager.js:620
+#: ../js/ui/components/autorunManager.js:601
 msgid "Eject"
 msgstr "Keluarkan"

@ -909,7 +891,7 @@ msgstr "Sunting Akun"
 msgid "Unknown reason"
 msgstr "Alasan yang tidak diketahui"

-#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
+#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
 msgid "Show Applications"
 msgstr "Tampilkan Aplikasi"

@ -917,14 +899,14 @@ msgstr "Tampilkan Aplikasi"
 msgid "Date and Time Settings"
 msgstr "Pengaturan Waktu dan Tanggal"

-#: ../js/ui/dateMenu.js:111
+#: ../js/ui/dateMenu.js:109
 msgid "Open Calendar"
 msgstr "Buka Kalender"

 #. 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:201
+#: ../js/ui/dateMenu.js:175
 msgid "%A %B %e, %Y"
 msgstr "%A, %e %B %Y"

@ -1023,11 +1005,11 @@ msgstr "Pasang"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Unduh dan pasang '%s' dari extensions.gnome.org?"

-#: ../js/ui/keyboard.js:337
+#: ../js/ui/keyboard.js:327
 msgid "tray"
 msgstr "baki"

-#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
+#: ../js/ui/keyboard.js:561 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "Papan Ketik"
@ -1080,19 +1062,19 @@ msgstr "Tilik Sumber"
 msgid "Web Page"
 msgstr "Halaman Web"

-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1080
 msgid "Open"
 msgstr "Buka"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1087
 msgid "Remove"
 msgstr "Hapus"

-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:2055
 msgid "Message Tray"
 msgstr "Baki Pesan"

-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2511
 msgid "System Information"
 msgstr "Informasi Sistem"

@ -1157,13 +1139,13 @@ msgstr "Ketikkan perintah:"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"

-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d pesan baru"

-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1201,7 +1183,7 @@ msgstr "Sandi"
 msgid "Remember Password"
 msgstr "Ingat Sandi"

-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:169
 msgid "Unlock"
 msgstr "Buka Kunci"

@ -1319,7 +1301,7 @@ msgstr "Pengaturan Papan Ketik"
 msgid "Mouse Settings"
 msgstr "Pengaturan Tetikus"

-#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:234
+#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:236
 msgid "Sound Settings"
 msgstr "Pengaturan Suara"

@ -1600,7 +1582,7 @@ msgid "Unknown"
 msgstr "Tak Dikenal"

 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:221
+#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:223
 msgid "Volume"
 msgstr "Volume"

@ -1608,7 +1590,7 @@ msgstr "Volume"
 msgid "Microphone"
 msgstr "Mikrofon"

-#: ../js/ui/unlockDialog.js:177
+#: ../js/ui/unlockDialog.js:176
 msgid "Log in as another user"
 msgstr "Masuk sebagai pengguna lain"

@ -1636,35 +1618,39 @@ msgstr "Menganggur"
 msgid "Unavailable"
 msgstr "Tak tersedia"

-#: ../js/ui/userMenu.js:740
-msgid "Notifications"
-msgstr "Pemberitahuan"
-
-#: ../js/ui/userMenu.js:748
-msgid "System Settings"
-msgstr "Pengaturan Sistem"
-
-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:618 ../js/ui/userMenu.js:759
 msgid "Switch User"
 msgstr "Ganti Pengguna"

-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:619
+msgid "Switch Session"
+msgstr "Pindah Sesi"
+
+#: ../js/ui/userMenu.js:743
+msgid "Notifications"
+msgstr "Pemberitahuan"
+
+#: ../js/ui/userMenu.js:751
+msgid "System Settings"
+msgstr "Pengaturan Sistem"
+
+#: ../js/ui/userMenu.js:764
 msgid "Log Out"
 msgstr "Keluar"

-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:769
 msgid "Lock"
 msgstr "Kunci"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:784
 msgid "Install Updates & Restart"
 msgstr "Pasang Pemutakhiran & Jalankan Ulang"

-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:802
 msgid "Your chat status will be set to busy"
 msgstr "Status obrolan Anda akan ditata ke sibuk"

-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:803
 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."
@ -1673,19 +1659,19 @@ msgstr ""
 "telah disesuaikan untuk memberitahu pihak lain bahwa Anda mungkin tak "
 "melihat pesan mereka."

-#: ../js/ui/viewSelector.js:87
+#: ../js/ui/viewSelector.js:85
 msgid "Windows"
 msgstr "Jendela"

-#: ../js/ui/viewSelector.js:91
+#: ../js/ui/viewSelector.js:89
 msgid "Applications"
 msgstr "Aplikasi"

-#: ../js/ui/viewSelector.js:95
+#: ../js/ui/viewSelector.js:93
 msgid "Search"
 msgstr "Cari"

-#: ../js/ui/wanda.js:117
+#: ../js/ui/wanda.js:119
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1694,12 +1680,12 @@ msgstr ""
 "Maaf, tidak ada kata-kata bijak bagi Anda hari ini:\n"
 "%s"

-#: ../js/ui/wanda.js:121
+#: ../js/ui/wanda.js:123
 #, c-format
 msgid "%s the Oracle says"
 msgstr "%s sang Peramal berkata"

-#: ../js/ui/wanda.js:162
+#: ../js/ui/wanda.js:164
 msgid "Your favorite Easter Egg"
 msgstr "Easter Egg kesukaan Anda"

@ -1732,19 +1718,19 @@ msgstr[0] "%u Masukan"
 msgid "System Sounds"
 msgstr "Suara Sistem"

-#: ../src/main.c:332
+#: ../src/main.c:330
 msgid "Print version"
 msgstr "Versi Cetak"

-#: ../src/main.c:338
+#: ../src/main.c:336
 msgid "Mode used by GDM for login screen"
 msgstr "Mode yang dipakai oleh layar log masuk GDM"

-#: ../src/main.c:344
+#: ../src/main.c:342
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "Menggunakan mode tertentu, mis. \"gdm\" untuk layar masuk"

-#: ../src/main.c:350
+#: ../src/main.c:348
 msgid "List possible modes"
 msgstr "Menampilkan mode yang mungkin"

--- a/po/lt.po
+++ b/po/lt.po
--- a/po/nb.po
+++ b/po/nb.po
@ -6,10 +6,10 @@
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 3.5.x\n"
+"Project-Id-Version: gnome-shell 3.6.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-11 20:24+0200\n"
-"PO-Revision-Date: 2012-10-11 20:25+0200\n"
+"POT-Creation-Date: 2012-11-02 08:10+0100\n"
+"PO-Revision-Date: 2012-11-02 08:10+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@ -128,50 +128,60 @@ msgid ""
 msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Vis dato for uken i kalender"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Viser ISO-ukedato i kalenderen hvis «true»."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Tastaturbinding som åpner programmenyen"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Tastaturbinding som åpner programmenyen."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Tastaturbinding som slår av/på synlighet for meldingstrau"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Tastaturbinding som slår av/på synlighet for meldingstrauet."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Tastaturbinding som slår av/på skjermopptak"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "Tastaturbinding som starter/stopper innebygget opptak av skjerm."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "Tastatur som skal brukes"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "Type tastatur som skal brukes."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "Bildefrekvens i bruk ved lagring av skjermvideoer."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@ -179,11 +189,11 @@ msgstr ""
 "Bildefrekvensen i den ferdige skjermvideoen tatt opp med GNOME Shells "
 "skjermvideoopptaker i bilder per sekund."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Gstreamer-kommandokø brukt til å kode skjermvideoen"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, fuzzy, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -200,11 +210,11 @@ msgstr ""
 "Setter GStreamer-rør som brukes til å kode opptak. Den følger syntaksen som "
 "brukes for gst-launch. Røret må ha en..."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "Filendelse i bruk ved lagring av skjermvideo"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 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,7 +256,7 @@ msgstr "Ikke listet?"
 #: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:166
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "Avbryt"

@ -264,8 +274,8 @@ msgstr "Innloggingsvindu"
 msgid "Power"
 msgstr "Strøm"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Hvilemodus"

@ -273,8 +283,8 @@ msgstr "Hvilemodus"
 msgid "Restart"
 msgstr "Start på nytt"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Slå av"

@ -655,35 +665,35 @@ msgstr "Demp"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:950
 #, 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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:956
 #, 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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:961
 #, 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/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, 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/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Invitasjon til %s"
@ -691,42 +701,42 @@ 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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer deg til å bli med i %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "Avslå"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "Godta"

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

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

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Avvis"

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

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

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1208
 #, 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/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Nettverksfeil"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Autentisering feilet"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Feil ved kryptering"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikatet"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "Sertifikatet er utløpt"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "Sertifikatet er ikke aktivert"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn for sertifikat"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "Feil fingeravtrykk for sertifikat"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Sertifikatet er selvsignert"

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

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

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "Sertifikatet er ugyldig"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "Tilkobling ble nektet"

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

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "Tilkobling tapt"

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

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1334
 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/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"

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

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er tilbaketrukket"

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

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -846,26 +856,26 @@ msgstr ""
 "Lengden eller dybden på tjenersertifikatet oversteg grensen som er satt i "
 "kryptografibiblioteket"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "Intern feil"

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

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Koble til på nytt"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Rediger konto"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Ukjent årsak"

@ -884,7 +894,7 @@ msgstr "Åpne kalender"
 #. 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:190
+#: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%a %e %B, %Y"

@ -1046,23 +1056,23 @@ msgstr "Vis kildekode"
 msgid "Web Page"
 msgstr "Nettside"

-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Åpne"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Fjern"

-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Meldingstrau"

-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Systeminformasjon"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Ukjent"
@ -1118,18 +1128,18 @@ msgstr "Oppgi en kommando:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %B %d"

-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d ny melding"
 msgstr[1] "%d nye meldinger"

-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1168,7 +1178,7 @@ msgstr "Passord"
 msgid "Remember Password"
 msgstr "Husk passord"

-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:169
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "Lås opp"

@ -1579,63 +1589,63 @@ msgstr "Volum"
 msgid "Microphone"
 msgstr "Mikrofon"

-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "Logg inn som en annen bruker"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Tilgjengelig"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Opptatt"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Usynlig"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Borte"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Ledig"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"

-#: ../js/ui/userMenu.js:740
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Varslinger"

-#: ../js/ui/userMenu.js:748
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Systeminnstillinger"

-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Bytt bruker"

-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Logg ut"

-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Lås"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Installer oppdateringer og start på nytt"

-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Din pratestatus vil bli satt til opptatt"

-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:804
 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."
@ -1721,7 +1731,7 @@ msgstr "Bruk spesifikt modus, f.eks «gdm» for innloggingsskjerm"
 msgid "List possible modes"
 msgstr "Vis mulige modi"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Klarte ikke å starte «%s»"
--- a/po/pa.po
+++ b/po/pa.po
@ -7,8 +7,8 @@ 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-09-25 00:06+0000\n"
-"PO-Revision-Date: 2012-09-25 06:45+0530\n"
+"POT-Creation-Date: 2012-10-31 16:48+0000\n"
+"PO-Revision-Date: 2012-11-04 09:23+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "Language: pa\n"
@ -137,50 +137,63 @@ msgstr ""
 "GsmPresenceStatus ਤੋਂ ਇੱਥੇ ਮੁੱਲ।"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "ਯੂਜ਼ਰ ਮੇਨੂ ਵਿੱਚ \"ਲਾਗ ਆਉਟ\" ਆਈਟਮ ਹਮੇਸ਼ਾ ਵੇਖਾਉ।"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"ਇਹ ਕੁੰਜੀ ਇੱਕਲੇ-ਯੂਜ਼ਰ, ਇੱਕਲੇ-ਸ਼ੈਸ਼ਨ ਹਾਲਤਾਂ ਵਿੱਚ 'ਲਾਗਆਉਟ' ਆਈਟਮ ਨੂੰ ਆਪਣੇ-ਆਪ ਓਹਲੇ "
+"ਰੱਖਣ ਨੂੰ "
+"ਅਣਡਿੱਠਾ ਕਰਦੀ ਹੈ।"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਹਫ਼ਤਾ ਮਿਤੀ ਵੇਖੋ"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ ਕੈਲੰਡਰ ਵਿੱਚ ISO ਹਫਤਾ ਮਿਤੀ ਵੇਖਾਈ ਜਾਵੇਗੀ।"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਮੇਨੂ ਖੋਲ੍ਹਣ ਲਈ ਕੀਬਾਈਡਿੰਗ ਹੈ"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਮੇਨੂ ਖੋਲ੍ਹਣ ਲਈ ਕੀਬਾਈਡਿੰਗ ਹੈ।"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "ਸੁਨੇਹਾ ਟਰੇ ਦੀ ਦਿੱਖਣ ਨੂੰ ਬਦਲਣ ਲਈ ਕੀਬਾਈਡਿੰਗ"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "ਸੁਨੇਹਾ ਟਰੇ ਦੀ ਦਿੱਖਣ ਨੂੰ ਬਦਲਣ ਲਈ ਕੀਬਾਈਡਿੰਗ ਹੈ।"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
 msgstr "ਸਕਰੀਨ ਰਿਕਾਡਰ ਨੂੰ ਬਦਲਣ ਲਈ ਕੀਬਾਈਡਿੰਗ"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr "ਬਿਲਟ-ਇਨ ਸਕਰੀਨ ਰਿਕਾਰਡ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ/ਰੋਕਣ ਲਈ ਕੀਬਾਈਡਿੰਗ"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "ਕਿਹੜਾ ਕੀਬੋਰਡ ਵਰਤਣਾ ਹੈ"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "ਵਰਤਣ ਲਈ ਕੀਬੋਰਡ ਦੀ ਕਿਸਮ ਹੈ।"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "ਸਕਰੀਨਕਾਸਟ ਰਿਕਾਰਡ ਕਰਨ ਲਈ ਫਰੇਮਰੇਟ ਹੈ।"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@ -189,11 +202,11 @@ msgstr ""
 "ਫਰੇਮ ਪ੍ਰਤੀ "
 "ਸਕਿੰਟ 'ਚ ਹੈ।"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "ਸਕਰੀਨਕਾਸਟ ਇੰਕੋਡ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਜੀਸਟਰੀਮਰ ਪਾਇਪਲਾਇਨ"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -226,11 +239,11 @@ msgstr ""
 "ਲਗਾਉਣ ਲਈ "
 "ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ।"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "ਸਕਰੀਨਕਾਸਟ ਸੰਭਾਲਣ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਫਾਇਲ ਇਕਟੈਨਸ਼ਨ"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 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 "
@ -255,11 +268,11 @@ msgstr "ਇਕਸਟੈਸ਼ਨ"
 msgid "Select an extension to configure using the combobox above."
 msgstr "ਉੱਤੇ ਦਿੱਤੇ ਕੰਬੋਬਾਕਸ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇਕਸਟੈਸ਼ਨ ਦੀ ਸੰਰਚਨਾ ਕਰਨ ਲਈ ਚੋਣ ਕਰੋ।"

-#: ../js/gdm/loginDialog.js:527
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "ਸ਼ੈਸ਼ਨ..."

-#: ../js/gdm/loginDialog.js:675
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "ਸਾਇਨ ਇਨ"
@ -267,34 +280,33 @@ 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:742
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "ਲਿਸਟ ਵਿੱਚ ਨਹੀਂ ਹੈ?"

-#: ../js/gdm/loginDialog.js:895 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:166
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"

-#: ../js/gdm/loginDialog.js:900
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "ਸਾਇਨ ਇਨ"

-#: ../js/gdm/loginDialog.js:1239
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "ਲਾਗਇਨ ਵਿੰਡੋ"

 #. Translators: accessible name of the power menu in the login screen
 #: ../js/gdm/powerMenu.js:35
-#| msgid "Power Off"
 msgid "Power"
 msgstr "ਪਾਵਰ"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:663 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:778
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "ਸਸਪੈਂਡ"

@ -302,8 +314,8 @@ msgstr "ਸਸਪੈਂਡ"
 msgid "Restart"
 msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:665 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:777
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "ਬੰਦ ਕਰੋ"

@ -354,7 +366,7 @@ msgstr "ਸੈਟਿੰਗ"
 msgid "New Window"
 msgstr "ਨਵੀਂ ਵਿੰਡੋ"

-#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:271
+#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:290
 msgid "Remove from Favorites"
 msgstr "ਪਸੰਦ ਵਿੱਚੋਂ ਹਟਾਓ"

@ -518,16 +530,16 @@ msgstr "ਇਹ ਹਫ਼ਤਾ"
 msgid "Next week"
 msgstr "ਹਫ਼ਤਾ ਅੱਗੇ"

-#: ../js/ui/components/autorunManager.js:278
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "ਹਟਾਉਣਯੋਗ ਜੰਤਰ"

-#: ../js/ui/components/autorunManager.js:575
+#: ../js/ui/components/autorunManager.js:594
 #, c-format
 msgid "Open with %s"
 msgstr "%s ਨਾਲ ਖੋਲ੍ਹੋ"

-#: ../js/ui/components/autorunManager.js:601
+#: ../js/ui/components/autorunManager.js:620
 msgid "Eject"
 msgstr "ਬਾਹਰ ਕੱਢੋ"

@ -682,35 +694,35 @@ msgstr "ਚੁੱਪ"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:950
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "<b>%2$A</b> ਨੂੰ <b>%1$X</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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:956
 #, 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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:961
 #, 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/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, 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/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "%s ਲਈ ਸੱਦਾ"
@ -718,42 +730,42 @@ 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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ਤੁਹਾਨੂੰ %s ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "ਇਨਕਾਰ"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "ਮਨਜ਼ੂਰ"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1131
 #, c-format
 msgid "Video call from %s"
 msgstr "%s ਵਲੋਂ ਵਿਡੀਓ ਕਾਲ"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "%s ਵਲੋਂ ਕਾਲ"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "ਨਾ-ਮਨਜ਼ੂਰ"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "ਜਵਾਬ ਦਿਓ"

@ -762,110 +774,110 @@ msgstr "ਜਵਾਬ ਦਿਓ"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1173
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s ਤੁਹਾਨੂੰ %s ਭੇਜ ਰਿਹਾ/ਰਹੀ ਹੈ"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1208
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr ""
 "%s ਤੁਹਾਨੂੰ ਵੇਖਣ ਦਾ ਅਧਿਕਾਰ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ, ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਆਨਲਾਈਨ ਹੋਵੋ"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੋਈ"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਗਲਤੀ"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਦਿੱਤਾ"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਬੇਭਰੋਸੇਯੋਗ"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗੀ"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਸਰਗਰਮ ਨਹੀਂ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ ਨਹੀਂ ਮਿਲਦਾ"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਫਿੰਗਰ-ਪਰਿੰਟ ਮਿਲਦਾ ਨਹੀਂ"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਖੁਦ-ਦਸਤਖਤੀ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "ਹਾਲਤ ਆਫਲਾਈਨ ਸੈੱਟ ਕੀਤੀ ਗਈ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਗਿਆ"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋ ਗਿਆ"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "ਇਹ ਅਕਾਊਂਟ ਪਹਿਲਾਂ ਹੀ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1334
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "ਉਸੇ ਸਰੋਤ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਨਵੇਂ ਕੁਨੈਕਸ਼ਨ ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਗਿਆ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr "ਸਰਵਰ ਇਸ ਵੇਲੇ ਐਨਾ ਰੁੱਝਿਆ ਹੋਇਆ ਹੈ ਕਿ ਕੁਨੈਕਸ਼ਨ ਸੰਭਾਲ ਨਹੀਂ ਸਕਦਾ"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਮਨਸੂਖ ਕੀਤਾ ਜਾ ਚੁੱਕਾ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "ਸਰਟੀਫਿਕੇਟ ਅਸੁਰੱਖਿਅਤ ਸੀਫ਼ਰ ਐਲਗੋਰਿਥਮ ਵਰਤਦਾ ਹੈ ਜਾਂ ਕਮਜ਼ੋਰ ਕ੍ਰਿਪਟੋਗਰਾਫਿਕਲ ਵਰਤਦਾ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -874,30 +886,30 @@ msgstr ""
 "ਲਾਇਬਰੇਰੀ ਵਲੋਂ ਰੱਖੀ "
 "ਗਈ ਲਿਮਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ।"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "%s ਲਈ ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "ਮੁੜ-ਕੁਨੈਕਟ ਕਰੋ"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "ਅਕਾਊਂਟ ਸੋਧ"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "ਅਣਜਾਣ ਕਾਰਨ"

-#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
+#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵੇਖੋ"

@ -905,14 +917,14 @@ msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵੇਖੋ"
 msgid "Date and Time Settings"
 msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ ਸੈਟਿੰਗ"

-#: ../js/ui/dateMenu.js:109
+#: ../js/ui/dateMenu.js:111
 msgid "Open Calendar"
 msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹੋ"

 #. 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:175
+#: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%A, %e %B %Y"

@ -1015,11 +1027,11 @@ msgstr "ਇੰਸਟਾਲ ਕਰੋ"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "ਕੀ extensions.gnome.org ਤੋਂ '%s' ਡਾਊਨਲੋਡ ਅਤੇ ਇੰਸਟਾਲ ਕਰਨੀ ਹੈ?"

-#: ../js/ui/keyboard.js:327
+#: ../js/ui/keyboard.js:337
 msgid "tray"
 msgstr "ਟਰੇ"

-#: ../js/ui/keyboard.js:561 ../js/ui/status/keyboard.js:195
+#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "ਕੀਬੋਰਡ"
@ -1072,23 +1084,23 @@ msgstr "ਸਰੋਤ ਵੇਖੋ"
 msgid "Web Page"
 msgstr "ਵੈੱਬ ਪੇਜ਼"

-#: ../js/ui/messageTray.js:1080
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "ਖੋਲ੍ਹੋ"

-#: ../js/ui/messageTray.js:1087
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "ਹਟਾਓ"

-#: ../js/ui/messageTray.js:2055
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "ਸੁਨੇਹਾ ਟਰੇ"

-#: ../js/ui/messageTray.js:2511
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "ਸਿਸਟਮ ਜਾਣਕਾਰੀ"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
@ -1144,7 +1156,7 @@ msgstr "ਕਮਾਂਡ ਦਿਓ ਜੀ:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %d %B"

@ -1194,7 +1206,7 @@ msgstr "ਪਾਸਵਰਡ"
 msgid "Remember Password"
 msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"

-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:169
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "ਅਣ-ਲਾਕ"

@ -1312,7 +1324,7 @@ msgstr "ਕੀਬੋਰਡ ਸੈਟਿੰਗ"
 msgid "Mouse Settings"
 msgstr "ਮਾਊਸ ਸੈਟਿੰਗ"

-#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:236
+#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:234
 msgid "Sound Settings"
 msgstr "ਸਾਊਂਡ ਸੈਟਿੰਗ"

@ -1597,7 +1609,7 @@ msgid "Unknown"
 msgstr "ਅਣਜਾਣ"

 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:223
+#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:221
 msgid "Volume"
 msgstr "ਆਵਾਜ਼"

@ -1605,67 +1617,63 @@ msgstr "ਆਵਾਜ਼"
 msgid "Microphone"
 msgstr "ਮਾਈਕਰੋਫੋਨ"

-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "ਹੋਰ ਯੂਜ਼ਰ ਵਜੋਂ ਲਾਗਇਨ"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "ਉਪਲੱਬਧ"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "ਰੁਝਿਆ"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "ਅਦਿੱਖ"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "ਦੂਰ"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "ਵੇਹਲਾ"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "ਨਾ ਉਪਲੱਬਧ"

-#: ../js/ui/userMenu.js:618 ../js/ui/userMenu.js:759
-msgid "Switch User"
-msgstr "ਯੂਜ਼ਰ ਬਦਲੋ"
-
-#: ../js/ui/userMenu.js:619
-msgid "Switch Session"
-msgstr "ਸ਼ੈਸ਼ਨ ਬਦਲੋ"
-
-#: ../js/ui/userMenu.js:743
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ"

-#: ../js/ui/userMenu.js:751
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "ਸਿਸਟਮ ਸੈਟਿੰਗ"

-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "ਯੂਜ਼ਰ ਬਦਲੋ"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "ਲਾਗ ਆਉਟ"

-#: ../js/ui/userMenu.js:769
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "ਲਾਕ"

-#: ../js/ui/userMenu.js:784
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕਰੋ ਅਤੇ ਮੁੜ-ਚਾਲੂ"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "ਤੁਹਾਡੀ ਚੈਟ ਹਾਲਤ ਰੁੱਝੇ ਵਜੋਂ ਸੈੱਟ ਕੀਤੀ ਜਾਵੇਗੀ"

-#: ../js/ui/userMenu.js:803
+#: ../js/ui/userMenu.js:804
 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."
@ -1687,7 +1695,7 @@ msgstr "ਐਪਲੀਕੇਸ਼ਨ"
 msgid "Search"
 msgstr "ਖੋਜ"

-#: ../js/ui/wanda.js:119
+#: ../js/ui/wanda.js:117
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1696,12 +1704,12 @@ msgstr ""
 "ਅਫਸੋਸ, ਅੱਜ ਤੁਹਾਡੇ ਲਈ ਕੋਈ ਨਸੀਹਤ ਨਹੀਂ:\n"
 "%s "

-#: ../js/ui/wanda.js:123
+#: ../js/ui/wanda.js:121
 #, c-format
 msgid "%s the Oracle says"
 msgstr "%s ਓਰੇਕਲ ਨੇ ਕਿਹਾ"

-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "ਤੁਹਾਡਾ ਪਸੰਦੀਦਾ ਈਸਟਰ ਅੰਡਾ"

@ -1736,23 +1744,23 @@ msgstr[1] "%u ਇੰਪੁੱਟ"
 msgid "System Sounds"
 msgstr "ਸਿਸਟਮ ਸਾਊਂਡ"

-#: ../src/main.c:330
+#: ../src/main.c:332
 msgid "Print version"
 msgstr "ਵਰਜਨ ਛਾਪੋ"

-#: ../src/main.c:336
+#: ../src/main.c:338
 msgid "Mode used by GDM for login screen"
 msgstr "ਲਾਗਇਨ ਸਕਰੀਨ ਲਈ GDM ਵਲੋਂ ਵਰਤਿਆ ਮੋਡ"

-#: ../src/main.c:342
+#: ../src/main.c:344
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "ਲਾਗਇਨ ਸਕਰੀਨ ਉੱਤੇ ਖਾਸ ਮੋਡ ਜਿਵੇਂ ਕਿ \"gdm\" ਵਰਤੋਂ"

-#: ../src/main.c:348
+#: ../src/main.c:350
 msgid "List possible modes"
 msgstr "ਸੰਭਵ ਮੋਡ ਵੇਖਾਓ"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "'%s' ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ"
@ -1777,6 +1785,9 @@ msgstr "ਡਿਫਾਲਟ"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "ਪਰਮਾਣਕਿਤਾ ਡਾਈਲਾਗ ਯੂਜ਼ਰ ਵਲੋਂ ਰੱਦ ਕੀਤਾ"

+#~ msgid "Switch Session"
+#~ msgstr "ਸ਼ੈਸ਼ਨ ਬਦਲੋ"
+
 #~ msgid "disabled OpenSearch providers"
 #~ msgstr "ਓਪਨਸਰਚ ਉਪਲੱਬਧ ਕਰਵਾਉਣ ਵਾਲੇ ਬੰਦ ਹਨ"

--- a/po/ru.po
+++ b/po/ru.po
@ -15,8 +15,8 @@ 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-09-25 00:06+0000\n"
-"PO-Revision-Date: 2012-09-27 16:38+0400\n"
+"POT-Creation-Date: 2012-10-31 16:48+0000\n"
+"PO-Revision-Date: 2012-11-04 20:48+0400\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@ -141,51 +141,63 @@ msgstr ""
 "Данное значение берётся из перечисления GsmPresenceStatus."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Всегда показывать в меню пункт «Завершить сеанс»."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Этот ключ переопределяет автоматическое скрытие пункта «Завершить сеанс» при "
+"использовании одиночного сеанса."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Показывать в часах дату недели"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Если установлено, календарь будет показывать неделю в формате ISO."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Комбинация клавиш для открытия меню приложения"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Комбинация клавиш для открытия меню приложения."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Комбинация клавиш для переключения видимости панели сообщений"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Комбинация клавиш для переключения видимости панели сообщений."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Комбинация клавиш для переключения записи экрана"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to start/stop the builtin screen recorder."
 msgstr ""
 "Комбинация клавиш для запуска/остановки встроенного средства записи экрана."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Which keyboard to use"
 msgstr "Какую клавиатуру использовать"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
 msgstr "Тип используемой клавиатуры."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
 msgstr "Частота смены кадров для записи скринкастов."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@ -193,11 +205,11 @@ msgstr ""
 "Частота смены кадров в скринкасте, записанном с помощью GNOME Shell (кадров/"
 "сек)."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "Конвейер gstreamer, используемый для кодирования скринкастов"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@ -224,11 +236,11 @@ msgstr ""
 "используется как заполнитель для определения оптимального количества потоков "
 "в системе."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "File extension used for storing the screencast"
 msgstr "Расширение файла, использующееся для хранения скринкастов"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 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 "
@ -251,11 +263,11 @@ msgstr "Расширение"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Выберите расширение из выпадающего списка."

-#: ../js/gdm/loginDialog.js:527
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "Сеанс…"

-#: ../js/gdm/loginDialog.js:675
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "Вход в систему"
@ -263,34 +275,33 @@ 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:742
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "Нет в списке?"

-#: ../js/gdm/loginDialog.js:895 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:166
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "Отмена"

-#: ../js/gdm/loginDialog.js:900
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "Войти"

-#: ../js/gdm/loginDialog.js:1239
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "Окно входа в систему"

 #. Translators: accessible name of the power menu in the login screen
 #: ../js/gdm/powerMenu.js:35
-#| msgid "Power Off"
 msgid "Power"
 msgstr "Питание"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:663 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:778
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Ждущий режим"

@ -298,8 +309,8 @@ msgstr "Ждущий режим"
 msgid "Restart"
 msgstr "Перезапустить"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:665 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:777
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Выключить"

@ -350,7 +361,7 @@ msgstr "НАСТРОЙКИ"
 msgid "New Window"
 msgstr "Новое окно"

-#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:271
+#: ../js/ui/appDisplay.js:678 ../js/ui/dash.js:290
 msgid "Remove from Favorites"
 msgstr "Удалить из избранного"

@ -514,16 +525,16 @@ msgstr "Эта неделя"
 msgid "Next week"
 msgstr "Следующая неделя"

-#: ../js/ui/components/autorunManager.js:278
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "Cъёмные устройства"

-#: ../js/ui/components/autorunManager.js:575
+#: ../js/ui/components/autorunManager.js:594
 #, c-format
 msgid "Open with %s"
 msgstr "Открыть с помощью %s"

-#: ../js/ui/components/autorunManager.js:601
+#: ../js/ui/components/autorunManager.js:620
 msgid "Eject"
 msgstr "Извлечь"

@ -679,35 +690,35 @@ msgstr "Приглушить звук"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:950
 #, no-c-format
 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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:956
 #, 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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:961
 #, 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/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, 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/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Приглашение в %s"
@ -715,42 +726,42 @@ 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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s приглашает вас присоединиться к %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "Отказаться"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "Принять"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1131
 #, c-format
 msgid "Video call from %s"
 msgstr "Вас вызывает %s по видео"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "Вас вызывает %s"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Отклонить"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "Ответить"

@ -759,111 +770,111 @@ msgstr "Ответить"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1173
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s отправляет вам %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1208
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s хотел бы получить разрешение видеть, когда вы в сети"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Ошибка сети"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Ошибка аутентификации"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Ошибка шифрования"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "Сертификат не предоставляется"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "Недоверенный сертификат"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "Срок действия сертификата истёк"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "Сертификат не активирован"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "Имя узла сертификата не совпадает"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "Отпечаток сертификата не совпадает"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Самоподписанный сертификат"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "Установлен статус «не в сети»"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "Шифрование недоступно"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "Недействительный сертификат"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "В соединении отказано"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "Соединение не может быть установлено"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "Соединение потеряно"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "Эта учётная запись уже подключена к серверу"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1334
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Соединение было заменено новым, используя тот же источник"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Учётная запись уже существует на сервере"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Сервер в настоящее время сильно перегружен, чтобы обработать соединение"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "Сертификат аннулирован"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Сертификат использует небезопасный алгоритм шифрования или он "
 "криптографически нестоек"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -871,30 +882,30 @@ msgstr ""
 "Длина сертификата сервера, или глубина цепочки сертификатов сервера, "
 "превышает пределы, установленные библиотекой криптографии"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "Внутренняя ошибка"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Сбой подключения к %s"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Переподключиться"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Изменить учётную запись"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Неизвестная причина"

-#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
+#: ../js/ui/dash.js:253 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "Показать приложения"

@ -902,14 +913,14 @@ msgstr "Показать приложения"
 msgid "Date and Time Settings"
 msgstr "Настроить дату и время"

-#: ../js/ui/dateMenu.js:109
+#: ../js/ui/dateMenu.js:111
 msgid "Open Calendar"
 msgstr "Открыть календарь"

 #. 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:175
+#: ../js/ui/dateMenu.js:201
 msgid "%A %B %e, %Y"
 msgstr "%A, %e %B, %Y"

@ -1019,11 +1030,11 @@ msgstr "Установить"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Загрузить и установить расширение «%s» с extensions.gnome.org?"

-#: ../js/ui/keyboard.js:327
+#: ../js/ui/keyboard.js:337
 msgid "tray"
 msgstr "лоток"

-#: ../js/ui/keyboard.js:561 ../js/ui/status/keyboard.js:195
+#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "Клавиатура"
@ -1076,23 +1087,23 @@ msgstr "Показать код"
 msgid "Web Page"
 msgstr "Веб-страница"

-#: ../js/ui/messageTray.js:1080
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Открыть"

-#: ../js/ui/messageTray.js:1087
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Удалить"

-#: ../js/ui/messageTray.js:2055
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Панель сообщений"

-#: ../js/ui/messageTray.js:2511
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Системная информация"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Неизвестно"
@ -1148,7 +1159,7 @@ msgstr "Введите команду:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%d %B, %A"

@ -1200,7 +1211,7 @@ msgstr "Пароль"
 msgid "Remember Password"
 msgstr "Запомнить пароль"

-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:169
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "Разблокировать"

@ -1318,7 +1329,7 @@ msgstr "Настроить клавиатуру"
 msgid "Mouse Settings"
 msgstr "Настроить мышь"

-#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:236
+#: ../js/ui/status/bluetooth.js:269 ../js/ui/status/volume.js:234
 msgid "Sound Settings"
 msgstr "Настроить звук"

@ -1607,7 +1618,7 @@ msgid "Unknown"
 msgstr "Неизвестно"

 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:223
+#: ../js/ui/status/volume.js:47 ../js/ui/status/volume.js:221
 msgid "Volume"
 msgstr "Громкость"

@ -1615,67 +1626,63 @@ msgstr "Громкость"
 msgid "Microphone"
 msgstr "Микрофон"

-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "Войти от имени другого пользователя"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Доступен"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Занят"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Невидим"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Отошёл"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Бездействует"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Недоступен"

-#: ../js/ui/userMenu.js:618 ../js/ui/userMenu.js:759
-msgid "Switch User"
-msgstr "Сменить пользователя"
-
-#: ../js/ui/userMenu.js:619
-msgid "Switch Session"
-msgstr "Переключить сеанс"
-
-#: ../js/ui/userMenu.js:743
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Уведомления"

-#: ../js/ui/userMenu.js:751
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Системные параметры"

-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "Сменить пользователя"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Выйти из системы"

-#: ../js/ui/userMenu.js:769
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Заблокировать"

-#: ../js/ui/userMenu.js:784
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Установить обновления и выполнить перезагрузку"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Будет установлен статус «не беспокоить»"

-#: ../js/ui/userMenu.js:803
+#: ../js/ui/userMenu.js:804
 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."
@ -1695,7 +1702,7 @@ msgstr "Приложения"
 msgid "Search"
 msgstr "Поиск"

-#: ../js/ui/wanda.js:119
+#: ../js/ui/wanda.js:117
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1704,12 +1711,12 @@ msgstr ""
 "Извините, на сегодня нет никаких советов:\n"
 "%s"

-#: ../js/ui/wanda.js:123
+#: ../js/ui/wanda.js:121
 #, c-format
 msgid "%s the Oracle says"
 msgstr "Оракул говорит: «%s»"

-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "Ваше любимое «пасхальное яйцо»"

@ -1746,24 +1753,24 @@ msgstr[2] "%u входов"
 msgid "System Sounds"
 msgstr "Системные звуки"

-#: ../src/main.c:330
+#: ../src/main.c:332
 msgid "Print version"
 msgstr "Показать номер версии"

-#: ../src/main.c:336
+#: ../src/main.c:338
 msgid "Mode used by GDM for login screen"
 msgstr "Режим, используемый GDM для окна входа в систему"

-#: ../src/main.c:342
+#: ../src/main.c:344
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr ""
 "Использовать для экрана входа в систему определённый режим, например «gdm»"

-#: ../src/main.c:348
+#: ../src/main.c:350
 msgid "List possible modes"
 msgstr "Список возможных режимов"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Не удалось запустить «%s»"
@ -1788,6 +1795,9 @@ msgstr "По умолчанию"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Пользователь отклонил диалог аутентификации"

+#~ msgid "Switch Session"
+#~ msgstr "Переключить сеанс"
+
 #~ msgid "disabled OpenSearch providers"
 #~ msgstr "отключённые провайдеры OpenSearch"

--- a/po/sk.po
+++ b/po/sk.po
@ -10,8 +10,8 @@ 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-10-27 16:22+0000\n"
-"PO-Revision-Date: 2012-10-28 19:49+0000\n"
+"POT-Creation-Date: 2012-10-18 16:51+0000\n"
+"PO-Revision-Date: 2012-10-13 22:35+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@ -25,6 +25,8 @@ msgstr ""
 msgid "Screenshots"
 msgstr "Snímky obrazovky"

+# PM: inde dianie na obrazovke
+# DK:presne taketo nieco som chcel povedat ale nevedel som ako
 #: ../data/50-gnome-shell-screenshot.xml.in.h:2
 msgid "Record a screencast"
 msgstr "Zaznamenať dianie na obrazovke"
@ -35,16 +37,20 @@ msgstr "Systém"

 #: ../data/50-gnome-shell-system.xml.in.h:2
 msgid "Show the message tray"
-msgstr "Zobrazí lištu správ"
+msgstr "Zobraziť lištu správ"

 # tooltip
 #: ../data/50-gnome-shell-system.xml.in.h:3
+#, fuzzy
+#| msgid "Show Applications"
 msgid "Show all applications"
-msgstr "Zobrazí všetky aplikácie"
+msgstr "Zobrazí aplikácie"

 #: ../data/50-gnome-shell-system.xml.in.h:4
+#, fuzzy
+#| msgid "Keybinding to open the application menu"
 msgid "Open the application menu"
-msgstr "Otvorí ponuku aplikácií"
+msgstr "Klávesová skratka na otvorenie ponuky aplikácií"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@ -79,9 +85,13 @@ msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "Uuids of extensions to enable"
-msgstr "Vlastnosť uuid rozšírení určených na povolenie"
+msgstr "Uuid identifikátory rozšírení určených na povolenie"

+# PM: nepáči sa mi konštrukcia viet, preklad vyznieva strojovo
+# DK: uz lepsie?
+# PM: lepšie ale nepáči sa mi org.gnome.Shell. mne sa vidí že to bude nejaký súbor a potom predložka na asi nebude dobre
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
+#, fuzzy
 msgid ""
 "GNOME Shell extensions have a uuid property; this key lists extensions which "
 "should be loaded. Any extension that wants to be loaded needs to be in this "
@ -91,7 +101,7 @@ msgstr ""
 "Rozšírenia pre GNOME Shell majú vlastnosť uuid; tento kľúč obsahuje zoznam "
 "rozšírení, ktoré by mali byť načítané. Každé rozšírenie, ktoré je potrebné "
 "načítať, musí byť v tomto zozname. Tento zoznam môžete upraviť aj ručne "
-"pomocou metód DBus EnableExtension a DisableExtension v org.gnome.Shell."
+"pomocou metód DBus EnableExtension a DisableExtension na org.gnome.Shell."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Whether to collect stats about applications usage"
@ -166,15 +176,17 @@ msgid "Keybinding to open the application menu."
 msgstr "Klávesová skratka na otvorenie ponuky aplikácií."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#, fuzzy
+#| msgid "Keybinding to open the application menu"
 msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Klávesová skratka na otvorenie pohľadu „Zobraziť aplikácie“"
+msgstr "Klávesová skratka na otvorenie ponuky aplikácií"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#, fuzzy
+#| msgid "Keybinding to open the application menu."
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr ""
-"Klávesová skratka na otvorenie pohľadu „Zobraziť aplikácie“ v prehľade "
-"aktivít."
+msgstr "Klávesová skratka na otvorenie ponuky aplikácií."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
@ -199,7 +211,7 @@ msgstr "Ktorú klávesnicu používať"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "The type of keyboard to use."
-msgstr "Typ klávesnice, ktorá sa má používať."
+msgstr "Typ klávesnice, ktorý sa má používať."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Framerate used for recording screencasts."
@ -261,39 +273,6 @@ msgstr ""
 "základe aktuálneho dátumu a použije túto príponu. Pri nahrávaní do iného "
 "formátu kontajneru by mala byť zmenená."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
-msgid "Attach modal dialog to the parent window"
-msgstr "Pripojiť modálne dialógové okno k rodičovskému oknu"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr "Tento kľúč preváži kľúč v org.gnome.mutter po spustení GNOME Shell."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Usporiadanie tlačidiel na titulku okna"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Tento kľúč preváži kľúč v org.gnome.desktop.wm.preferences po spustení GNOME "
-"Shell."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
-msgid "Workspaces are managed dynamically"
-msgstr "Pracovné priestory sú spravované dynamicky"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid "Workspaces only on primary monitor"
-msgstr "Pracovné priestory sú iba na primárnom monitore"
-
 #: ../js/extensionPrefs/main.js:124
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
@ -307,11 +286,11 @@ msgstr "Rozšírenie"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Použitím ponuky vyberte rozšírenie na nastavenie"

-#: ../js/gdm/loginDialog.js:560
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "Relácia..."

-#: ../js/gdm/loginDialog.js:704
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "Prihlásenie"
@ -320,42 +299,42 @@ msgstr "Prihlásenie"
 #. 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:763
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "Nie ste v zozname?"

-#: ../js/gdm/loginDialog.js:901 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:889 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:373
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:168
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "Zrušiť"

-#: ../js/gdm/loginDialog.js:906
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prihlásiť sa"

-#: ../js/gdm/loginDialog.js:1217
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "Prihlasovacie okno"

 #. Translators: accessible name of the power menu in the login screen
-#: ../js/gdm/powerMenu.js:36
+#: ../js/gdm/powerMenu.js:37
 msgid "Power"
 msgstr "Napájanie"

-#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:663 ../js/ui/userMenu.js:667
-#: ../js/ui/userMenu.js:778
+#: ../js/gdm/powerMenu.js:95 ../js/ui/userMenu.js:655 ../js/ui/userMenu.js:659
+#: ../js/ui/userMenu.js:770
 msgid "Suspend"
 msgstr "Uspať"

-#: ../js/gdm/powerMenu.js:98
+#: ../js/gdm/powerMenu.js:100
 msgid "Restart"
 msgstr "Reštartovať"

-#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:665
-#: ../js/ui/userMenu.js:667 ../js/ui/userMenu.js:777
+#: ../js/gdm/powerMenu.js:105 ../js/ui/userMenu.js:657
+#: ../js/ui/userMenu.js:659 ../js/ui/userMenu.js:769
 msgid "Power Off"
 msgstr "Vypnúť"

@ -538,35 +517,35 @@ msgid "S"
 msgstr "So"

 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:700
+#: ../js/ui/calendar.js:699
 msgid "Nothing Scheduled"
 msgstr "Žiadne naplánované udalosti"

 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:716
+#: ../js/ui/calendar.js:715
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"

 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:719
+#: ../js/ui/calendar.js:718
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e. %B %Y"

-#: ../js/ui/calendar.js:729
+#: ../js/ui/calendar.js:728
 msgid "Today"
 msgstr "Dnes"

-#: ../js/ui/calendar.js:733
+#: ../js/ui/calendar.js:732
 msgid "Tomorrow"
 msgstr "Zajtra"

-#: ../js/ui/calendar.js:744
+#: ../js/ui/calendar.js:743
 msgid "This week"
 msgstr "Tento týždeň"

-#: ../js/ui/calendar.js:752
+#: ../js/ui/calendar.js:751
 msgid "Next week"
 msgstr "Ďalší týždeň"

@ -574,11 +553,10 @@ msgstr "Ďalší týždeň"
 msgid "Removable Devices"
 msgstr "Vymeniteľné zariadenia"

-# DK: doplnil som slovo "programu", aby to znelo prirodzenejsie. priklad:po pripojeni USB kluca bolo zobrazene "Otvoriť pomocou Súbory"
 #: ../js/ui/components/autorunManager.js:591
 #, c-format
 msgid "Open with %s"
-msgstr "Otvoriť pomocou programu %s"
+msgstr "Otvoriť pomocou %s"

 #: ../js/ui/components/autorunManager.js:617
 msgid "Eject"
@ -645,7 +623,7 @@ msgstr ""

 #: ../js/ui/components/networkAgent.js:314
 msgid "Wired 802.1X authentication"
-msgstr "Overenie totožnosti k drôtovej sieti 802.1X"
+msgstr "Overenie totožnosti drôtovej 802.1X"

 #: ../js/ui/components/networkAgent.js:316
 msgid "Network name: "
@ -653,7 +631,7 @@ msgstr "Názov siete: "

 #: ../js/ui/components/networkAgent.js:321
 msgid "DSL authentication"
-msgstr "Overenie totožnosti k DSL"
+msgstr "Overenie totožnosti DSL"

 #: ../js/ui/components/networkAgent.js:328
 msgid "PIN code required"
@ -661,7 +639,7 @@ msgstr "Požaduje sa kód PIN"

 #: ../js/ui/components/networkAgent.js:329
 msgid "PIN code is needed for the mobile broadband device"
-msgstr "Pre zariadenie mobilnej siete je potrebný kód PIN"
+msgstr "Pre zariadenie mobilnej siete je potrebný PIN kód"

 #: ../js/ui/components/networkAgent.js:330
 msgid "PIN: "
@ -669,7 +647,7 @@ msgstr "PIN: "

 #: ../js/ui/components/networkAgent.js:336
 msgid "Mobile broadband network password"
-msgstr "Heslo k mobilnej sieti"
+msgstr "Heslo pre mobilnú sieť"

 #: ../js/ui/components/networkAgent.js:337
 #, c-format
@ -697,12 +675,11 @@ msgstr "Overiť totožnosť"
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Prepáčte, ale nezabralo to. Skúste to, prosím, znova."

-# %d je datum, %t je cas
 #. Translators: this is a filename used for screencast recording
 #: ../js/ui/components/recorder.js:44
 #, no-c-format
 msgid "Screencast from %d %t"
-msgstr "Záznam videa obrazovky dňa %d o %t"
+msgstr "Záznam videa obrazovky z %d %t"

 #. FIXME: We don't have a 'chat room' icon (bgo #653737) use
 #. system-users for now as Empathy does.
@ -737,42 +714,44 @@ msgid "Mute"
 msgstr "Stlmiť"

 #. Translators: this is a time format string followed by the word "Yesterday". i.e. "14:30 on Yesterday"
-#: ../js/ui/components/telepathyClient.js:943
+#: ../js/ui/components/telepathyClient.js:941
 #, no-c-format
 msgid "<b>%H:%M</b> on Yesterday"
-msgstr "včera o <b>%H:%M</b>"
+msgstr ""

 #. Translators: this is a time format string followed by a week day name. i.e. "14:30 on Monday
-#: ../js/ui/components/telepathyClient.js:949
-#, no-c-format
+#: ../js/ui/components/telepathyClient.js:947
+#, fuzzy, no-c-format
+#| msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgid "<b>%H:%M</b> on <b>%A</b>"
-msgstr "v <b>%A</b> o <b>%H:%M</b>"
+msgstr "Čas odoslania: <b>%A</b>, <b>%R</b>"

 #. Translators: this is a time format in the style of "14:30 on Wednesday, May 25",
 #. shown when you get a chat message in the same year
-#: ../js/ui/components/telepathyClient.js:955
-#, no-c-format
+#: ../js/ui/components/telepathyClient.js:953
+#, fuzzy, no-c-format
+#| msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>"
-msgstr "v <b>%A</b> o <b>%H:%M</b>, <b>%e.</b> <b>%B</b>"
+msgstr "Čas odoslania: <b>%A</b>, <b>%e. %B</b>"

 #. Translators: this is a time format in the style of "14:30 on Wednesday, May 25, 2012",
 #. shown when you get a chat message in a different year
-#: ../js/ui/components/telepathyClient.js:960
-#, no-c-format
+#: ../js/ui/components/telepathyClient.js:958
+#, fuzzy, no-c-format
+#| msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>, %Y"
-msgstr "v <b>%A</b> o <b>%H:%M</b>, <b>%e.</b> <b>%B</b>, %Y"
+msgstr "Čas odoslania: <b>%A</b>, <b>%e. %B</b> %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:986
 #, c-format
 msgid "%s is now known as %s"
-msgstr "Kontakt %s odteraz vystupuje ako %s"
-
+msgstr "%s odteraz vystupuje ako %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1087
+#: ../js/ui/components/telepathyClient.js:1085
 #, c-format
 msgid "Invitation to %s"
 msgstr "Pozvánka do %s"
@ -780,42 +759,42 @@ msgstr "Pozvánka do %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/components/telepathyClient.js:1095
+#: ../js/ui/components/telepathyClient.js:1093
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "Kontakt %s vás pozýva aby ste sa pridali do %s"
+msgstr "%s vás pozýva aby ste sa pridali do %s"

-#: ../js/ui/components/telepathyClient.js:1097
-#: ../js/ui/components/telepathyClient.js:1176
-#: ../js/ui/components/telepathyClient.js:1239
+#: ../js/ui/components/telepathyClient.js:1095
+#: ../js/ui/components/telepathyClient.js:1174
+#: ../js/ui/components/telepathyClient.js:1237
 msgid "Decline"
 msgstr "Odmietnuť"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1175
+#: ../js/ui/components/telepathyClient.js:1238
 msgid "Accept"
 msgstr "Prijať"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1128
+#: ../js/ui/components/telepathyClient.js:1126
 #, c-format
 msgid "Video call from %s"
-msgstr "Videohovor od kontaktu %s"
+msgstr "Videohovor od používateľa %s"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1131
+#: ../js/ui/components/telepathyClient.js:1129
 #, c-format
 msgid "Call from %s"
-msgstr "Hovor od kontaktu %s"
+msgstr "Hovor od používateľa %s"

-#: ../js/ui/components/telepathyClient.js:1136
+#: ../js/ui/components/telepathyClient.js:1134
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Odmietnuť"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1138
+#: ../js/ui/components/telepathyClient.js:1136
 msgid "Answer"
 msgstr "Prijať hovor"

@ -824,111 +803,110 @@ msgstr "Prijať hovor"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1170
+#: ../js/ui/components/telepathyClient.js:1168
 #, c-format
 msgid "%s is sending you %s"
-msgstr "Kontakt %s vám posiela %s"
+msgstr "%s vám posiela %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1205
+#: ../js/ui/components/telepathyClient.js:1203
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr ""
-"Kontakt %s by chcel získať oprávnenie vidieť, kedy ste pripojený"
+msgstr "%s by chcel získať oprávnenie vidieť, kedy ste pripojený"

-#: ../js/ui/components/telepathyClient.js:1297
+#: ../js/ui/components/telepathyClient.js:1295
 msgid "Network error"
 msgstr "Chyba siete"

-#: ../js/ui/components/telepathyClient.js:1299
+#: ../js/ui/components/telepathyClient.js:1297
 msgid "Authentication failed"
 msgstr "Overenie totožnosti zlyhalo"

-#: ../js/ui/components/telepathyClient.js:1301
+#: ../js/ui/components/telepathyClient.js:1299
 msgid "Encryption error"
 msgstr "Chyba šifrovania"

-#: ../js/ui/components/telepathyClient.js:1303
+#: ../js/ui/components/telepathyClient.js:1301
 msgid "Certificate not provided"
 msgstr "Neposkytnutý certifikát"

-#: ../js/ui/components/telepathyClient.js:1305
+#: ../js/ui/components/telepathyClient.js:1303
 msgid "Certificate untrusted"
 msgstr "Nedôveryhodný certifikát"

-#: ../js/ui/components/telepathyClient.js:1307
+#: ../js/ui/components/telepathyClient.js:1305
 msgid "Certificate expired"
 msgstr "Certifikát s ukončenou platnosťou"

-#: ../js/ui/components/telepathyClient.js:1309
+#: ../js/ui/components/telepathyClient.js:1307
 msgid "Certificate not activated"
 msgstr "Neaktivovaný certifikát"

-#: ../js/ui/components/telepathyClient.js:1311
+#: ../js/ui/components/telepathyClient.js:1309
 msgid "Certificate hostname mismatch"
 msgstr "Certifikát s nesúhlasným názvom hostiteľa"

-#: ../js/ui/components/telepathyClient.js:1313
+#: ../js/ui/components/telepathyClient.js:1311
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikát s nesúhlasným odtlačkom"

-#: ../js/ui/components/telepathyClient.js:1315
+#: ../js/ui/components/telepathyClient.js:1313
 msgid "Certificate self-signed"
 msgstr "Sebou podpísaný certifikát"

-#: ../js/ui/components/telepathyClient.js:1317
+#: ../js/ui/components/telepathyClient.js:1315
 msgid "Status is set to offline"
 msgstr "Stav je nastavený na odhlásený"

-#: ../js/ui/components/telepathyClient.js:1319
+#: ../js/ui/components/telepathyClient.js:1317
 msgid "Encryption is not available"
 msgstr "Šifrovanie nie je dostupné"

-#: ../js/ui/components/telepathyClient.js:1321
+#: ../js/ui/components/telepathyClient.js:1319
 msgid "Certificate is invalid"
 msgstr "Certifikát je neplatný"

-#: ../js/ui/components/telepathyClient.js:1323
+#: ../js/ui/components/telepathyClient.js:1321
 msgid "Connection has been refused"
 msgstr "Pripojenie bolo odmietnuté"

-#: ../js/ui/components/telepathyClient.js:1325
+#: ../js/ui/components/telepathyClient.js:1323
 msgid "Connection can't be established"
 msgstr "Nedá sa nadviazať spojenie"

-#: ../js/ui/components/telepathyClient.js:1327
+#: ../js/ui/components/telepathyClient.js:1325
 msgid "Connection has been lost"
 msgstr "Spojenie sa stratilo"

-#: ../js/ui/components/telepathyClient.js:1329
+#: ../js/ui/components/telepathyClient.js:1327
 msgid "This account is already connected to the server"
 msgstr "Tento účet je už pripojený k serveru"

-#: ../js/ui/components/telepathyClient.js:1331
+#: ../js/ui/components/telepathyClient.js:1329
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Pripojenie bolo nahradené novým, ktoré používa rovnaký zdroj"

-#: ../js/ui/components/telepathyClient.js:1333
+#: ../js/ui/components/telepathyClient.js:1331
 msgid "The account already exists on the server"
 msgstr "Účet na serveri už existuje"

-#: ../js/ui/components/telepathyClient.js:1335
+#: ../js/ui/components/telepathyClient.js:1333
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je momentálne príliš zaneprázdnený na zvládnutie pripojenia"

-#: ../js/ui/components/telepathyClient.js:1337
+#: ../js/ui/components/telepathyClient.js:1335
 msgid "Certificate has been revoked"
 msgstr "Certifikát bol zrušený"

-#: ../js/ui/components/telepathyClient.js:1339
+#: ../js/ui/components/telepathyClient.js:1337
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Šifrovací algoritmus používaný certifikátom nie je bezpečný alebo je "
 "kryptograficky slabý"

-#: ../js/ui/components/telepathyClient.js:1341
+#: ../js/ui/components/telepathyClient.js:1339
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -936,26 +914,26 @@ msgstr ""
 "Dĺžka certifikátu servera, alebo hĺbka reťazca certifikátu servera presahuje "
 "limit stanovený kryptografickou knižnicou."

-#: ../js/ui/components/telepathyClient.js:1343
+#: ../js/ui/components/telepathyClient.js:1341
 msgid "Internal error"
 msgstr "Vnútorná chyba"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1353
+#: ../js/ui/components/telepathyClient.js:1351
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Pripojenie k %s zlyhalo"

-#: ../js/ui/components/telepathyClient.js:1362
+#: ../js/ui/components/telepathyClient.js:1360
 msgid "Reconnect"
 msgstr "Znovu sa pripojiť"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1361
 msgid "Edit account"
 msgstr "Upraviť účet"

-#: ../js/ui/components/telepathyClient.js:1408
+#: ../js/ui/components/telepathyClient.js:1406
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"

@ -1014,7 +992,7 @@ msgstr[2] "Budete automaticky odhlásený o %d sekundy."

 #: ../js/ui/endSessionDialog.js:74
 msgid "Logging out of the system."
-msgstr "Prebieha odhlásenie zo systému."
+msgstr "Odhlasuje sa zo systému."

 #: ../js/ui/endSessionDialog.js:76
 msgctxt "button"
@ -1142,21 +1120,21 @@ msgstr "Zobraziť zdroj"
 msgid "Web Page"
 msgstr "Webová stránka"

-#: ../js/ui/messageTray.js:1083
+#: ../js/ui/messageTray.js:1082
 msgid "Open"
 msgstr "Otvoriť"

-#: ../js/ui/messageTray.js:1090
+#: ../js/ui/messageTray.js:1089
 msgid "Remove"
 msgstr "Odstrániť"

 # DK: zvazoval som pouzit "Panel správ"
 # neviem co bude vhodnejsie ako preklad "tray"
-#: ../js/ui/messageTray.js:1534
+#: ../js/ui/messageTray.js:1545
 msgid "Message Tray"
 msgstr "Lišta správ"

-#: ../js/ui/messageTray.js:2557
+#: ../js/ui/messageTray.js:2552
 msgid "System Information"
 msgstr "Informácie o systéme"

@ -1197,7 +1175,7 @@ msgstr "Ukončiť"
 msgid "Activities"
 msgstr "Aktivity"

-#: ../js/ui/panel.js:966
+#: ../js/ui/panel.js:965
 msgid "Top Bar"
 msgstr "Horná lišta"

@ -1219,11 +1197,11 @@ msgstr "Prosím, zadajte príkaz:"
 # v ostatnych retazcoch je pouzite %e, tak to bude asi OK
 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:80
+#: ../js/ui/screenShield.js:79
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"

-#: ../js/ui/screenShield.js:144
+#: ../js/ui/screenShield.js:143
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1231,13 +1209,13 @@ msgstr[0] "%d nových správ"
 msgstr[1] "%d nová správa"
 msgstr[2] "%d nové správy"

-#: ../js/ui/screenShield.js:146
+#: ../js/ui/screenShield.js:145
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
-msgstr[0] "%d nových oznámení"
-msgstr[1] "%d nové oznámenie"
-msgstr[2] "%d nové oznámenia"
+msgstr[0] "%d nových upozornení"
+msgstr[1] "%d nové upozornenie"
+msgstr[2] "%d nové upozornenia"

 #: ../js/ui/searchDisplay.js:275
 msgid "Searching..."
@ -1271,13 +1249,13 @@ msgstr "Heslo"
 msgid "Remember Password"
 msgstr "Zapamätať heslo"

-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:171
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "Odblokovať"

 #: ../js/ui/status/accessibility.js:39
 msgid "Accessibility"
-msgstr "Zjednodušenie ovládania"
+msgstr "Prístupnosť"

 #: ../js/ui/status/accessibility.js:44
 msgid "Zoom"
@ -1559,7 +1537,7 @@ msgstr "Mobilné"

 #: ../js/ui/status/network.js:1628
 msgid "VPN Connections"
-msgstr "Pripojenia k VPN"
+msgstr "VPN pripojenia"

 #: ../js/ui/status/network.js:1635
 msgid "Network Settings"
@ -1691,7 +1669,7 @@ msgstr "Hlasitosť"
 msgid "Microphone"
 msgstr "Mikrofón"

-#: ../js/ui/unlockDialog.js:178
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "Prihlásiť ako iný používateľ"

@ -1719,35 +1697,35 @@ msgstr "Nečinný"
 msgid "Unavailable"
 msgstr "Nedostupný"

-#: ../js/ui/userMenu.js:743
+#: ../js/ui/userMenu.js:735
 msgid "Notifications"
 msgstr "Upozornenia"

-#: ../js/ui/userMenu.js:751
+#: ../js/ui/userMenu.js:743
 msgid "System Settings"
 msgstr "Nastavenia systému"

-#: ../js/ui/userMenu.js:759
+#: ../js/ui/userMenu.js:751
 msgid "Switch User"
 msgstr "Prepnúť používateľa"

-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:756
 msgid "Log Out"
 msgstr "Odhlásiť sa"

-#: ../js/ui/userMenu.js:769
+#: ../js/ui/userMenu.js:761
 msgid "Lock"
 msgstr "Uzamknúť"

-#: ../js/ui/userMenu.js:784
+#: ../js/ui/userMenu.js:776
 msgid "Install Updates & Restart"
 msgstr "Nainštalovať aktualizácie a reštartovať"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:794
 msgid "Your chat status will be set to busy"
 msgstr "Váš stav bude nastavený na zaneprázdnený"

-#: ../js/ui/userMenu.js:803
+#: ../js/ui/userMenu.js:795
 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."
--- a/po/sl.po
+++ b/po/sl.po
@ -8,8 +8,8 @@ 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-10-16 00:16+0000\n"
-"PO-Revision-Date: 2012-10-16 07:53+0100\n"
+"POT-Creation-Date: 2012-10-31 16:48+0000\n"
+"PO-Revision-Date: 2012-10-31 18:50+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: Slovenian\n"
@ -37,14 +37,6 @@ msgstr "Sistem"
 msgid "Show the message tray"
 msgstr "Pokaži sporočilno vrstico"

-#: ../data/50-gnome-shell-system.xml.in.h:3
-msgid "Show all applications"
-msgstr "Pokaži vse programe"
-
-#: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Open the application menu"
-msgstr "Odpri meni programov"
-
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "Gnome lupina"
@ -111,29 +103,29 @@ msgid "Internally used to store the last session presence status for the user. T
 msgstr "Uporabljeno za shranjevanje stanja prisotnosti zadnje seje uporabnika. Vrednost določa števec predmeta GsmPresenceStatus."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Vedno pokaži možnost 'Odjave' v meniju uporabnika."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid "This key overrides the automatic hiding of the 'Log out' menuitem in single-user, single-session situations."
+msgstr "Možnost onemogoči samodejno skrivanje možnosti 'Odjava' v meniju uporabnika, kadar je ta seja edina dejavna."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Pokaži tedenski datum v koledarju"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Izbrana možnost določa prikaz ISO tedenski datum v koledarju."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Keybinding to open the application menu"
 msgstr "Tipkovna bližnjica, ki odpre meni programov"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Keybinding to open the application menu."
 msgstr "Tipkovna bližnjica, ki odpre meni programov."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Tipkovna bližnjica, ki odpre pogled \"Pokaži programe\""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-msgid "Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr "Tipkovna bližnjica, ki odpre pogled \"Pokaži programe\" v pregledu dejavnosti."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Tipkovna bližnjica za preklop vidnosti vrstice sporočanja"
@ -238,9 +230,9 @@ msgid "Power"
 msgstr "Napajanje"

 #: ../js/gdm/powerMenu.js:89
-#: ../js/ui/userMenu.js:660
 #: ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Zaustavi"

@ -249,9 +241,9 @@ msgid "Restart"
 msgstr "Zaženi znova"

 #: ../js/gdm/powerMenu.js:99
-#: ../js/ui/userMenu.js:662
-#: ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/ui/userMenu.js:666
+#: ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Izklop"

@ -631,35 +623,35 @@ msgstr "Utišaj"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:950
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Poslano <b>%A</b> ob <b>%X</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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:956
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Poslano <b>%A</b>, <b>%d. %Ba</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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:961
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Poslano <b>%A</b>, <b>%d. %Ba</b>, %Y"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:990
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je sedaj znan kot v %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Povabilo v %s"
@ -667,42 +659,42 @@ msgstr "Povabilo v %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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1098
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas vabi, da se pridružite v %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1100
+#: ../js/ui/components/telepathyClient.js:1179
+#: ../js/ui/components/telepathyClient.js:1242
 msgid "Decline"
 msgstr "Zavrni"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1101
+#: ../js/ui/components/telepathyClient.js:1180
+#: ../js/ui/components/telepathyClient.js:1243
 msgid "Accept"
 msgstr "Sprejmi"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1131
 #, c-format
 msgid "Video call from %s"
 msgstr "%s želi vzpostaviti video klic"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "%s kliče"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1139
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Zavrni"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "Odgovori"

@ -711,129 +703,129 @@ msgstr "Odgovori"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1173
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s pošilja %s"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1208
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s želi dovoljenje za pogled dosegljivosti"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Napaka omrežja"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Overitev je spodletela"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Napaka šifriranja"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "Potrdilo ni na voljo"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "Potrdilo ni zaupljivo"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "Potrdilo je preteklo"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "Potrdilo ni potrjeno"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "Neustrezno ime gostitelja potrdila"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "Neustrezen prstni odtis potrdila"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Potrdilo je samo-podpisano"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "Stanje je nastavljeno na brez povezave"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "Šifriranje ni na voljo."

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "Potrdilo je neveljavno."

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "Povezava je zavrnjena."

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "Povezave ni mogoče vzpostaviti."

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "Povezava je prekinjena."

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "Račun je s strežnikom že povezan"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1334
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Povezava je zamenjana z novo povezavo, ki uporablja isti vir."

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Račun na strežniku že obstaja"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr "Strežnik je trenutno preveč zaposlen za upravljanje s povezavo."

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "Potrdilo je preklicano"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Potrdilo ne uporablja varnega algoritma ali pa uporablja šibko šifriranje."

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1344
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, ki je določena s šifrirno knjižnico."

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "Notranja napaka"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Povezava z %s je spodletela"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Ponovno se poveži"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Uredi račun"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Neznan vzrok"

@ -1023,24 +1015,24 @@ msgstr "Poglej vir"
 msgid "Web Page"
 msgstr "Spletna stran"

-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Odpri"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Odstrani"

-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Vrstica sporočanja"

-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Podrobnosti sistema"

 #: ../js/ui/notificationDaemon.js:506
-#: ../src/shell-app.c:373
+#: ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Neznano"
@ -1096,11 +1088,11 @@ msgstr "Vnos ukaza:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %d. %m."

-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1109,7 +1101,7 @@ msgstr[1] "%d novo sporočilo"
 msgstr[2] "%d novi sporočili"
 msgstr[3] "%d nova sporočila"

-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1590,71 +1582,71 @@ msgstr "Mikrofon"
 msgid "Log in as another user"
 msgstr "Prijava kot drug uporabnik"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Na voljo"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Zaposleno"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Nevidno"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Odsotno"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Nedejavno"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Nedostopno"

-#: ../js/ui/userMenu.js:740
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Obvestila"

-#: ../js/ui/userMenu.js:748
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Sistemske nastavitve"

-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Preklopi uporabnika"

-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Odjava"

-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Zakleni"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Namesti posodobitve in ponovno zaženi"

-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Stanje vašega klepeta bo nastavljeno na zasedeno"

-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:804
 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."
 msgstr "Obveščanje je zdaj onemogočeno, vključno s sporočili klepeta. Vaše stanje povezanosti se je prilagodilo, da bodo drugi vedeli, da njihovih sporočil morda ne boste opazili."

-#: ../js/ui/viewSelector.js:87
+#: ../js/ui/viewSelector.js:85
 msgid "Windows"
 msgstr "Okna"

-#: ../js/ui/viewSelector.js:91
+#: ../js/ui/viewSelector.js:89
 msgid "Applications"
 msgstr "Programi"

-#: ../js/ui/viewSelector.js:95
+#: ../js/ui/viewSelector.js:93
 msgid "Search"
 msgstr "Poišči"

@ -1727,7 +1719,7 @@ msgstr "Uporabi poseben način, npr.: \"gdm\" za prijavni zaslon"
 msgid "List possible modes"
 msgstr "Seznam mogočih načinov"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Zaganjanje '%s' je spodletelo"
--- a/po/sr.po
+++ b/po/sr.po
@ -8,8 +8,8 @@ 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-10-15 23:38+0000\n"
-"PO-Revision-Date: 2012-10-16 20:23+0200\n"
+"POT-Creation-Date: 2012-11-02 15:25+0000\n"
+"PO-Revision-Date: 2012-11-03 09:05+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@ -36,16 +36,6 @@ msgstr "Систем"
 msgid "Show the message tray"
 msgstr "Прикажите фиоку порука"

-#: ../data/50-gnome-shell-system.xml.in.h:3
-#| msgid "Show Applications"
-msgid "Show all applications"
-msgstr "Прикажи све програме"
-
-#: ../data/50-gnome-shell-system.xml.in.h:4
-#| msgid "Keybinding to open the application menu"
-msgid "Open the application menu"
-msgstr "Отворите изборник програма"
-
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "Гномова шкољка"
@ -144,31 +134,32 @@ msgstr ""
 "корисника. Ова вредност је из пописа стања Гсм присуства."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Увек приказује ставку изборника „Одјави ме“ у корисничком изборнику."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Овај кључ преписује самостално скривање ставке изборника „Одјави ме“ у "
+"случају једног корисника са једном сесијом."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Приказује дан у недељи у календару"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Ако је изабрано, приказује ИСО дан у недељи у календару."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
-msgid "Keybinding to open the application menu"
-msgstr "Пречица за отварање изборника програма"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
-msgid "Keybinding to open the application menu."
-msgstr "Пречица за отварање изборника програма."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Пречица за отварање прегледа „Прикажи програме“"
+msgid "Keybinding to open the application menu"
+msgstr "Свеза тастера за отварање изборника програма"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-#| msgid "Keybinding to open the application menu."
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr "Пречица за отварање прегледа „Прикажи програме“ у прегледу активности."
+msgid "Keybinding to open the application menu."
+msgstr "Свеза тастера за отварање изборника програма."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
@ -301,8 +292,8 @@ msgstr "Прозор за пријављивање"
 msgid "Power"
 msgstr "Угаси"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Обустави"

@ -310,8 +301,8 @@ msgstr "Обустави"
 msgid "Restart"
 msgstr "Поново покрени"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Угаси"

@ -691,35 +682,35 @@ msgstr "Утишај"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:952
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Послато је <b>%A</b> у <b>%X</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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:958
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Послато је у <b>%A</b>, <b>%d. %B</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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:963
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Послато је у <b>%A</b>, <b>%d %B</b>, %Y."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:992
 #, 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/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1092
 #, c-format
 msgid "Invitation to %s"
 msgstr "Позивница за %s"
@ -727,42 +718,42 @@ 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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1100
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s вас позива да се придружите %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1102
+#: ../js/ui/components/telepathyClient.js:1181
+#: ../js/ui/components/telepathyClient.js:1244
 msgid "Decline"
 msgstr "Одбиј"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1103
+#: ../js/ui/components/telepathyClient.js:1182
+#: ../js/ui/components/telepathyClient.js:1245
 msgid "Accept"
 msgstr "Прихвати"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1133
 #, c-format
 msgid "Video call from %s"
 msgstr "%s вам је упутио видео позив"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1136
 #, c-format
 msgid "Call from %s"
 msgstr "%s вас зове"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1141
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Одбиј"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1143
 msgid "Answer"
 msgstr "Одговори"

@ -771,109 +762,109 @@ msgstr "Одговори"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1175
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s вам шаље „%s“"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s тражи одобрење да види када сте на вези"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Network error"
 msgstr "Грешка мреже"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Authentication failed"
 msgstr "Потврђивање идентитета није успело"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Encryption error"
 msgstr "Грешка шифровања"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate not provided"
 msgstr "Уверење није прослеђено"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate untrusted"
 msgstr "Уверење није поверљиво"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate expired"
 msgstr "Уверење је истекло"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate not activated"
 msgstr "Уверење није активирано"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate hostname mismatch"
 msgstr "Назив домаћина уверења се не поклапа"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate fingerprint mismatch"
 msgstr "Отисак уверења се не поклапа"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Certificate self-signed"
 msgstr "Уверење је самопотписано"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Status is set to offline"
 msgstr "Стање је постављено на „неповезан“"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Encryption is not available"
 msgstr "Шифровање није доступно"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Certificate is invalid"
 msgstr "Уверење није исправно"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection has been refused"
 msgstr "Веза је одбијена"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection can't be established"
 msgstr "Веза не може бити успостављена"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "Connection has been lost"
 msgstr "Веза је изгубљена"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1334
 msgid "This account is already connected to the server"
 msgstr "Овај налог је већ повезан са сервером"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1336
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Веза је замењена новом везом користећи исти ресурс"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "The account already exists on the server"
 msgstr "Овај налог већ постоји на серверу"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер је тренутно превише заузет да би руковао везом"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Certificate has been revoked"
 msgstr "Уверење је опозвано"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Уверење користи несигуран алгоритам шифровања или је криптографски слабо"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1346
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -881,26 +872,26 @@ msgstr ""
 "Дужина уверења сервера, или дубина ланца уверења сервера, премашује границе "
 "које је задала библиотека шифровања"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Internal error"
 msgstr "Унутрашња грешка"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1358
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Повезивање на „%s“ није успело"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Reconnect"
 msgstr "Поново се повежи"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Edit account"
 msgstr "Уреди налог"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1413
 msgid "Unknown reason"
 msgstr "Непознат разлог"

@ -1089,23 +1080,23 @@ msgstr "Прикажи код"
 msgid "Web Page"
 msgstr "Веб страница"

-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Отвори"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Уклони"

-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Фиока порука"

-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Подаци о систему"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Непознат"
@ -1161,11 +1152,11 @@ msgstr "Унесите наредбу:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %d. %B"

-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1174,7 +1165,7 @@ msgstr[1] "%d нове поруке"
 msgstr[2] "%d нових порука"
 msgstr[3] "Једна нова порука"

-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1638,59 +1629,59 @@ msgstr "Микрофон"
 msgid "Log in as another user"
 msgstr "Пријавите се као други корсник"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Доступан"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Заузет"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Невидљив"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Одсутан"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Мирује"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Недоступан"

-#: ../js/ui/userMenu.js:740
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Обавештења"

-#: ../js/ui/userMenu.js:748
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Подешавања система"

-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Промени корисника"

-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Одјави ме"

-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Закључај"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Инсталирај ажурирања и поново покрени"

-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Ваше стање ћаскања ће бити постављено на заузето"

-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:804
 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."
@ -1699,15 +1690,15 @@ msgstr ""
 "мрежи је подешено тако да ће остали знати да ви не можете видети њихове "
 "поруке."

-#: ../js/ui/viewSelector.js:87
+#: ../js/ui/viewSelector.js:85
 msgid "Windows"
 msgstr "Прозори"

-#: ../js/ui/viewSelector.js:91
+#: ../js/ui/viewSelector.js:89
 msgid "Applications"
 msgstr "Програми"

-#: ../js/ui/viewSelector.js:95
+#: ../js/ui/viewSelector.js:93
 msgid "Search"
 msgstr "Тражи"

@ -1780,7 +1771,7 @@ msgstr "Користи нарочит режим, нпр. „gdm“ за екр
 msgid "List possible modes"
 msgstr "Исписује могуће режиме"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Не могу да покренем „%s“"
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@ -8,8 +8,8 @@ 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-10-15 23:38+0000\n"
-"PO-Revision-Date: 2012-10-16 20:23+0200\n"
+"POT-Creation-Date: 2012-11-02 15:25+0000\n"
+"PO-Revision-Date: 2012-11-03 09:05+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@ -36,16 +36,6 @@ msgstr "Sistem"
 msgid "Show the message tray"
 msgstr "Prikažite fioku poruka"

-#: ../data/50-gnome-shell-system.xml.in.h:3
-#| msgid "Show Applications"
-msgid "Show all applications"
-msgstr "Prikaži sve programe"
-
-#: ../data/50-gnome-shell-system.xml.in.h:4
-#| msgid "Keybinding to open the application menu"
-msgid "Open the application menu"
-msgstr "Otvorite izbornik programa"
-
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "Gnomova školjka"
@ -144,31 +134,32 @@ msgstr ""
 "korisnika. Ova vrednost je iz popisa stanja Gsm prisustva."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Uvek prikazuje stavku izbornika „Odjavi me“ u korisničkom izborniku."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menuitem in single-"
+"user, single-session situations."
+msgstr ""
+"Ovaj ključ prepisuje samostalno skrivanje stavke izbornika „Odjavi me“ u "
+"slučaju jednog korisnika sa jednom sesijom."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Prikazuje dan u nedelji u kalendaru"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Ako je izabrano, prikazuje ISO dan u nedelji u kalendaru."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
-msgid "Keybinding to open the application menu"
-msgstr "Prečica za otvaranje izbornika programa"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
-msgid "Keybinding to open the application menu."
-msgstr "Prečica za otvaranje izbornika programa."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Prečica za otvaranje pregleda „Prikaži programe“"
+msgid "Keybinding to open the application menu"
+msgstr "Sveza tastera za otvaranje izbornika programa"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-#| msgid "Keybinding to open the application menu."
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr "Prečica za otvaranje pregleda „Prikaži programe“ u pregledu aktivnosti."
+msgid "Keybinding to open the application menu."
+msgstr "Sveza tastera za otvaranje izbornika programa."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Keybinding to toggle the visibility of the message tray"
@ -301,8 +292,8 @@ msgstr "Prozor za prijavljivanje"
 msgid "Power"
 msgstr "Ugasi"

-#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:660 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:775
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Obustavi"

@ -310,8 +301,8 @@ msgstr "Obustavi"
 msgid "Restart"
 msgstr "Ponovo pokreni"

-#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:662 ../js/ui/userMenu.js:664
-#: ../js/ui/userMenu.js:774
+#: ../js/gdm/powerMenu.js:99 ../js/ui/userMenu.js:666 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:778
 msgid "Power Off"
 msgstr "Ugasi"

@ -691,35 +682,35 @@ msgstr "Utišaj"
 #. 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/components/telepathyClient.js:948
+#: ../js/ui/components/telepathyClient.js:952
 #, no-c-format
 msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "Poslato je <b>%A</b> u <b>%X</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/components/telepathyClient.js:954
+#: ../js/ui/components/telepathyClient.js:958
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Poslato je u <b>%A</b>, <b>%d. %B</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/components/telepathyClient.js:959
+#: ../js/ui/components/telepathyClient.js:963
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
 msgstr "Poslato je u <b>%A</b>, <b>%d %B</b>, %Y."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:988
+#: ../js/ui/components/telepathyClient.js:992
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je sada poznat kao %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1088
+#: ../js/ui/components/telepathyClient.js:1092
 #, c-format
 msgid "Invitation to %s"
 msgstr "Pozivnica za %s"
@ -727,42 +718,42 @@ msgstr "Pozivnica za %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/components/telepathyClient.js:1096
+#: ../js/ui/components/telepathyClient.js:1100
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas poziva da se pridružite %s"

-#: ../js/ui/components/telepathyClient.js:1098
-#: ../js/ui/components/telepathyClient.js:1177
-#: ../js/ui/components/telepathyClient.js:1240
+#: ../js/ui/components/telepathyClient.js:1102
+#: ../js/ui/components/telepathyClient.js:1181
+#: ../js/ui/components/telepathyClient.js:1244
 msgid "Decline"
 msgstr "Odbij"

-#: ../js/ui/components/telepathyClient.js:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
+#: ../js/ui/components/telepathyClient.js:1103
+#: ../js/ui/components/telepathyClient.js:1182
+#: ../js/ui/components/telepathyClient.js:1245
 msgid "Accept"
 msgstr "Prihvati"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1129
+#: ../js/ui/components/telepathyClient.js:1133
 #, c-format
 msgid "Video call from %s"
 msgstr "%s vam je uputio video poziv"

 #. translators: argument is a contact name like Alice for example.
-#: ../js/ui/components/telepathyClient.js:1132
+#: ../js/ui/components/telepathyClient.js:1136
 #, c-format
 msgid "Call from %s"
 msgstr "%s vas zove"

-#: ../js/ui/components/telepathyClient.js:1137
+#: ../js/ui/components/telepathyClient.js:1141
 #: ../js/ui/status/bluetooth.js:346
 msgid "Reject"
 msgstr "Odbij"

 #. translators: this is a button label (verb), not a noun
-#: ../js/ui/components/telepathyClient.js:1139
+#: ../js/ui/components/telepathyClient.js:1143
 msgid "Answer"
 msgstr "Odgovori"

@ -771,109 +762,109 @@ msgstr "Odgovori"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1171
+#: ../js/ui/components/telepathyClient.js:1175
 #, c-format
 msgid "%s is sending you %s"
 msgstr "%s vam šalje „%s“"

 #. To translators: The parameter is the contact's alias
-#: ../js/ui/components/telepathyClient.js:1206
+#: ../js/ui/components/telepathyClient.js:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s traži odobrenje da vidi kada ste na vezi"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Network error"
 msgstr "Greška mreže"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Authentication failed"
 msgstr "Potvrđivanje identiteta nije uspelo"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Encryption error"
 msgstr "Greška šifrovanja"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate not provided"
 msgstr "Uverenje nije prosleđeno"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate untrusted"
 msgstr "Uverenje nije poverljivo"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate expired"
 msgstr "Uverenje je isteklo"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate not activated"
 msgstr "Uverenje nije aktivirano"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate hostname mismatch"
 msgstr "Naziv domaćina uverenja se ne poklapa"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate fingerprint mismatch"
 msgstr "Otisak uverenja se ne poklapa"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Certificate self-signed"
 msgstr "Uverenje je samopotpisano"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Status is set to offline"
 msgstr "Stanje je postavljeno na „nepovezan“"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Encryption is not available"
 msgstr "Šifrovanje nije dostupno"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Certificate is invalid"
 msgstr "Uverenje nije ispravno"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection has been refused"
 msgstr "Veza je odbijena"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection can't be established"
 msgstr "Veza ne može biti uspostavljena"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "Connection has been lost"
 msgstr "Veza je izgubljena"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1334
 msgid "This account is already connected to the server"
 msgstr "Ovaj nalog je već povezan sa serverom"

-#: ../js/ui/components/telepathyClient.js:1332
+#: ../js/ui/components/telepathyClient.js:1336
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Veza je zamenjena novom vezom koristeći isti resurs"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "The account already exists on the server"
 msgstr "Ovaj nalog već postoji na serveru"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je trenutno previše zauzet da bi rukovao vezom"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Certificate has been revoked"
 msgstr "Uverenje je opozvano"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Uverenje koristi nesiguran algoritam šifrovanja ili je kriptografski slabo"

-#: ../js/ui/components/telepathyClient.js:1342
+#: ../js/ui/components/telepathyClient.js:1346
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -881,26 +872,26 @@ msgstr ""
 "Dužina uverenja servera, ili dubina lanca uverenja servera, premašuje granice "
 "koje je zadala biblioteka šifrovanja"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Internal error"
 msgstr "Unutrašnja greška"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1354
+#: ../js/ui/components/telepathyClient.js:1358
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Povezivanje na „%s“ nije uspelo"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1367
 msgid "Reconnect"
 msgstr "Ponovo se poveži"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Edit account"
 msgstr "Uredi nalog"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1413
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"

@ -1089,23 +1080,23 @@ msgstr "Prikaži kod"
 msgid "Web Page"
 msgstr "Veb stranica"

-#: ../js/ui/messageTray.js:1081
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Otvori"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Ukloni"

-#: ../js/ui/messageTray.js:1540
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Fioka poruka"

-#: ../js/ui/messageTray.js:2547
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Podaci o sistemu"

-#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:373
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Nepoznat"
@ -1161,11 +1152,11 @@ msgstr "Unesite naredbu:"

 #. Translators: This is a time format for a date in
 #. long format
-#: ../js/ui/screenShield.js:79
+#: ../js/ui/screenShield.js:80
 msgid "%A, %B %d"
 msgstr "%A, %d. %B"

-#: ../js/ui/screenShield.js:143
+#: ../js/ui/screenShield.js:144
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1174,7 +1165,7 @@ msgstr[1] "%d nove poruke"
 msgstr[2] "%d novih poruka"
 msgstr[3] "Jedna nova poruka"

-#: ../js/ui/screenShield.js:145
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1638,59 +1629,59 @@ msgstr "Mikrofon"
 msgid "Log in as another user"
 msgstr "Prijavite se kao drugi korsnik"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Dostupan"

-#: ../js/ui/userMenu.js:183
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Zauzet"

-#: ../js/ui/userMenu.js:186
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "Nevidljiv"

-#: ../js/ui/userMenu.js:189
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Odsutan"

-#: ../js/ui/userMenu.js:192
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Miruje"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Nedostupan"

-#: ../js/ui/userMenu.js:740
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Obaveštenja"

-#: ../js/ui/userMenu.js:748
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Podešavanja sistema"

-#: ../js/ui/userMenu.js:756
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Promeni korisnika"

-#: ../js/ui/userMenu.js:761
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Odjavi me"

-#: ../js/ui/userMenu.js:766
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Zaključaj"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Instaliraj ažuriranja i ponovo pokreni"

-#: ../js/ui/userMenu.js:799
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Vaše stanje ćaskanja će biti postavljeno na zauzeto"

-#: ../js/ui/userMenu.js:800
+#: ../js/ui/userMenu.js:804
 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."
@ -1699,15 +1690,15 @@ msgstr ""
 "mreži je podešeno tako da će ostali znati da vi ne možete videti njihove "
 "poruke."

-#: ../js/ui/viewSelector.js:87
+#: ../js/ui/viewSelector.js:85
 msgid "Windows"
 msgstr "Prozori"

-#: ../js/ui/viewSelector.js:91
+#: ../js/ui/viewSelector.js:89
 msgid "Applications"
 msgstr "Programi"

-#: ../js/ui/viewSelector.js:95
+#: ../js/ui/viewSelector.js:93
 msgid "Search"
 msgstr "Traži"

@ -1780,7 +1771,7 @@ msgstr "Koristi naročit režim, npr. „gdm“ za ekran prijavljivanja"
 msgid "List possible modes"
 msgstr "Ispisuje moguće režime"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Ne mogu da pokrenem „%s“"
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -113,6 +113,7 @@ shell_public_headers_h =		\
 	shell-generic-container.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		\
@ -157,6 +158,7 @@ libgnome_shell_la_SOURCES =		\
 	shell-generic-container.c	\
 	shell-gtk-embed.c		\
 	shell-global.c			\
+	shell-idle-monitor.c		\
 	shell-invert-lightness-effect.c	\
 	shell-keyring-prompt.h		\
 	shell-keyring-prompt.c		\
--- a/src/hotplug-sniffer/hotplug-sniffer.c
+++ b/src/hotplug-sniffer/hotplug-sniffer.c
@ -240,6 +240,8 @@ main (int    argc,
 {
  guint name_owner_id;

+  g_type_init ();
+
  introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
  g_assert (introspection_data != NULL);

--- a/src/main.c
+++ b/src/main.c
@ -361,6 +361,8 @@ main (int argc, char **argv)
  int ecode;
  TpDebugSender *sender;

+  g_type_init ();
+
  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
  textdomain (GETTEXT_PACKAGE);
--- a/src/run-js-test.c
+++ b/src/run-js-test.c
@ -92,6 +92,7 @@ main(int argc, char **argv)
    g_error ("option parsing failed: %s", error->message);

  setlocale (LC_ALL, "");
+  g_type_init ();

  _shell_global_init (NULL);
  global = shell_global_get ();
--- a/src/shell-global.c
+++ b/src/shell-global.c
@ -1693,3 +1693,43 @@ shell_global_get_session_mode (ShellGlobal *global)

  return global->session_mode;
 }
+
+/**
+ * shell_global_create_xrootpmap_texture:
+ * @global: The #ShellGlobal
+ *
+ * This returns the _XROOTPMAP_ID pixmap that gdm should have stuffed
+ * in the root window. The goal here is to allow a smooth fade between
+ * plymouth and the shell greeter. This is also a workaround for gjs not
+ * supporting raw xlib types.
+ *
+ * Returns: (transfer floating): A #ClutterActor that represents the
+ * _XROOTPMAP_ID pixmap property from the root window.
+ */
+ClutterActor *
+shell_global_create_xrootpmap_texture (ShellGlobal *global)
+{
+  Atom res_type;
+  int res_format;
+  unsigned long res_nitems, bytesafter;
+  unsigned char *data;
+  Pixmap root_pixmap_id = None;
+
+  g_return_val_if_fail (SHELL_IS_GLOBAL (global), NULL);
+
+  if (XGetWindowProperty (global->xdisplay,
+                          DefaultRootWindow (global->xdisplay),
+                          XInternAtom (global->xdisplay, "_XROOTPMAP_ID", False),
+                          0, G_MAXLONG, False, XA_PIXMAP,
+                          &res_type, &res_format, &res_nitems, &bytesafter, &data) == Success)
+    {
+      if (res_type == XA_PIXMAP && res_format == 32 && res_nitems == 1)
+        root_pixmap_id = * (Pixmap *) data;
+      XFree (data);
+    }
+
+  if (root_pixmap_id != None)
+    return clutter_x11_texture_pixmap_new_with_pixmap (root_pixmap_id);
+  else
+    return NULL;
+}
--- a/src/shell-global.h
+++ b/src/shell-global.h
@ -136,6 +136,8 @@ void     shell_global_reexec_self               (ShellGlobal  *global);

 const char *     shell_global_get_session_mode  (ShellGlobal  *global);

+ClutterActor * shell_global_create_xrootpmap_texture (ShellGlobal *global);
+
 G_END_DECLS

 #endif /* __SHELL_GLOBAL_H__ */
--- a/src/shell-idle-monitor.c
+++ b/src/shell-idle-monitor.c
@ -0,0 +1,429 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Adapted from gnome-session/gnome-session/gs-idle-monitor.c
+ *
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: William Jon McCann <mccann@jhu.edu>
+ *
+ */
+
+#include "config.h"
+
+#include <time.h>
+#include <string.h>
+
+#include <X11/Xlib.h>
+#include <X11/extensions/sync.h>
+
+#include <glib.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
+
+#include "shell-idle-monitor.h"
+
+#define SHELL_IDLE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHELL_TYPE_IDLE_MONITOR, ShellIdleMonitorPrivate))
+
+struct ShellIdleMonitorPrivate
+{
+        Display     *display;
+
+        GHashTable  *watches;
+        int          sync_event_base;
+        XSyncCounter counter;
+};
+
+typedef struct
+{
+        Display                  *display;
+        guint                     id;
+        XSyncValue                interval;
+        ShellIdleMonitorWatchFunc callback;
+        gpointer                  user_data;
+        GDestroyNotify            notify;
+        XSyncAlarm                xalarm_positive;
+        XSyncAlarm                xalarm_negative;
+} ShellIdleMonitorWatch;
+
+static guint32 watch_serial = 1;
+
+G_DEFINE_TYPE (ShellIdleMonitor, shell_idle_monitor, G_TYPE_OBJECT)
+
+static gint64
+_xsyncvalue_to_int64 (XSyncValue value)
+{
+        return ((guint64) XSyncValueHigh32 (value)) << 32
+                | (guint64) XSyncValueLow32 (value);
+}
+
+static XSyncValue
+_int64_to_xsyncvalue (gint64 value)
+{
+        XSyncValue ret;
+
+        XSyncIntsToValue (&ret, value, ((guint64)value) >> 32);
+
+        return ret;
+}
+
+static void
+shell_idle_monitor_dispose (GObject *object)
+{
+        ShellIdleMonitor *monitor;
+
+        monitor = SHELL_IDLE_MONITOR (object);
+
+        if (monitor->priv->watches != NULL) {
+                g_hash_table_destroy (monitor->priv->watches);
+                monitor->priv->watches = NULL;
+        }
+
+        G_OBJECT_CLASS (shell_idle_monitor_parent_class)->dispose (object);
+}
+
+static gboolean
+_find_alarm (gpointer               key,
+             ShellIdleMonitorWatch *watch,
+             XSyncAlarm            *alarm)
+{
+        /* g_debug ("Searching for %d in %d,%d", (int)*alarm, (int)watch->xalarm_positive, (int)watch->xalarm_negative); */
+        if (watch->xalarm_positive == *alarm
+            || watch->xalarm_negative == *alarm) {
+                return TRUE;
+        }
+        return FALSE;
+}
+
+static ShellIdleMonitorWatch *
+find_watch_for_alarm (ShellIdleMonitor *monitor,
+                      XSyncAlarm        alarm)
+{
+        ShellIdleMonitorWatch *watch;
+
+        watch = g_hash_table_find (monitor->priv->watches,
+                                   (GHRFunc)_find_alarm,
+                                   &alarm);
+        return watch;
+}
+
+static void
+handle_alarm_notify_event (ShellIdleMonitor         *monitor,
+                           XSyncAlarmNotifyEvent    *alarm_event)
+{
+        ShellIdleMonitorWatch *watch;
+        gboolean               condition;
+
+        if (alarm_event->state == XSyncAlarmDestroyed) {
+                return;
+        }
+
+        watch = find_watch_for_alarm (monitor, alarm_event->alarm);
+
+        if (watch == NULL) {
+                /* g_debug ("Unable to find watch for alarm %d", (int)alarm_event->alarm); */
+                return;
+        }
+
+        /* g_debug ("Watch %d fired, idle time = %" G_GINT64_FORMAT,
+                 watch->id,
+                 _xsyncvalue_to_int64 (alarm_event->counter_value)); */
+
+        if (alarm_event->alarm == watch->xalarm_positive) {
+                condition = TRUE;
+        } else {
+                condition = FALSE;
+        }
+
+        if (watch->callback != NULL) {
+                watch->callback (monitor,
+                                 watch->id,
+                                 condition,
+                                 watch->user_data);
+        }
+}
+
+static GdkFilterReturn
+xevent_filter (GdkXEvent        *xevent,
+               GdkEvent         *event,
+               ShellIdleMonitor *monitor)
+{
+        XEvent                *ev;
+        XSyncAlarmNotifyEvent *alarm_event;
+
+        ev = xevent;
+        if (ev->xany.type != monitor->priv->sync_event_base + XSyncAlarmNotify) {
+                return GDK_FILTER_CONTINUE;
+        }
+
+        alarm_event = xevent;
+
+        handle_alarm_notify_event (monitor, alarm_event);
+
+        return GDK_FILTER_CONTINUE;
+}
+
+static gboolean
+init_xsync (ShellIdleMonitor *monitor)
+{
+        int                 sync_error_base;
+        int                 res;
+        int                 major;
+        int                 minor;
+        int                 i;
+        int                 ncounters;
+        XSyncSystemCounter *counters;
+
+        res = XSyncQueryExtension (monitor->priv->display,
+                                   &monitor->priv->sync_event_base,
+                                   &sync_error_base);
+        if (! res) {
+                g_warning ("ShellIdleMonitor: Sync extension not present");
+                return FALSE;
+        }
+
+        res = XSyncInitialize (monitor->priv->display, &major, &minor);
+        if (! res) {
+                g_warning ("ShellIdleMonitor: Unable to initialize Sync extension");
+                return FALSE;
+        }
+
+        counters = XSyncListSystemCounters (monitor->priv->display, &ncounters);
+        for (i = 0; i < ncounters; i++) {
+                if (counters[i].name != NULL
+                    && strcmp (counters[i].name, "IDLETIME") == 0) {
+                        monitor->priv->counter = counters[i].counter;
+                        break;
+                }
+        }
+        XSyncFreeSystemCounterList (counters);
+
+        if (monitor->priv->counter == None) {
+                g_warning ("ShellIdleMonitor: IDLETIME counter not found");
+                return FALSE;
+        }
+
+        gdk_window_add_filter (NULL, (GdkFilterFunc)xevent_filter, monitor);
+
+        return TRUE;
+}
+
+static GObject *
+shell_idle_monitor_constructor (GType                  type,
+                                guint                  n_construct_properties,
+                                GObjectConstructParam *construct_properties)
+{
+        ShellIdleMonitor *monitor;
+
+        monitor = SHELL_IDLE_MONITOR (G_OBJECT_CLASS (shell_idle_monitor_parent_class)->constructor (type,
+                                                                                                     n_construct_properties,
+                                                                                                     construct_properties));
+
+        monitor->priv->display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+
+        if (! init_xsync (monitor)) {
+                g_object_unref (monitor);
+                return NULL;
+        }
+
+        return G_OBJECT (monitor);
+}
+
+static void
+shell_idle_monitor_class_init (ShellIdleMonitorClass *klass)
+{
+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+
+        object_class->dispose = shell_idle_monitor_dispose;
+        object_class->constructor = shell_idle_monitor_constructor;
+
+        g_type_class_add_private (klass, sizeof (ShellIdleMonitorPrivate));
+}
+
+static guint32
+get_next_watch_serial (void)
+{
+        guint32 serial;
+
+        serial = watch_serial++;
+
+        if ((gint32)watch_serial < 0) {
+                watch_serial = 1;
+        }
+
+        /* FIXME: make sure it isn't in the hash */
+
+        return serial;
+}
+
+static ShellIdleMonitorWatch *
+idle_monitor_watch_new (guint interval)
+{
+        ShellIdleMonitorWatch *watch;
+
+        watch = g_slice_new0 (ShellIdleMonitorWatch);
+        watch->interval = _int64_to_xsyncvalue ((gint64)interval);
+        watch->id = get_next_watch_serial ();
+        watch->xalarm_positive = None;
+        watch->xalarm_negative = None;
+
+        return watch;
+}
+
+static void
+idle_monitor_watch_free (ShellIdleMonitorWatch *watch)
+{
+        if (watch == NULL) {
+                return;
+        }
+
+        if (watch->notify != NULL) {
+            watch->notify (watch->user_data);
+        }
+
+        if (watch->xalarm_positive != None) {
+                XSyncDestroyAlarm (watch->display, watch->xalarm_positive);
+        }
+        if (watch->xalarm_negative != None) {
+                XSyncDestroyAlarm (watch->display, watch->xalarm_negative);
+        }
+        g_slice_free (ShellIdleMonitorWatch, watch);
+}
+
+static void
+shell_idle_monitor_init (ShellIdleMonitor *monitor)
+{
+        monitor->priv = SHELL_IDLE_MONITOR_GET_PRIVATE (monitor);
+
+        monitor->priv->watches = g_hash_table_new_full (NULL,
+                                                        NULL,
+                                                        NULL,
+                                                        (GDestroyNotify)idle_monitor_watch_free);
+
+        monitor->priv->counter = None;
+}
+
+/**
+ * shell_idle_monitor_get:
+ *
+ * Returns: (transfer none): the global #ShellIdleMonitor.
+ */
+ShellIdleMonitor *
+shell_idle_monitor_get (void)
+{
+        static ShellIdleMonitor *idle_monitor;
+
+        if (G_UNLIKELY (idle_monitor == NULL))
+                idle_monitor = g_object_new (SHELL_TYPE_IDLE_MONITOR,
+                                             NULL);
+
+        return idle_monitor;
+}
+
+static gboolean
+_xsync_alarm_set (ShellIdleMonitor      *monitor,
+                  ShellIdleMonitorWatch *watch)
+{
+        XSyncAlarmAttributes attr;
+        XSyncValue           delta;
+        guint                flags;
+
+        flags = XSyncCACounter
+                | XSyncCAValueType
+                | XSyncCATestType
+                | XSyncCAValue
+                | XSyncCADelta
+                | XSyncCAEvents;
+
+        XSyncIntToValue (&delta, 0);
+        attr.trigger.counter = monitor->priv->counter;
+        attr.trigger.value_type = XSyncAbsolute;
+        attr.trigger.wait_value = watch->interval;
+        attr.delta = delta;
+        attr.events = TRUE;
+
+        attr.trigger.test_type = XSyncPositiveTransition;
+        if (watch->xalarm_positive != None) {
+                /* g_debug ("ShellIdleMonitor: updating alarm for positive transition wait=%" G_GINT64_FORMAT,
+                         _xsyncvalue_to_int64 (attr.trigger.wait_value)); */
+                XSyncChangeAlarm (monitor->priv->display, watch->xalarm_positive, flags, &attr);
+        } else {
+                /* g_debug ("ShellIdleMonitor: creating new alarm for positive transition wait=%" G_GINT64_FORMAT,
+                         _xsyncvalue_to_int64 (attr.trigger.wait_value)); */
+                watch->xalarm_positive = XSyncCreateAlarm (monitor->priv->display, flags, &attr);
+        }
+
+        attr.trigger.wait_value = _int64_to_xsyncvalue (_xsyncvalue_to_int64 (watch->interval) - 1);
+        attr.trigger.test_type = XSyncNegativeTransition;
+        if (watch->xalarm_negative != None) {
+                /* g_debug ("ShellIdleMonitor: updating alarm for negative transition wait=%" G_GINT64_FORMAT,
+                         _xsyncvalue_to_int64 (attr.trigger.wait_value)); */
+                XSyncChangeAlarm (monitor->priv->display, watch->xalarm_negative, flags, &attr);
+        } else {
+                /* g_debug ("ShellIdleMonitor: creating new alarm for negative transition wait=%" G_GINT64_FORMAT,
+                         _xsyncvalue_to_int64 (attr.trigger.wait_value)); */
+                watch->xalarm_negative = XSyncCreateAlarm (monitor->priv->display, flags, &attr);
+        }
+
+        return TRUE;
+}
+
+guint
+shell_idle_monitor_add_watch (ShellIdleMonitor         *monitor,
+                              guint                     interval,
+                              ShellIdleMonitorWatchFunc callback,
+                              gpointer                  user_data,
+                              GDestroyNotify            notify)
+{
+        ShellIdleMonitorWatch *watch;
+
+        g_return_val_if_fail (SHELL_IS_IDLE_MONITOR (monitor), 0);
+        g_return_val_if_fail (callback != NULL, 0);
+
+        watch = idle_monitor_watch_new (interval);
+        watch->display = monitor->priv->display;
+        watch->callback = callback;
+        watch->user_data = user_data;
+        watch->notify = notify;
+
+        _xsync_alarm_set (monitor, watch);
+
+        g_hash_table_insert (monitor->priv->watches,
+                             GUINT_TO_POINTER (watch->id),
+                             watch);
+        return watch->id;
+}
+
+void
+shell_idle_monitor_remove_watch (ShellIdleMonitor *monitor,
+                                 guint          id)
+{
+        g_return_if_fail (SHELL_IS_IDLE_MONITOR (monitor));
+
+        g_hash_table_remove (monitor->priv->watches,
+                             GUINT_TO_POINTER (id));
+}
+
+gint64
+shell_idle_monitor_get_idletime (ShellIdleMonitor *monitor)
+{
+        XSyncValue value;
+
+        if (!XSyncQueryCounter (monitor->priv->display, monitor->priv->counter, &value))
+                return FALSE;
+
+        return _xsyncvalue_to_int64 (value);
+}
--- a/src/shell-idle-monitor.h
+++ b/src/shell-idle-monitor.h
@ -0,0 +1,74 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Adapted from gnome-session/gnome-session/gs-idle-monitor.h
+ *
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: William Jon McCann <mccann@jhu.edu>
+ *
+ */
+
+#ifndef __SHELL_IDLE_MONITOR_H
+#define __SHELL_IDLE_MONITOR_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define SHELL_TYPE_IDLE_MONITOR         (shell_idle_monitor_get_type ())
+#define SHELL_IDLE_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), SHELL_TYPE_IDLE_MONITOR, ShellIdleMonitor))
+#define SHELL_IDLE_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), SHELL_TYPE_IDLE_MONITOR, ShellIdleMonitorClass))
+#define SHELL_IS_IDLE_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), SHELL_TYPE_IDLE_MONITOR))
+#define SHELL_IS_IDLE_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), SHELL_TYPE_IDLE_MONITOR))
+#define SHELL_IDLE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), SHELL_TYPE_IDLE_MONITOR, ShellIdleMonitorClass))
+
+typedef struct ShellIdleMonitorPrivate ShellIdleMonitorPrivate;
+
+typedef struct
+{
+        GObject                  parent;
+        ShellIdleMonitorPrivate *priv;
+} ShellIdleMonitor;
+
+typedef struct
+{
+        GObjectClass          parent_class;
+} ShellIdleMonitorClass;
+
+typedef void (*ShellIdleMonitorWatchFunc) (ShellIdleMonitor *monitor,
+                                           guint             id,
+                                           gboolean          condition,
+                                           gpointer          user_data);
+
+GType              shell_idle_monitor_get_type     (void);
+
+ShellIdleMonitor * shell_idle_monitor_get          (void);
+
+guint              shell_idle_monitor_add_watch    (ShellIdleMonitor         *monitor,
+                                                    guint                     interval,
+                                                    ShellIdleMonitorWatchFunc callback,
+                                                    gpointer                  user_data,
+                                                    GDestroyNotify            notify);
+
+void               shell_idle_monitor_remove_watch (ShellIdleMonitor         *monitor,
+                                                    guint                     id);
+
+gint64             shell_idle_monitor_get_idletime (ShellIdleMonitor         *monitor);
+
+G_END_DECLS
+
+#endif /* __SHELL_IDLE_MONITOR_H */
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@ -11,8 +11,6 @@
 #define GST_USE_UNSTABLE_API
 #include <gst/gst.h>

-#include <gtk/gtk.h>
-
 #include "shell-recorder-src.h"
 #include "shell-recorder.h"
 #include "shell-screen-grabber.h"
@ -67,7 +65,7 @@ struct _ShellRecorder {

  int framerate;
  char *pipeline_description;
-  char *file_template;
+  char *filename;

  /* We might have multiple pipelines that are finishing encoding
   * to go along with the current pipeline where we are recording.
@ -92,7 +90,6 @@ struct _RecorderPipeline
  GstElement *pipeline;
  GstElement *src;
  int outfile;
-  char *filename;
 };

 static void recorder_set_stage    (ShellRecorder *recorder,
@ -101,8 +98,8 @@ static void recorder_set_framerate (ShellRecorder *recorder,
                                    int framerate);
 static void recorder_set_pipeline (ShellRecorder *recorder,
                                   const char    *pipeline);
-static void recorder_set_file_template (ShellRecorder *recorder,
-                                        const char    *file_template);
+static void recorder_set_filename (ShellRecorder *recorder,
+                                   const char    *filename);

 static void recorder_pipeline_set_caps (RecorderPipeline *pipeline);
 static void recorder_pipeline_closed   (RecorderPipeline *pipeline);
@ -112,7 +109,7 @@ enum {
  PROP_STAGE,
  PROP_FRAMERATE,
  PROP_PIPELINE,
-  PROP_FILE_TEMPLATE
+  PROP_FILENAME
 };

 G_DEFINE_TYPE(ShellRecorder, shell_recorder, G_TYPE_OBJECT);
@ -272,6 +269,18 @@ static void
 shell_recorder_finalize (GObject  *object)
 {
  ShellRecorder *recorder = SHELL_RECORDER (object);
+  GSList *l;
+
+  for (l = recorder->pipelines; l; l = l->next)
+    {
+      RecorderPipeline *pipeline = l->data;
+
+      /* Remove the back-reference. The pipeline will be freed
+       * when it finishes. (Or when the process exits, but that's
+       * out of our control.)
+       */
+      pipeline->recorder = NULL;
+    }

  if (recorder->update_memory_used_timeout)
    g_source_remove (recorder->update_memory_used_timeout);
@ -281,7 +290,7 @@ shell_recorder_finalize (GObject  *object)

  recorder_set_stage (recorder, NULL);
  recorder_set_pipeline (recorder, NULL);
-  recorder_set_file_template (recorder, NULL);
+  recorder_set_filename (recorder, NULL);

  g_object_unref (recorder->grabber);

@ -908,22 +917,22 @@ recorder_set_pipeline (ShellRecorder *recorder,
 }

 static void
-recorder_set_file_template (ShellRecorder *recorder,
-                            const char    *file_template)
+recorder_set_filename (ShellRecorder *recorder,
+                       const char    *filename)
 {
-  if (file_template == recorder->file_template ||
-      (file_template && recorder->file_template && strcmp (recorder->file_template, file_template) == 0))
+  if (filename == recorder->filename ||
+      (filename && recorder->filename && strcmp (recorder->filename, filename) == 0))
    return;

  if (recorder->current_pipeline)
    shell_recorder_close (recorder);

-  if (recorder->file_template)
-    g_free (recorder->file_template);
+  if (recorder->filename)
+    g_free (recorder->filename);

-  recorder->file_template = g_strdup (file_template);
+  recorder->filename = g_strdup (filename);

-  g_object_notify (G_OBJECT (recorder), "file-template");
+  g_object_notify (G_OBJECT (recorder), "filename");
 }

 static void
@ -945,8 +954,8 @@ shell_recorder_set_property (GObject      *object,
    case PROP_PIPELINE:
      recorder_set_pipeline (recorder, g_value_get_string (value));
      break;
-    case PROP_FILE_TEMPLATE:
-      recorder_set_file_template (recorder, g_value_get_string (value));
+    case PROP_FILENAME:
+      recorder_set_filename (recorder, g_value_get_string (value));
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -973,8 +982,8 @@ shell_recorder_get_property (GObject         *object,
    case PROP_PIPELINE:
      g_value_set_string (value, recorder->pipeline_description);
      break;
-    case PROP_FILE_TEMPLATE:
-      g_value_set_string (value, recorder->file_template);
+    case PROP_FILENAME:
+      g_value_set_string (value, recorder->filename);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -1018,9 +1027,9 @@ shell_recorder_class_init (ShellRecorderClass *klass)
                                                        G_PARAM_READWRITE));

  g_object_class_install_property (gobject_class,
-                                   PROP_FILE_TEMPLATE,
-                                   g_param_spec_string ("file-template",
-                                                        "File Template",
+                                   PROP_FILENAME,
+                                   g_param_spec_string ("filename",
+                                                        "Filename",
                                                        "The filename template to use for output files",
                                                        NULL,
                                                        G_PARAM_READWRITE));
@ -1140,14 +1149,13 @@ get_absolute_path (char *maybe_relative)
 * be opened.
 */
 static int
-recorder_open_outfile (ShellRecorder  *recorder,
-                       char          **outfilename)
+recorder_open_outfile (ShellRecorder *recorder)
 {
  const char *pattern;
  int flags;
  int outfile = -1;

-  pattern = recorder->file_template;
+  pattern = recorder->filename;
  if (!pattern)
    return -1;

@ -1222,12 +1230,8 @@ recorder_open_outfile (ShellRecorder  *recorder,
        {
          g_printerr ("Recording to %s\n", path);

-          if (outfilename != NULL)
-            *outfilename = path;
-          else
-            g_free (path);
          g_string_free (filename, TRUE);
-
+          g_free (path);
          goto out;
        }

@ -1265,8 +1269,7 @@ recorder_pipeline_add_sink (RecorderPipeline *pipeline)
      return TRUE;
    }

-  pipeline->outfile = recorder_open_outfile (pipeline->recorder,
-                                             &pipeline->filename);
+  pipeline->outfile = recorder_open_outfile (pipeline->recorder);
  if (pipeline->outfile == -1)
    goto out;

@ -1341,10 +1344,6 @@ recorder_pipeline_free (RecorderPipeline *pipeline)
  if (pipeline->outfile != -1)
    close (pipeline->outfile);

-  g_free (pipeline->filename);
-
-  g_clear_object (&pipeline->recorder);
-
  g_free (pipeline);
 }

@ -1394,10 +1393,6 @@ recorder_pipeline_closed (RecorderPipeline *pipeline)

  if (pipeline->recorder)
    {
-      GtkRecentManager *recent_manager;
-      GFile *file;
-      char *uri;
-
      ShellRecorder *recorder = pipeline->recorder;
      if (pipeline == recorder->current_pipeline)
        {
@ -1406,15 +1401,6 @@ recorder_pipeline_closed (RecorderPipeline *pipeline)
          shell_recorder_close (recorder);
        }

-      recent_manager = gtk_recent_manager_get_default ();
-
-      file = g_file_new_for_path (pipeline->filename);
-      uri = g_file_get_uri (file);
-      gtk_recent_manager_add_item (recent_manager,
-                                   uri);
-      g_free (uri);
-      g_object_unref (file);
-
      recorder->pipelines = g_slist_remove (recorder->pipelines, pipeline);
    }

@ -1466,7 +1452,7 @@ recorder_open_pipeline (ShellRecorder *recorder)
  GstBus *bus;

  pipeline = g_new0(RecorderPipeline, 1);
-  pipeline->recorder = g_object_ref (recorder);
+  pipeline->recorder = recorder;
  pipeline->outfile = - 1;

  pipeline_description = recorder->pipeline_description;
@ -1569,10 +1555,10 @@ shell_recorder_set_framerate (ShellRecorder *recorder,
 }

 /**
- * shell_recorder_set_file_template:
+ * shell_recorder_set_filename:
 * @recorder: the #ShellRecorder
- * @file_template: the filename template to use for output files,
- *                 or %NULL for the defalt value.
+ * @filename: the filename template to use for output files,
+ *            or %NULL for the defalt value.
 *
 * Sets the filename that will be used when creating output
 * files. This is only used if the configured pipeline has an
@ -1587,12 +1573,12 @@ shell_recorder_set_framerate (ShellRecorder *recorder,
 * The default value is 'shell-%d%u-%c.ogg'.
 */
 void
-shell_recorder_set_file_template (ShellRecorder *recorder,
-                                  const char    *file_template)
+shell_recorder_set_filename (ShellRecorder *recorder,
+                             const char    *filename)
 {
  g_return_if_fail (SHELL_IS_RECORDER (recorder));

-  recorder_set_file_template (recorder, file_template);
+  recorder_set_filename (recorder, filename);

 }

@ -1607,7 +1593,7 @@ shell_recorder_set_file_template (ShellRecorder *recorder,
 * 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. (See shell_recorder_set_file_template().) However
+ * output file. (See shell_recorder_set_filename().) 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.
--- a/src/shell-recorder.h
+++ b/src/shell-recorder.h
@ -32,8 +32,8 @@ ShellRecorder     *shell_recorder_new (ClutterStage  *stage);

 void               shell_recorder_set_framerate (ShellRecorder *recorder,
                                                 int framerate);
-void               shell_recorder_set_file_template (ShellRecorder *recorder,
-                                                     const char    *file_template);
+void               shell_recorder_set_filename (ShellRecorder *recorder,
+						const char    *filename);
 void               shell_recorder_set_pipeline (ShellRecorder *recorder,
 						const char    *pipeline);
 gboolean           shell_recorder_record       (ShellRecorder *recorder);
--- a/src/shell-screen-grabber.c
+++ b/src/shell-screen-grabber.c
@ -170,7 +170,16 @@ shell_screen_grabber_grab (ShellScreenGrabber *grabber,
       * top-left */
      glGetIntegerv (GL_VIEWPORT, vp_size);
      y = vp_size[3] - (y + height);
+
+      /* the "big-endian" version actually works for both, but the litle-endian
+       * version has been better tested with a range of drivers, so we'll
+       * keep on using it on little-endian.
+       */
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
      glReadPixels (x, y, width, height, GL_BGRA, GL_UNSIGNED_BYTE, 0);
+#else
+      glReadPixels (x, y, width, height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0);
+#endif

      mapped_data = pf_glMapBufferARB (GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY_ARB);

--- a/src/st/st-texture-cache.c
+++ b/src/st/st-texture-cache.c
@ -42,9 +42,6 @@ struct _StTextureCachePrivate

  /* Presently this is used to de-duplicate requests for GIcons and async URIs. */
  GHashTable *outstanding_requests; /* char * -> AsyncTextureLoadData * */
-
-  /* File monitors to evict cache data on changes */
-  GHashTable *file_monitors; /* char * -> GFileMonitor * */
 };

 static void st_texture_cache_dispose (GObject *object);
@ -53,7 +50,6 @@ static void st_texture_cache_finalize (GObject *object);
 enum
 {
  ICON_THEME_CHANGED,
-  TEXTURE_FILE_CHANGED,

  LAST_SIGNAL
 };
@ -96,14 +92,33 @@ st_texture_cache_class_init (StTextureCacheClass *klass)
                  0, /* no default handler slot */
                  NULL, NULL, NULL,
                  G_TYPE_NONE, 0);
+}

-  signals[TEXTURE_FILE_CHANGED] =
-    g_signal_new ("texture-file-changed",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, /* no default handler slot */
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, G_TYPE_STRING);
+/**
+ * st_texture_cache_clear_uri:
+ * @cache: A #StTextureCache
+ * @uri: URI of cached object
+ *
+ * If the given @uri is known to have been modified
+ * externally, this function may be used to invalidate
+ * the in-memory cache.
+ */
+void
+st_texture_cache_clear_uri (StTextureCache *cache,
+                            const char     *uri)
+{
+  char *key;
+
+  g_return_if_fail (ST_IS_TEXTURE_CACHE (cache));
+  g_return_if_fail (uri != NULL);
+
+  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
+  g_hash_table_remove (cache->priv->keyed_cache, key);
+  g_free (key);
+
+  key = g_strconcat (CACHE_PREFIX_URI_FOR_CAIRO, uri, NULL);
+  g_hash_table_remove (cache->priv->keyed_cache, key);
+  g_free (key);
 }

 /* Evicts all cached textures for named icons */
@ -149,9 +164,6 @@ st_texture_cache_init (StTextureCache *self)
                                                   g_free, cogl_handle_unref);
  self->priv->outstanding_requests = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                            g_free, NULL);
-  self->priv->file_monitors = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                     g_object_unref, g_object_unref);
-
 }

 static void
@ -167,9 +179,13 @@ st_texture_cache_dispose (GObject *object)
      self->priv->icon_theme = NULL;
    }

-  g_clear_pointer (&self->priv->keyed_cache, g_hash_table_destroy);
-  g_clear_pointer (&self->priv->outstanding_requests, g_hash_table_destroy);
-  g_clear_pointer (&self->priv->file_monitors, g_hash_table_destroy);
+  if (self->priv->keyed_cache)
+    g_hash_table_destroy (self->priv->keyed_cache);
+  self->priv->keyed_cache = NULL;
+
+  if (self->priv->outstanding_requests)
+    g_hash_table_destroy (self->priv->outstanding_requests);
+  self->priv->outstanding_requests = NULL;

  G_OBJECT_CLASS (st_texture_cache_parent_class)->dispose (object);
 }
@ -1023,52 +1039,6 @@ load_from_pixbuf (GdkPixbuf *pixbuf)
  return CLUTTER_ACTOR (texture);
 }

-static void
-file_changed_cb (GFileMonitor      *monitor,
-                 GFile             *file,
-                 GFile             *other,
-                 GFileMonitorEvent  event_type,
-                 gpointer           user_data)
-{
-  StTextureCache *cache = user_data;
-  char *uri, *key;
-
-  if (event_type != G_FILE_MONITOR_EVENT_CHANGED)
-    return;
-
-  uri = g_file_get_uri (file);
-
-  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
-  g_hash_table_remove (cache->priv->keyed_cache, key);
-  g_free (key);
-
-  key = g_strconcat (CACHE_PREFIX_URI_FOR_CAIRO, uri, NULL);
-  g_hash_table_remove (cache->priv->keyed_cache, key);
-  g_free (key);
-
-  g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, uri);
-
-  g_free (uri);
-}
-
-static void
-ensure_monitor_for_uri (StTextureCache *cache,
-                        const gchar    *uri)
-{
-  StTextureCachePrivate *priv = cache->priv;
-  GFile *file = g_file_new_for_uri (uri);
-
-  if (g_hash_table_lookup (priv->file_monitors, uri) == NULL)
-    {
-      GFileMonitor *monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE,
-                                                   NULL, NULL);
-      g_signal_connect (monitor, "changed",
-                        G_CALLBACK (file_changed_cb), cache);
-      g_hash_table_insert (priv->file_monitors, g_strdup (uri), monitor);
-    }
-  g_object_unref (file);
-}
-
 typedef struct {
  gchar *path;
  gint   grid_width, grid_height;
@ -1191,6 +1161,41 @@ st_texture_cache_load_sliced_image (StTextureCache    *cache,
  return actor;
 }

+/**
+ * st_texture_cache_load_icon_name:
+ * @cache: The texture cache instance
+ * @theme_node: (allow-none): a #StThemeNode
+ * @name: Name of a themed icon
+ * @size: Size of themed icon
+ *
+ * Load a themed icon into a texture. The colors used for symbolic
+ * icons are derived from @theme_node.
+ *
+ * Return Value: (transfer none): A new #ClutterTexture for the icon
+ */
+ClutterActor *
+st_texture_cache_load_icon_name (StTextureCache    *cache,
+                                 StThemeNode       *theme_node,
+                                 const char        *name,
+                                 gint               size)
+{
+  ClutterActor *texture;
+  GIcon *themed;
+
+  themed = g_themed_icon_new_with_default_fallbacks (name);
+  texture = load_gicon_with_colors (cache, themed, size,
+                                    theme_node ? st_theme_node_get_icon_colors (theme_node) : NULL);
+  g_object_unref (themed);
+
+  if (texture == NULL)
+    {
+      texture = (ClutterActor *) create_default_texture ();
+      clutter_actor_set_size (texture, size, size);
+    }
+
+  return texture;
+}
+
 /**
 * st_texture_cache_load_uri_async:
 * @cache: The texture cache instance
@ -1241,8 +1246,6 @@ st_texture_cache_load_uri_async (StTextureCache *cache,
      load_texture_async (cache, request);
    }

-  ensure_monitor_for_uri (cache, uri);
-
  return CLUTTER_ACTOR (texture);
 }

@ -1280,8 +1283,6 @@ st_texture_cache_load_uri_sync_to_cogl_texture (StTextureCache *cache,
  else
    cogl_handle_ref (texdata);

-  ensure_monitor_for_uri (cache, uri);
-
 out:
  g_free (key);
  return texdata;
@ -1321,8 +1322,6 @@ st_texture_cache_load_uri_sync_to_cairo_surface (StTextureCache        *cache,
  else
    cairo_surface_reference (surface);

-  ensure_monitor_for_uri (cache, uri);
-
 out:
  g_free (key);
  return surface;
--- a/src/st/st-texture-cache.h
+++ b/src/st/st-texture-cache.h
@ -68,6 +68,9 @@ GType st_texture_cache_get_type (void) G_GNUC_CONST;

 StTextureCache* st_texture_cache_get_default (void);

+void st_texture_cache_clear_uri (StTextureCache *cache,
+                                 const gchar    *uri);
+
 ClutterActor *
 st_texture_cache_load_sliced_image (StTextureCache    *cache,
                                    const gchar       *path,
@ -78,6 +81,11 @@ ClutterActor *st_texture_cache_bind_pixbuf_property (StTextureCache    *cache,
                                                     GObject           *object,
                                                     const char        *property_name);

+ClutterActor *st_texture_cache_load_icon_name (StTextureCache *cache,
+                                               StThemeNode    *theme_node,
+                                               const char     *name,
+                                               gint            size);
+
 ClutterActor *st_texture_cache_load_gicon (StTextureCache *cache,
                                           StThemeNode    *theme_node,
                                           GIcon          *icon,
--- a/src/st/st-theme.c
+++ b/src/st/st-theme.c
@ -1018,7 +1018,6 @@ _st_theme_resolve_url (StTheme      *theme,
  const char *base_filename = NULL;
  char *dirname;
  char *filename;
-  char *canonicalized_path;

  /* Handle absolute file:/ URLs */
  if (g_str_has_prefix (url, "file:") ||
@ -1035,7 +1034,7 @@ _st_theme_resolve_url (StTheme      *theme,
          g_error_free (error);
        }

-      return filename;
+      return NULL;
    }

  /* Guard against http:/ URLs */
@ -1051,19 +1050,7 @@ _st_theme_resolve_url (StTheme      *theme,
  /* Assume anything else is a relative URL, and "resolve" it
   */
  if (url[0] == '/')
-    {
-      canonicalized_path = realpath (url, NULL);
-      if (g_mem_is_system_malloc ())
-        {
-          filename = canonicalized_path;
-        }
-      else
-        {
-          filename = g_strdup (canonicalized_path);
-          free (canonicalized_path);
-        }
-      return filename;
-    }
+    return g_strdup (url);

  base_filename = g_hash_table_lookup (theme->filenames_by_stylesheet, base_stylesheet);

@ -1075,19 +1062,7 @@ _st_theme_resolve_url (StTheme      *theme,

  dirname = g_path_get_dirname (base_filename);
  filename = g_build_filename (dirname, url, NULL);
-  canonicalized_path = realpath (filename, NULL);
  g_free (dirname);
-  g_free (filename);
-
-  if (g_mem_is_system_malloc ())
-    {
-      filename = canonicalized_path;
-    }
-  else
-    {
-      filename = g_strdup (canonicalized_path);
-      free (canonicalized_path);
-    }

  return filename;
 }
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@ -269,39 +269,6 @@ st_widget_remove_transition (StWidget *widget)
    }
 }

-static void
-st_widget_texture_cache_changed (StTextureCache *cache,
-                                 const char     *uri,
-                                 gpointer        user_data)
-{
-  StWidget *actor = ST_WIDGET (user_data);
-  StThemeNode *node = actor->priv->theme_node;
-  StBorderImage *border_image;
-  char *path;
-  gboolean changed;
-
-  if (node == NULL)
-    return;
-
-  path = g_filename_from_uri (uri, NULL, NULL);
-
-  changed = g_strcmp0 (st_theme_node_get_background_image (node), path) == 0;
-
-  border_image = st_theme_node_get_border_image (node);
-  if (!changed && border_image)
-    changed = strcmp (st_border_image_get_filename (border_image), path) == 0;
-
-  g_free (path);
-
-  if (!changed)
-    return;
-
-  st_theme_node_invalidate_paint_state (node);
-
-  if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (actor)))
-    clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
-}
-
 static void
 st_widget_dispose (GObject *gobject)
 {
@ -335,10 +302,6 @@ st_widget_dispose (GObject *gobject)
      priv->label_actor = NULL;
    }

-  g_signal_handlers_disconnect_by_func (st_texture_cache_get_default (),
-                                        st_widget_texture_cache_changed,
-                                        actor);
-
  g_clear_object (&priv->prev_first_child);
  g_clear_object (&priv->prev_last_child);

@ -1507,8 +1470,6 @@ st_widget_init (StWidget *actor)

  g_signal_connect (actor, "notify::first-child", G_CALLBACK (st_widget_first_child_notify), NULL);
  g_signal_connect (actor, "notify::last-child", G_CALLBACK (st_widget_last_child_notify), NULL);
-  g_signal_connect (st_texture_cache_get_default (), "texture-file-changed",
-                    G_CALLBACK (st_widget_texture_cache_changed), actor);
 }

 static void
@ -2799,3 +2760,38 @@ st_widget_get_focus_chain (StWidget *widget)
 {
  return ST_WIDGET_GET_CLASS (widget)->get_focus_chain (widget);
 }
+
+/**
+ * st_widget_clear_background_image:
+ * @widget: An #StWidget
+ *
+ * Force a reload of the background-image property. Usually properties
+ * are cached heavily to avoid unnecessary work on paint, this method
+ * will force the cache to be recreated.
+ */
+void
+st_widget_clear_background_image (StWidget *actor)
+{
+  GFile *file;
+  const char *path;
+  char *uri;
+
+  if (actor->priv->theme_node == NULL)
+    return;
+
+  path = st_theme_node_get_background_image (actor->priv->theme_node);
+  if (path == NULL)
+    return;
+
+  file = g_file_new_for_path (path);
+  uri = g_file_get_uri (file);
+
+  st_texture_cache_clear_uri (st_texture_cache_get_default (), uri);
+  st_theme_node_invalidate_paint_state (actor->priv->theme_node);
+
+  if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (actor)))
+    clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
+
+  g_object_unref (file);
+  g_free (uri);
+}
--- a/src/st/st-widget.h
+++ b/src/st/st-widget.h
@ -142,6 +142,8 @@ ClutterActor *        st_widget_get_label_actor           (StWidget        *widg
 void                  st_widget_set_label_actor           (StWidget        *widget,
                                                           ClutterActor    *label);

+void                  st_widget_clear_background_image    (StWidget        *widget);
+
 /* Only to be used by sub-classes of StWidget */
 void                  st_widget_style_changed             (StWidget        *widget);
 StThemeNode *         st_widget_get_theme_node            (StWidget        *widget);
--- a/src/test-recorder.c
+++ b/src/test-recorder.c
@ -3,7 +3,6 @@
 #define GST_USE_UNSTABLE_API
 #include "shell-recorder.h"
 #include <clutter/clutter.h>
-#include <gtk/gtk.h>
 #include <gst/gst.h>

 /* Very simple test of the ShellRecorder class; shows some text strings
@ -12,34 +11,23 @@
 static ShellRecorder *recorder = NULL;

 static gboolean
-stop_recording_timeout (ClutterActor *stage)
+stop_recording_timeout (gpointer data)
 {
  if (recorder)
    {
      shell_recorder_close (recorder);
-
-      /* quit when the recorder finishes closing
-       */
-      g_object_weak_ref (G_OBJECT (recorder),
-                         (GWeakNotify)
-                         clutter_actor_destroy,
-                         stage);
-
      g_object_unref (recorder);
    }
-  else
-    {
-      clutter_actor_destroy (stage);
-    }
+
+  clutter_main_quit ();

  return FALSE;
 }

 static void
-on_animation_completed (ClutterAnimation *animation,
-                        ClutterStage     *stage)
+on_animation_completed (ClutterAnimation *animation)
 {
-  g_timeout_add (1000, (GSourceFunc) stop_recording_timeout, stage);
+  g_timeout_add (1000, stop_recording_timeout, NULL);
 }

 static void
@ -47,7 +35,7 @@ on_stage_realized (ClutterActor *stage,
                   gpointer      data)
 {
  recorder = shell_recorder_new (CLUTTER_STAGE (stage));
-  shell_recorder_set_file_template (recorder, "test-recorder.ogg");
+  shell_recorder_set_filename (recorder, "test-recorder.ogg");
  shell_recorder_record (recorder);
 }

@ -58,7 +46,6 @@ int main (int argc, char **argv)
  ClutterAnimation *animation;
  ClutterColor red, green, blue;

-  gtk_init (&argc, &argv);
  gst_init (&argc, &argv);
  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
    return 1;
@ -82,7 +69,7 @@ int main (int argc, char **argv)
 				     "y", 240.0,
 				     NULL);
  g_signal_connect (animation, "completed",
-		    G_CALLBACK (on_animation_completed), stage);
+		    G_CALLBACK (on_animation_completed), NULL);

  text = g_object_new (CLUTTER_TYPE_TEXT,
 		       "text", "Blue",
@ -123,5 +110,7 @@ int main (int argc, char **argv)

  clutter_main ();

+  g_object_unref (stage);
+
  return 0;
 }
--- a/tests/interactive/test-title.js
+++ b/tests/interactive/test-title.js
@ -1,34 +0,0 @@
-#!/usr/bin/env gjs
-
-const Gtk = imports.gi.Gtk;
-const Mainloop = imports.mainloop;
-
-function nextTitle() {
-    let length = Math.random() * 20;
-    let str = '';
-
-    for (let i = 0; i < length; i++) {
-        // 97 == 'a'
-        str += String.fromCharCode(97 + Math.random() * 26);
-    }
-
-    return str;
-}
-
-function main() {
-    Gtk.init(null);
-
-    let win = new Gtk.Window({ title: nextTitle() });
-    win.connect('destroy', Gtk.main_quit);
-    win.present();
-
-    Mainloop.timeout_add(5000, function() {
-        win.title = nextTitle();
-        return true;
-    });
-
-    Gtk.main();
-}
-
-main();
-
Author	SHA1	Message	Date
Florian Müllner	8461f44048	Bump version to 3.6.2 Update NEWS	2012-11-12 22:02:39 +01:00
Florian Müllner	c32f13e0f6	Update .gitignore	2012-11-12 21:17:37 +01:00
Ray Strode	7e8d6f23c2	loginDialog: support disable-user-list key In some deployments showing a user list at the login screen is undesirable. GDM's fallback login screen has a configuration key: org.gnome.login-screen disable-user-list false that causes the user-list to get hidden. This commit adds similar functionality to the normal, shell-based login screen. Based on a series of patches by Marius Rieder. https://bugzilla.gnome.org/show_bug.cgi?id=660660	2012-11-12 14:09:25 -05:00
Ray Strode	f4377138f1	loginDialog: hide session list until username is entered Right now when a user clicks "Not Listed?" they end up seeing a session list that gets reset after they enter their username. This commit hides the session list until the username has been entered. https://bugzilla.gnome.org/show_bug.cgi?id=660660	2012-11-12 13:43:16 -05:00
Ray Strode	dcbdae85eb	loginDialog: don't rely on PAM to ask for a username For the "Not Listed?" case we will need to be able to identify when the user has entered their username. Once we have a way of tracking when the username is entered, we can then defer showing the session list too early, before the user can reliably pick a session. This username tracking will also be important for implementing a disable-user-list configuration key. If the config key gets toggled off at runtime, we'll need to know if we're at a disruptive part of the authentication process or not, so we know whether we can can expose the user list right away, or wait until the authentication conversation finishes. Right now, we pass null in for an initial username, and let the PAM machinery ask the user, which means we have no good way of knowing when the username is entered. This commit changes the "Not Listed?" code to ask the user their username up front, before starting the PAM conversation in much the same way we do if the user picks a user from the user list. https://bugzilla.gnome.org/show_bug.cgi?id=660660	2012-11-12 13:43:10 -05:00
Owen W. Taylor	980c3290de	shell-screen-grabber.c: Fix PBO path for big-endian machines GL_BGRA/GL_UNSIGNED_BYTE only properly represents the Cairo pixel format for little-endian machines. On big endian machines we need to use GL_BGRA/GL_UNSIGNED_INT_8_8_8_8_REV. That would also work for little- endian, but for minimum disruption we keep using the old version on little endian. https://bugzilla.gnome.org/show_bug.cgi?id=685915	2012-11-12 19:09:59 +01:00
Florian Müllner	2acb129505	loginDialog: Fix yet another StIconType removal fallout https://bugzilla.gnome.org/show_bug.cgi?id=688181	2012-11-12 18:46:33 +01:00
Florian Müllner	09b897369d	loginDialog: Remove the correct focus root from ctrl-alt-tab Commit `3abfcda8b5` fixed the focus root passed to addGroup(), but left the one in removeGroup() unchanged. https://bugzilla.gnome.org/show_bug.cgi?id=688181	2012-11-12 18:46:33 +01:00
Florian Müllner	68e011d4cb	polkitAgent: Expand password entry to the full width Due to an oversight, the width of the password entry is currently determined by the length of the message description. Fix the flags so that the entry spans the entire width of the dialog. https://bugzilla.gnome.org/show_bug.cgi?id=684810	2012-11-12 17:40:11 +01:00
Florian Müllner	f4cc2474bd	dash: Disable animations during overview transitions When updating the dash, we already avoid all animations while the overview is hidden. However, as we are using Main.queueDeferredWork(), updates may be deferred up to ~20 seconds while the overview is hidden. If the overview is entered before a queued update has taken place, it will be run immediately on map - as the overview is visible by then, this means animating any outstanding changes. Work around this by skipping animations during overview transitions as well. https://bugzilla.gnome.org/show_bug.cgi?id=686530	2012-11-12 17:40:11 +01:00
Florian Müllner	01b2f596a2	messageTray: Hide summary notification immediately when closing the tray When the summary notification is open when the tray is closed, we end up with two concurrent animations: the notification fading out, and the tray moving away from underneath it. Sliding out the tray should be the primary transition here, so hide the notification immediately to not draw the user's attention away from it. https://bugzilla.gnome.org/show_bug.cgi?id=686888	2012-11-12 13:48:12 +01:00
Florian Müllner	423d8ab5ec	messageTray: Hide notification close button immediately on click Having the close button move away from under the pointer after clicking it is confusing and distracts from the main transition, which is hiding the notification. Just hide it immediately. https://bugzilla.gnome.org/show_bug.cgi?id=682237	2012-11-12 13:48:12 +01:00
Jasper St. Pierre	5fb355ba2d	messageTray: Don't destroy the notification when clicking on the close button Clicking on the close button should simply hide the notification. https://bugzilla.gnome.org/show_bug.cgi?id=682237	2012-11-12 13:48:12 +01:00
Jasper St. Pierre	c16f9ba7c4	messageTray: Only hide the notification stack on clicking close Rather than destroying the entire source, which is unintuitive, simply close the notification. Removing the entire source is still possible by right-clicking on the summary item and choosing "Remove". https://bugzilla.gnome.org/show_bug.cgi?id=682237	2012-11-12 13:48:12 +01:00
Jasper St. Pierre	972267e215	messageTray: make SummaryItem._closeButton public Use this to show/hide the close button instead of closeButtonVisible. https://bugzilla.gnome.org/show_bug.cgi?id=682237	2012-11-12 13:48:12 +01:00
Giovanni Campagna	678d3623ed	ScreenShield: fix code to detect missing unlock dialog If the session mode has no locking support, screenshield had code to unlock automatically, but it did so by checking the return value of the constructor, instead of checking if the constructor was actually callable, so it would get a TypeError before reaching the check. https://bugzilla.gnome.org/show_bug.cgi?id=687708	2012-11-11 19:20:15 +01:00
Giovanni Campagna	1a86dd9df3	ScreenShield: don't rely on gnome-session to hide the lightbox If we lock before the user becomes active again, gnome-session will never change presence from IDLE, and thus we'll never hide the lightbox. Instead, install our own idle monitor. https://bugzilla.gnome.org/show_bug.cgi?id=687020	2012-11-11 19:19:31 +01:00
Sebastian Keller	f7423967b6	power: indicate 1 hour remaining correctly Before 60 minutes remaining were displayed as "0 minutes" now it is "1 hour". https://bugzilla.gnome.org/show_bug.cgi?id=687958	2012-11-09 17:18:16 +01:00
Giovanni Campagna	ec1a13a325	UnlockDialog: clear the password on failure It is wrong, and the user can't correct it because it's obfuscated. Just let him type it again. https://bugzilla.gnome.org/show_bug.cgi?id=687132	2012-11-08 19:00:17 -05:00
Giovanni Campagna	d7adfe9bf1	ShellUserVerifier: fix fail counter If it is updated after checking, it counts the number of failures not including the current one, so it allows one extra attempt. Instead, by updating it before checking, we get the expected result of dropping the curtain at the third password. https://bugzilla.gnome.org/show_bug.cgi?id=687132	2012-11-08 19:00:09 -05:00
Giovanni Campagna	26026ecf10	LoginDialog: clear previous auth failed messages when trying again When the user has the entered the password for the second time and clicked OK, clear messages from the previous attempt, so any new failure is shown clearly. https://bugzilla.gnome.org/show_bug.cgi?id=687132	2012-11-08 19:00:00 -05:00
Daniel Mustieles	6ff09f8bf9	Updated Spanish translation	2012-11-08 12:40:17 +01:00
Wolfgang Stöggl	ced93003fb	[l10n] Updated German translation	2012-11-06 20:11:27 +01:00
Alejandro Piñeiro	c05605f27c	a11y: fixing a regression with the accessible name at dash items After some changes, the tooltip label at the dash is not available until it is visually shown. As this is not anymore a reliable source of accessible name, we just set the accessible name with the string used on that label. https://bugzilla.gnome.org/show_bug.cgi?id=686583	2012-11-06 10:05:11 +01:00
Matthias Clasen	d8c5cc3b52	Add a --disable-man configure option OSTree doesn't have DocBook stylesheets, so generating man pages from xml causes build failures there.	2012-11-05 23:39:32 -05:00
Matthias Clasen	25ddcab9bf	Use the same xsltproc parameters as other modules Using the same parameters makes sure that the generated man pages look more or less uniform.	2012-11-05 23:33:38 -05:00
Matthias Clasen	11f79d1bd4	Some updates to the man page Mention relevant files, and how gnome-shell gets started in the session. https://bugzilla.gnome.org/show_bug.cgi?id=680601	2012-11-05 19:33:38 -05:00
Matthias Clasen	d046ba597f	Convert man page to Docbook This make it easier to update the content and to transform the man page into other output formats, like HTML. https://bugzilla.gnome.org/show_bug.cgi?id=680601	2012-11-05 19:33:26 -05:00
Sweta Kothari	d11b1a0ac8	Updated gujarati file	2012-11-05 12:23:42 +05:30
Marek Černocký	dc43ff4c29	Updated Czech translation	2012-11-04 20:00:17 +01:00
Yuri Myasoedov	c2fc886053	Updated Russian translation	2012-11-04 20:49:07 +04:00
A S Alam	c0ae60ee50	update Punjabi Translation for package	2012-11-04 09:27:16 +05:30
Gil Forcada	6cf694d6c9	[l10n] Updated Catalan translation	2012-11-03 16:22:50 +01:00
Мирослав Николић	4f6cc5fa08	Updated Serbian translation	2012-11-03 09:09:07 +01:00
Sjoerd Simons	99b768ec54	telepathyClient: Fix auto-scroll to bottom Instead of keeping track of the old adjustment.upper keep track of the old adjustment.value that corresponded to the bottom scroll position. This fixes the integrated chatview not always scrolling to the bottom by removing the assumption that page_size is constant between updates, which is not the case as the view is presented in various different ways. https://bugzilla.gnome.org/show_bug.cgi?id=686571	2012-11-02 16:25:31 +01:00
Ihar Hrachyshka	23db99b96a	Updated Belarusian translation.	2012-11-02 15:12:10 +03:00
Kjartan Maraas	e54b3ecbe6	Updated Norwegian bokmål translation	2012-11-02 08:10:33 +01:00
Aurimas Černius	9ce1c18529	Updated Lithuanian translation	2012-11-01 15:24:18 +02:00
Fran Diéguez	cc5dce7e36	Updated Galician translations	2012-11-01 11:21:58 +01:00
Piotr Drąg	e429b222c9	Updated Polish translation	2012-10-31 19:14:46 +01:00
Matej Urbančič	3079565eb5	Updated Slovenian translation	2012-10-31 18:58:12 +01:00
Matthias Clasen	a618c41e7b	Add a setting to force the 'Log out' menuitem I've heard quite a bit of feedback from people who want to log out, even if they are the sole user on their system. It doesn't seem worth alienating them over this; so add a setting to make the 'Log out' item always show up. https://bugzilla.gnome.org/show_bug.cgi?id=686057	2012-10-31 12:48:11 -04:00
Matthias Clasen	b9851e3127	Show 'Log out' in more situations When the current user is a remote account, or a we are logged in as root, we should always show 'Log out'. https://bugzilla.gnome.org/show_bug.cgi?id=686736	2012-10-31 12:45:33 -04:00
Matthew Barnes	eb3b68a4d1	calendar: Drop unnecessary libedataserverui dependency The libedataserverui dependency is a relic of the old E-D-S API. As of 3.6.0, E-D-S now centralizes authentication prompts so clients don't have to display their own. This also allows trading the GTK+ main loop for a plain GMainLoop in gnome-shell-calendar-server.c. https://bugzilla.gnome.org/show_bug.cgi?id=687189 (cherry picked from commit `29714922ea`)	2012-10-30 14:55:00 -04:00
Giovanni Campagna	8ca914638e	NetworkAgent: cancel requests when disabling component When the NetworkAgent is disabled (for example because the lock screen is being activated), cancel all modal dialogs. https://bugzilla.gnome.org/show_bug.cgi?id=685239	2012-10-30 16:38:05 +01:00
Matthias Clasen	d1242e9ae7	App search: Match GenericName too This is making shell search results more useful in many cases, such as 'web', 'browser', spreadsheet'. https://bugzilla.gnome.org/show_bug.cgi?id=687121	2012-10-29 11:52:50 -04:00
Sweta Kothari	16e22017f2	Updated gujarati file	2012-10-29 12:39:58 +05:30
Florian Müllner	b7442137ab	message-tray: Restore Fittsability of summary items The reactive area of tray items should extend to the screen edge. This regressed when implementing the new tray design, make it work again. https://bugzilla.gnome.org/show_bug.cgi?id=686474	2012-10-26 16:31:42 +02:00
Florian Müllner	123d6e1ef6	panelMenu: Fix exception when destroying menuless button There's explicit API to create PanelMenu.Buttons with no menu, so guard against this case in destroy(). https://bugzilla.gnome.org/show_bug.cgi?id=686763	2012-10-26 15:50:31 +02:00
Rui Matos	dca925e40b	screenShield: Tweak curtain animation timings Rationale: - Getting something out of the way should be quick; - Very few things in the real world move linearly so, linear animations, especially for something as big and visible as this, felt too artificial; - Moving the curtain out should start slower to make it feel like having weight (it fills the whole screen after all) but quickly accelerate towards the end to make it snappy too. https://bugzilla.gnome.org/show_bug.cgi?id=686745	2012-10-26 13:03:36 +02:00
Florian Müllner	a598b06496	messageTray: Fix close button position in RTL locales https://bugzilla.gnome.org/show_bug.cgi?id=686879	2012-10-25 22:53:05 +02:00
Florian Müllner	98686e5f7b	style: Adjust close button overlap After changing the button size, we need to adjust the x-offset by 1px (apparently the y-offset already assumed the correct size).	2012-10-25 22:53:05 +02:00
Florian Müllner	a7f61753a7	style: Fix close button size The image is actually 32px, so we end up with a slightly fuzzy button when scaling up to 34px. Don't do that. Spotted by lamefun.xOr<at>gmail.com https://bugzilla.gnome.org/show_bug.cgi?id=686574	2012-10-25 22:53:05 +02:00
Florian Müllner	8df790a069	po: Enforce RTL in fa/ug for messages that might end up as LTR See commit `70dbfb9a56`. https://bugzilla.gnome.org/show_bug.cgi?id=686630	2012-10-25 20:14:30 +02:00
Florian Müllner	d845c8eed0	messageTray: Fix lightbox Commit `448517032e` accidentally reverted the condition for showing the lightbox. Fix that. https://bugzilla.gnome.org/show_bug.cgi?id=686728	2012-10-24 09:04:10 +02:00
Florian Müllner	40efe6c324	popupMenu: Overwrite ongoing animations when calling close repeatedly Currently close() is a no-op when the menu has already been closed. However, repeated calls could pass different animation parameters. For instance in the user menu, we try to hide the menu immediately before locking the screen, to avoid the popup jumping across the screen while fading out - as we do this from the corresponding item's activate handler, the closing is still animated if the menu's own handler (which requests a full animation) is run first. Fix this by changing close() to overwrite ongoing animations before bailing out early. https://bugzilla.gnome.org/show_bug.cgi?id=686484	2012-10-24 09:04:10 +02:00
Florian Müllner	70dbfb9a56	po: Enforce RTL in he for messages that might end up as LTR As the messages start with a string placeholder that might be untranslated, we need an explicit mark to ensure that the string does not end up as LTR. https://bugzilla.gnome.org/show_bug.cgi?id=686630	2012-10-23 22:23:45 +02:00
Florian Müllner	5e5bc71064	workspacesView: Fix updating when number of workspaces changes Ouch. This went unnoticed for a long time as by default (using dynamic workspaces) only one workspace is added at a time, which happens to work fine. https://bugzilla.gnome.org/show_bug.cgi?id=686487	2012-10-23 18:28:05 +02:00
Florian Müllner	0ee977080d	workspacesView: Fix typo We want to check for a setting, not the existence of a function. https://bugzilla.gnome.org/show_bug.cgi?id=686487	2012-10-23 18:28:05 +02:00
Tom Tryfonidis	05295e5564	Updated Greek translation	2012-10-23 15:41:07 +03:00
Xavier Claessens	837ea2d589	Telepathy: Set empathy-chat as prefered handler when delegating channels https://bugzilla.gnome.org/show_bug.cgi?id=686296	2012-10-23 12:38:36 +02:00
Tim Lunn	4e58026e10	screenShield: explicitly load gnome-screensaver in fallback mode. When running gnome-shell from lightDM, gnome-screensaver is no longer auto-loaded. As a result the dbus calls for Lock user etc will fail. https://bugzilla.gnome.org/show_bug.cgi?id=683060 Bug-Ubuntu: https://launchpad.net/bugs/1064354	2012-10-22 11:22:32 -04:00
Florian Müllner	87504ea720	userMenu: Hide menu immediately before suspending The same logic as for commit `1f30670c1d` applies to the case where we lock the screen before suspending - we don't want the menu to jump to the opposite screen side to fade out, so remove the animation altogether. https://bugzilla.gnome.org/show_bug.cgi?id=686484	2012-10-19 19:10:52 +02:00
Mattias Põldaru	c28540b4df	[l10n] Updated Estonian translation	2012-10-19 10:34:41 +03:00
Dušan Kazik	1892457fcf	Updated slovak translation	2012-10-18 21:11:00 +02:00
Giovanni Campagna	38611eafa2	ScreenShield: implement o.g.ScreenSaver.GetActiveTime Part of the old gnome-screensaver interface, returns the number of seconds that the screensaver has been active for. https://bugzilla.gnome.org/show_bug.cgi?id=686064	2012-10-18 15:31:42 +02:00
Jasper St. Pierre	4a4e5f3893	runDialog: Use a symbolic icon Another fallout from the St.IconType changes https://bugzilla.gnome.org/show_bug.cgi?id=686233	2012-10-17 19:06:02 +02:00
Takayuki KUSANO	e2dae6b995	Updated Japanese translation	2012-10-16 23:30:17 +09:00