Added Occitan translation

[l10n] Update Catalan translation
updated kn.po
2016-03-21 18:53:53 +00:00 · 2014-02-21 23:20:58 +01:00 · 2014-02-03 16:52:11 +05:30 · 2014-01-13 09:45:46 +01:00 · 2014-01-13 09:22:42 +01:00 · 2013-11-03 09:10:52 +01:00
117 changed files with 17591 additions and 14688 deletions
--- a/131
+++ b/131
@@ -1,99 +1,62 @@
-3.7.2.1
+3.6.3.1
 =======
-* Revert 490206b to not depend on NMGTK-0.9.7, which hasn't been released yet
+* Fix regression in reentrancy fix for 3.6.3 [Giovanni; #689295]

-3.7.2
+Contributors:
+  Giovanni Campagna
+
+Translations:
+  Rafael Ferreira [pt_BR]
+
+3.6.3
 =====
-* Enforce RTL in he for messages that might end up as LTR [Florian; #686630]
-* gdm: Move logo into the panel [Florian; #685852]
-* Hide notifications when closed button is clicked [Jasper, Florian; #682237]
+* recorder: Set frame duration to fix broken video headers [Adel; #688487]
+* Block cancellation of unlock dialog during drags [Giovanni; #686800]
+* Honor lock-delay GSettings key [Giovanni, Matthias; #690766, #691170]
+* Fix reentrancy problem causing the tray to disappear [Giovanni; #683986]
+
+Contributors:
+  Giovanni Campagna, Matthias Clasen, Adel Gadllah,
+
+Translations:
+  Mattias Põldaru [et], Sandeep Sheshrao Shedmake [mr], Wouter Bolsterlee [nl],
+  Rajesh Ranjan [hi], Nilamdyuti Goswami [as], Ani Peter [ml],
+  Andika Triwidada [id], Krishnababu Krothapalli [te], Shankar Prasad [kn],
+  Dr.T.Vasudevan [ta], Runa Bhattacharjee [bn_IN], Rafael Ferreira [pt_BR],
+  Balázs Úr [hu], Gheyret Kenji [ug], Yasumichi Akahoshi [ja], Yoji TOYODA [ja],
+  Alexandre Franke [fr]
+
+3.6.2
+=====
+* Implement org.gnome.ScreenSaver.GetActiveTime [Giovanni; #686064]
+* Explicitly load gnome-screensaver when not running GDM [Tim; #683060]
+* Set Empathy as preferred handler when delegating channels [Xavier; #686296]
 * Tweak screenShield animations [Rui; #686745]
 * Restore Fittsability of summary items in message tray [Florian; #686474]
-* Save screencasts as recent item [Ray; #680647]
-* overview: Resize window captions on content change [Giovanni, Alex; #620874]
 * App search: Match GenericName too [Matthias; #687121]
-* runDialog: Better match style of other modal dialogs [Florian, Allan; #687127]
-* Improve the button insensitive style [Stéphane; #687110]
-* network: Don't use a global switch for all VPN connections [Giovanni; #682929]
-* appMenu: Update on icon theme changes [Florian; #687224]
-* Show 'Log out' in more situations [Matthias; #686736]
-* Add a setting to force the 'Log out' menuitem [Matthias; #686057]
-* overview: Improve styling of search box [Stéphane; #686479]
-* Implement 'disable-user-list' in login screen [Ray; #660660]
+* Add setting to force log out menuitem [Matthias; #686057]
 * Fix auto-scroll to bottom in chat notifications [Sjoerd; #686571]
-* Show feedback notifications when user is busy [Stéphane; #662900]
-* Disable login button when there is no input [Stéphane; #687112]
-* Use non-linear overview shade for background [Giovanni, Pierre-Eric; #669798]
-* Reduce blocking in compositor thread [Simon, Jasper; #687465]
-* network: new country-specific type to gather providers [Aleksander; #687356]
 * Update man page [Matthias; #680601]
-* st-entry: Change the pointer cursor on enter/leave events [Thomas; #687130]
-* screenShield: Blur and desaturate the background [Giovanni, Cosimo; #682536]
-* Change height of chat notifications to have more context [Carlos; #665255]
-* screenShield: Account for motion velocity when hiding [Giovanni; #682537]
-* screenShield: hide the cursor while the lock screen is on [Giovanni; #682535]
-* Support remote search provider settings [Cosimo; #687491]
-* unlockDialog: Improve label of confirmation button [Stéphane; #687656]
-* userMenu: Rename "System Settings" item to "Settings" [Elad; #687738]
-* messageTray: Add keybinding to focus current notification [Stéphane; #652082]
-* Remove shell-screen-grabber [Neil; #685915]
-* main: Stop using Metacity's keybinding files [Florian; #687672]
-* Bluetooth: Remove ObexFTP functionality [Bastien; #688160]
-* a11y: Also set WM theme when HighContrast is switched on [Cosimo; #688256]
-* network: Rework multiple NIC support [Giovanni; #677142]
-* Rework keybindings to allow selective blocking/processing [Florian; #688202]
-* recorder: Show indicator on primary monitor [Adel; #688470]
-* recorder: Set frame duration to fix broken video headers [Adel; #688487]
-* Misc. bugfixes and cleanups [Florian, Jasper, Giovanni, Matthew, Stéphane,
-  Allan, Daiki, Owen, Alejandro, Jean-François, Cosimo, Sebastian, Adel, Alban;
-  #686484, #686728, #686805, #686574, #686763, #682428, #687132, #685239,
-  #687189, #687226, #658091, #670687, #687457, #687242, #687287, #687020,
-  #686583, #661194, #687491, #657315, #687958, #683986, #688089, #687708,
-  #686530, #684810, #688181, #688475, #688557, #688507, #638351]
+* 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:
-  Elad Alfassa, Matthew Barnes, Alban Browaeys, Giovanni Campagna,
-  Cosimo Cecchi, Matthias Clasen, Allan Day, Stéphane Démurget,
-  Jean-François Fortin Tam, Adel Gadllah, Alex Hultman, Sebastian Keller,
-  Rui Matos, Simon McVittie, Aleksander Morgado, Florian Müllner,
-  Bastien Nocera, Pierre-Eric Pelloux-Prayer, Alejandro Piñeiro, Neil Roberts,
-  Sjoerd Simons, Carlos Soriano Sánchez, Jasper St. Pierre, Ray Strode,
-  Owen Taylor, Daiki Ueno, Thomas Wood
+  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:
-  Dušan Kazik [sk], Pavol Klačanský [sk], Piotr Drąg [pl], Yuri Myasoedov [ru],
-  Marek Černocký [cs], Kjartan Maraas [nb], Wolfgang Stöggl [de],
-  Yaron Shahrabani [he], Fran Diéguez [gl], Mattias Põldaru [et]
-
-3.7.1
-=====
-* 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]
-
-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
-
-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.2.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.6.3.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -54,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)
@@ -65,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.2
+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
@@ -76,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!
@@ -99,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)

@@ -121,10 +122,10 @@ 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.7.2)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.5.4)

 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
--- a/data/50-gnome-shell-system.xml.in
+++ b/data/50-gnome-shell-system.xml.in
@@ -8,14 +8,5 @@
 	<KeyListEntry name="toggle-message-tray"
                      _description="Show the message tray"/>

-	<KeyListEntry name="focus-active-notification"
-                      _description="Focus the active notification"/>
-
-	<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>
@@ -106,13 +98,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
        Keybinding to toggle the visibility of the message tray.
      </_description>
    </key>
-    <key name="focus-active-notification" type="as">
-      <default>["&lt;Super&gt;n"]</default>
-      <_summary>Keybinding to focus the active notification</_summary>
-      <_description>
-        Keybinding to focus the active notification.
-      </_description>
-    </key>
    <key name="toggle-recording" type="as">
      <default><![CDATA[['<Control><Shift><Alt>r']]]></default>
      <_summary>Keybinding to toggle the screen recorder</_summary>
@@ -171,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;
 }

@@ -1432,10 +1410,6 @@ StScrollBar StButton#vhandle:active {
    padding-right: 4px;
 }

-.chat-notification-scrollview{
-	max-height: 22em;
-}
-
 .subscription-message {
    font-style: italic;
 }
@@ -1650,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 {
@@ -2129,7 +2112,7 @@ StScrollBar StButton#vhandle:active {
    font-weight: bold;
    text-align: left;
    padding-left: 15px;
-    text-shadow: black 0px 4px 3px 0px;
+    text-shadow: black 4px 4px 3px 0px;
 }

 .login-dialog-prompt-layout {
@@ -2195,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 {
@@ -2226,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/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',

@@ -660,7 +629,6 @@ const LoginDialog = new Lang.Class({
        this.parent({ shellReactive: true,
                      styleClass: 'login-dialog',
                      parentActor: parentActor,
-                      keybindingMode: Main.KeybindingMode.LOGIN_SCREEN,
                      shouldFadeIn: false });
        this.connect('destroy',
                     Lang.bind(this, this._onDestroy));
@@ -670,17 +638,15 @@ 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));
@@ -692,6 +658,8 @@ const LoginDialog = new Lang.Class({

        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,
@@ -699,6 +667,10 @@ const LoginDialog = new Lang.Class({
        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: '' });
        this.contentLayout.add(this._bannerLabel);
@@ -736,7 +708,6 @@ const LoginDialog = new Lang.Class({
                              x_align: St.Align.START });
        this._promptEntry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
                                           can_focus: true });
-        this._promptEntryTextChangedId = 0;
        this._promptBox.add(this._promptEntry,
                            { expand: true,
                              x_fill: true,
@@ -812,8 +783,22 @@ const LoginDialog = new Lang.Class({
            this._disableUserList = disableUserList;

            if (!this._verifyingUser)
-                this._reset();
+               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() {
@@ -906,7 +891,7 @@ const LoginDialog = new Lang.Class({
        return batch.run();
    },

-    _showPrompt: function(forSecret) {
+    _showPrompt: function() {
        let hold = new Batch.Hold();

        let cancelButtonInfo = { action: Lang.bind(this, this.cancel),
@@ -915,7 +900,7 @@ const LoginDialog = new Lang.Class({
        let okButtonInfo = { action: Lang.bind(this, function() {
                                         hold.release();
                                     }),
-                             label: forSecret ? C_("button", "Sign In") : _("Next"),
+                             label: C_("button", "Sign In"),
                             default: true };
        let buttons = [];
        if (!this._disableUserList || this._verifyingUser)
@@ -928,16 +913,6 @@ const LoginDialog = new Lang.Class({

                     function() {
                         this.setButtons(buttons);
-
-                         let updateOkButtonEnabled = Lang.bind(this, function() {
-                             let sensitive = this._promptEntry.text.length > 0;
-                             okButtonInfo.button.reactive = sensitive;
-                             okButtonInfo.button.can_focus = sensitive;
-                         });
-
-                         updateOkButtonEnabled();
-
-                         this._promptEntryTextChangedId = this._promptEntry.clutter_text.connect('text-changed', updateOkButtonEnabled);
                     },

                     hold];
@@ -950,11 +925,6 @@ const LoginDialog = new Lang.Class({
    _hidePrompt: function() {
        this.setButtons([]);

-        if (this._promptEntryTextChangedId > 0) {
-            this._promptEntry.clutter_text.disconnect(this._promptEntryTextChangedId);
-            this._promptEntryTextChangedId = 0;
-        }
-
        let tasks = [function() {
                         return GdmUtil.fadeOutActor(this._promptBox);
                     },
@@ -976,9 +946,7 @@ const LoginDialog = new Lang.Class({
        this._promptEntry.set_text('');
        this._promptEntry.clutter_text.set_password_char(passwordChar);

-        let tasks = [function() {
-                         return this._showPrompt(!!passwordChar);
-                     },
+        let tasks = [this._showPrompt,

                     function() {
                         let _text = this._promptEntry.get_text();
@@ -1149,7 +1117,8 @@ const LoginDialog = new Lang.Class({
                     },

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

                     function() {
                         return this._askForUsernameAndLogIn();
@@ -1159,11 +1128,20 @@ const LoginDialog = new Lang.Class({
        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._fadeInNotListedButton,
+                                                      this._fadeInLogo]),

                     function() {
                         this._sessionList.close();
@@ -1231,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();
--- 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,15 +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();

        this._loginManager = LoginManager.getLoginManager();

-        this._settings = new Gio.Settings({ schema: GdmUtil.LOGIN_SCREEN_SCHEMA });
-        this._settings.connect('changed::disable-restart-buttons',
-                               Lang.bind(this, this._updateVisibility));
-
        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,
@@ -50,17 +50,15 @@ 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() {
@@ -80,11 +78,9 @@ const PowerMenuButton = new Lang.Class({
    },

    _updateHaveSuspend: function() {
-        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() {
@@ -107,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/misc/loginManager.js
+++ b/js/misc/loginManager.js
@@ -3,9 +3,7 @@
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 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'>
@@ -14,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'>
@@ -131,25 +123,12 @@ const LoginManagerSystemd = new Lang.Class({
        });
    },

-    canSuspend: function(asyncCallback) {
-        this._proxy.CanSuspendRemote(function(result, error) {
-            if (error)
-                asyncCallback(false);
-            else
-                asyncCallback(result[0] != 'no');
-        });
-    },
-
    powerOff: function() {
        this._proxy.PowerOffRemote(true);
    },

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

@@ -160,7 +139,6 @@ const LoginManagerConsoleKit = new Lang.Class({
        this._proxy = new ConsoleKitManager(Gio.DBus.system,
                                            'org.freedesktop.ConsoleKit',
                                            '/org/freedesktop/ConsoleKit/Manager');
-        this._upClient = new UPowerGlib.Client();
    },

    // Having this function is a bit of a hack since the Systemd and ConsoleKit
@@ -208,22 +186,12 @@ const LoginManagerConsoleKit = new Lang.Class({
        });
    },

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

    reboot: function() {
        this._proxy.RestartRemote();
-    },
-
-    suspend: function() {
-        this._upClient.suspend_sync(null);
    }
+            
 });
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -46,70 +46,8 @@ let _providersTable;
 function _getProvidersTable() {
    if (_providersTable)
        return _providersTable;
-    return _providersTable = Shell.mobile_providers_parse(null,null);
-}
-
-function findProviderForMCCMNC(table, needle) {
-    let needlemcc = needle.substring(0, 3);
-    let needlemnc = needle.substring(3, needle.length);
-
-    let name2, name3;
-    for (let iter in table) {
-        let country = table[iter];
-        let providers = country.get_providers();
-
-        // Search through each country's providers
-        for (let i = 0; i < providers.length; i++) {
-            let provider = providers[i];
-
-            // Search through MCC/MNC list
-            let list = provider.get_gsm_mcc_mnc();
-            for (let j = 0; j < list.length; j++) {
-                let mccmnc = list[j];
-
-                // Match both 2-digit and 3-digit MNC; prefer a
-                // 3-digit match if found, otherwise a 2-digit one.
-                if (mccmnc.mcc != needlemcc)
-                    continue;  // MCC was wrong
-
-                if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
-                    name3 = provider.name;
-
-                if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
-                    name2 = provider.name;
-
-                if (name2 && name3)
-                    break;
-            }
-        }
-    }
-
-    return name3 || name2 || null;
-}
-
-function findProviderForSid(table, sid) {
-    if (sid == 0)
-        return null;
-
-    // Search through each country
-    for (let iter in table) {
-        let country = table[iter];
-        let providers = country.get_providers();
-
-        // Search through each country's providers
-        for (let i = 0; i < providers.length; i++) {
-            let provider = providers[i];
-            let cdma_sid = provider.get_cdma_sid();
-
-            // Search through CDMA SID list
-            for (let j = 0; j < cdma_sid.length; j++) {
-                if (cdma_sid[j] == sid)
-                    return provider.name;
-            }
-        }
-    }
-
-    return null;
+    let [providers, countryCodes] = Shell.mobile_providers_parse();
+    return _providersTable = providers;
 }

 const ModemGsm = new Lang.Class({
@@ -153,29 +91,64 @@ const ModemGsm = new Lang.Class({
    },

    _findOperatorName: function(name, opCode) {
-        if (name) {
-            if (name && name.length != 0 && (name.length > 6 || name.length < 5)) {
-                // this looks like a valid name, i.e. not an MCCMNC (that some
-                // devices return when not yet connected
-                return name;
-            }
-            if (isNaN(parseInt(name))) {
-                // name is definitely not a MCCMNC, so it may be a name
-                // after all; return that
-                return name;
-            }
+        if (name.length != 0 && (name.length > 6 || name.length < 5)) {
+            // this looks like a valid name, i.e. not an MCCMNC (that some
+            // devices return when not yet connected
+            return name;
+        }
+        if (isNaN(parseInt(name))) {
+            // name is definitely not a MCCMNC, so it may be a name
+            // after all; return that
+            return name;
        }

        let needle;
-        if ((name == null || name.length == 0) && opCode)
+        if (name.length == 0 && opCode)
            needle = opCode;
        else if (name.length == 6 || name.length == 5)
            needle = name;
        else // nothing to search
            return null;

+        return this._findProviderForMCCMNC(needle);
+    },
+
+    _findProviderForMCCMNC: function(needle) {
        let table = _getProvidersTable();
-        return findProviderForMCCMNC(table, needle);
+        let needlemcc = needle.substring(0, 3);
+        let needlemnc = needle.substring(3, needle.length);
+
+        let name2, name3;
+        for (let iter in table) {
+            let providers = table[iter];
+
+            // Search through each country's providers
+            for (let i = 0; i < providers.length; i++) {
+                let provider = providers[i];
+
+                // Search through MCC/MNC list
+                let list = provider.get_gsm_mcc_mnc();
+                for (let j = 0; j < list.length; j++) {
+                    let mccmnc = list[j];
+
+                    // Match both 2-digit and 3-digit MNC; prefer a
+                    // 3-digit match if found, otherwise a 2-digit one.
+                    if (mccmnc.mcc != needlemcc)
+                        continue;  // MCC was wrong
+
+                    if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
+                        name3 = provider.name;
+
+                    if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
+                        name2 = provider.name;
+
+                    if (name2 && name3)
+                        break;
+                }
+            }
+        }
+
+        return name3 || name2 || null;
    }
 });
 Signals.addSignalMethods(ModemGsm.prototype);
@@ -216,14 +189,39 @@ const ModemCdma = new Lang.Class({
                this.operator_name = null;
            } else {
                let [bandClass, band, id] = result;
-                if (name.length > 0) {
-                    let table = _getProvidersTable();
-                    this.operator_name = findProviderForSid(table, id);
-                } else
+                if (name.length > 0)
+                    this.operator_name = this._findProviderForSid(id);
+                else
                    this.operator_name = null;
            }
            this.emit('notify::operator-name');
        }));
+    },
+
+    _findProviderForSid: function(sid) {
+        if (sid == 0)
+            return null;
+
+        let table = _getProvidersTable();
+
+        // Search through each country
+        for (let iter in table) {
+            let providers = table[iter];
+
+            // Search through each country's providers
+            for (let i = 0; i < providers.length; i++) {
+                let provider = providers[i];
+                let cdma_sid = provider.get_cdma_sid();
+
+                // Search through CDMA SID list
+                for (let j = 0; j < cdma_sid.length; j++) {
+                    if (cdma_sid[j] == sid)
+                        return provider.name;
+                }
+            }
+        }
+
+        return null;
    }
 });
 Signals.addSignalMethods(ModemCdma.prototype);
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -172,7 +172,7 @@ const AltTabPopup = new Lang.Class({

        if (!Main.pushModal(this.actor)) {
            // Probably someone else has a pointer grab, try again with keyboard only
-            if (!Main.pushModal(this.actor, { options: Meta.ModalOptions.POINTER_ALREADY_GRABBED })) {
+            if (!Main.pushModal(this.actor, global.get_current_time(), Meta.ModalOptions.POINTER_ALREADY_GRABBED)) {
                return false;
            }
        }
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -479,6 +479,7 @@ const AppWellIcon = new Lang.Class({
                                                Lang.bind(this,
                                                          this._onStateChanged));
        this._onStateChanged();
+        this.isMenuUp = false;
    },

    _onDestroy: function() {
@@ -560,8 +561,7 @@ const AppWellIcon = new Lang.Class({
            this._menuManager.addMenu(this._menu);
        }

-        this.emit('menu-state-changed', true);
-
+        this.isMenuUp = true;
        this.actor.set_hover(true);
        this._menu.popup();

@@ -578,7 +578,7 @@ const AppWellIcon = new Lang.Class({

    _onMenuPoppedDown: function() {
        this.actor.sync_hover();
-        this.emit('menu-state-changed', false);
+        this.isMenuUp = false;
    },

    _onActivate: function (event) {
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -84,12 +84,9 @@ const AppFavorites = new Lang.Class({

        let app = Shell.AppSystem.get_default().lookup_app(appId);

-        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()),
-                                 { forFeedback: true,
-                                   undoCallback: Lang.bind(this, function () {
-                                                               this._removeFavorite(appId);
-                                                           })
-                                 });
+        Main.overview.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
+            this._removeFavorite(appId);
+        }));
    },

    addFavorite: function(appId) {
@@ -119,11 +116,9 @@ const AppFavorites = new Lang.Class({
            return;

        Main.overview.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
-                                 { forFeedback: true,
-                                   undoCallback: Lang.bind(this, function () {
-                                                               this._addFavorite(appId, pos);
-                                                           })
-                                 });
+                                 Lang.bind(this, function () {
+            this._addFavorite(appId, pos);
+        }));
    }
 });
 Signals.addSignalMethods(AppFavorites.prototype);
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -2,6 +2,7 @@

 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Signals = imports.signals;
@@ -203,15 +204,12 @@ const CalendarServerIface = <interface name="org.gnome.Shell.CalendarServer">
 const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);

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

 function _datesEqual(a, b) {
@@ -239,14 +237,27 @@ const DBusEventSource = new Lang.Class({
    _init: function() {
        this._resetCache();

+        this._initialized = false;
        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(object, result) {
+            try {
+                this._dbusProxy.init_finish(result);
+            } catch(e) {
+                log('Error loading calendars: ' + e.message);
+                return;
+            }

-        this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
-            if (this._dbusProxy.g_name_owner)
-                this._onNameAppeared();
-            else
-                this._onNameVanished();
+            this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
+
+            this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
+                if (this._dbusProxy.g_name_owner)
+                    this._onNameAppeared();
+                else
+                    this._onNameVanished();
+            }));
+
+            this._initialized = true;
+            this._onNameAppeared();
        }));
    },

@@ -270,9 +281,8 @@ const DBusEventSource = new Lang.Class({
        this._loadEvents(false);
    },

-    _onEventsReceived: function(results, error) {
+    _onEventsReceived: function([appointments]) {
        let newEvents = [];
-        let appointments = results ? results[0] : null;
        if (appointments != null) {
            for (let n = 0; n < appointments.length; n++) {
                let a = appointments[n];
@@ -293,6 +303,10 @@ const DBusEventSource = new Lang.Class({
    },

    _loadEvents: function(forceReload) {
+        // Ignore while loading
+        if (!this._initialized)
+            return;
+
        if (this._curRequestBegin && this._curRequestEnd){
            let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
            if (forceReload)
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -45,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");
 }
@@ -544,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/recorder.js
+++ b/js/ui/components/recorder.js
@@ -1,6 +1,5 @@

 const Lang = imports.lang;
-const Main = imports.ui.main;

 const Gio = imports.gi.Gio;
 const Meta = imports.gi.Meta;
@@ -17,16 +16,13 @@ const Recorder = new Lang.Class({
    },

    enable: function() {
-        Main.wm.addKeybinding('toggle-recording',
-                              this._bindingSettings,
-                              Meta.KeyBindingFlags.NONE,
-                              Main.KeybindingMode.NORMAL |
-                              Main.KeybindingMode.OVERVIEW,
-                              Lang.bind(this, this._toggleRecorder));
+        global.display.add_keybinding('toggle-recording',
+                                      this._bindingSettings,
+                                      Meta.KeyBindingFlags.NONE, Lang.bind(this, this._toggleRecorder));
    },

    disable: function() {
-        Main.wm.removeKeybinding('toggle-recording');
+        global.display.remove_keybinding('toggle-recording');
    },

    _ensureRecorder: function() {
@@ -45,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',
@@ -779,7 +788,6 @@ const ChatNotification = new Lang.Class({
        // force a scroll to the bottom if things change while we were at the
        // bottom
        this._oldMaxScrollValue = this._scrollArea.vscroll.adjustment.value;
-        this._scrollArea.add_style_class_name('chat-notification-scrollview');
        this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
            if (adjustment.value == this._oldMaxScrollValue)
                this.scrollTo(St.Side.BOTTOM);
@@ -935,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);
@@ -973,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 });

@@ -1074,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 });
    }
 });

@@ -1136,7 +1138,7 @@ const AudioVideoNotification = new Lang.Class({
        this.parent(source, title, null, { customContent: true });
        this.setResident(true);

-        this.addButton('reject', _("Decline"));
+        this.addButton('reject', _("Reject"));
        /* translators: this is a button label (verb), not a noun */
        this.addButton('answer', _("Answer"));

--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -23,7 +23,8 @@ const DASH_ITEM_HOVER_TIMEOUT = 300;

 function getAppFromSource(source) {
    if (source instanceof AppDisplay.AppWellIcon) {
-        return source.app;
+        let appSystem = Shell.AppSystem.get_default();
+        return appSystem.lookup_app(source.getId());
    } else if (source.metaWindow) {
        let tracker = Shell.WindowTracker.get_default();
        return tracker.get_window_app(source.metaWindow);
@@ -491,51 +492,34 @@ const Dash = new Lang.Class({
    },

    _createAppItem: function(app) {
-        let appIcon = new AppDisplay.AppWellIcon(app,
+        let display = new AppDisplay.AppWellIcon(app,
                                                 { setSizeManually: true,
                                                   showLabel: false });
-        appIcon._draggable.connect('drag-begin',
+        display._draggable.connect('drag-begin',
                                   Lang.bind(this, function() {
-                                       appIcon.actor.opacity = 50;
+                                       display.actor.opacity = 50;
                                   }));
-        appIcon._draggable.connect('drag-end',
+        display._draggable.connect('drag-end',
                                   Lang.bind(this, function() {
-                                       appIcon.actor.opacity = 255;
+                                       display.actor.opacity = 255;
                                   }));
-        appIcon.connect('menu-state-changed',
-                        Lang.bind(this, function(appIcon, opened) {
-                            this._itemMenuStateChanged(item, opened);
-                        }));

        let item = new DashItemContainer();
-        item.setChild(appIcon.actor);
+        item.setChild(display.actor);

        // Override default AppWellIcon label_actor, now the
        // accessible_name is set at DashItemContainer.setLabelText
-        appIcon.actor.label_actor = null;
+        display.actor.label_actor = null;
        item.setLabelText(app.get_name());

-        appIcon.icon.setIconSize(this.iconSize);
+        display.icon.setIconSize(this.iconSize);
        this._hookUpLabel(item);

        return item;
    },

-    _itemMenuStateChanged: function(item, opened) {
-        // When the menu closes, it calls sync_hover, which means
-        // that the notify::hover handler does everything we need to.
-        if (opened) {
-            if (this._showLabelTimeoutId > 0) {
-                Mainloop.source_remove(this._showLabelTimeoutId);
-                this._showLabelTimeoutId = 0;
-            }
-
-            item.hideLabel();
-        }
-    },
-
    _onHover: function (item) {
-        if (item.child.get_hover()) {
+        if (item.child.get_hover() && !item.child._delegate.isMenuUp) {
            if (this._showLabelTimeoutId == 0) {
                let timeout = this._labelShowing ? 0 : DASH_ITEM_HOVER_TIMEOUT;
                this._showLabelTimeoutId = Mainloop.timeout_add(timeout,
--- 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'
 };

--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -23,7 +23,6 @@ function _navigateActor(actor) {

 // GrabHelper:
 // @owner: the actor that owns the GrabHelper
-// @params: optional parameters to pass to Main.pushModal()
 //
 // Creates a new GrabHelper object, for dealing with keyboard and pointer grabs
 // associated with a set of actors.
@@ -35,9 +34,8 @@ function _navigateActor(actor) {
 const GrabHelper = new Lang.Class({
    Name: 'GrabHelper',

-    _init: function(owner, params) {
+    _init: function(owner) {
        this._owner = owner;
-        this._modalParams = params;

        this._grabStack = [];

@@ -167,7 +165,7 @@ const GrabHelper = new Lang.Class({
    _takeModalGrab: function() {
        let firstGrab = (this._modalCount == 0);
        if (firstGrab) {
-            if (!Main.pushModal(this._owner, this._modalParams))
+            if (!Main.pushModal(this._owner))
                return false;

            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -20,6 +20,25 @@ const KEYBOARD_TYPE = 'keyboard-type';
 const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEYBOARD = 'screen-keyboard-enabled';

+// Key constants taken from Antler
+// FIXME: ought to be moved into libcaribou
+const PRETTY_KEYS = {
+    'BackSpace': '\u232b',
+    'space': ' ',
+    'Return': '\u23ce',
+    'Caribou_Prefs': '\u2328',
+    'Caribou_ShiftUp': '\u2b06',
+    'Caribou_ShiftDown': '\u2b07',
+    'Caribou_Emoticons': '\u263a',
+    'Caribou_Symbols': '123',
+    'Caribou_Symbols_More': '{#*',
+    'Caribou_Alpha': 'Abc',
+    'Tab': 'Tab',
+    'Escape': 'Esc',
+    'Control_L': 'Ctrl',
+    'Alt_L': 'Alt'
+};
+
 const CaribouKeyboardIface = <interface name='org.gnome.Caribou.Keyboard'>
 <method name='Show'>
    <arg type='u' direction='in' />
@@ -79,7 +98,17 @@ const Key = new Lang.Class({
    },

    _makeKey: function () {
-        let label = GLib.markup_escape_text(this._key.label, -1);
+        let label = this._key.name;
+
+        if (label.length > 1) {
+            let pretty = PRETTY_KEYS[label];
+            if (pretty)
+                label = pretty;
+            else
+                label = this._getUnichar(this._key);
+        }
+
+        label = GLib.markup_escape_text(label, -1);
        let button = new St.Button ({ label: label,
                                      style_class: 'keyboard-key' });

--- 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;
@@ -128,6 +128,8 @@ const LayoutManager = new Lang.Class({
        this.trayBox = new St.Widget({ name: 'trayBox',
                                       layout_manager: new Clutter.BinLayout() }); 
        this.addChrome(this.trayBox);
+        this.trayBox.connect('allocation-changed',
+                             Lang.bind(this, this._updateTrayBarrier));

        this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox',
                                              reactive: true,
@@ -278,6 +280,22 @@ const LayoutManager = new Lang.Class({
        }
    },

+    _updateTrayBarrier: function() {
+        let monitor = this.bottomMonitor;
+
+        if (this._trayBarrier)
+            global.destroy_pointer_barrier(this._trayBarrier);
+
+        if (Main.messageTray) {
+            this._trayBarrier =
+                global.create_pointer_barrier(monitor.x + monitor.width, monitor.y + monitor.height - Main.messageTray.actor.height,
+                                              monitor.x + monitor.width, monitor.y + monitor.height,
+                                              4 /* BarrierNegativeX */);
+        } else {
+            this._trayBarrier = 0;
+        }
+    },
+
    _monitorsChanged: function() {
        this._updateMonitors();
        this._updateBoxes();
@@ -315,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/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -1129,7 +1129,7 @@ const LookingGlass = new Lang.Class({
        if (this._open)
            return;

-        if (!Main.pushModal(this._entry, { keybindingMode: Main.KeybindingMode.LOOKING_GLASS }))
+        if (!Main.pushModal(this._entry))
            return;

        this._notebook.selectIndex(0);
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -20,7 +20,6 @@ const Keyboard = imports.ui.keyboard;
 const MessageTray = imports.ui.messageTray;
 const Overview = imports.ui.overview;
 const Panel = imports.ui.panel;
-const Params = imports.misc.params;
 const RunDialog = imports.ui.runDialog;
 const Layout = imports.ui.layout;
 const LookingGlass = imports.ui.lookingGlass;
@@ -40,18 +39,6 @@ const Util = imports.misc.util;
 const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
 const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);

-const KeybindingMode = {
-    NONE:          0,       // block all keybindings
-    NORMAL:        1 << 0,  // window mode
-    OVERVIEW:      1 << 1,
-    LOCK_SCREEN:   1 << 2,
-    UNLOCK_SCREEN: 1 << 3,
-    LOGIN_SCREEN:  1 << 4,
-    MESSAGE_TRAY:  1 << 5,
-    SYSTEM_MODAL:  1 << 6,
-    LOOKING_GLASS: 1 << 7
-};
-
 let componentManager = null;
 let panel = null;
 let overview = null;
@@ -68,7 +55,6 @@ let shellDBusService = null;
 let shellMountOpDBusService = null;
 let screenSaverDBus = null;
 let modalCount = 0;
-let keybindingMode = KeybindingMode.NORMAL;
 let modalActorFocusStack = [];
 let uiGroup = null;
 let magnifier = null;
@@ -83,17 +69,7 @@ let _overridesSettings = null;
 let background = null;

 function _sessionUpdated() {
-    wm.setCustomKeybindingHandler('panel-main-menu',
-                                  KeybindingMode.NORMAL |
-                                  KeybindingMode.OVERVIEW,
-                                  sessionMode.hasOverview ? Lang.bind(overview, overview.toggle) : null);
-    wm.allowKeybinding('overlay-key', KeybindingMode.NORMAL |
-                                      KeybindingMode.OVERVIEW);
-
-    wm.setCustomKeybindingHandler('panel-run-dialog',
-                                  KeybindingMode.NORMAL |
-                                  KeybindingMode.OVERVIEW,
-                                  sessionMode.hasRunDialog ? openRunDialog : null);
+    Meta.keybindings_set_custom_handler('panel-run-dialog', sessionMode.hasRunDialog ? openRunDialog : null);
    if (sessionMode.isGreeter)
        screenShield.showDialog();
 }
@@ -179,7 +155,9 @@ function start() {

    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
                                            false, -1, 1);
+    Meta.keybindings_set_custom_handler('panel-main-menu', Lang.bind(overview, overview.toggle));
    global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));
+
    sessionMode.connect('update', _sessionUpdated);
    _sessionUpdated();

@@ -189,6 +167,8 @@ function start() {

    _startDate = new Date();

+    global.stage.connect('captured-event', _globalKeyPressHandler);
+
    log('GNOME Shell started at ' + _startDate);

    let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
@@ -485,6 +465,80 @@ function getWindowActorsForWorkspace(workspaceIndex) {
    });
 }

+// This function encapsulates hacks to make certain global keybindings
+// work even when we are in one of our modes where global keybindings
+// are disabled with a global grab. (When there is a global grab, then
+// all key events will be delivered to the stage, so ::captured-event
+// on the stage can be used for global keybindings.)
+function _globalKeyPressHandler(actor, event) {
+    if (modalCount == 0)
+        return false;
+    if (event.type() != Clutter.EventType.KEY_PRESS)
+        return false;
+
+    if (!sessionMode.allowKeybindingsWhenModal) {
+        if (modalCount > (overview.visible ? 1 : 0))
+            return false;
+    }
+
+    let symbol = event.get_key_symbol();
+    let keyCode = event.get_key_code();
+    let ignoredModifiers = global.display.get_ignored_modifier_mask();
+    let modifierState = event.get_state() & ~ignoredModifiers;
+
+    // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
+    let action = global.display.get_keybinding_action(keyCode, modifierState);
+
+    if (action == Meta.KeyBindingAction.SWITCH_PANELS) {
+        ctrlAltTabManager.popup(modifierState & Clutter.ModifierType.SHIFT_MASK,
+                                modifierState);
+        return true;
+    }
+
+    switch (action) {
+        // left/right would effectively act as synonyms for up/down if we enabled them;
+        // but that could be considered confusing; we also disable them in the main view.
+        //
+        // case Meta.KeyBindingAction.WORKSPACE_LEFT:
+        //  if (!sessionMode.hasWorkspaces)
+        //      return false;
+        //
+        //     wm.actionMoveWorkspaceLeft();
+        //     return true;
+        // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
+        //  if (!sessionMode.hasWorkspaces)
+        //      return false;
+        //
+        //     wm.actionMoveWorkspaceRight();
+        //     return true;
+        case Meta.KeyBindingAction.WORKSPACE_UP:
+            if (!sessionMode.hasWorkspaces)
+                return false;
+
+            wm.actionMoveWorkspace(Meta.MotionDirection.UP);
+            return true;
+        case Meta.KeyBindingAction.WORKSPACE_DOWN:
+            if (!sessionMode.hasWorkspaces)
+                return false;
+
+            wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
+            return true;
+        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
+        case Meta.KeyBindingAction.COMMAND_2:
+            if (!sessionMode.hasRunDialog)
+                return false;
+
+            openRunDialog();
+            return true;
+        case Meta.KeyBindingAction.PANEL_MAIN_MENU:
+        case Meta.KeyBindingAction.OVERLAY_KEY:
+            overview.hide();
+            return true;
+    }
+
+    return false;
+}
+
 function _findModal(actor) {
    for (let i = 0; i < modalActorFocusStack.length; i++) {
        if (modalActorFocusStack[i].actor == actor)
@@ -500,7 +554,7 @@ function isInModalStack(actor) {
 /**
 * pushModal:
 * @actor: #ClutterActor which will be given keyboard focus
- * @params: optional parameters
+ * @timestamp: optional timestamp
 *
 * Ensure we are in a mode where all keyboard and mouse input goes to
 * the stage, and focus @actor. Multiple calls to this function act in
@@ -511,27 +565,21 @@ function isInModalStack(actor) {
 * modal stack returns to this actor, reset the focus to the actor
 * which was focused at the time pushModal() was invoked.
 *
- * @params may be used to provide the following parameters:
- *  - timestamp: used to associate the call with a specific user initiated
- *               event.  If not provided then the value of
- *               global.get_current_time() is assumed.
+ * @timestamp is optionally used to associate the call with a specific user
+ * initiated event.  If not provided then the value of
+ * global.get_current_time() is assumed.
 *
- *  - options: Meta.ModalOptions flags to indicate that the pointer is
- *             already grabbed
- *
- *  - keybindingMode: used to set the current Main.KeybindingMode to filter
- *                    global keybindings; the default of NONE will filter
- *                    out all keybindings
+ * @options: optional Meta.ModalOptions flags to indicate that the
+ *           pointer is alrady grabbed
 *
 * Returns: true iff we successfully acquired a grab or already had one
 */
-function pushModal(actor, params) {
-    params = Params.parse(params, { timestamp: global.get_current_time(),
-                                    options: 0,
-                                    keybindingMode: KeybindingMode.NONE });
+function pushModal(actor, timestamp, options) {
+    if (timestamp == undefined)
+        timestamp = global.get_current_time();

    if (modalCount == 0) {
-        if (!global.begin_modal(params.timestamp, params.options)) {
+        if (!global.begin_modal(timestamp, options ? options : 0)) {
            log('pushModal: invocation of begin_modal failed');
            return false;
        }
@@ -558,10 +606,8 @@ function pushModal(actor, params) {
    modalActorFocusStack.push({ actor: actor,
                                focus: curFocus,
                                destroyId: actorDestroyId,
-                                focusDestroyId: curFocusDestroyId,
-                                keybindingMode: keybindingMode });
+                                focusDestroyId: curFocusDestroyId });

-    keybindingMode = params.keybindingMode;
    global.stage.set_key_focus(actor);
    return true;
 }
@@ -588,7 +634,6 @@ function popModal(actor, timestamp) {
        global.stage.set_key_focus(null);
        global.end_modal(timestamp);
        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
-        keybindingMode = KeybindingMode.NORMAL;

        throw new Error('incorrect pop');
    }
@@ -601,7 +646,6 @@ function popModal(actor, timestamp) {
    if (focusIndex == modalActorFocusStack.length - 1) {
        if (record.focus)
            record.focus.disconnect(record.focusDestroyId);
-        keybindingMode = record.keybindingMode;
        global.stage.set_key_focus(record.focus);
    } else {
        let t = modalActorFocusStack[modalActorFocusStack.length - 1];
@@ -611,7 +655,6 @@ function popModal(actor, timestamp) {
        for (let i = modalActorFocusStack.length - 1; i > focusIndex; i--) {
            modalActorFocusStack[i].focus = modalActorFocusStack[i - 1].focus;
            modalActorFocusStack[i].focusDestroyId = modalActorFocusStack[i - 1].focusDestroyId;
-            modalActorFocusStack[i].keybindingMode = modalActorFocusStack[i - 1].keybindingMode;
        }
    }
    modalActorFocusStack.splice(focusIndex, 1);
@@ -622,7 +665,6 @@ function popModal(actor, timestamp) {
    global.end_modal(timestamp);
    global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
    Meta.enable_unredirect_for_screen(global.screen);
-    keybindingMode = KeybindingMode.NORMAL;
 }

 function createLookingGlass() {
--- 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) {
@@ -314,7 +320,6 @@ const Notification = new Lang.Class({
        this.resident = false;
        // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
        this.isTransient = false;
-        this.forFeedback = false;
        this.expanded = false;
        this.focused = false;
        this.acknowledged = false;
@@ -389,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,
@@ -400,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;
        }
@@ -435,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,
@@ -451,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;
@@ -714,10 +714,6 @@ const Notification = new Lang.Class({
        this.isTransient = isTransient;
    },

-    setForFeedback: function(forFeedback) {
-        this.forFeedback = forFeedback;
-    },
-
    setUseActionIcons: function(useIcons) {
        this._useActionIcons = useIcons;
    },
@@ -1121,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;
@@ -1394,8 +1386,6 @@ const MessageTray = new Lang.Class({
                                                   y_expand: true,
                                                   x_expand: true,
                                                   layout_manager: new Clutter.BinLayout() });
-        this._notificationWidget.connect('key-release-event', Lang.bind(this, this._onNotificationKeyRelease));
-
        this.actor.add_actor(this._notificationWidget);

        this._notificationBin = new St.Bin({ y_expand: true });
@@ -1445,16 +1435,15 @@ const MessageTray = new Lang.Class({

        this._closeButton = makeCloseButton();
        this._closeButton.hide();
-        this._closeButton.connect('clicked', Lang.bind(this, this._closeNotification));
+        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,
-                                                     { keybindingMode: Main.KeybindingMode.MESSAGE_TRAY });
+        this._grabHelper = new GrabHelper.GrabHelper(this.actor);
        this._grabHelper.addActor(this._summaryBoxPointer.actor);
        this._grabHelper.addActor(this.actor);
        if (Main.panel.statusArea.activities)
@@ -1518,20 +1507,10 @@ const MessageTray = new Lang.Class({

        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));

-        Main.wm.addKeybinding('toggle-message-tray',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                              Meta.KeyBindingFlags.NONE,
-                              Main.KeybindingMode.NORMAL |
-                              Main.KeybindingMode.MESSAGE_TRAY |
-                              Main.KeybindingMode.OVERVIEW,
-                              Lang.bind(this, this.toggleAndNavigate));
-        Main.wm.addKeybinding('focus-active-notification',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                              Meta.KeyBindingFlags.NONE,
-                              Main.KeybindingMode.NORMAL |
-                              Main.KeybindingMode.MESSAGE_TRAY |
-                              Main.KeybindingMode.OVERVIEW,
-                              Lang.bind(this, this._expandActiveNotification));
+        global.display.add_keybinding('toggle-message-tray',
+                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                                      Meta.KeyBindingFlags.NONE,
+                                      Lang.bind(this, this.toggleAndNavigate));

        this._summaryItems = [];
        this._chatSummaryItemsCount = 0;
@@ -1607,19 +1586,7 @@ const MessageTray = new Lang.Class({
        return false;
    },

-    _onNotificationKeyRelease: function(actor, event) {
-        let ignoredModifiers = global.display.get_ignored_modifier_mask();
-        let modifierState = event.get_state() & ~ignoredModifiers;
-
-        if (event.get_key_symbol() == Clutter.KEY_Escape && modifierState == 0) {
-            this._closeNotification();
-            return true;
-        }
-
-        return false;
-    },
-
-    _closeNotification: function() {
+    _onCloseClicked: function() {
        if (this._notificationState == State.SHOWN) {
            this._closeButton.hide();
            this._notificationClosed = true;
@@ -1979,9 +1946,8 @@ const MessageTray = new Lang.Class({
        // Notifications
        let notificationQueue = this._notificationQueue;
        let notificationUrgent = notificationQueue.length > 0 && notificationQueue[0].urgency == Urgency.CRITICAL;
-        let notificationForFeedback = notificationQueue.length > 0 && notificationQueue[0].forFeedback;
        let notificationsLimited = this._busy || this._inFullscreen;
-        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent || notificationForFeedback) && Main.sessionMode.hasNotifications;
+        let notificationsPending = notificationQueue.length > 0 && (!notificationsLimited || notificationUrgent) && Main.sessionMode.hasNotifications;
        let nextNotification = notificationQueue.length > 0 ? notificationQueue[0] : null;
        let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
        let notificationExpanded = this._notification && this._notification.expanded;
@@ -2085,6 +2051,8 @@ const MessageTray = new Lang.Class({
        params.onCompleteScope = this;
        params.onCompleteParams = [statevar, value, onComplete, onCompleteScope, onCompleteParams];

+        // Remove other tweens that could mess with the state machine
+        Tweener.removeTweens(actor);
        Tweener.addTween(actor, params);

        let valuing = (value == State.SHOWN) ? State.SHOWING : State.HIDING;
@@ -2187,29 +2155,23 @@ 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() {
+        this._notificationUnfocusedId = this._notification.connect('unfocused', Lang.bind(this, function() {
            this._updateState();
        }));
        this._notificationBin.child = this._notification.actor;
@@ -2238,40 +2200,28 @@ const MessageTray = new Lang.Class({
    _updateShowingNotification: function() {
        this._notification.acknowledged = true;

-        Tweener.removeTweens(this._notificationWidget);
-
        // We auto-expand notifications with CRITICAL urgency.
-        // We use Tweener.removeTweens() to remove a tween that was hiding the notification we are
-        // updating, in case that notification was in the process of being hidden. However,
-        // Tweener.removeTweens() would also remove a tween that was updating the position of the
-        // notification we are updating, in case that notification was already expanded and its height
-        // changed. Therefore we need to call this._expandNotification() for expanded notifications
-        // to make sure their position is updated.
-        if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
+        if (this._notification.urgency == Urgency.CRITICAL)
            this._expandNotification(true);

        // We tween all notifications to full opacity. This ensures that both new notifications and
        // notifications that might have been in the process of hiding get full opacity.
        //
-        // We tween any notification showing in the banner mode to banner height
-        // (this._notificationWidget.y = -this._notificationWidget.height).
+        // We tween any notification showing in the banner mode to the appropriate height
+        // (which is banner height or expanded height, depending on the notification state)
        // This ensures that both new notifications and notifications in the banner mode that might
-        // have been in the process of hiding are shown with the banner height.
+        // have been in the process of hiding are shown with the correct height.
        //
        // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
        // notification is being shown.
-        //
-        // We don't set the y parameter for the tween for expanded notifications because
-        // this._expandNotification() will result in getting this._notificationWidget.y set to the appropriate
-        // fully expanded value.
+
        let tweenParams = { opacity: 255,
+                            y: -this._notificationWidget.height,
                            time: ANIMATION_TIME,
                            transition: 'easeOutQuad',
                            onComplete: this._showNotificationCompleted,
                            onCompleteScope: this
                          };
-        if (!this._notification.expanded)
-            tweenParams.y = -this._notificationWidget.height;

        this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
   },
@@ -2331,11 +2281,6 @@ const MessageTray = new Lang.Class({

        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;
@@ -2360,26 +2305,22 @@ const MessageTray = new Lang.Class({
    },

    _hideNotificationCompleted: function() {
-        this._notificationRemoved = false;
-        this._notificationWidget.hide();
-        this._closeButton.hide();
-        this._pointerInTray = false;
-        this.actor.hover = false; // Clutter doesn't emit notify::hover when actors move
-        this._notificationBin.child = null;
        this._notification.collapseCompleted();
        this._notification.disconnect(this._notificationClickedId);
        this._notificationClickedId = 0;
+        this._notification.disconnect(this._notificationUnfocusedId);
+        this._notificationUnfocusedId = 0;
        let notification = this._notification;
        this._notification = null;
        if (notification.isTransient)
            notification.destroy(NotificationDestroyedReason.EXPIRED);
-    },

-    _expandActiveNotification: function() {
-        if (!this._notification)
-            return;
-
-        this._expandNotification(false);
+        this._notificationRemoved = false;
+        this._closeButton.hide();
+        this._pointerInTray = false;
+        this.actor.hover = false; // Clutter doesn't emit notify::hover when actors move
+        this._notificationBin.child = null;
+        this._notificationWidget.hide();
    },

    _expandNotification: function(autoExpanding) {
--- 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 = {
@@ -37,12 +38,10 @@ const ModalDialog = new Lang.Class({
        params = Params.parse(params, { shellReactive: false,
                                        styleClass: null,
                                        parentActor: Main.uiGroup,
-                                        keybindingMode: Main.KeybindingMode.SYSTEM_MODAL,
                                        shouldFadeIn: true });

        this.state = State.CLOSED;
        this._hasModal = false;
-        this._keybindingMode = params.keybindingMode;
        this._shellReactive = params.shellReactive;
        this._shouldFadeIn = params.shouldFadeIn;

@@ -58,7 +57,9 @@ const ModalDialog = new Lang.Class({

        this._group.connect('destroy', Lang.bind(this, this._onGroupDestroy));

+        this._pressedKey = null;
        this._actionKeys = {};
+        this._group.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
        this._group.connect('key-release-event', Lang.bind(this, this._onKeyReleaseEvent));

        this._backgroundBin = new St.Bin();
@@ -118,6 +119,8 @@ const ModalDialog = new Lang.Class({
    },

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

@@ -168,11 +171,35 @@ 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');
+        }
+
+    },
+
+    _onKeyPressEvent: function(object, event) {
+        this._pressedKey = event.get_key_symbol();
    },

    _onKeyReleaseEvent: function(object, event) {
+        let pressedKey = this._pressedKey;
+        this._pressedKey = null;
+
        let symbol = event.get_key_symbol();
+        if (symbol != pressedKey)
+            return false;
+
        let action = this._actionKeys[symbol];

        if (action) {
@@ -228,7 +255,7 @@ const ModalDialog = new Lang.Class({
        if (this.state == State.OPENED || this.state == State.OPENING)
            return true;

-        if (!this.pushModal({ timestamp: timestamp }))
+        if (!this.pushModal(timestamp))
            return false;

        this._fadeOpen(onPrimary);
@@ -278,8 +305,7 @@ const ModalDialog = new Lang.Class({
    pushModal: function (timestamp) {
        if (this._hasModal)
            return true;
-        if (!Main.pushModal(this._group, { timestamp: timestamp,
-                                           keybindingMode: this._keybindingMode }))
+        if (!Main.pushModal(this._group, timestamp))
            return false;

        this._hasModal = true;
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -356,10 +356,12 @@ const NotificationDaemon = new Lang.Class({
             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,
@@ -384,7 +386,7 @@ const NotificationDaemon = new Lang.Class({
                    this._emitActionInvoked(ndata.id, actionId);
                }));
        } else {
-            notification.update(summary, body, { gicon: gicon,
+            notification.update(summary, body, { icon: iconActor,
                                                 bannerMarkup: true,
                                                 clear: true });
        }
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -23,29 +23,11 @@ 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;

-const GLSL_DIM_EFFECT_DECLARATIONS = '';
-const GLSL_DIM_EFFECT_CODE = '\
-   vec2 dist = cogl_tex_coord_in[0].xy - vec2(0.5, 0.5); \
-   float elipse_radius = 0.5; \
-   /* from https://bugzilla.gnome.org/show_bug.cgi?id=669798: \
-      the alpha on the gradient goes from 165 at its darkest to 98 at its most transparent. */ \
-   float y = 165.0 / 255.0; \
-   float x = 98.0 / 255.0; \
-   /* interpolate darkening value, based on distance from screen center */ \
-   float val = min(length(dist), elipse_radius); \
-   float a = mix(x, y, val / elipse_radius); \
-   /* dim_factor varies from [1.0 -> 0.5] when overview is showing \
-      We use it to smooth value, then we clamp it to valid color interval */ \
-   a = clamp(a - cogl_color_in.r + 0.5, 0.0, 1.0); \
-   /* We\'re blending between: color and black color (obviously omitted in the equation) */ \
-   cogl_color_out.xyz = cogl_color_out.xyz * (1.0 - a); \
-   cogl_color_out.a = 1.0;';
-
 const SwipeScrollDirection = {
    NONE: 0,
    HORIZONTAL: 1,
@@ -75,14 +57,7 @@ const ShellInfo = new Lang.Class({
            this._source.destroy();
    },

-    setMessage: function(text, options) {
-        options = Params.parse(options, { undoCallback: null,
-                                          forFeedback: false
-                                        });
-
-        let undoCallback = options.undoCallback;
-        let forFeedback = options.forFeedback;
-
+    setMessage: function(text, undoCallback, undoLabel) {
        if (this._source == null) {
            this._source = new MessageTray.SystemNotificationSource();
            this._source.connect('destroy', Lang.bind(this,
@@ -96,7 +71,6 @@ const ShellInfo = new Lang.Class({
        if (this._source.notifications.length == 0) {
            notification = new MessageTray.Notification(this._source, text, null);
            notification.setTransient(true);
-            notification.setForFeedback(forFeedback);
        } else {
            notification = this._source.notifications[0];
            notification.update(text, null, { clear: true });
@@ -104,8 +78,10 @@ const ShellInfo = new Lang.Class({

        this._undoCallback = undoCallback;
        if (undoCallback) {
-            notification.addButton('system-undo', _("Undo"));
-            notification.connect('action-invoked', Lang.bind(this, this._onUndoClicked));
+            notification.addButton('system-undo',
+                                   undoLabel ? undoLabel : _("Undo"));
+            notification.connect('action-invoked',
+                                 Lang.bind(this, this._onUndoClicked));
        }

        this._source.notify(notification);
@@ -137,10 +113,6 @@ const Overview = new Lang.Class({
        // scenes which allows us to show the background with different
        // rendering options without duplicating the texture data.
        this._background = Meta.BackgroundActor.new_for_screen(global.screen);
-        this._background.add_glsl_snippet(Meta.SnippetHook.FRAGMENT,
-                                          GLSL_DIM_EFFECT_DECLARATIONS,
-                                          GLSL_DIM_EFFECT_CODE,
-                                          false);
        this._background.hide();
        global.overlay_group.add_actor(this._background);

@@ -261,16 +233,11 @@ const Overview = new Lang.Class({
        this._viewSelector.removeSearchProvider(provider);
    },

-    //
-    // options:
-    //  - undoCallback (function): the callback to be called if undo support is needed
-    //  - forFeedback (boolean): whether the message is for direct feedback of a user action
-    //
-    setMessage: function(text, options) {
+    setMessage: function(text, undoCallback, undoLabel) {
        if (this.isDummy)
            return;

-        this._shellInfo.setMessage(text, options);
+        this._shellInfo.setMessage(text, undoCallback, undoLabel);
    },

    _onDragBegin: function() {
@@ -535,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) {
@@ -591,7 +558,7 @@ const Overview = new Lang.Class({
        if (this._shown)
            return;
        // Do this manually instead of using _syncInputMode, to handle failure
-        if (!Main.pushModal(this._group, { keybindingMode: Main.KeybindingMode.OVERVIEW }))
+        if (!Main.pushModal(this._group))
            return;
        this._modal = true;
        this._animateVisible();
@@ -655,7 +622,7 @@ const Overview = new Lang.Class({
                         });

        Tweener.addTween(this._background,
-                         { dim_factor: 0.8,
+                         { dim_factor: 0.4,
                           time: ANIMATION_TIME,
                           transition: 'easeOutQuad'
                         });
@@ -742,8 +709,7 @@ const Overview = new Lang.Class({

        if (this._shown) {
            if (!this._modal) {
-                if (Main.pushModal(this._group,
-                                   { keybindingMode: Main.KeybindingMode.OVERVIEW }))
+                if (Main.pushModal(this._group))
                    this._modal = true;
                else
                    this.hide();
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -82,34 +82,26 @@ const AnimatedIcon = new Lang.Class({
    _init: function(name, size) {
        this.actor = new St.Bin({ visible: false });
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+        this.actor.connect('notify::visible', Lang.bind(this, this._onVisibleNotify));

-        this._isLoaded = false;
-        this._isPlaying = false;
        this._timeoutId = 0;
        this._frame = 0;
-        this._animations = St.TextureCache.get_default().load_sliced_image (global.datadir + '/theme/' + name, size, size,
-                                                                            Lang.bind(this, this._animationsLoaded));
+        this._animations = St.TextureCache.get_default().load_sliced_image (global.datadir + '/theme/' + name, size, size);
        this.actor.set_child(this._animations);
    },

-    play: function() {
-        if (this._isLoaded && this._timeoutId == 0) {
-            if (this._frame == 0)
-                this._showFrame(0);
-
-            this._timeoutId = Mainloop.timeout_add(ANIMATED_ICON_UPDATE_TIMEOUT, Lang.bind(this, this._update));
-        }
-
-        this._isPlaying = true;
-    },
-
-    stop: function() {
+    _disconnectTimeout: function() {
        if (this._timeoutId > 0) {
            Mainloop.source_remove(this._timeoutId);
            this._timeoutId = 0;
        }
+    },

-        this._isPlaying = false;
+    _onVisibleNotify: function() {
+        if (this.actor.visible)
+            this._timeoutId = Mainloop.timeout_add(ANIMATED_ICON_UPDATE_TIMEOUT, Lang.bind(this, this._update));
+        else
+            this._disconnectTimeout();
    },

    _showFrame: function(frame) {
@@ -129,17 +121,8 @@ const AnimatedIcon = new Lang.Class({
        return true;
    },

-    _animationsLoaded: function() {
-        this._isLoaded = true;
-
-        if (this._isPlaying) {
-            this._showFrame(0);
-            this._timeoutId = Mainloop.timeout_add(ANIMATED_ICON_UPDATE_TIMEOUT, Lang.bind(this, this._update));
-        }
-    },
-
    _onDestroy: function() {
-        this.stop();
+        this._disconnectTimeout();
    }
 });

@@ -264,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));
@@ -353,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)
@@ -384,7 +354,6 @@ const AppMenuButton = new Lang.Class({
                           transition: "easeOutQuad",
                           onCompleteScope: this,
                           onComplete: function() {
-                               this._spinner.stop();
                               this._spinner.actor.opacity = 255;
                               this._spinner.actor.hide();
                           }
@@ -394,7 +363,6 @@ const AppMenuButton = new Lang.Class({
    startAnimation: function() {
        this._stop = false;
        this.actor.reactive = false;
-        this._spinner.play();
        this._spinner.actor.show();
    },

@@ -933,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
@@ -31,37 +31,20 @@ const SearchProviderIface = <interface name="org.gnome.Shell.SearchProvider">

 var SearchProviderProxy = Gio.DBusProxy.makeProxyWrapper(SearchProviderIface);

-function loadRemoteSearchProviders(addProviderCallback) {
-    let loadState = { loadedProviders: [],
-                      objectPaths: {},
-                      numLoading: 0,
-                      addProviderCallback: addProviderCallback };

+function loadRemoteSearchProviders(addProviderCallback) {
    let dataDirs = GLib.get_system_data_dirs();
+    let loadedProviders = {};
    for (let i = 0; i < dataDirs.length; i++) {
        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'search-providers']);
        let dir = Gio.file_new_for_path(path);
-
-        dir.query_info_async('standard:type', Gio.FileQueryInfoFlags.NONE,
-            GLib.PRIORITY_DEFAULT, null,
-                function(object, res) {
-                    let exists = false;
-                    try {
-                        object.query_info_finish(res);
-                        exists = true;
-                    } catch (e) {
-                    }
-
-                    if (!exists)
-                        return;
-
-                    loadState.numLoading++;
-                    loadRemoteSearchProvidersFromDir(dir, loadState);
-                });
+        if (!dir.query_exists(null))
+            continue;
+        loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallback);
    }
 };

-function loadRemoteSearchProvidersFromDir(dir, loadState) {
+function loadRemoteSearchProvidersFromDir(dir, loadedProviders, addProviderCallback) {
    let dirPath = dir.get_path();
    FileUtils.listDirAsync(dir, Lang.bind(this, function(files) {
        for (let i = 0; i < files.length; i++) {
@@ -77,13 +60,13 @@ function loadRemoteSearchProvidersFromDir(dir, loadState) {
            if (!keyfile.has_group(KEY_FILE_GROUP))
                continue;

-            let remoteProvider;
+            let remoteProvider, title;
            try {
                let group = KEY_FILE_GROUP;
                let busName = keyfile.get_string(group, 'BusName');
                let objectPath = keyfile.get_string(group, 'ObjectPath');

-                if (loadState.objectPaths[objectPath])
+                if (loadedProviders[objectPath])
                    continue;

                let appInfo = null;
@@ -91,93 +74,46 @@ function loadRemoteSearchProvidersFromDir(dir, loadState) {
                    let desktopId = keyfile.get_string(group, 'DesktopId');
                    appInfo = Gio.DesktopAppInfo.new(desktopId);
                } catch (e) {
-                    log('Ignoring search provider ' + path + ': missing DesktopId');
-                    continue;
                }

-                remoteProvider = new RemoteSearchProvider(appInfo,
+                let icon;
+                if (appInfo) {
+                    icon = appInfo.get_icon();
+                    title = appInfo.get_name();
+                } else {
+                    let iconName = keyfile.get_string(group, 'Icon');
+                    icon = new Gio.ThemedIcon({ name: iconName });
+                    title = keyfile.get_locale_string(group, 'Title', null);
+                }
+
+                remoteProvider = new RemoteSearchProvider(title,
+                                                          icon,
                                                          busName,
                                                          objectPath);
-                loadState.objectPaths[objectPath] = remoteProvider;
-                loadState.loadedProviders.push(remoteProvider);
+                loadedProviders[objectPath] = remoteProvider;
            } catch(e) {
-                log('Failed to add search provider %s: %s'.format(path, e.toString()));
+                log('Failed to add search provider "%s": %s'.format(title, e.toString()));
                continue;
            }
-        }

-        remoteProvidersDirLoaded(loadState);
+            addProviderCallback(remoteProvider);
+        }
    }));

 };

-function remoteProvidersDirLoaded(loadState) {
-    loadState.numLoading--;
-    if (loadState.numLoading > 0)
-        return;
-
-    let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
-    let sortOrder = searchSettings.get_strv('sort-order');
-    let numSorted = sortOrder.length;
-
-    loadState.loadedProviders.sort(
-        function(providerA, providerB) {
-            let idxA, idxB;
-            let appIdA, appIdB;
-
-            appIdA = providerA.appInfo.get_id();
-            appIdB = providerB.appInfo.get_id();
-
-            idxA = sortOrder.indexOf(appIdA);
-            idxB = sortOrder.indexOf(appIdB);
-
-            // if no provider is found in the order, use alphabetical order
-            if ((idxA == -1) && (idxB == -1))
-                return GLib.utf8_collate(providerA.title, providerB.title);
-
-            if (numSorted > 1) {
-                // if providerA is the last, it goes after everything
-                if ((idxA + 1) == numSorted)
-                    return 1;
-                // if providerB is the last, it goes after everything
-                else if ((idxB + 1) == numSorted)
-                    return -1;
-            }
-
-            // if providerA isn't found, it's sorted after providerB
-            if (idxA == -1)
-                return 1;
-
-            // if providerB isn't found, it's sorted after providerA
-            if (idxB == -1)
-                return -1;
-
-            // finally, if both providers are found, return their order in the list
-            return (idxA - idxB);
-        });
-
-    loadState.loadedProviders.forEach(
-        function(provider) {
-            loadState.addProviderCallback(provider);
-        });
-}
-
 const RemoteSearchProvider = new Lang.Class({
    Name: 'RemoteSearchProvider',
    Extends: Search.SearchProvider,

-    _init: function(appInfo, dbusName, dbusPath) {
+    _init: function(title, icon, dbusName, dbusPath) {
        this._proxy = new SearchProviderProxy(Gio.DBus.session,
-            dbusName, dbusPath, Lang.bind(this, this._onProxyConstructed));
+                                              dbusName, dbusPath);

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

-    _onProxyConstructed: function(proxy) {
-        // Do nothing
-    },
-
    createIcon: function(size, meta) {
        if (meta['gicon']) {
            return new St.Icon({ gicon: Gio.icon_new_for_string(meta['gicon']),
--- 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;

@@ -25,6 +26,7 @@ const Util = imports.misc.util;

 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
 const LOCK_ENABLED_KEY = 'lock-enabled';
+const LOCK_DELAY_KEY = 'lock-delay';

 const CURTAIN_SLIDE_TIME = 0.3;
 // fraction of screen height the arrow must reach before completing
@@ -49,38 +51,6 @@ const SUMMARY_ICON_SIZE = 48;
 const STANDARD_FADE_TIME = 10;
 const SHORT_FADE_TIME = 0.3;

-function sample(offx, offy) {
-    return 'texel += texture2D (sampler, tex_coord.st + pixel_step * ' +
-        'vec2 (' + offx + ',' + offy + '));\n'
-}
-const GLSL_BLUR_EFFECT_DECLARATIONS = ' \
-uniform vec2 pixel_step;\n \
-uniform float desaturation;\n \
-vec4 apply_blur(in sampler2D sampler, in vec2 tex_coord) {\n \
-  vec4 texel;\n \
-  texel = texture2D (sampler, tex_coord.st);\n'
-  + sample(-1.0, -1.0)
-  + sample( 0.0, -1.0)
-  + sample(+1.0, -1.0)
-  + sample(-1.0,  0.0)
-  + sample(+1.0,  0.0)
-  + sample(-1.0, +1.0)
-  + sample( 0.0, +1.0)
-  + sample(+1.0, +1.0) + ' \
-   texel /= 9.0;\n \
-   return texel;\n \
-}\n \
-vec3 desaturate (const vec3 color)\n \
-{\n \
-   const vec3 gray_conv = vec3 (0.299, 0.587, 0.114);\n \
-   vec3 gray = vec3 (dot (gray_conv, color));\n \
-   return vec3 (mix (color.rgb, gray, desaturation));\n \
-}';
-const GLSL_BLUR_EFFECT_CODE = ' \
-cogl_texel = apply_blur(cogl_sampler, cogl_tex_coord.st);\n \
-cogl_texel.rgb = desaturate(cogl_texel.rgb);\n';
-
-
 const Clock = new Lang.Class({
    Name: 'ScreenShieldClock',

@@ -367,10 +337,6 @@ const Arrow = new Lang.Class({
    }
 });

-function clamp(value, min, max) {
-    return Math.max(min, Math.min(max, value));
-}
-
 /**
 * To test screen shield, make sure to kill gnome-screensaver.
 *
@@ -398,25 +364,13 @@ const ScreenShield = new Lang.Class({
                                      Lang.bind(this, this._onLockScreenKeyRelease));
        this._lockScreenGroup.connect('scroll-event',
                                      Lang.bind(this, this._onLockScreenScroll));
-        Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');

        this._lockScreenContents = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                                   name: 'lockScreenContents' });
        this._lockScreenContents.add_constraint(new Layout.MonitorConstraint({ primary: true }));

-        let backgroundActor = Meta.BackgroundActor.new_for_screen(global.screen);
-        backgroundActor.add_glsl_snippet(Meta.SnippetHook.TEXTURE_LOOKUP,
-                                         GLSL_BLUR_EFFECT_DECLARATIONS,
-                                         GLSL_BLUR_EFFECT_CODE,
-                                         true);
-        backgroundActor.set_uniform_float('desaturation',
-                                          1, 1, [0.6]);
-        backgroundActor.connect('notify::size', function(actor) {
-            actor.set_uniform_float('pixel_step', 2, 1, [1/actor.width, 1/actor.height]);
-        });
-
        this._background = new St.Bin({ style_class: 'screen-shield-background',
-                                        child: backgroundActor });
+                                        child: Meta.BackgroundActor.new_for_screen(global.screen) });
        this._lockScreenGroup.add_actor(this._background);
        this._lockScreenGroup.add_actor(this._lockScreenContents);

@@ -435,11 +389,14 @@ const ScreenShield = new Lang.Class({
        }
        this._lockScreenContents.add_actor(this._arrowContainer);

-        this._dragAction = new Clutter.GestureAction();
-        this._dragAction.connect('gesture-begin', Lang.bind(this, this._onDragBegin));
-        this._dragAction.connect('gesture-progress', Lang.bind(this, this._onDragMotion));
-        this._dragAction.connect('gesture-end', Lang.bind(this, this._onDragEnd));
-        this._lockScreenGroup.add_action(this._dragAction);
+        let dragArea = new Clutter.Rect({ origin: new Clutter.Point({ x: 0, y: -global.screen_height, }),
+                                          size: new Clutter.Size({ width: global.screen_width,
+                                                                   height: global.screen_height }) });
+        let action = new Clutter.DragAction({ drag_axis: Clutter.DragAxis.Y_AXIS,
+                                              drag_area: dragArea });
+        action.connect('drag-begin', Lang.bind(this, this._onDragBegin));
+        action.connect('drag-end', Lang.bind(this, this._onDragEnd));
+        this._lockScreenGroup.add_action(action);

        this._lockDialogGroup = new St.Widget({ x_expand: true,
                                                y_expand: true,
@@ -482,7 +439,21 @@ const ScreenShield = new Lang.Class({
                                                 fadeInTime: STANDARD_FADE_TIME,
                                                 fadeFactor: 1 });

-        this.idleMonitor = new GnomeDesktop.IdleMonitor();
+        this.idleMonitor = Shell.IdleMonitor.get();
+    },
+
+    _becomeModal: function() {
+        if (this._isModal)
+            return true;
+
+        this._isModal = Main.pushModal(this.actor);
+        if (this._isModal)
+            return true;
+
+        // We failed to get a pointer grab, it means that
+        // something else has it. Try with a keyboard grab only
+        this._isModal = Main.pushModal(this.actor, { options: Meta.ModalOptions.POINTER_ALREADY_GRABBED });
+        return this._isModal;
    },

    _onLockScreenKeyRelease: function(actor, event) {
@@ -502,8 +473,8 @@ const ScreenShield = new Lang.Class({
        if (symbol == Clutter.KEY_Escape ||
            symbol == Clutter.KEY_Return ||
            symbol == Clutter.KEY_KP_Enter) {
-            this._ensureUnlockDialog(true);
-            this._hideLockScreen(true, 0);
+            this._ensureUnlockDialog(true, true);
+            this._hideLockScreen(true);
            return true;
        }

@@ -525,8 +496,8 @@ const ScreenShield = new Lang.Class({

        // 7 standard scrolls to lift up
        if (this._lockScreenScrollCounter > 35) {
-            this._ensureUnlockDialog(false);
-            this._hideLockScreen(true, 0);
+            this._ensureUnlockDialog(false, true);
+            this._hideLockScreen(true);
        }

        return true;
@@ -557,28 +528,14 @@ const ScreenShield = new Lang.Class({
    _onDragBegin: function() {
        Tweener.removeTweens(this._lockScreenGroup);
        this._lockScreenState = MessageTray.State.HIDING;
-        this._ensureUnlockDialog(false);
-
-        return true;
-    },
-
-    _onDragMotion: function() {
-	let [origX, origY] = this._dragAction.get_press_coords(0);
-	let [currentX, currentY] = this._dragAction.get_motion_coords(0);
-
-	let newY = currentY - origY;
-	newY = clamp(newY, -global.stage.height, 0);
-
-	this._lockScreenGroup.y = newY;
-
-	return true;
+        this._ensureUnlockDialog(false, false);
    },

    _onDragEnd: function(action, actor, eventX, eventY, modifiers) {
        if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) {
            // Complete motion automatically
-	    let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0);
-	    this._hideLockScreen(true, -velocityY);
+            this._hideLockScreen(true);
+            this._ensureUnlockDialog(false, true);
        } else {
            // restore the lock screen to its original place
            // try to use the same speed as the normal animation
@@ -617,9 +574,17 @@ const ScreenShield = new Lang.Class({
            }
        }

-        if (!this._isModal) {
-            Main.pushModal(this.actor, { keybindingMode: Main.KeybindingMode.LOCK_SCREEN });
-            this._isModal = true;
+        if (!this._becomeModal()) {
+            // We could not become modal, so we can't activate the
+            // screenshield. The user is probably very upset at this
+            // point, but any application using global grabs is broken
+            // Just tell him to stop using this app
+            //
+            // XXX: another option is to kick the user into the gdm login
+            // screen, where we're not affected by grabs
+            Main.notifyError("Unable to lock",
+                             "Lock was blocked by an application");
+            return;
        }

        if (!this._isActive) {
@@ -628,13 +593,23 @@ const ScreenShield = new Lang.Class({
            if (this._activationTime == 0)
                this._activationTime = GLib.get_monotonic_time();

-            this._becameActiveId = this.idleMonitor.connect('became-active', Lang.bind(this, function() {
-                this.idleMonitor.disconnect(this._becameActiveId);
+            // 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);
+                // GLib.get_monotonic_time() returns microseconds, convert to seconds
+                let elapsedTime = (GLib.get_monotonic_time() - this._activationTime) / 1000000;
+                let shouldLock = lightboxWasShown &&
+                    this._settings.get_boolean(LOCK_ENABLED_KEY) &&
+                    (elapsedTime >= this._settings.get_uint(LOCK_DELAY_KEY));
                if (shouldLock || this._isLocked) {
                    this.lock(false);
                } else if (this._isActive) {
@@ -651,9 +626,10 @@ const ScreenShield = new Lang.Class({
        // Ensure that the stage window is mapped, before taking a grab
        // otherwise X errors out
        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-            if (!this._isModal) {
-                Main.pushModal(this.actor);
-                this._isModal = true;
+            if (!this._becomeModal()) {
+                // In the login screen, this is a hard error. Fail-whale
+                log('Could not acquire modal grab for the login screen. Aborting login process.');
+                Meta.quit(Meta.ExitCode.ERROR);
            }

            return false;
@@ -661,8 +637,8 @@ const ScreenShield = new Lang.Class({

        this.actor.show();
        this._isGreeter = Main.sessionMode.isGreeter;
-        this._ensureUnlockDialog(true);
-        this._hideLockScreen(false, 0);
+        this._ensureUnlockDialog(true, true);
+        this._hideLockScreen(false);
    },

    _bumpLockScreen: function() {
@@ -680,21 +656,14 @@ const ScreenShield = new Lang.Class({
                         });
    },

-    _hideLockScreen: function(animate, velocity) {
+    _hideLockScreen: function(animate) {
        this._lockScreenState = MessageTray.State.HIDING;

        if (animate) {
            // Tween the lock screen out of screen
-            // if velocity is not specified (i.e. we come here from pressing ESC),
-            // use the same speed regardless of original position
-            // if velocity is specified, it's in pixels per milliseconds
+            // try to use the same speed regardless of original position
            let h = global.stage.height;
-            let delta = (h + this._lockScreenGroup.y);
-            let min_velocity = global.stage.height / (CURTAIN_SLIDE_TIME * 1000);
-
-            velocity = Math.max(min_velocity, velocity);
-            let time = (delta / velocity) / 1000;
-
+            let time = CURTAIN_SLIDE_TIME * (h + this._lockScreenGroup.y) / h;
            Tweener.removeTweens(this._lockScreenGroup);
            Tweener.addTween(this._lockScreenGroup,
                             { y: -h,
@@ -711,13 +680,11 @@ const ScreenShield = new Lang.Class({
            this._lockScreenGroup.hide();
        }

-        global.stage.show_cursor();
-
        if (Main.sessionMode.currentMode == 'lock-screen')
            Main.sessionMode.popMode('lock-screen');
    },

-    _ensureUnlockDialog: function(onPrimary) {
+    _ensureUnlockDialog: function(onPrimary, allowCancel) {
        if (!this._dialog) {
            let constructor = Main.sessionMode.unlockDialog;
            if (!constructor) {
@@ -740,6 +707,8 @@ const ScreenShield = new Lang.Class({
            this._dialog.connect('failed', Lang.bind(this, this._onUnlockFailed));
            this._dialog.connect('unlocked', Lang.bind(this, this._onUnlockSucceded));
        }
+
+        this._dialog.allowCancel = allowCancel;
    },

    _onUnlockFailed: function() {
@@ -803,16 +772,6 @@ const ScreenShield = new Lang.Class({
        this._arrowAnimationId = Mainloop.timeout_add(6000, Lang.bind(this, this._animateArrows));
        this._animateArrows();

-        let motionId = global.stage.connect('captured-event', function(stage, event) {
-            if (event.type() == Clutter.EventType.MOTION) {
-                global.stage.show_cursor();
-                global.stage.disconnect(motionId);
-            }
-
-            return false;
-        });
-        global.stage.hide_cursor();
-
        this._lockScreenState = MessageTray.State.SHOWN;
        this._lockScreenGroup.fixed_position_set = false;
        this._lockScreenScrollCounter = 0;
@@ -926,9 +885,11 @@ const ScreenShield = new Lang.Class({
    },

    lock: function(animate) {
-        if (!this._isModal) {
-            Main.pushModal(this.actor, { keybindingMode: Main.KeybindingMode.LOCK_SCREEN });
-            this._isModal = true;
+        // Warn the user if we can't become modal
+        if (!this._becomeModal()) {
+            Main.notifyError("Unable to lock",
+                             "Lock was blocked by an application");
+            return;
        }

        if (this._activationTime == 0)
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -10,8 +10,6 @@ const Util = imports.misc.util;
 const FileUtils = imports.misc.fileUtils;
 const Main = imports.ui.main;

-const SEARCH_PROVIDERS_SCHEMA = 'org.gnome.desktop.search-providers';
-
 // Not currently referenced by the search API, but
 // this enumeration can be useful for provider
 // implementations.
@@ -76,11 +74,9 @@ const SearchResultDisplay = new Lang.Class({
 const SearchProvider = new Lang.Class({
    Name: 'SearchProvider',

-    _init: function(title, appInfo, isRemoteProvider) {
+    _init: function(title) {
        this.title = title;
-        this.appInfo = appInfo;
        this.searchSystem = null;
-        this.isRemoteProvider = !!isRemoteProvider;
    },

    /**
@@ -176,16 +172,12 @@ const SearchSystem = new Lang.Class({

    _init: function() {
        this._providers = [];
-        this._remoteProviders = [];
        this.reset();
    },

    registerProvider: function (provider) {
        provider.searchSystem = this;
        this._providers.push(provider);
-
-        if (provider.isRemoteProvider)
-            this._remoteProviders.push(provider);
    },

    unregisterProvider: function (provider) {
@@ -194,20 +186,12 @@ const SearchSystem = new Lang.Class({
            return;
        provider.searchSystem = null;
        this._providers.splice(index, 1);
-
-        let remoteIndex = this._remoteProviders.indexOf(provider);
-        if (remoteIndex != -1)
-            this._remoteProviders.splice(index, 1);
    },

    getProviders: function() {
        return this._providers;
    },

-    getRemoteProviders: function() {
-        return this._remoteProviders;
-    },
-
    getTerms: function() {
        return this._previousTerms;
    },
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -14,6 +14,7 @@ const _modes = {
        showCalendarEvents: false,
        allowSettings: false,
        allowExtensions: false,
+        allowKeybindingsWhenModal: false,
        hasRunDialog: false,
        hasWorkspaces: false,
        hasWindows: false,
@@ -31,13 +32,14 @@ const _modes = {
    },

    'gdm': {
+        allowKeybindingsWhenModal: true,
        hasNotifications: true,
        isGreeter: true,
        isPrimary: true,
        unlockDialog: imports.gdm.loginDialog.LoginDialog,
        components: ['polkitAgent'],
        panel: {
-            left: ['logo'],
+            left: [],
            center: ['dateMenu'],
            right: ['a11y', 'display', 'keyboard',
                    'volume', 'battery', 'powerMenu']
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -27,7 +27,6 @@ const KEY_VISUAL_BELL      = 'visual-bell';
 const DESKTOP_INTERFACE_SCHEMA = 'org.gnome.desktop.interface';
 const KEY_GTK_THEME      = 'gtk-theme';
 const KEY_ICON_THEME     = 'icon-theme';
-const KEY_WM_THEME       = 'theme';
 const KEY_TEXT_SCALING_FACTOR = 'text-scaling-factor';

 const HIGH_CONTRAST_THEME = 'HighContrast';
@@ -102,35 +101,28 @@ const ATIndicator = new Lang.Class({
    },

    _buildHCItem: function() {
-        let interfaceSettings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
-        let wmSettings = new Gio.Settings({ schema: WM_SCHEMA });
-        let gtkTheme = interfaceSettings.get_string(KEY_GTK_THEME);
-        let iconTheme = interfaceSettings.get_string(KEY_ICON_THEME);
-        let wmTheme = wmSettings.get_string(KEY_WM_THEME);
+        let settings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
+        let gtkTheme = settings.get_string(KEY_GTK_THEME);
+        let iconTheme = settings.get_string(KEY_ICON_THEME);
        let hasHC = (gtkTheme == HIGH_CONTRAST_THEME);
        let highContrast = this._buildItemExtended(
            _("High Contrast"),
            hasHC,
-            interfaceSettings.is_writable(KEY_GTK_THEME) &&
-            interfaceSettings.is_writable(KEY_ICON_THEME) &&
-            wmSettings.is_writable(KEY_WM_THEME),
+            settings.is_writable(KEY_GTK_THEME) && settings.is_writable(KEY_ICON_THEME),
            function (enabled) {
                if (enabled) {
-                    interfaceSettings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
-                    interfaceSettings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
-                    wmSettings.set_string(KEY_WM_THEME, HIGH_CONTRAST_THEME);
+                    settings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
+                    settings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
                } else if(!hasHC) {
-                    interfaceSettings.set_string(KEY_GTK_THEME, gtkTheme);
-                    interfaceSettings.set_string(KEY_ICON_THEME, iconTheme);
-                    wmSettings.set_string(KEY_WM_THEME, wmTheme);
+                    settings.set_string(KEY_GTK_THEME, gtkTheme);
+                    settings.set_string(KEY_ICON_THEME, iconTheme);
                } else {
-                    interfaceSettings.reset(KEY_GTK_THEME);
-                    interfaceSettings.reset(KEY_ICON_THEME);
-                    wmSettings.reset(KEY_WM_THEME);
+                    settings.reset(KEY_GTK_THEME);
+                    settings.reset(KEY_ICON_THEME);
                }
            });
-        interfaceSettings.connect('changed::' + KEY_GTK_THEME, function() {
-            let value = interfaceSettings.get_string(KEY_GTK_THEME);
+        settings.connect('changed::' + KEY_GTK_THEME, function() {
+            let value = settings.get_string(KEY_GTK_THEME);
            if (value == HIGH_CONTRAST_THEME) {
                highContrast.setToggleState(true);
            } else {
@@ -138,16 +130,11 @@ const ATIndicator = new Lang.Class({
                gtkTheme = value;
            }
        });
-        interfaceSettings.connect('changed::' + KEY_ICON_THEME, function() {
-            let value = interfaceSettings.get_string(KEY_ICON_THEME);
+        settings.connect('changed::' + KEY_ICON_THEME, function() {
+            let value = settings.get_string(KEY_ICON_THEME);
            if (value != HIGH_CONTRAST_THEME)
                iconTheme = value;
        });
-        wmSettings.connect('changed::' + KEY_WM_THEME, function() {
-            let value = wmSettings.get_string(KEY_WM_THEME);
-            if (value != HIGH_CONTRAST_THEME)
-                wmTheme = value;
-        });
        return highContrast;
    },

--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -239,6 +239,22 @@ const Indicator = new Lang.Class({
                this._applet.send_to_address(device.bdaddr, device.alias);
            }));
        }
+        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
+            item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
+                this._applet.browse_address(device.bdaddr, event.get_time(),
+                    Lang.bind(this, function(applet, result) {
+                        try {
+                            applet.browse_address_finish(result);
+                        } catch (e) {
+                            this._ensureSource();
+                            this._source.notify(new MessageTray.Notification(this._source,
+                                 _("Bluetooth"),
+                                 _("Error browsing device"),
+                                 { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
+                        }
+                    }));
+            }));
+        }

        switch (device.type) {
        case GnomeBluetoothApplet.Type.KEYBOARD:
@@ -353,7 +369,6 @@ const ConfirmNotification = new Lang.Class({
    _init: function(source, applet, device_path, name, long_name, pin) {
        this.parent(source,
                    _("Bluetooth"),
-                    /* Translators: argument is the device short name */
                    _("Pairing confirmation for %s").format(name),
                    { customContent: true });
        this.setResident(true);
@@ -363,7 +378,6 @@ const ConfirmNotification = new Lang.Class({
        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
        this.addBody(_("Please confirm whether the PIN '%06d' matches the one on the device.").format(pin));

-        /* Translators: this is the verb, not the noun */
        this.addButton('matches', _("Matches"));
        this.addButton('does-not-match', _("Does not match"));

--- 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,
@@ -1684,9 +1622,15 @@ 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');

@@ -1755,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;
@@ -1791,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() {
@@ -1802,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);
        }));
@@ -1898,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) {
@@ -1965,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);
@@ -2047,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++)
@@ -2070,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++) {
@@ -2096,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/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;
@@ -113,7 +112,6 @@ const UnlockDialog = new Lang.Class({
    _init: function(parentActor) {
        this.parent({ shellReactive: true,
                      styleClass: 'login-dialog',
-                      keybindingMode: Main.KeybindingMode.UNLOCK_SCREEN,
                      parentActor: parentActor
                    });

@@ -152,9 +150,6 @@ const UnlockDialog = new Lang.Class({
        ShellEntry.addContextMenu(this._promptEntry, { isPassword: true });
        this.setInitialKeyFocus(this._promptEntry);
        this._promptEntry.clutter_text.connect('activate', Lang.bind(this, this._doUnlock));
-        this._promptEntry.clutter_text.connect('text-changed', Lang.bind(this, function() {
-            this._updateOkButtonSensitivity(this._promptEntry.text.length > 0);
-        }));

        this._promptLayout.add(this._promptEntry,
                               { expand: true,
@@ -169,6 +164,7 @@ const UnlockDialog = new Lang.Class({
        this._promptLoginHint.hide();
        this.contentLayout.add_actor(this._promptLoginHint);

+        this.allowCancel = false;
        let cancelButton = { label: _("Cancel"),
                             action: Lang.bind(this, this._escape),
                             key: Clutter.KEY_Escape };
@@ -200,19 +196,15 @@ const UnlockDialog = new Lang.Class({
            return false;
        }));

-        Main.ctrlAltTabManager.addGroup(this.dialogLayout, _("Unlock Window"), 'dialog-password-symbolic');
-
-        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));
    },

    _updateSensitivity: function(sensitive) {
        this._promptEntry.reactive = sensitive;
        this._promptEntry.clutter_text.editable = sensitive;
-        this._updateOkButtonSensitivity(sensitive && this._promptEntry.text.length > 0);
-    },
-
-    _updateOkButtonSensitivity: function(sensitive) {
        this._okButton.button.reactive = sensitive;
        this._okButton.button.can_focus = sensitive;
    },
@@ -300,8 +292,10 @@ const UnlockDialog = new Lang.Class({
    },

    _escape: function() {
-        this._userVerifier.cancel();
-        this.emit('failed');
+        if (this.allowCancel) {
+            this._userVerifier.cancel();
+            this.emit('failed');
+        }
    },

    _otherUserClicked: function(button, event) {
--- 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,7 +193,7 @@ 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',
@@ -483,11 +488,10 @@ const UserMenuButton = new Lang.Class({
        this._presence = new GnomeSession.Presence();
        this._session = new GnomeSession.SessionManager();
        this._haveShutdown = true;
-        this._haveSuspend = true;

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

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

        this._iconBox = new St.Bin();
@@ -567,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();
    },
@@ -647,15 +650,9 @@ const UserMenuButton = new Lang.Class({
            }));
    },

-    _updateHaveSuspend: function() {
-        this._loginManager.canSuspend(Lang.bind(this,
-            function(result) {
-                this._haveSuspend = result;
-                this._updateSuspendOrPowerOff();
-        }));
-    },
-
    _updateSuspendOrPowerOff: function() {
+        this._haveSuspend = this._upClient.get_can_suspend();
+
        if (!this._suspendOrPowerOffItem)
            return;

@@ -752,7 +749,7 @@ const UserMenuButton = new Lang.Class({
        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);

-        item = new PopupMenu.PopupMenuItem(_("Settings"));
+        item = new PopupMenu.PopupMenuItem(_("System Settings"));
        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
        this.menu.addMenuItem(item);
        this._systemSettings = item;
@@ -858,13 +855,13 @@ const UserMenuButton = new Lang.Class({
                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',
@@ -94,11 +92,6 @@ const ViewSelector = new Lang.Class({
        this._searchPage = this._addPage(this._searchResults.actor, this._entry,
                                         _("Search"), 'edit-find-symbolic');

-        this._searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
-        this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
-        this._searchSettings.connect('changed::disable-external', Lang.bind(this, this._reloadRemoteProviders));
-        this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders));
-
        // Default search providers
        // Wanda comes obviously first
        this.addSearchProvider(new Wanda.WandaSearchProvider());
@@ -148,18 +141,6 @@ const ViewSelector = new Lang.Class({
        // accessing the properties.
        this.constrainHeight = new Clutter.BindConstraint({ source: this._pageArea,
                                                            coordinate: Clutter.BindCoordinate.HEIGHT });
-
-        Main.wm.addKeybinding('toggle-application-view',
-                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                              Meta.KeyBindingFlags.NONE,
-                              Main.KeybindingMode.NORMAL |
-                              Main.KeybindingMode.OVERVIEW,
-                              Lang.bind(this, this._toggleAppsPage));
-    },
-
-    _toggleAppsPage: function() {
-        Main.overview.show();
-        this._showAppsButton.checked = !this._showAppsButton.checked;
    },

    show: function() {
@@ -203,7 +184,7 @@ const ViewSelector = new Lang.Class({
                                                  })
                                            });;
        this._pageArea.add_actor(page);
-        return page;
+        return page
    },

    _showPage: function(page) {
@@ -440,32 +421,7 @@ const ViewSelector = new Lang.Class({
        this._showPage(this._searchPage);
    },

-    _shouldUseSearchProvider: function(provider) {
-        // the disable-external GSetting only affects remote providers
-        if (!provider.isRemoteProvider)
-            return true;
-
-        if (this._searchSettings.get_boolean('disable-external'))
-            return false;
-
-        let appId = provider.appInfo.get_id();
-        let disable = this._searchSettings.get_strv('disabled');
-        return disable.indexOf(appId) == -1;
-    },
-
-    _reloadRemoteProviders: function() {
-        // removeSearchProvider() modifies the provider list we iterate on,
-        // so make a copy first
-        let remoteProviders = this._searchSystem.getRemoteProviders().slice(0);
-
-        remoteProviders.forEach(Lang.bind(this, this.removeSearchProvider));
-        RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
-    },
-
    addSearchProvider: function(provider) {
-        if (!this._shouldUseSearchProvider(provider))
-            return;
-
        this._searchSystem.registerProvider(provider);
        this._searchResults.createProviderMeta(provider);
    },
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@@ -39,8 +39,6 @@ const WindowAttentionHandler = new Lang.Class({
        let [title, banner] = this._getTitleAndBanner(app, window);

        let notification = new MessageTray.Notification(source, title, banner);
-        notification.setForFeedback(true);
-
        source.notify(notification);

        source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function() {
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -83,8 +83,6 @@ const WindowManager = new Lang.Class({

        this._animationBlockCount = 0;

-        this._allowedKeybindings = {};
-
        this._switchData = null;
        this._shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone));
        this._shellwm.connect('kill-window-effects', Lang.bind(this, function (shellwm, actor) {
@@ -101,66 +99,38 @@ const WindowManager = new Lang.Class({
        this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
        this._shellwm.connect('map', Lang.bind(this, this._mapWindow));
        this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
-        this._shellwm.connect('filter-keybinding', Lang.bind(this, this._filterKeybinding));

        this._workspaceSwitcherPopup = null;
-        this.setCustomKeybindingHandler('switch-to-workspace-left',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-right',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-up',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-to-workspace-down',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-left',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-right',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-up',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('move-to-workspace-down',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
-                                        Lang.bind(this, this._showWorkspaceSwitcher));
-        this.setCustomKeybindingHandler('switch-windows',
-                                        Main.KeybindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-group',
-                                        Main.KeybindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-windows-backward',
-                                        Main.KeybindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-group-backward',
-                                        Main.KeybindingMode.NORMAL,
-                                        Lang.bind(this, this._startAppSwitcher));
-        this.setCustomKeybindingHandler('switch-panels',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW |
-                                        Main.KeybindingMode.LOCK_SCREEN |
-                                        Main.KeybindingMode.UNLOCK_SCREEN |
-                                        Main.KeybindingMode.LOGIN_SCREEN,
-                                        Lang.bind(this, this._startA11ySwitcher));
-
-        this.addKeybinding('open-application-menu',
-                           new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
-                           Meta.KeyBindingFlags.NONE,
-                           Main.KeybindingMode.NORMAL,
-                           Lang.bind(this, this._openAppMenu));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-left',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-right',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-up',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-down',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-left',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-right',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-up',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('move-to-workspace-down',
+                                            Lang.bind(this, this._showWorkspaceSwitcher));
+        Meta.keybindings_set_custom_handler('switch-windows',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-group',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-windows-backward',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-group-backward',
+                                            Lang.bind(this, this._startAppSwitcher));
+        Meta.keybindings_set_custom_handler('switch-panels',
+                                            Lang.bind(this, this._startA11ySwitcher));
+        global.display.add_keybinding('open-application-menu',
+                                      new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                                      Meta.KeyBindingFlags.NONE,
+                                      Lang.bind(this, this._openAppMenu));

        Main.overview.connect('showing', Lang.bind(this, function() {
            for (let i = 0; i < this._dimmedWindows.length; i++)
@@ -172,25 +142,6 @@ const WindowManager = new Lang.Class({
        }));
    },

-    setCustomKeybindingHandler: function(name, modes, handler) {
-        if (Meta.keybindings_set_custom_handler(name, handler))
-            this.allowKeybinding(name, modes);
-    },
-
-    addKeybinding: function(name, settings, flags, modes, handler) {
-        if (global.display.add_keybinding(name, settings, flags, handler))
-            this.allowKeybinding(name, modes);
-    },
-
-    removeKeybinding: function(name) {
-        if (global.display.remove_keybinding(name))
-            this.allowKeybinding(name, Main.KeybindingMode.NONE);
-    },
-
-    allowKeybinding: function(name, modes) {
-        this._allowedKeybindings[name] = modes;
-    },
-
    blockAnimations: function() {
        this._animationBlockCount++;
    },
@@ -473,21 +424,6 @@ const WindowManager = new Lang.Class({
        }
    },

-    _filterKeybinding: function(shellwm, binding) {
-        if (Main.keybindingMode == Main.KeybindingMode.NONE)
-            return true;
-
-        // There's little sense in implementing a keybinding in mutter and
-        // not having it work in NORMAL mode; handle this case generically
-        // so we don't have to explicitly allow all builtin keybindings in
-        // NORMAL mode.
-        if (Main.keybindingMode == Main.KeybindingMode.NORMAL &&
-            binding.is_builtin())
-            return false;
-
-        return !(this._allowedKeybindings[binding.get_name()] & Main.keybindingMode);
-    },
-
    _switchWorkspace : function(shellwm, from, to, direction) {
        if (!this._shouldAnimate()) {
            shellwm.completed_switch_workspace();
--- 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/po/LINGUAS
+++ b/po/LINGUAS
@@ -44,6 +44,7 @@ ms
 nb
 nl
 nn
+oc
 or
 pa
 pl
--- a/po/as.po
+++ b/po/as.po
@@ -7,18 +7,18 @@
 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-09-25 00:06+0000\n"
-"PO-Revision-Date: 2012-09-25 12:18+0530\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-31 16:48+0000\n"
+"PO-Revision-Date: 2012-11-23 17:21+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Language: as_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
 msgid "Screenshots"
@@ -56,7 +56,8 @@ msgstr "GNOME শ্বেল সম্প্ৰসাৰনসমূহ সং
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
-"Alt-F2 ৰ পৰা উন্নয়নকাৰী আৰু পৰীক্ষকসমূহৰ কাৰণে লাভদায়ক অভ্যন্তৰীক সঁজুলিসমূহ সামৰ্থবান "
+"Alt-F2 ৰ পৰা উন্নয়নকাৰী আৰু পৰীক্ষকসমূহৰ কাৰণে লাভদায়ক অভ্যন্তৰীক সঁজুলিসমূহ "
+"সামৰ্থবান "
 "কৰক"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
@@ -64,7 +65,8 @@ msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
 msgstr ""
-"Alt-F2 ডাইলগ ব্যৱহাৰ কৰি অভ্যন্তৰীক ডিবাগিং আৰু মনিটৰিং সঁজুলিসমূহলে অভিগমৰ অনুমতি "
+"Alt-F2 ডাইলগ ব্যৱহাৰ কৰি অভ্যন্তৰীক ডিবাগিং আৰু মনিটৰিং সঁজুলিসমূহলে অভিগমৰ "
+"অনুমতি "
 "দিয়ে।"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
@@ -79,8 +81,10 @@ msgid ""
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
 "GNOME শ্বেল সম্প্ৰসাৰণসমূহৰ এটা uuid বৈশিষ্ট আছে; এই কি'য়ে ল'ড হব লগিয়া "
-"সমপ্ৰসাৰণসমূহ তালিকাভুক্ত কৰে। যিকোনো সম্প্ৰসাৰন যি ল'ড হব বিচাৰে এই তালিকাত থাকিব "
-"লাগিব। আপুনি এই তালিকাক org.gnome.Shell ত EnableExtension আৰু DisableExtension "
+"সমপ্ৰসাৰণসমূহ তালিকাভুক্ত কৰে। যিকোনো সম্প্ৰসাৰন যি ল'ড হব বিচাৰে এই তালিকাত "
+"থাকিব "
+"লাগিব। আপুনি এই তালিকাক org.gnome.Shell ত EnableExtension আৰু "
+"DisableExtension "
 "DBus পদ্ধতিসমূহৰ সৈতে সলনি কৰিব পাৰিব।"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
@@ -95,7 +99,8 @@ msgid ""
 "remove already saved data."
 msgstr ""
 "শ্বেলে সাধাৰণত সক্ৰিয় এপ্লিকেচনসমূহ মনিটৰ কৰে যাতে সকলোতকৈ অধিক ব্যৱহৃতসমূহ "
-"(উদাহৰনস্বৰুপে লঞ্চাৰসমূহত) ক দেখুৱাব পাৰে। যত এই তথ্য গোপন ৰখা হব, আপুনি ইয়াক "
+"(উদাহৰনস্বৰুপে লঞ্চাৰসমূহত) ক দেখুৱাব পাৰে। যত এই তথ্য গোপন ৰখা হব, আপুনি "
+"ইয়াক "
 "গোপনীয়তা কাৰণসমূহৰ কাৰণে অসামৰ্থবান কৰিব পাৰে। অনুগ্ৰহ কৰি মন কৰিব যে এনেকুৱা "
 "কৰাত ইতিমধ্যে সংৰক্ষীত তথ্য আতৰি নাযায়।"

@@ -107,7 +112,8 @@ 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"
@@ -130,54 +136,68 @@ 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 "ব্যৱহাৰকাৰী মেনুত 'Log out' মেনুআইটেম সদায় দেখুৱাব।"
+
+#: ../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 ""
+"এই কি'য়ে এটা-ব্যৱহাৰকাৰী, এটা-অধিবেশন অৱস্থাবোৰত 'Log out' মেনুআইটেম "
+"স্বচালিতভাৱে "
+"লুকুৱা অভাৰৰাইড কৰে।"
+
+#: ../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 "এপ্লিকেচন মেনু খোলিবলে Keybinding"

-#: ../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 "এপ্লিকেচন মেনু খোলিবলে Keybinding।"

-#: ../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 "বাৰ্তা ট্ৰেৰ দৃশ্যমানতা টগ'ল কৰিবলে Keybinding"

-#: ../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 "বাৰ্তা ট্ৰেৰ দৃশ্যমানতা টগ'ল কৰিবলে Keybinding।"

-#: ../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 "পৰ্দা ৰেকৰ্ডাৰ অদল বদল কৰিবলে Keybinding"

-#: ../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 "বিল্টইন পৰ্দা ৰেকৰ্ডাৰ আৰম্ভ/বন্ধ কৰিবলে Keybinding।"

-#: ../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 "screencasts ৰেকৰ্ড কৰাৰ কাৰণে ব্যৱহৃত Framerate"

-#: ../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."
@@ -185,11 +205,11 @@ msgstr ""
 "GNOME শ্বেলৰ screencast ৰেকৰ্ডাৰে ফ্ৰেইম-প্ৰতি ছেকেণ্ডত ৰেকৰ্ড কৰা পৰিণাম "
 "screencast ৰ framerate।"

-#: ../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 "screencast এনক'ড কৰিবলে ব্যৱহাৰ কৰা 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 "
@@ -204,28 +224,32 @@ msgid ""
 "used as a placeholder for a guess at the optimal thread count on the system."
 msgstr ""
 "ৰেকৰ্ডিংসমূহ এনক'ড কৰোতে ব্যৱহৃত GStreamer পাইপলাইন সংহতি কৰে। ই gst-launch ৰ "
-"কাৰণে ব্যৱহৃত বাক্যবিন্যাস অনুকৰন কৰে। পাইপলাইনৰ এটা অসংযোগিত চিঙ্ক পেড থাকিব লাগে "
+"কাৰণে ব্যৱহৃত বাক্যবিন্যাস অনুকৰন কৰে। পাইপলাইনৰ এটা অসংযোগিত চিঙ্ক পেড থাকিব "
+"লাগে "
 "যত ৰেকৰ্ড কৰা ভিডিঅ' ৰেকৰ্ড কৰা হয়। ইয়াৰ সাধাৰণত এটা অসংযোগিত উৎস পেড থাকিব; "
 "সেই পেডৰ পৰা আউটপুট এটা আউটপুট ফাইললে লিখা হব। যি কি নহওক পাইপলাইনে নিজৰ "
-"আউটপুটৰ যত্ন লব পাৰে - ইয়াৰ হওতো আউটপুটক shout2send অথবা সমসাময়িকৰে এটা icecast "
+"আউটপুটৰ যত্ন লব পাৰে - ইয়াৰ হওতো আউটপুটক shout2send অথবা সমসাময়িকৰে এটা "
+"icecast "
 "চাৰ্ভাৰত পঠাবলে ব্যৱহাৰ হব পাৰে। যেতিয়া এটা ৰিক্ত মানলে অসংহিত বা সংহিত, "
 "অবিকল্পিত পাইপলাইন ব্যৱহাৰ কৰা হব। এইটো বৰ্তমানত 'vp8enc min_quantizer=13 "
 "max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux' "
-"আৰু VP8 কডেক ব্যৱহাৰ কৰি WEBM ত ৰেকৰ্ড কৰে। %T ক চিস্টেমত অনুকূলিত থ্ৰেড কাওন্টত "
-"এটা অনুমানৰ প্লেইচহল্ডাৰ হিচাপে ব্যৱহাৰ কৰা হয়।"
+"আৰু 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 "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 "
 "a different container format."
 msgstr ""
 "ৰেকৰ্ড কৰা screencasts ৰ কাৰণে ফাইল নাম বৰ্তমান তাৰিখৰ উপৰত ভিত্তি কৰি এটা "
-"অবিকল্প ফাইল নাম হব, আৰু এই সম্প্ৰসাৰন ব্যৱহাৰ কৰিব। ইয়াক এটা ভিন্ন অন্তৰ্ভুক্তক "
+"অবিকল্প ফাইল নাম হব, আৰু এই সম্প্ৰসাৰন ব্যৱহাৰ কৰিব। ইয়াক এটা ভিন্ন "
+"অন্তৰ্ভুক্তক "
 "বিন্যাসত ৰেকৰ্ড কৰোতে পৰিবৰ্তন কৰিব লাগিব।"

 #: ../js/extensionPrefs/main.js:124
@@ -241,11 +265,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 "ছাইন ইন কৰক"
@@ -253,34 +277,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 "বাতিল কৰক"

@@ -288,8 +311,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 "বন্ধ কৰক"

@@ -340,7 +363,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 "পছন্দৰ পৰা আতৰাওক"

@@ -504,16 +527,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 "উলিৱাওক"

@@ -572,7 +595,9 @@ msgstr "বেতাঁৰ নেটৱাৰ্কৰ দ্বাৰা প্
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
-msgstr "বেতাঁৰ নেটৱাৰ্ক '%s' অভিগম কৰিবলে পাছৱাৰ্ডসমূহ অথবা ইনক্ৰিপষণ কি'সমূহৰ প্ৰয়োজন।"
+msgstr ""
+"বেতাঁৰ নেটৱাৰ্ক '%s' অভিগম কৰিবলে পাছৱাৰ্ডসমূহ অথবা ইনক্ৰিপষণ কি'সমূহৰ "
+"প্ৰয়োজন।"

 #: ../js/ui/components/networkAgent.js:314
 msgid "Wired 802.1X authentication"
@@ -668,35 +693,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> on <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 লে নিমন্ত্ৰণ"
@@ -704,42 +729,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 "উত্তৰ দিয়ক"

@@ -748,138 +773,142 @@ 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
-msgid "Connection has been replaced by a new connection using the same resource"
+#: ../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
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"প্ৰমাণপত্ৰয় এটা অসুৰক্ষিত চিফাৰ এলগৰিথম ব্যৱহাৰ কৰে অথবা ক্ৰিপ্টোগ্ৰাফিয়ভাৱে দুৰ্বল"
-
 #: ../js/ui/components/telepathyClient.js:1342
 msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"প্ৰমাণপত্ৰয় এটা অসুৰক্ষিত চিফাৰ এলগৰিথম ব্যৱহাৰ কৰে অথবা ক্ৰিপ্টোগ্ৰাফিয়ভাৱে "
+"দুৰ্বল"
+
+#: ../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 ""
-"চাৰ্ভাৰ প্ৰমাণপত্ৰৰ দৈৰ্ঘ, অথবা চাৰ্ভাৰ প্ৰমাণপত্ৰ শৃংখলৰ গভীৰতা, ক্ৰিপ্টোগ্ৰাফী "
+"চাৰ্ভাৰ প্ৰমাণপত্ৰৰ দৈৰ্ঘ, অথবা চাৰ্ভাৰ প্ৰমাণপত্ৰ শৃংখলৰ গভীৰতা, "
+"ক্ৰিপ্টোগ্ৰাফী "
 "লাইব্ৰেৰীয়ে প্ৰণয়ন কৰা সীমাসমূহত অতিক্ৰম কৰে"

-#: ../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 "এপ্লিকেচনসমূহ দেখুৱাওক"

@@ -887,14 +916,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"

@@ -911,7 +940,8 @@ 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
@@ -973,7 +1003,8 @@ 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
@@ -995,11 +1026,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 "কিবৰ্ড"
@@ -1052,23 +1083,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 "অজ্ঞাত"
@@ -1124,7 +1155,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, %B %d"

@@ -1174,7 +1205,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 "আনলক কৰক"

@@ -1292,7 +1323,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 "শব্দ সংহতিসমূহ"

@@ -1577,7 +1608,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 "ভলিউম"

@@ -1585,72 +1616,69 @@ 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."
 msgstr ""
-"অধিসূচনাসমূহ এতিয়া অসামৰ্থবান কৰা হৈছে, চেট বাৰ্তাসমূহ অন্তৰ্ভুক্ত কৰাকৈ। আপোনাৰ "
+"অধিসূচনাসমূহ এতিয়া অসামৰ্থবান কৰা হৈছে, চেট বাৰ্তাসমূহ অন্তৰ্ভুক্ত কৰাকৈ। "
+"আপোনাৰ "
 "অনলাইন অৱস্থা ঠিক কৰা হৈছে যাতে আনে জানিব পাৰে যে আপুনি সিহতৰ বাৰ্তা চাব "
 "নোৱাৰিবও পাৰে।"

@@ -1666,7 +1694,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"
@@ -1675,12 +1703,12 @@ msgstr ""
 "ক্ষমা কৰিব, আপোনাৰ বাবে আজি কোনো জ্ঞান নাই:\n"
 "%s"

-#: ../js/ui/wanda.js:123
+#: ../js/ui/wanda.js:121
 #, c-format
 msgid "%s the Oracle says"
 msgstr "%s Oracle এ ক'য়"

-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "আপোনাৰ পছন্দৰ Easter Egg"

@@ -1715,23 +1743,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' লঞ্চ কৰিবলে ব্যৰ্থ"
@@ -1756,6 +1784,9 @@ msgstr "অবিকল্পিত"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "প্ৰমাণীকৰণ ডাইলগ ব্যৱহাৰকাৰী দ্বাৰা নাকচ কৰা হৈছিল"

+#~ msgid "Switch Session"
+#~ msgstr "অধিবেশন পৰিবৰ্তন কৰক"
+
 #~ msgid "Failed to unmount '%s'"
 #~ msgstr "'%s' আনমাউন্ট কৰিবলে ব্যৰ্থ"

--- 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/bn_IN.po
+++ b/po/bn_IN.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/es.po
+++ b/po/es.po
--- 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-11-16 18:27+0000\n"
-"PO-Revision-Date: 2012-11-16 20:40+0300\n"
+"POT-Creation-Date: 2012-11-16 18:26+0000\n"
+"PO-Revision-Date: 2012-11-16 20:49+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
@@ -37,15 +37,6 @@ msgstr "Arvuti"
 msgid "Show the message tray"
 msgstr "Teateala näitamine"

-msgid "Focus the active notification"
-msgstr "Aktiivse märguande fokuseerimine"
-
-msgid "Show all applications"
-msgstr "Kõigi rakenduste kuvamine"
-
-msgid "Open the application menu"
-msgstr "Rakenduste menüü avamine"
-
 msgid "GNOME Shell"
 msgstr "GNOME Shell"

@@ -147,25 +138,12 @@ msgstr "Rakenduste menüü avamise kiirklahv"
 msgid "Keybinding to open the application menu."
 msgstr "Kiirklahv  rakenduste menüü avamiseks."

-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "\"Rakenduste vaate\" avamise kiirklahv"
-
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr "\"Rakenduste vaate\" avamise kiirklahv tegevuste ülevaates."
-
 msgid "Keybinding to toggle the visibility of the message tray"
 msgstr "Teateala nähtavuse muutmise kiirklahv"

 msgid "Keybinding to toggle the visibility of the message tray."
 msgstr "Kiirklahv teateala nähtavuse muutmiseks."

-msgid "Keybinding to focus the active notification"
-msgstr "Aktiivse teate fokuseerimise kiirklahv"
-
-msgid "Keybinding to focus the active notification."
-msgstr "Aktiivse teate fokuseerimise kiirklahv."
-
 msgid "Keybinding to toggle the screen recorder"
 msgstr "Erkaanilindistaja lülitamise kiirklahv"

@@ -227,34 +205,6 @@ msgstr ""
 "konteinervormingusse salvestades tuleks ka sellele vormingule vastav laiend "
 "määrata."

-msgid "Attach modal dialog to the parent window"
-msgstr "Modaaldialoog kuulub vanemakna juurde"
-
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"See võti on ülimuslik võtme org.gnome.mutter suhtes, kui kasutatakse GNOME "
-"Shelli."
-
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Nuppude järjekord tiitliribal"
-
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"See võti on ülimuslik võtme org.gnome.desktop.wm.preferences suhtes, kui "
-"kasutatakse GNOME Shelli."
-
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Akende lohistamisel ekraani serva lubatakse serva paigutamine"
-
-msgid "Workspaces are managed dynamically"
-msgstr "Tööalasid hallatakse dünaamiliselt"
-
-msgid "Workspaces only on primary monitor"
-msgstr "Tööalad peamisel monitoril"
-
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "%s jaoks eelistuste dialoogi laadimisel esines viga:"
@@ -285,9 +235,6 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Logi sisse"

-msgid "Next"
-msgstr "Järgmine"
-
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
@@ -600,27 +547,24 @@ msgstr "Heli peale"
 msgid "Mute"
 msgstr "Heli maha"

-#. Translators: this is a time format string followed by the word "Yesterday". i.e. "14:30 on Yesterday"
+#. 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.
 #, no-c-format
-msgid "<b>%H:%M</b> on Yesterday"
-msgstr "Eile <b>%H:%M</b>"
+msgid "Sent at <b>%X</b> on <b>%A</b>"
+msgstr "Saadeti: <b>%a</b>, <b>%X</b>"

-#. Translators: this is a time format string followed by a week day name. i.e. "14:30 on Monday
+#. 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 "<b>%H:%M</b> on <b>%A</b>"
-msgstr "<b>%H:%M</b>, <b>%A</b>"
+msgid "Sent on <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 "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, 2012",
+#. shown when you get a chat message in a different year.
 #, no-c-format
-msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>"
-msgstr "<b>%H:%M</b>, <b>%A</b>, <b>%d. %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
-#, no-c-format
-msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>, %Y"
-msgstr "<b>%H:%M</b>, <b>%A</b>, <b>%d. %B</b> %Y"
+msgid "Sent on <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.
@@ -657,6 +601,9 @@ msgstr "%s tahab alustada videokõnet"
 msgid "Call from %s"
 msgstr "%s helistab"

+msgid "Reject"
+msgstr "Lükka tagasi"
+
 #. translators: this is a button label (verb), not a noun
 msgid "Answer"
 msgstr "Vasta"
@@ -964,11 +911,8 @@ msgstr "Ülemine riba"
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-msgid "Enter a Command"
-msgstr "Palun sisesta käsk"
-
-msgid "Close"
-msgstr "Sulge"
+msgid "Please enter a command:"
+msgstr "Palun sisesta käsk:"

 #. Translators: This is a time format for a date in
 #. long format
@@ -1081,6 +1025,16 @@ msgstr "ühendumine..."
 msgid "Send Files..."
 msgstr "Failide saatmine..."

+msgid "Browse Files..."
+msgstr "Failide sirvimine..."
+
+msgid "Error browsing device"
+msgstr "Viga seadme sirvimisel"
+
+#, c-format
+msgid "The requested device cannot be browsed, error is '%s'"
+msgstr "Küsitud seadet pole võimalik sirvida, viga on '%s'"
+
 msgid "Keyboard Settings"
 msgstr "Klaviatuurisätted"

@@ -1104,9 +1058,6 @@ msgstr "Luba alati"
 msgid "Grant this time only"
 msgstr "Luba ainult seekord"

-msgid "Reject"
-msgstr "Lükka tagasi"
-
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Paardumise kinnitus seadmele %s"
@@ -1217,6 +1168,9 @@ msgstr "Juhtmeta"
 msgid "Mobile broadband"
 msgstr "Mobiiliühendus"

+msgid "VPN Connections"
+msgstr "VPN-ühendused"
+
 msgid "Network Settings"
 msgstr "Võrgusätted"

@@ -1334,20 +1288,20 @@ msgstr "Eemal"
 msgid "Idle"
 msgstr "Jõude"

-msgid "Offline"
-msgstr "Ühendamata"
+msgid "Unavailable"
+msgstr "Pole saadaval"

 msgid "Notifications"
 msgstr "Märguanded"

-msgid "Settings"
-msgstr "Sätted"
+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"
@@ -1446,6 +1400,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"

@@ -1461,6 +1436,9 @@ msgstr "Kasutaja katkestas autentimisdialoogi"
 #~ msgid "If true, display date in the clock, in addition to time."
 #~ msgstr "Kui määratud, siis kuvatakse kellaaja kõrval ka kuupäeva."

+#~ msgid "Offline"
+#~ msgstr "Ühendamata"
+
 #~ msgid "CONTACTS"
 #~ msgstr "KONTAKTID"

--- a/po/fr.po
+++ b/po/fr.po
@@ -17,8 +17,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell master fr\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-10-04 15:34+0200\n"
+"POT-Creation-Date: 2012-10-31 16:48+0000\n"
+"PO-Revision-Date: 2013-02-08 17:20+0100\n"
 "Last-Translator: Alexandre Franke <alexandre.franke@gmail.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: \n"
@@ -148,54 +148,68 @@ msgstr ""
 "GsmPresenceStatus."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr ""
+"Toujours afficher l'élément « Se déconnecter » dans le menu utilisateur."
+
+#: ../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 ""
+"Cette clé affiche l'élément « Se déconnecter » du menu utilisateur "
+"normalement caché automatiquement dans le cas d'une session et d'un "
+"utilisateur uniques."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Afficher la numérotation des semaines dans le calendrier"

-#: ../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 vrai, afficher le numéro de semaine ISO dans le calendrier."

-#: ../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 "Combinaison de touches pour ouvrir le menu de l'application"

-#: ../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 "Combinaison de touches pour ouvrir le menu de l'application."

-#: ../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 ""
 "Combinaison de touches pour basculer la visibilité du tiroir de messagerie"

-#: ../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 ""
 "Combinaison de touches pour basculer la visibilité du tiroir de messagerie."

-#: ../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 "Combinaison de touches pour basculer l'enregistreur d'écran"

-#: ../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 ""
 "Combinaison de touches pour démarrer/arrêter l'enregistreur d'écran intégré."

-#: ../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 "Le clavier utilisé"

-#: ../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 "Le type de clavier utilisé."

-#: ../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 ""
 "Nombre d'images par seconde pour l'enregistrement des animations d'écran."

-#: ../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."
@@ -203,11 +217,11 @@ msgstr ""
 "Le nombre d'images par seconde des animations d'écran enregistrées par "
 "l'outil idoine de 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 "Le pipeline GStreamer utilisé pour coder l'animation d'écran"

-#: ../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 "
@@ -235,11 +249,11 @@ msgstr ""
 "comme paramètre pour une supposition quant au nombre optimal de threads à "
 "utiliser sur le système."

-#: ../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 "Extension de fichier à utiliser pour enregistrer l'animation d'écran"

-#: ../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 "
@@ -266,11 +280,11 @@ msgstr ""
 "Sélectionnez une extension à configurer en utilisant la boîte combinée ci-"
 "dessus."

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

-#: ../js/gdm/loginDialog.js:675
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "Connexion"
@@ -278,23 +292,23 @@ msgstr "Connexion"
 #. 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 "Absent de la liste ?"

-#: ../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 "Annuler"

-#: ../js/gdm/loginDialog.js:900
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "Se connecter"

-#: ../js/gdm/loginDialog.js:1239
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "Fenêtre de connexion"

@@ -303,8 +317,8 @@ msgstr "Fenêtre de connexion"
 msgid "Power"
 msgstr "Énergie"

-#: ../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 "Mettre en veille"

@@ -312,8 +326,8 @@ msgstr "Mettre en veille"
 msgid "Restart"
 msgstr "Redémarrer"

-#: ../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 "Éteindre"

@@ -364,7 +378,7 @@ msgstr "PARAMÈTRES"
 msgid "New Window"
 msgstr "Nouvelle fenêtre"

-#: ../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 "Enlever des favoris"

@@ -551,16 +565,16 @@ msgstr "Cette semaine"
 msgid "Next week"
 msgstr "La semaine prochaine"

-#: ../js/ui/components/autorunManager.js:278
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "Périphériques amovibles"

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

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

@@ -719,35 +733,35 @@ msgstr "Muet"
 #. 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 "Envoyé <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:956
 #, no-c-format
 msgid "Sent on <b>%A</b>, <b>%B %d</b>"
 msgstr "Envoyé le <b>%A %-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 "Envoyé le <b>%A %-d %B %Y</b>"

 #. 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 est maintenant connu sous le nom de %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 "Invitation vers %s"
@@ -755,42 +769,42 @@ msgstr "Invitation vers %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 vous invite à rejoindre %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 "Refuser"

-#: ../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 "Accepter"

 #. 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 "Appel vidéo 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 "Appel provenant de %s"

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

 #. 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 "Répondre"

@@ -799,112 +813,112 @@ msgstr "Répondre"
 #. * 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 vous envoie %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 aimerait être autorisé à savoir lorsque vous êtes en ligne"

-#: ../js/ui/components/telepathyClient.js:1298
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Erreur réseau"

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "L'authentification a échoué"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Erreur de chiffrement"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "Certificat non fourni"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "Certificat non validé"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "Certificat expiré"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "Certificat non activé"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "Le nom de l'hôte du certificat ne correspond pas"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "L'empreinte du certificat ne correspond pas"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Certificat auto-signé"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Status is set to offline"
 msgstr "Le statut est hors ligne"

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Encryption is not available"
 msgstr "Chiffrement non disponible"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "Certificat non valide"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "La connexion a été refusée"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection can't be established"
 msgstr "La connexion ne peut pas être établie"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "La connexion a été perdue"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "This account is already connected to the server"
 msgstr "Ce compte est déjà connectée au serveur"

-#: ../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 ""
 "La connexion a été remplacée par une nouvelle connexion utilisant la même "
 "ressource"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1336
 msgid "The account already exists on the server"
 msgstr "Ce compte existe déjà sur le serveur"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Server is currently too busy to handle the connection"
 msgstr "Le serveur est actuellement trop chargé pour traiter la connexion"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "Le certificat a été révoqué"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1342
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Le certificat utilise un algorithme de chiffrement douteux, ou est faible "
 "cryptographiquement"

-#: ../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"
@@ -912,30 +926,30 @@ msgstr ""
 "La longueur du certificat du serveur, ou la taille de sa chaîne de "
 "certification, dépasse les limites de la bibliothèque de cryptographie"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Internal error"
 msgstr "Erreur interne"

 #. 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 "La connexion à %s a échoué"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Se reconnecter"

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

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

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

@@ -943,7 +957,7 @@ msgstr "Montrer les applications"
 msgid "Date and Time Settings"
 msgstr "Paramètres de date et heure"

-#: ../js/ui/dateMenu.js:109
+#: ../js/ui/dateMenu.js:111
 msgid "Open Calendar"
 msgstr "Ouvrir l'agenda"

@@ -956,7 +970,7 @@ msgstr "Ouvrir l'agenda"
 #. 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"

@@ -1063,11 +1077,11 @@ msgstr "Installer"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Télécharger et installer « %s » à partir de extensions.gnome.org ?"

-#: ../js/ui/keyboard.js:327
+#: ../js/ui/keyboard.js:337
 msgid "tray"
 msgstr "tiroir de messagerie"

-#: ../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 "Clavier"
@@ -1120,23 +1134,23 @@ msgstr "Afficher la source"
 msgid "Web Page"
 msgstr "Page Web"

-#: ../js/ui/messageTray.js:1080
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Ouvrir"

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

-#: ../js/ui/messageTray.js:2055
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Tiroir de messagerie"

-#: ../js/ui/messageTray.js:2511
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Informations du système"

-#: ../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 "Inconnu"
@@ -1192,7 +1206,7 @@ msgstr "Veuillez saisir une commande :"

 #. 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"

@@ -1242,7 +1256,7 @@ msgstr "Mot de passe"
 msgid "Remember Password"
 msgstr "Se souvenir du mot de passe"

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

@@ -1360,7 +1374,7 @@ msgstr "Paramètres du clavier"
 msgid "Mouse Settings"
 msgstr "Paramètres de la souris"

-#: ../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 "Paramètres du son"

@@ -1649,7 +1663,7 @@ msgid "Unknown"
 msgstr "Inconnu"

 #. 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 "Volume"

@@ -1657,67 +1671,63 @@ msgstr "Volume"
 msgid "Microphone"
 msgstr "Microphone"

-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "Se connecter en tant qu'un autre utilisateur"

-#: ../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 "Occupé"

-#: ../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 "Inactif"

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

-#: ../js/ui/userMenu.js:618 ../js/ui/userMenu.js:759
-msgid "Switch User"
-msgstr "Changer d'utilisateur"
-
-#: ../js/ui/userMenu.js:619
-msgid "Switch Session"
-msgstr "Changer de session"
-
-#: ../js/ui/userMenu.js:743
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Notifications"

-#: ../js/ui/userMenu.js:751
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Paramètres système"

-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "Changer d'utilisateur"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Fermer la session"

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

-#: ../js/ui/userMenu.js:784
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Installer les mises à jour et redémarrer"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Votre statut pour les discussions sera défini à occupé"

-#: ../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."
@@ -1738,7 +1748,7 @@ msgstr "Applications"
 msgid "Search"
 msgstr "Recherche"

-#: ../js/ui/wanda.js:119
+#: ../js/ui/wanda.js:117
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@@ -1747,12 +1757,12 @@ msgstr ""
 "Désolé, aucune sagesse pour vous aujourd'hui :\n"
 "%s"

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

-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "Votre œuf de Pâques favori"

@@ -1787,24 +1797,24 @@ msgstr[1] "%u entrées"
 msgid "System Sounds"
 msgstr "Sons système"

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

-#: ../src/main.c:336
+#: ../src/main.c:338
 msgid "Mode used by GDM for login screen"
 msgstr "Mode utilisé par GDM pour l'écran de connexion"

-#: ../src/main.c:342
+#: ../src/main.c:344
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr ""
 "Utiliser un mode particulier, par ex. « gdm » pour l'écran de connexion"

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

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Impossible de lancer « %s »"
@@ -1828,3 +1838,6 @@ msgstr "Défaut"
 #: ../src/shell-polkit-authentication-agent.c:343
 msgid "Authentication dialog was dismissed by the user"
 msgstr "La fenêtre d'authentification a été écartée par l'utilisateur"
+
+#~ msgid "Switch Session"
+#~ msgstr "Changer de session"
--- a/po/gl.po
+++ b/po/gl.po
--- 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/he.po
+++ b/po/he.po
--- a/po/hi.po
+++ b/po/hi.po
@@ -11,16 +11,16 @@ msgstr ""
 "Project-Id-Version: gnome-shell.master.hi\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 14:38+0530\n"
-"Last-Translator: rajesh <rajeshkajha@yahoo.com>\n"
+"POT-Creation-Date: 2012-11-28 11:02+0000\n"
+"PO-Revision-Date: 2012-11-23 14:08+0530\n"
+"Last-Translator: Rajesh Ranjan <rajesh>\n"
 "Language-Team: Hindi <kde-i18n-doc@kde.org>\n"
 "Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.5\n"
 "X-DamnedLies-Scope: partial\n"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
@@ -58,15 +58,13 @@ msgstr "गनोम शेल एक्सटेंशन विन्यस्

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr ""
-"Alt-F2 से डेवलपर्स और परीक्षकों के लिए उपयोगी आंतरिक उपकरण को सक्षम करें"
+msgstr "Alt-F2 से डेवलपर्स और परीक्षकों के लिए उपयोगी आंतरिक उपकरण को सक्षम करें"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
-msgstr ""
-"Alt-F2 संवाद का उपयोग करके आंतरिक डिबगिंग और निगरानी उपकरण तक पहुँच पायें."
+msgstr "Alt-F2 संवाद का उपयोग करके आंतरिक डिबगिंग और निगरानी उपकरण तक पहुँच पायें."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "Uuids of extensions to enable"
@@ -79,12 +77,9 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
-"गनोम शैल एक्सटेंशन का एक uuid गुण है, इस कुंजी एक्सटेंशन जो लोड किया जाना "
-"चाहिए की सूची "
-"दिखाता हैं. किसी भी विस्तारक जिसे लोड करने के लिए चाहता है को इस सूची में "
-"होने की जरूरत "
-"है. आप भी  इस सूची में EnableExtension और DisableExtension डिबस  तरीकों के "
-"साथ org."
+"गनोम शैल एक्सटेंशन का एक uuid गुण है, इस कुंजी एक्सटेंशन जो लोड किया जाना चाहिए की सूची "
+"दिखाता हैं. किसी भी विस्तारक जिसे लोड करने के लिए चाहता है को इस सूची में होने की जरूरत "
+"है. आप भी  इस सूची में EnableExtension और DisableExtension डिबस  तरीकों के साथ org."
 "gnome.Shell पर हेरफेर कर सकते हैं."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
@@ -98,12 +93,9 @@ 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"
@@ -113,8 +105,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"
@@ -129,78 +120,86 @@ msgid ""
 "Internally used to store the last IM presence explicitly set by the user. "
 "The value here is from the TpConnectionPresenceType enumeration."
 msgstr ""
-"स्पष्ट रूप से उपयोगकर्ता द्वारा निर्धारित की गई आंतरिक रूप से पिछले आईएम "
-"उपस्थिति का "
-"इस्तेमाल किया किया जाता हैं. यह TpConnectionPresenceType  गणन से मान लिया गया "
-"हैं "
+"स्पष्ट रूप से उपयोगकर्ता द्वारा निर्धारित की गई आंतरिक रूप से पिछले आईएम उपस्थिति का "
+"इस्तेमाल किया किया जाता हैं. यह 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 "अगर सही है, तो पंचांग में 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 "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."
 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 "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 "
@@ -214,37 +213,29 @@ 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 पाइपलाइन सेट करें. पाइपलाइन के पास "
-"एक "
-"असंबद्ध सिंक पैड है जहाँ रिकॉर्ड की गई वीडियो दर्ज की गई है.यह सामान्य रूप से "
-"एक असंबद्ध "
-"स्रोत पैड होगा,  इस पैड के उत्पादन को आउटपुट फाइल में लिखा जाएगा. लेकिन पाइप "
-"लाइन भी "
-"अपने स्वयं केआउटपुट की देखभाल ले सकते हैं-  इस shout2send या इसी तरह के "
-"माध्यम से एक "
-"Icecast सर्वर से आउटपुट को भेजने के लिए इस्तेमाल किया जा सकता है.  रिक्त मान "
-"को "
-"निर्धारित या अनिर्धारित करने के दौरान, डिफ़ॉल्ट पाइपलाइन का इस्तेमाल किया "
-"जाएगा. VP8 "
+"रिकॉर्डिंग को इनकोड करने के लिए GStreamer पाइपलाइन सेट करें. पाइपलाइन के पास एक "
+"असंबद्ध सिंक पैड है जहाँ रिकॉर्ड की गई वीडियो दर्ज की गई है.यह सामान्य रूप से एक असंबद्ध "
+"स्रोत पैड होगा,  इस पैड के उत्पादन को आउटपुट फाइल में लिखा जाएगा. लेकिन पाइप लाइन भी "
+"अपने स्वयं केआउटपुट की देखभाल ले सकते हैं-  इस shout2send या इसी तरह के माध्यम से एक "
+"Icecast सर्वर से आउटपुट को भेजने के लिए इस्तेमाल किया जा सकता है.  रिक्त मान को "
+"निर्धारित या अनिर्धारित करने के दौरान, डिफ़ॉल्ट पाइपलाइन का इस्तेमाल किया जाएगा. VP8 "
 "कोडेक का उपयोग करके को  WEBM रिकॉर्ड कर सकते हैं और यह वर्त्तमान में 'vp8enc "
 "min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! "
 "queue ! webmmux' हैं.  %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
@@ -258,14 +249,13 @@ msgstr "एक्सटेंशन"

 #: ../js/extensionPrefs/main.js:188
 msgid "Select an extension to configure using the combobox above."
-msgstr ""
-"उपर्युक्त कोंबोबॉक्स के उपयोग को विन्यस्त करने के लिए किसी विस्तार को चुनें."
+msgstr "उपर्युक्त कोंबोबॉक्स के उपयोग को विन्यस्त करने के लिए किसी विस्तार को चुनें."

-#: ../js/gdm/loginDialog.js:527
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "सत्र..."

-#: ../js/gdm/loginDialog.js:675
+#: ../js/gdm/loginDialog.js:680
 msgctxt "title"
 msgid "Sign In"
 msgstr "साइन इन"
@@ -273,34 +263,41 @@ 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:740
 msgid "Not listed?"
 msgstr "सूचीबद्ध नहीं?"

-#: ../js/gdm/loginDialog.js:895 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:898 ../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:168
 msgid "Cancel"
 msgstr "रद्द करें"

-#: ../js/gdm/loginDialog.js:900
+#: ../js/gdm/loginDialog.js:903
 msgctxt "button"
 msgid "Sign In"
 msgstr "साइन इन"

-#: ../js/gdm/loginDialog.js:1239
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. is not visible here since we only care about phase2 authentication
+#. (and don't even care of which one)
+#: ../js/gdm/loginDialog.js:962 ../js/ui/components/networkAgent.js:260
+#: ../js/ui/components/networkAgent.js:278
+msgid "Username: "
+msgstr "उपयोक्तानाम: "
+
+#: ../js/gdm/loginDialog.js:1269
 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 "स्थगित"

@@ -308,22 +305,22 @@ 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 "बंद करें"

-#: ../js/gdm/util.js:148
+#: ../js/gdm/util.js:152
 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:265
+#: ../js/gdm/util.js:269
 msgid "(or swipe finger)"
 msgstr "(या स्वाइप फिंगर)"

-#: ../js/gdm/util.js:290
+#: ../js/gdm/util.js:294
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(उदाहरण के लिए, उपयोक्ता या %s)"
@@ -360,7 +357,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 "पसंदीदा से हटाएँ"

@@ -524,16 +521,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 "बाहर निकालें"

@@ -563,14 +560,6 @@ msgstr "कूटशब्द: "
 msgid "Key: "
 msgstr "कुंजी: "

-#. TTLS and PEAP are actually much more complicated, but this complication
-#. is not visible here since we only care about phase2 authentication
-#. (and don't even care of which one)
-#: ../js/ui/components/networkAgent.js:260
-#: ../js/ui/components/networkAgent.js:278
-msgid "Username: "
-msgstr "उपयोक्तानाम: "
-
 #: ../js/ui/components/networkAgent.js:266
 msgid "Identity: "
 msgstr "पहचान : "
@@ -688,35 +677,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>%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: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 में आमंत्रण"
@@ -724,42 +713,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 "जवाब"

@@ -768,142 +757,139 @@ 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 ""
-"समान संसाधन के उपयोग से नए कनेक्शन के द्वारा कनेक्शन को प्रतिस्थापित किया गया "
-"है"
+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"
 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
+#: ../js/ui/dash.js:254 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "अनुप्रयोग दिखाएँ"

@@ -911,14 +897,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"

@@ -936,8 +922,7 @@ msgstr "लॉग आउट"
 #: ../js/ui/endSessionDialog.js:63
 msgid "Click Log Out to quit these applications and log out of the system."
 msgstr ""
-"इन अनुप्रयोगों से बाहर निकलने के लिए और तंत्र से लॉग आउट होने के लिए लॉग आउट "
-"पर क्लिक करें."
+"इन अनुप्रयोगों से बाहर निकलने के लिए और तंत्र से लॉग आउट होने के लिए लॉग आउट पर क्लिक करें."

 #: ../js/ui/endSessionDialog.js:65
 #, c-format
@@ -970,8 +955,7 @@ msgstr "बंद करें"
 #: ../js/ui/endSessionDialog.js:82
 msgid "Click Power Off to quit these applications and power off the system."
 msgstr ""
-"इन अनुप्रयोगों से बाहर निकलने या तंत्र की बिजली बंद करने के लिए बंद करें पर "
-"क्लिक करें."
+"इन अनुप्रयोगों से बाहर निकलने या तंत्र की बिजली बंद करने के लिए बंद करें पर क्लिक करें."

 #: ../js/ui/endSessionDialog.js:84
 #, c-format
@@ -1002,8 +986,7 @@ msgstr "फिर आरंभ करें"
 #: ../js/ui/endSessionDialog.js:99
 msgid "Click Restart to quit these applications and restart the system."
 msgstr ""
-"इन अनुप्रयोगों से बाहर निकलने और तंत्र को फिर चालू करने के लिए फिर आरंभ करें "
-"क्लिक करें."
+"इन अनुप्रयोगों से बाहर निकलने और तंत्र को फिर चालू करने के लिए फिर आरंभ करें क्लिक करें."

 #: ../js/ui/endSessionDialog.js:101
 #, c-format
@@ -1025,11 +1008,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 "कुंजीपटल"
@@ -1082,23 +1065,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:1531
 msgid "Message Tray"
 msgstr "संदेश तश्तरी"

-#: ../js/ui/messageTray.js:2511
+#: ../js/ui/messageTray.js:2543
 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 "अज्ञात"
@@ -1154,18 +1137,18 @@ msgstr "कृपया कमांड दर्ज करें:"

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

-#: ../js/ui/screenShield.js:144
+#: ../js/ui/screenShield.js:145
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d नया संदेश"
 msgstr[1] "%d नए संदेश"

-#: ../js/ui/screenShield.js:146
+#: ../js/ui/screenShield.js:147
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@@ -1204,7 +1187,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:171
 msgid "Unlock"
 msgstr "ताला खोलें"

@@ -1322,7 +1305,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 "ध्वनि सेटिंग्स"

@@ -1357,8 +1340,7 @@ msgstr "युक्ति %s इस कंप्यूटर के साथ
 #: ../js/ui/status/bluetooth.js:379
 #, c-format
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
-msgstr ""
-"कृपया पुष्टि करें कि क्या पिन '%06d' युक्ति पर स्थिति किसी के साथ मेल खाता है."
+msgstr "कृपया पुष्टि करें कि क्या पिन '%06d' युक्ति पर स्थिति किसी के साथ मेल खाता है."

 #: ../js/ui/status/bluetooth.js:381
 msgid "Matches"
@@ -1608,7 +1590,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 "आवाज़"

@@ -1616,73 +1598,68 @@ msgstr "आवाज़"
 msgid "Microphone"
 msgstr "माइक्रोफोन"

-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:178
 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 "तंत्र विन्यास"
+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."
 msgstr ""
-"चैट संदेश सहित अधिसूचना अब निष्क्रिय है. आपकी ऑनलाइन स्थिति दूसरे को यह जानने "
-"के लिए "
+"चैट संदेश सहित अधिसूचना अब निष्क्रिय है. आपकी ऑनलाइन स्थिति दूसरे को यह जानने के लिए "
 "समायोजित की जाएगी जिसे आप अपने संदेश में नहीं देख सकते हैं."

 #: ../js/ui/viewSelector.js:85
@@ -1697,7 +1674,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"
@@ -1706,12 +1683,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,23 +1723,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 "लॉगिन स्क्रीन के लिए प्रयुक्त जीडीएम अवस्था"

-#: ../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' लॉन्च करने में विफल"
@@ -1787,6 +1764,9 @@ msgstr "तयशुदा"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "सत्यापन संवाद को उपयोक्ता के द्वारा खारिज़ कर दिया गया"

+#~ msgid "Switch Session"
+#~ msgstr "सत्र बदलें"
+
 #, fuzzy
 #~| msgid "If true, display seconds in time."
 #~ msgid "If true, display onscreen keyboard."
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/kn.po
+++ b/po/kn.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/ml.po
+++ b/po/ml.po
@@ -8,22 +8,21 @@
 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-09-20 16:11+0000\n"
-"PO-Revision-Date: 2012-09-20 22:56+0000\n"
-"Last-Translator: Ani Peter <apeter@redhat.com>\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-31 16:48+0000\n"
+"PO-Revision-Date: 2012-11-26 14:54+0530\n"
+"Last-Translator: Ani Peter <peter.ani@gmail.com>\n"
 "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
 "Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"
 "X-DamnedLies-Scope: partial\n"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
-#| msgid "Screen position"
 msgid "Screenshots"
 msgstr "സ്ക്രീന്‍ഷോട്ടുകള്‍"

@@ -32,12 +31,10 @@ msgid "Record a screencast"
 msgstr "ഒരു സ്ക്രീന്‍കാസ്റ്റ് റിക്കോര്‍ഡ് ചെയ്യുക"

 #: ../data/50-gnome-shell-system.xml.in.h:1
-#| msgid "File System"
 msgid "System"
 msgstr "സിസ്റ്റം"

 #: ../data/50-gnome-shell-system.xml.in.h:2
-#| msgid "Message Tray"
 msgid "Show the message tray"
 msgstr "സന്ദേശത്തിന്റെ ട്രേ കാണിയ്ക്കുക"

@@ -61,7 +58,8 @@ msgstr "ഗ്നോം ഷെല്‍ എക്സ്റ്റെന്‍ഷ
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
-"Alt-F2-ല്‍ ഡവലപ്പര്‍മാര്‍ക്കും ടെസ്റ്റേര്‍സിനും പ്രയോജനകരമായ ആന്തരിക പ്രയോഗങ്ങള്‍ പ്രവര്‍ത്തന "
+"Alt-F2-ല്‍ ഡവലപ്പര്‍മാര്‍ക്കും ടെസ്റ്റേര്‍സിനും പ്രയോജനകരമായ ആന്തരിക "
+"പ്രയോഗങ്ങള്‍ പ്രവര്‍ത്തന "
 "സജ്ജമാക്കുന്നു"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
@@ -69,7 +67,8 @@ msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
 msgstr ""
-"Alt-F2 ഡയലോഗ് ഉപയോഗിച്ചു് ആന്തരിക ഡീബഗ്ഗിലേക്കും നീരീക്ഷണ പ്രയോഗങ്ങളിലേക്കും പ്രവേശനം "
+"Alt-F2 ഡയലോഗ് ഉപയോഗിച്ചു് ആന്തരിക ഡീബഗ്ഗിലേക്കും നീരീക്ഷണ പ്രയോഗങ്ങളിലേക്കും "
+"പ്രവേശനം "
 "അനുവദിയ്ക്കുക."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
@@ -83,14 +82,19 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
-"ഗ്നോം ഷെല്‍ എക്സ്റ്റെന്‍ഷനുകള്‍ക്കു് ഒരു യുയുഐഡി വിശേഷതയുണ്ടു്; ലഭ്യമാക്കേണ്ട എക്സ്റ്റെന്‍ഷനുകള്‍ ഈ കീ പട്ടിക "
-"ലഭ്യമാക്കുന്നു. ലഭ്യമാക്കേണ്ട ഏതു് എക്സ്റ്റെന്‍ഷനും ഈ പട്ടികയിലുണ്ടാവണം. org.gnome.Shell-ല്‍ "
-"നിങ്ങള്‍ക്കു് EnableExtension, DisableExtension എന്നീ ഡീബസ് രീതികളിലൂടെ ഈ പട്ടിക "
+"ഗ്നോം ഷെല്‍ എക്സ്റ്റെന്‍ഷനുകള്‍ക്കു് ഒരു യുയുഐഡി വിശേഷതയുണ്ടു്; ലഭ്യമാക്കേണ്ട "
+"എക്സ്റ്റെന്‍ഷനുകള്‍ ഈ കീ പട്ടിക "
+"ലഭ്യമാക്കുന്നു. ലഭ്യമാക്കേണ്ട ഏതു് എക്സ്റ്റെന്‍ഷനും ഈ പട്ടികയിലുണ്ടാവണം. "
+"org.gnome.Shell-ല്‍ "
+"നിങ്ങള്‍ക്കു് EnableExtension, DisableExtension എന്നീ ഡീബസ് രീതികളിലൂടെ ഈ "
+"പട്ടിക "
 "കൈകാര്യം ചെയ്യുവാനും സാധിയ്ക്കുന്നു."

 #: ../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 ""
@@ -99,9 +103,12 @@ 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
@@ -112,7 +119,8 @@ 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"
@@ -127,7 +135,8 @@ msgid ""
 "Internally used to store the last IM presence explicitly set by the user. "
 "The value here is from the TpConnectionPresenceType enumeration."
 msgstr ""
-"ഉപയോക്താവു് സജ്ജമാക്കിയ അവസാന ഐഎം ആന്തരികമായി സൂക്ഷിയ്ക്കുന്നതിനു് ഉപയോഗിയ്ക്കുന്നു. മൂല്യം "
+"ഉപയോക്താവു് സജ്ജമാക്കിയ അവസാന ഐഎം ആന്തരികമായി സൂക്ഷിയ്ക്കുന്നതിനു് "
+"ഉപയോഗിയ്ക്കുന്നു. മൂല്യം "
 "TpConnectionPresenceType തരത്തിലുള്ളതാകുന്നു."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:12
@@ -135,78 +144,84 @@ 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 എങ്കില്‍, കലണ്ടറില്‍ ഐഎസ്ഒ ആഴ്ച തീയതി കാണിയ്ക്കുക."

-#: ../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 "ബിള്‍ട്ടിന്‍ സ്ക്രീന്‍ റിക്കോര്‍ഡര്‍ തുടങ്ങുവാന്‍/നിര്‍ത്തുന്നതിനുള്ള കീക്കൂട്ടം."
+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."
 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 "സ്ക്രീന്‍കാസ്റ്റ് എന്‍കോഡ് ചെയ്യുന്നതിനുള്ള 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 used for gst-launch. The pipeline should have an unconnected sink "
-#| "pad where the recorded video is recorded. It will normally have a "
-#| "unconnected source pad; output from that pad will be written into the "
-#| "output file. However the pipeline can also take care of its own output - "
-#| "this might be used to send the output to an icecast server via shout2send "
-#| "or similar. When unset or set to an empty value, the default pipeline "
-#| "will be used. This is currently 'vp8enc quality=8 speed=6 threads=%T ! "
-#| "queue ! webmmux' and records to WEBM using the VP8 codec. %T is used as a "
-#| "placeholder for a guess at the optimal thread count on the system."
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
 "used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -219,24 +234,27 @@ 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-നുള്ള സിന്റാക്സ് ഉപയോഗിയ്ക്കുന്നു. കാലിയായി സജ്ജമാക്കുമ്പോള്‍ കാലിയാകുന്നു."
-"ഇതു് നിലവില്‍ 'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 "
-"threads=%T ! queue ! webmmux' ആകുന്നുസ WEBM VP8 കോഡ് ഉപയോഗിച്ചു് റിക്കോര്‍ഡ് "
-"ചെയ്യുന്നു."
+"റിക്കോര്‍ഡിങുകള്‍ എന്‍കോഡ് ചെയ്യുന്നതിനായി GStreamer പൈപ്പ് ലൈന്‍ "
+"ഉപയോഗിയ്ക്കുന്നു. gst-launch-"
+"നുള്ള സിന്റാക്സ് ഉപയോഗിയ്ക്കുന്നു. കാലിയായി സജ്ജമാക്കുമ്പോള്‍ "
+"കാലിയാകുന്നു.ഇതു് നിലവില്‍ 'vp8enc "
+"min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! "
+"queue ! webmmux' ആകുന്നുസ WEBM VP8 കോഡ് ഉപയോഗിച്ചു് റിക്കോര്‍ഡ് ചെയ്യുന്നു."

-#: ../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
@@ -249,13 +267,15 @@ msgstr "എക്സ്റ്റെന്‍ഷന്‍"

 #: ../js/extensionPrefs/main.js:188
 msgid "Select an extension to configure using the combobox above."
-msgstr "മുകളിലുള്ള കോമ്പോ ബോക്സ് ഉപയോഗിച്ചു് ക്രമീകരിയ്ക്കുന്നതിനുള്ളൊരു എക്സ്റ്റെന്‍ഷന്‍ തെര‍ഞ്ഞെടുക്കുക."
+msgstr ""
+"മുകളിലുള്ള കോമ്പോ ബോക്സ് ഉപയോഗിച്ചു് ക്രമീകരിയ്ക്കുന്നതിനുള്ളൊരു "
+"എക്സ്റ്റെന്‍ഷന്‍ തെര‍ഞ്ഞെടുക്കുക."

-#: ../js/gdm/loginDialog.js:526
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "പ്രവര്‍ത്തനവേള"

-#: ../js/gdm/loginDialog.js:674
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "അകത്തുകയറുക"
@@ -263,42 +283,47 @@ 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:741
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "ലഭ്യമല്ലേ?"

-#: ../js/gdm/loginDialog.js:894 ../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:899
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "അകത്തുകയറുക"

-#: ../js/gdm/loginDialog.js:1238
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "പ്രവേശന ജാലകം"

-#: ../js/gdm/powerMenu.js:88 ../js/ui/userMenu.js:658 ../js/ui/userMenu.js:662
-#: ../js/ui/userMenu.js:773
+#. 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: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:660 ../js/ui/userMenu.js:662
-#: ../js/ui/userMenu.js:772
+#: ../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 Required"
 msgid "Authentication error"
 msgstr "തിരിച്ചറിയല്‍ പിശക്"

@@ -345,7 +370,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 "ഇഷ്ടപ്പെട്ടവയില്‍ നിന്നും നീക്കം ചെയ്യുക"

@@ -509,16 +534,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 "പുറന്തള്ളുക"

@@ -578,7 +603,8 @@ msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 msgstr ""
-"വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്ക് '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി രഹസ്യവാക്കുകള്‍ അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
+"വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്ക് '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി രഹസ്യവാക്കുകള്‍ "
+"അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
 "ആവശ്യമുണ്ടു്."

 #: ../js/ui/components/networkAgent.js:314
@@ -675,35 +701,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 ലേക്കുള്ള ക്ഷണം"
@@ -711,42 +737,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 "എടുക്കുക"

@@ -755,137 +781,145 @@ 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-നു് ആവശ്യമുണ്ടു്"
+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
-msgid "Connection has been replaced by a new connection using the same resource"
-msgstr "അതേ ശ്രോതസ്സ് ഉപയോഗിച്ചു് ഒരു പുതിയ കണക്ഷന്‍ ഉപയോഗിച്ചു് ഈ കണക്ഷന്‍ മാറ്റിസ്ഥാപിയ്ക്കുന്നു"
-
 #: ../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: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
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr "സമ്മതപത്രം സുരക്ഷിതമല്ലാത്തൊരു സിഫര്‍ ആല്‍ഗോരിഥം ഉപയോഗിയ്ക്കുന്നു അല്ലെങ്കില്‍ ഉചിതമല്ല"
-
 #: ../js/ui/components/telepathyClient.js:1342
 msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"സമ്മതപത്രം സുരക്ഷിതമല്ലാത്തൊരു സിഫര്‍ ആല്‍ഗോരിഥം ഉപയോഗിയ്ക്കുന്നു "
+"അല്ലെങ്കില്‍ ഉചിതമല്ല"
+
+#: ../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 ""
-"സര്‍വറിന്റെ സമ്മതപത്രത്തിന്റെ വ്യാപ്തി, അല്ലെങ്കില്‍ സര്‍വര്‍ സമ്മതപത്ര ചെയിന്റെ വ്യാപ്തി, എന്നിവ "
+"സര്‍വറിന്റെ സമ്മതപത്രത്തിന്റെ വ്യാപ്തി, അല്ലെങ്കില്‍ സര്‍വര്‍ സമ്മതപത്ര "
+"ചെയിന്റെ വ്യാപ്തി, എന്നിവ "
 "പരിധിയില്‍ കൂടുന്നു"

-#: ../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 "പ്രയോഗങ്ങള്‍ കാണിയ്ക്കുക"

@@ -893,14 +927,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"

@@ -918,7 +952,8 @@ msgstr "പുറത്ത് കടക്കുക"
 #: ../js/ui/endSessionDialog.js:63
 msgid "Click Log Out to quit these applications and log out of the system."
 msgstr ""
-"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പുറത്തു കടക്കുക ക്ലിക്ക് ചെയ്തു് സിസ്റ്റത്തില്‍ നിന്നും "
+"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പുറത്തു കടക്കുക ക്ലിക്ക് "
+"ചെയ്തു് സിസ്റ്റത്തില്‍ നിന്നും "
 "പുറത്തു് കടക്കുക."

 #: ../js/ui/endSessionDialog.js:65
@@ -952,7 +987,8 @@ msgstr "നിര്‍ത്തുക"
 #: ../js/ui/endSessionDialog.js:82
 msgid "Click Power Off to quit these applications and power off the system."
 msgstr ""
-"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പവര്‍ ഓഫ് ചെയ്യുക ക്ലിക്ക് ചെയ്തു സിസ്റ്റിന്റെ പവര്‍ "
+"ഈ പ്രയോഗങ്ങളില്‍ നിന്നും പുറത്തു് കടക്കുന്നതിനായി പവര്‍ ഓഫ് ചെയ്യുക ക്ലിക്ക് "
+"ചെയ്തു സിസ്റ്റിന്റെ പവര്‍ "
 "ഓഫ് ചെയ്യുക."

 #: ../js/ui/endSessionDialog.js:84
@@ -983,7 +1019,8 @@ 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
@@ -1003,13 +1040,15 @@ msgstr "ഇന്‍സ്റ്റോള്‍"
 #: ../js/ui/extensionDownloader.js:204
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
-msgstr "extensions.gnome.org ഇല്‍ നിന്നും '%s' ഡൗണ്‍ലോട് ചെയ്ത് ഇന്‍സ്റ്റോള്‍ ചെയ്യേണമോ?"
+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:194
+#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "കീബോര്‍ഡ്"
@@ -1062,23 +1101,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:2050
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "സന്ദേശത്തിന്റെ ട്രേ"

-#: ../js/ui/messageTray.js:2506
+#: ../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 "അജ്ഞാതം"
@@ -1134,7 +1173,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, %B %d"

@@ -1184,7 +1223,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 "പൂട്ട് തുറക്കുക"

@@ -1302,7 +1341,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 "ശബ്ദത്തിന്റെ ക്രമീകരണങ്ങള്‍"

@@ -1360,11 +1399,11 @@ msgstr "ഉപകരണത്തില്‍ പറഞ്ഞിരിക്ക
 msgid "OK"
 msgstr "ശരി"

-#: ../js/ui/status/keyboard.js:227
+#: ../js/ui/status/keyboard.js:228
 msgid "Show Keyboard Layout"
 msgstr "കീബോര്‍ഡ് വിന്യാസ കാണിയ്ക്കുക"

-#: ../js/ui/status/keyboard.js:232
+#: ../js/ui/status/keyboard.js:233
 msgid "Region and Language Settings"
 msgstr "സ്ഥലവും ഭാഷ സജ്ജീകരണങ്ങളും"

@@ -1587,7 +1626,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 "ഒച്ച"

@@ -1595,73 +1634,71 @@ 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:175
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "ലഭ്യമാണ്"

-#: ../js/ui/userMenu.js:178
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "തിരക്കിലാണ്"

-#: ../js/ui/userMenu.js:181
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "അദൃശ്യം"

-#: ../js/ui/userMenu.js:184
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "വിദൂരെയാണ്"

-#: ../js/ui/userMenu.js:187
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "പ്രവര്‍ത്തനത്തിലല്ല"

-#: ../js/ui/userMenu.js:190
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "ലഭ്യമല്ല"

-#: ../js/ui/userMenu.js:613 ../js/ui/userMenu.js:754
-msgid "Switch User"
-msgstr "ഉപയോക്താവിനെ മാറ്റുക"
-
-#: ../js/ui/userMenu.js:614
-msgid "Switch Session"
-msgstr "സെഷന്‍ മാറ്റുക"
-
-#: ../js/ui/userMenu.js:738
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "അറിയിപ്പുകള്‍"

-#: ../js/ui/userMenu.js:746
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "സിസ്റ്റം ക്രമീകരണങ്ങള്‍"

-#: ../js/ui/userMenu.js:759
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "ഉപയോക്താവിനെ മാറ്റുക"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "പുറത്ത് കടക്കുക"

-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "പൂട്ടുക"

-#: ../js/ui/userMenu.js:779
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "പരിഷ്കരണങ്ങള്‍ ഇന്‍സ്റ്റോള്‍ ചെയ്തു് വീണ്ടും ആരംഭിയ്ക്കുക"

-#: ../js/ui/userMenu.js:797
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "നിങ്ങളുടെ ചാറ്റ് അവസ്ഥ - തിരക്കില്‍"

-#: ../js/ui/userMenu.js:798
+#: ../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"
@@ -1675,7 +1712,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"
@@ -1684,12 +1721,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 "നിങ്ങള്‍ക്കു് ഇഷ്ടമുള്ള ഈസ്റ്റര്‍ മുട്ട"

@@ -1724,23 +1761,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 "പ്രവേശന സ്ക്രീനില്‍ ജിഡിഎം ഉപയോഗിയ്ക്കുന്ന മോഡ്"

-#: ../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' ലഭ്യമാക്കുന്നതില്‍ പരാജയം"
@@ -1765,6 +1802,9 @@ msgstr "സഹജം"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "ഉപയോക്താവു് ആധികാരികത ഉറപ്പാക്കല്‍ ഡയലോഗ് നിര്‍ത്തുന്നു"

+#~ msgid "Switch Session"
+#~ msgstr "സെഷന്‍ മാറ്റുക"
+
 #, fuzzy
 #~ msgid "disabled OpenSearch providers"
 #~ msgstr "OpenSearch വെബ്സൈറ്റ് ചേര്‍ക്കുക"
--- a/po/mr.po
+++ b/po/mr.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.7.x\n"
+"Project-Id-Version: gnome-shell 3.6.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-05 19:06+0100\n"
-"PO-Revision-Date: 2012-11-05 19:10+0100\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"
@@ -34,14 +34,6 @@ msgstr "System"
 msgid "Show the message tray"
 msgstr "Vis meldingstrau"

-#: ../data/50-gnome-shell-system.xml.in.h:3
-msgid "Show all applications"
-msgstr "Vis alle programmer"
-
-#: ../data/50-gnome-shell-system.xml.in.h:4
-msgid "Open the application menu"
-msgstr "Åpne programmenyen"
-
 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
@@ -162,45 +154,34 @@ msgid "Keybinding to open the application menu."
 msgstr "Tastaturbinding som åpner programmenyen."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
-#, fuzzy
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Tastaturbinding som åpner programmenyen"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
-#, fuzzy
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr "Tastaturbinding som åpner programmenyen."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 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:22
+#: ../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:23
+#: ../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:24
+#: ../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:25
+#: ../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:26
+#: ../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:27
+#: ../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:28
+#: ../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."
@@ -208,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:29
+#: ../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:31
+#: ../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 "
@@ -229,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:32
+#: ../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:33
+#: ../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 "
@@ -243,37 +224,6 @@ msgstr ""
 "og bruke denne filendelsen. Den bør endres når du gjør opptak til et nytt "
 "oppbevaringsformat."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
-msgid "Attach modal dialog to the parent window"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
-msgid "Arrangement of buttons on the titlebar"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
-msgid "Workspaces are managed dynamically"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
-msgid "Workspaces only on primary monitor"
-msgstr ""
-
 #: ../js/extensionPrefs/main.js:124
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
@@ -287,11 +237,11 @@ msgstr "Utvidelse"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Velg en utvidelse som skal konfigureres med komboboksen over."

-#: ../js/gdm/loginDialog.js:560
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "Økt …"

-#: ../js/gdm/loginDialog.js:704
+#: ../js/gdm/loginDialog.js:677
 msgctxt "title"
 msgid "Sign In"
 msgstr "Logg inn"
@@ -299,56 +249,56 @@ msgstr "Logg inn"
 #. 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:764
+#: ../js/gdm/loginDialog.js:736
 msgid "Not listed?"
 msgstr "Ikke listet?"

-#: ../js/gdm/loginDialog.js:906 ../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:171
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:167
 msgid "Cancel"
 msgstr "Avbryt"

-#: ../js/gdm/loginDialog.js:911
+#: ../js/gdm/loginDialog.js:894
 msgctxt "button"
 msgid "Sign In"
 msgstr "Logg inn"

-#: ../js/gdm/loginDialog.js:1237
+#: ../js/gdm/loginDialog.js:1215
 msgid "Login Window"
 msgstr "Innloggingsvindu"

 #. Translators: accessible name of the power menu in the login screen
-#: ../js/gdm/powerMenu.js:36
+#: ../js/gdm/powerMenu.js:35
 msgid "Power"
 msgstr "Strøm"

-#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:667 ../js/ui/userMenu.js:671
-#: ../js/ui/userMenu.js:782
+#: ../js/gdm/powerMenu.js:89 ../js/ui/userMenu.js:664 ../js/ui/userMenu.js:668
+#: ../js/ui/userMenu.js:779
 msgid "Suspend"
 msgstr "Hvilemodus"

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

-#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:669
-#: ../js/ui/userMenu.js:671 ../js/ui/userMenu.js:781
+#: ../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"

-#: ../js/gdm/util.js:151
+#: ../js/gdm/util.js:148
 msgid "Authentication error"
 msgstr "Autentiseringsfeil"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:268
+#: ../js/gdm/util.js:265
 msgid "(or swipe finger)"
 msgstr "(eller dra finger)"

-#: ../js/gdm/util.js:293
+#: ../js/gdm/util.js:290
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(f.eks. bruker eller %s)"
@@ -398,7 +348,7 @@ msgstr "Legg til i favoritter"
 msgid "%s has been added to your favorites."
 msgstr "%s ble lagt til i dine favoritter."

-#: ../js/ui/appFavorites.js:121
+#: ../js/ui/appFavorites.js:118
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s ble fjernet fra dine favoritter."
@@ -517,48 +467,48 @@ msgid "S"
 msgstr "Lø"

 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:700
+#: ../js/ui/calendar.js:699
 msgid "Nothing Scheduled"
 msgstr "Ingenting planlagt"

 #. 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 %B %d"

 #. 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 %B %d, %Y"

-#: ../js/ui/calendar.js:729
+#: ../js/ui/calendar.js:728
 msgid "Today"
 msgstr "I dag"

-#: ../js/ui/calendar.js:733
+#: ../js/ui/calendar.js:732
 msgid "Tomorrow"
 msgstr "I morgen"

-#: ../js/ui/calendar.js:744
+#: ../js/ui/calendar.js:743
 msgid "This week"
 msgstr "Denne uken"

-#: ../js/ui/calendar.js:752
+#: ../js/ui/calendar.js:751
 msgid "Next week"
 msgstr "Neste uke"

-#: ../js/ui/components/autorunManager.js:295
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "Avtagbare enheter"

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

-#: ../js/ui/components/autorunManager.js:617
+#: ../js/ui/components/autorunManager.js:620
 msgid "Eject"
 msgstr "Løs ut"

@@ -712,31 +662,27 @@ msgstr "Fjern demping"
 msgid "Mute"
 msgstr "Demp"

-#. Translators: this is a time format string followed by the word "Yesterday". i.e. "14:30 on Yesterday"
-#: ../js/ui/components/telepathyClient.js:945
+#. 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:950
 #, no-c-format
-msgid "<b>%H:%M</b> on Yesterday"
-msgstr "<b>%H.%M</b> i går"
+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 string followed by a week day name. i.e. "14:30 on Monday
-#: ../js/ui/components/telepathyClient.js:951
+#. 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:956
 #, no-c-format
-msgid "<b>%H:%M</b> on <b>%A</b>"
-msgstr "<b>%H.%M</b> på <b>%A</b>"
+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 "14:30 on Wednesday, May 25",
-#. shown when you get a chat message in the same year
-#: ../js/ui/components/telepathyClient.js:957
+#. 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:961
 #, no-c-format
-msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>"
-msgstr "<b>%H.%M</b>, <b>%A</b>, <b>%B</b> <b>%d</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:962
-#, no-c-format
-msgid "<b>%H:%M</b> on <b>%A</b>, <b>%B</b> <b>%d</b>, %Y"
-msgstr "<b>%H.%M</b>, <b>%A</b>, <b>%B</b> <b>%d</b>, %Y"
+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.
@@ -747,7 +693,7 @@ msgstr "%s er nå kjent som %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example.
-#: ../js/ui/components/telepathyClient.js:1089
+#: ../js/ui/components/telepathyClient.js:1090
 #, c-format
 msgid "Invitation to %s"
 msgstr "Invitasjon til %s"
@@ -755,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:1097
+#: ../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:1099
-#: ../js/ui/components/telepathyClient.js:1178
-#: ../js/ui/components/telepathyClient.js:1241
-msgid "Decline"
-msgstr "Avslå"
-
 #: ../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: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:1130
+#: ../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:1133
+#: ../js/ui/components/telepathyClient.js:1134
 #, c-format
 msgid "Call from %s"
 msgstr "Samtale fra %s"

-#: ../js/ui/components/telepathyClient.js:1138
+#: ../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:1140
+#: ../js/ui/components/telepathyClient.js:1141
 msgid "Answer"
 msgstr "Svar"

@@ -799,110 +745,110 @@ msgstr "Svar"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #.
-#: ../js/ui/components/telepathyClient.js:1172
+#: ../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:1207
+#: ../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:1299
+#: ../js/ui/components/telepathyClient.js:1300
 msgid "Network error"
 msgstr "Nettverksfeil"

-#: ../js/ui/components/telepathyClient.js:1301
+#: ../js/ui/components/telepathyClient.js:1302
 msgid "Authentication failed"
 msgstr "Autentisering feilet"

-#: ../js/ui/components/telepathyClient.js:1303
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Encryption error"
 msgstr "Feil ved kryptering"

-#: ../js/ui/components/telepathyClient.js:1305
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"

-#: ../js/ui/components/telepathyClient.js:1307
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikatet"

-#: ../js/ui/components/telepathyClient.js:1309
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate expired"
 msgstr "Sertifikatet er utløpt"

-#: ../js/ui/components/telepathyClient.js:1311
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate not activated"
 msgstr "Sertifikatet er ikke aktivert"

-#: ../js/ui/components/telepathyClient.js:1313
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn for sertifikat"

-#: ../js/ui/components/telepathyClient.js:1315
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate fingerprint mismatch"
 msgstr "Feil fingeravtrykk for sertifikat"

-#: ../js/ui/components/telepathyClient.js:1317
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate self-signed"
 msgstr "Sertifikatet er selvsignert"

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

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

-#: ../js/ui/components/telepathyClient.js:1323
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Certificate is invalid"
 msgstr "Sertifikatet er ugyldig"

-#: ../js/ui/components/telepathyClient.js:1325
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Connection has been refused"
 msgstr "Tilkobling ble nektet"

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

-#: ../js/ui/components/telepathyClient.js:1329
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection has been lost"
 msgstr "Tilkobling tapt"

-#: ../js/ui/components/telepathyClient.js:1331
+#: ../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:1333
+#: ../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:1335
+#: ../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:1337
+#: ../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:1339
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er tilbaketrukket"

-#: ../js/ui/components/telepathyClient.js:1341
+#: ../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:1343
+#: ../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"
@@ -910,26 +856,26 @@ msgstr ""
 "Lengden eller dybden på tjenersertifikatet oversteg grensen som er satt i "
 "kryptografibiblioteket"

-#: ../js/ui/components/telepathyClient.js:1345
+#: ../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:1355
+#: ../js/ui/components/telepathyClient.js:1356
 #, c-format
 msgid "Connection to %s failed"
 msgstr "Tilkobling til %s feilet"

-#: ../js/ui/components/telepathyClient.js:1364
+#: ../js/ui/components/telepathyClient.js:1365
 msgid "Reconnect"
 msgstr "Koble til på nytt"

-#: ../js/ui/components/telepathyClient.js:1365
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Edit account"
 msgstr "Rediger konto"

-#: ../js/ui/components/telepathyClient.js:1410
+#: ../js/ui/components/telepathyClient.js:1411
 msgid "Unknown reason"
 msgstr "Ukjent årsak"

@@ -1053,11 +999,11 @@ msgstr "Installer"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Last ned og installer «%s» fra extensions.gnome.org?"

-#: ../js/ui/keyboard.js:308
+#: ../js/ui/keyboard.js:337
 msgid "tray"
 msgstr "varslingsområde"

-#: ../js/ui/keyboard.js:555 ../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 "Tastatur"
@@ -1110,32 +1056,32 @@ msgstr "Vis kildekode"
 msgid "Web Page"
 msgstr "Nettside"

-#: ../js/ui/messageTray.js:1088
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Åpne"

-#: ../js/ui/messageTray.js:1095
+#: ../js/ui/messageTray.js:1091
 msgid "Remove"
 msgstr "Fjern"

-#: ../js/ui/messageTray.js:1539
+#: ../js/ui/messageTray.js:1543
 msgid "Message Tray"
 msgstr "Meldingstrau"

-#: ../js/ui/messageTray.js:2563
+#: ../js/ui/messageTray.js:2549
 msgid "System Information"
 msgstr "Systeminformasjon"

-#: ../js/ui/notificationDaemon.js:504 ../src/shell-app.c:374
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Ukjent"

-#: ../js/ui/overview.js:89
+#: ../js/ui/overview.js:82
 msgid "Undo"
 msgstr "Angre"

-#: ../js/ui/overview.js:133
+#: ../js/ui/overview.js:127
 msgid "Overview"
 msgstr "Oversikt"

@@ -1143,27 +1089,27 @@ msgstr "Oversikt"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:207
+#: ../js/ui/overview.js:201
 msgid "Type to search..."
 msgstr "Skriv for å søke …"

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

-#: ../js/ui/panel.js:581
+#: ../js/ui/panel.js:567
 msgid "Quit"
 msgstr "Avslutt"

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

-#: ../js/ui/panel.js:980
+#: ../js/ui/panel.js:965
 msgid "Top Bar"
 msgstr "Topp-panel"

@@ -1177,12 +1123,8 @@ msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

 #: ../js/ui/runDialog.js:205
-msgid "Enter a Command"
-msgstr "Oppgi en kommando"
-
-#: ../js/ui/runDialog.js:241
-msgid "Close"
-msgstr "Lukk"
+msgid "Please enter a command:"
+msgstr "Oppgi en kommando:"

 #. Translators: This is a time format for a date in
 #. long format
@@ -1236,7 +1178,7 @@ msgstr "Passord"
 msgid "Remember Password"
 msgstr "Husk passord"

-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:174
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:170
 msgid "Unlock"
 msgstr "Lås opp"

@@ -1291,7 +1233,7 @@ msgstr "Stor tekst"
 #: ../js/ui/status/bluetooth.js:27 ../js/ui/status/bluetooth.js:31
 #: ../js/ui/status/bluetooth.js:251 ../js/ui/status/bluetooth.js:304
 #: ../js/ui/status/bluetooth.js:335 ../js/ui/status/bluetooth.js:371
-#: ../js/ui/status/bluetooth.js:400 ../js/ui/status/network.js:873
+#: ../js/ui/status/bluetooth.js:400 ../js/ui/status/network.js:867
 msgid "Bluetooth"
 msgstr "Bluetooth"

@@ -1320,12 +1262,12 @@ msgstr "maskinvare slått av"
 msgid "Connection"
 msgstr "Tilkobling"

-#: ../js/ui/status/bluetooth.js:207 ../js/ui/status/network.js:475
+#: ../js/ui/status/bluetooth.js:207 ../js/ui/status/network.js:458
 msgid "disconnecting..."
 msgstr "kobler fra …"

-#: ../js/ui/status/bluetooth.js:220 ../js/ui/status/network.js:481
-#: ../js/ui/status/network.js:1507
+#: ../js/ui/status/bluetooth.js:220 ../js/ui/status/network.js:464
+#: ../js/ui/status/network.js:934
 msgid "connecting..."
 msgstr "kobler til …"

@@ -1435,106 +1377,109 @@ msgstr "slått av"

 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu)
-#: ../js/ui/status/network.js:473
+#: ../js/ui/status/network.js:456
 msgid "unmanaged"
 msgstr "ikke håndtert"

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:484 ../js/ui/status/network.js:1510
+#: ../js/ui/status/network.js:467 ../js/ui/status/network.js:937
 msgid "authentication required"
 msgstr "autentisering kreves"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:494
+#: ../js/ui/status/network.js:477
 msgid "firmware missing"
 msgstr "fastvare mangler"

 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:501
+#: ../js/ui/status/network.js:484
 msgid "cable unplugged"
 msgstr "kabel koblet fra"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage
-#: ../js/ui/status/network.js:506
+#: ../js/ui/status/network.js:489
 msgid "unavailable"
 msgstr "ikke tilgjengelig"

-#: ../js/ui/status/network.js:508 ../js/ui/status/network.js:1512
+#: ../js/ui/status/network.js:491 ../js/ui/status/network.js:939
 msgid "connection failed"
 msgstr "tilkobling feilet"

-#: ../js/ui/status/network.js:560 ../js/ui/status/network.js:1446
-#: ../js/ui/status/network.js:1588
+#: ../js/ui/status/network.js:552 ../js/ui/status/network.js:1529
 msgid "More..."
 msgstr "Mer …"

 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
-#: ../js/ui/status/network.js:596 ../js/ui/status/network.js:1376
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1459
 msgid "Connected (private)"
 msgstr "Tilkoblet (privat)"

-#: ../js/ui/status/network.js:669
+#: ../js/ui/status/network.js:663
 msgid "Auto Ethernet"
 msgstr "Automatisk Ethernet"

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

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

 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:859 ../js/ui/status/network.js:1393
+#: ../js/ui/status/network.js:853 ../js/ui/status/network.js:1476
 #, c-format
 msgid "Auto %s"
 msgstr "Automatisk %s"

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

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

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

-#: ../js/ui/status/network.js:1659
+#: ../js/ui/status/network.js:1597
 msgid "Wired"
 msgstr "Kablet"

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

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

-#: ../js/ui/status/network.js:1691
+#: ../js/ui/status/network.js:1628
+msgid "VPN Connections"
+msgstr "VPN-tilkoblinger"
+
+#: ../js/ui/status/network.js:1635
 msgid "Network Settings"
 msgstr "Innstillinger for nettverk"

-#: ../js/ui/status/network.js:1735
+#: ../js/ui/status/network.js:1679
 msgid "Network Manager"
 msgstr "Nettverkshåndtering"

-#: ../js/ui/status/network.js:1809
+#: ../js/ui/status/network.js:1769
 msgid "Connection failed"
 msgstr "Tilkobling feilet"

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

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

@@ -1644,63 +1589,63 @@ msgstr "Volum"
 msgid "Microphone"
 msgstr "Mikrofon"

-#: ../js/ui/unlockDialog.js:181
+#: ../js/ui/unlockDialog.js:177
 msgid "Log in as another user"
 msgstr "Logg inn som en annen bruker"

-#: ../js/ui/userMenu.js:176
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Tilgjengelig"

-#: ../js/ui/userMenu.js:179
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "Opptatt"

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

-#: ../js/ui/userMenu.js:185
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "Borte"

-#: ../js/ui/userMenu.js:188
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "Ledig"

-#: ../js/ui/userMenu.js:191
-msgid "Offline"
-msgstr "Frakoblet"
+#: ../js/ui/userMenu.js:196
+msgid "Unavailable"
+msgstr "Ikke tilgjengelig"

-#: ../js/ui/userMenu.js:747
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Varslinger"

-#: ../js/ui/userMenu.js:755
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Systeminnstillinger"

-#: ../js/ui/userMenu.js:763
+#: ../js/ui/userMenu.js:760
 msgid "Switch User"
 msgstr "Bytt bruker"

-#: ../js/ui/userMenu.js:768
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Logg ut"

-#: ../js/ui/userMenu.js:773
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "Lås"

-#: ../js/ui/userMenu.js:788
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Installer oppdateringer og start på nytt"

-#: ../js/ui/userMenu.js:806
+#: ../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:807
+#: ../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."
@@ -1709,15 +1654,15 @@ msgstr ""
 "tilkoblingsstatus er justert for å la andre vite at du kanskje ikke ser "
 "deres meldinger."

-#: ../js/ui/viewSelector.js:87
+#: ../js/ui/viewSelector.js:85
 msgid "Windows"
 msgstr "Vinduer"

-#: ../js/ui/viewSelector.js:91
+#: ../js/ui/viewSelector.js:89
 msgid "Applications"
 msgstr "Programmer"

-#: ../js/ui/viewSelector.js:95
+#: ../js/ui/viewSelector.js:93
 msgid "Search"
 msgstr "Søk"

--- a/po/nl.po
+++ b/po/nl.po
--- a/po/oc.po
+++ b/po/oc.po
--- 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/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,21 +10,22 @@
 # Gabriel F. Vilar <cogumm@gmail.com>, 2011.
 # Adorilson Bezerra <adorilson@gmail.com>, 2011.
 # Djavan Fagundes <djavan@comum.org>, 2012.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"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 21:57-0200\n"
-"Last-Translator: Djavan Fagundes <djavan@comum.org>\n"
+"POT-Creation-Date: 2013-02-14 07:51+0000\n"
+"PO-Revision-Date: 2013-02-14 18:06-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Poedit 1.5.4\n"
 "X-Project-Style: gnome\n"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
@@ -41,7 +42,7 @@ msgstr "Sistema"

 #: ../data/50-gnome-shell-system.xml.in.h:2
 msgid "Show the message tray"
-msgstr "Exibe a área de notificações"
+msgstr "Mostra a área de notificação"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@@ -146,52 +147,65 @@ msgstr ""
 "definida pelo usuário. O valor aqui é de uma enumeração GsmPresenceStatus."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "Always show the 'Log out' menuitem in the user menu."
+msgstr "Sempre mostrar o item de menu \"Encerrar sessão\" no menu do usuário."
+
+#: ../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 ""
+"Essa chave sobrescreve a ocultação automática do item de menu \"Encerrar "
+"sessão\" quando houver somente um usuário, em situações de somente uma "
+"sessão."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
 msgstr "Mostrar o número da semana no calendário"

-#: ../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, exibe o número da semana no calendário."

-#: ../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 "Associação de tecla para abrir um menu 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 "Associação de tecla para abrir um menu de aplicativo."

-#: ../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 ""
-"Associação de tecla para alternar a visibilidade da bandeja de mensagens"
+"Associação de tecla para alternar a visibilidade da área de notificação"

-#: ../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 ""
-"Associação de tecla para alternar a visibilidade da bandeja de mensagens."
+"Associação de tecla para alternar a visibilidade da área de notificação."

-#: ../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 "Associação de tecla para alternar o gravador de tela"

-#: ../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 "Associação de tecla para iniciar/parar o gravador de tela embutido."

-#: ../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 "Qual teclado usar"

-#: ../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 "O tipo do teclado para usar."

-#: ../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 "Taxa de quadros usada para gravar 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."
@@ -199,11 +213,11 @@ msgstr ""
 "A taxa de quadros do screencast resultante do gravador de screencasts do "
 "GNOME Shell em quadros por segundo."

-#: ../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 "A fila de processamento gstreamer usada para codificar o screencast"

-#: ../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 "
@@ -230,11 +244,11 @@ msgstr ""
 "usado como espaço reservado para um convidado na lista para uma ótima "
 "contagem de threads no 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 "Extensão de arquivo usada para armazenagem do 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 "
@@ -258,11 +272,11 @@ msgid "Select an extension to configure using the combobox above."
 msgstr ""
 "Selecione uma extensão para configurar usando a caixa de seleção abaixo."

-#: ../js/gdm/loginDialog.js:527
+#: ../js/gdm/loginDialog.js:529
 msgid "Session..."
 msgstr "Sessão..."

-#: ../js/gdm/loginDialog.js:675
+#: ../js/gdm/loginDialog.js:680
 msgctxt "title"
 msgid "Sign In"
 msgstr "Iniciar sessão"
@@ -270,34 +284,41 @@ msgstr "Iniciar sessão"
 #. 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:740
 msgid "Not listed?"
 msgstr "Não listado?"

-#: ../js/gdm/loginDialog.js:895 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:898 ../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:168
 msgid "Cancel"
 msgstr "Cancelar"

-#: ../js/gdm/loginDialog.js:900
+#: ../js/gdm/loginDialog.js:903
 msgctxt "button"
 msgid "Sign In"
 msgstr "Entrar"

-#: ../js/gdm/loginDialog.js:1239
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. is not visible here since we only care about phase2 authentication
+#. (and don't even care of which one)
+#: ../js/gdm/loginDialog.js:962 ../js/ui/components/networkAgent.js:260
+#: ../js/ui/components/networkAgent.js:278
+msgid "Username: "
+msgstr "Nome de usuário: "
+
+#: ../js/gdm/loginDialog.js:1269
 msgid "Login Window"
 msgstr "Janela de sessão"

 #. Translators: accessible name of the power menu in the login screen
 #: ../js/gdm/powerMenu.js:35
-#| msgid "Power Off"
 msgid "Power"
 msgstr "Desligar"

-#: ../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 "Suspender"

@@ -305,25 +326,25 @@ msgstr "Suspender"
 msgid "Restart"
 msgstr "Reiniciar"

-#: ../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 "Desligar"

-#: ../js/gdm/util.js:148
+#: ../js/gdm/util.js:152
 msgid "Authentication error"
 msgstr "Erro de autenticação"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:265
+#: ../js/gdm/util.js:269
 msgid "(or swipe finger)"
 msgstr "(ou deslize o dedo)"

-#: ../js/gdm/util.js:290
+#: ../js/gdm/util.js:294
 #, c-format
 msgid "(e.g., user or %s)"
-msgstr "(ex., usuário ou %s)"
+msgstr "(ex.: usuário ou %s)"

 #: ../js/misc/util.js:92
 msgid "Command not found"
@@ -357,7 +378,7 @@ msgstr "CONFIGURAÇÕES"
 msgid "New Window"
 msgstr "Nova janela"

-#: ../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 "Remover dos favoritos"

@@ -497,13 +518,13 @@ msgstr "Nada agendado"
 #: ../js/ui/calendar.js:715
 msgctxt "calendar heading"
 msgid "%A, %B %d"
-msgstr "%A, %B %d"
+msgstr "%A, %d de %B"

 #. Translators: Shown on calendar heading when selected day occurs on different year
 #: ../js/ui/calendar.js:718
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+msgstr "%A, %d de %B, %Y"

 #: ../js/ui/calendar.js:728
 msgid "Today"
@@ -521,16 +542,16 @@ msgstr "Esta semana"
 msgid "Next week"
 msgstr "Próxima semana"

-#: ../js/ui/components/autorunManager.js:278
+#: ../js/ui/components/autorunManager.js:297
 msgid "Removable Devices"
 msgstr "Dispositivos removíveis"

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

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

@@ -560,14 +581,6 @@ msgstr "Senha: "
 msgid "Key: "
 msgstr "Chave: "

-#. TTLS and PEAP are actually much more complicated, but this complication
-#. is not visible here since we only care about phase2 authentication
-#. (and don't even care of which one)
-#: ../js/ui/components/networkAgent.js:260
-#: ../js/ui/components/networkAgent.js:278
-msgid "Username: "
-msgstr "Nome de usuário: "
-
 #: ../js/ui/components/networkAgent.js:266
 msgid "Identity: "
 msgstr "Identidade: "
@@ -678,44 +691,44 @@ msgstr "Erro de conexão"

 #: ../js/ui/components/telepathyClient.js:491
 msgid "Unmute"
-msgstr "Ativar som"
+msgstr "Ativar áudio"

 #: ../js/ui/components/telepathyClient.js:491
 msgid "Mute"
-msgstr "Mudo"
+msgstr "Sem áudio"

 #. 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 <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 "Enviado <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 <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 "%s agora é conhecido como %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 "Convite para %s"
@@ -723,42 +736,42 @@ msgstr "Convite para %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 está convidando você para participar de %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 "Recusar"

-#: ../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 "Aceitar"

 #. 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 "Chamada de vídeo para %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 "Chamada de %s"

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

 #. 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 "Atender"

@@ -767,110 +780,110 @@ msgstr "Atender"
 #. * 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 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 quer permissão para vê-lo quando conectado"

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

-#: ../js/ui/components/telepathyClient.js:1300
+#: ../js/ui/components/telepathyClient.js:1304
 msgid "Authentication failed"
 msgstr "Falha de autenticação"

-#: ../js/ui/components/telepathyClient.js:1302
+#: ../js/ui/components/telepathyClient.js:1306
 msgid "Encryption error"
 msgstr "Erro de criptografia"

-#: ../js/ui/components/telepathyClient.js:1304
+#: ../js/ui/components/telepathyClient.js:1308
 msgid "Certificate not provided"
 msgstr "Certificado não fornecido"

-#: ../js/ui/components/telepathyClient.js:1306
+#: ../js/ui/components/telepathyClient.js:1310
 msgid "Certificate untrusted"
 msgstr "Certificado não confiável"

-#: ../js/ui/components/telepathyClient.js:1308
+#: ../js/ui/components/telepathyClient.js:1312
 msgid "Certificate expired"
 msgstr "Certificado expirado"

-#: ../js/ui/components/telepathyClient.js:1310
+#: ../js/ui/components/telepathyClient.js:1314
 msgid "Certificate not activated"
 msgstr "Certificado não ativado"

-#: ../js/ui/components/telepathyClient.js:1312
+#: ../js/ui/components/telepathyClient.js:1316
 msgid "Certificate hostname mismatch"
 msgstr "Máquina do certificado não confere"

-#: ../js/ui/components/telepathyClient.js:1314
+#: ../js/ui/components/telepathyClient.js:1318
 msgid "Certificate fingerprint mismatch"
 msgstr "Impressão digital do certificado não confere"

-#: ../js/ui/components/telepathyClient.js:1316
+#: ../js/ui/components/telepathyClient.js:1320
 msgid "Certificate self-signed"
 msgstr "Certificado auto-assinado"

-#: ../js/ui/components/telepathyClient.js:1318
+#: ../js/ui/components/telepathyClient.js:1322
 msgid "Status is set to offline"
 msgstr "O status está definido como desconectado."

-#: ../js/ui/components/telepathyClient.js:1320
+#: ../js/ui/components/telepathyClient.js:1324
 msgid "Encryption is not available"
 msgstr "Criptografia não disponível"

-#: ../js/ui/components/telepathyClient.js:1322
+#: ../js/ui/components/telepathyClient.js:1326
 msgid "Certificate is invalid"
 msgstr "O certificado é inválido"

-#: ../js/ui/components/telepathyClient.js:1324
+#: ../js/ui/components/telepathyClient.js:1328
 msgid "Connection has been refused"
 msgstr "A conexão foi recusada"

-#: ../js/ui/components/telepathyClient.js:1326
+#: ../js/ui/components/telepathyClient.js:1330
 msgid "Connection can't be established"
 msgstr "A conexão não pode ser estabelecida"

-#: ../js/ui/components/telepathyClient.js:1328
+#: ../js/ui/components/telepathyClient.js:1332
 msgid "Connection has been lost"
 msgstr "Conexão perdida"

-#: ../js/ui/components/telepathyClient.js:1330
+#: ../js/ui/components/telepathyClient.js:1334
 msgid "This account is already connected to the server"
 msgstr "Esta conta já está conectada ao 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 "A conexão foi substituída por uma nova conexão usando o mesmo recurso"

-#: ../js/ui/components/telepathyClient.js:1334
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "The account already exists on the server"
 msgstr "A conta já existe no servidor"

-#: ../js/ui/components/telepathyClient.js:1336
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Server is currently too busy to handle the connection"
 msgstr "O servidor está atualmente muito ocupado para controlar a conexão"

-#: ../js/ui/components/telepathyClient.js:1338
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revogado"

-#: ../js/ui/components/telepathyClient.js:1340
+#: ../js/ui/components/telepathyClient.js:1344
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado usa um algoritmo de cifragem inseguro ou é criptograficamente "
 "fraco"

-#: ../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"
@@ -878,30 +891,30 @@ msgstr ""
 "O comprimento do certificado do servidor, ou a profundidade da cadeia do "
 "certificado excedeu os limites impostos pela biblioteca de criptografia"

-#: ../js/ui/components/telepathyClient.js:1344
+#: ../js/ui/components/telepathyClient.js:1348
 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:1358
 #, c-format
 msgid "Connection to %s failed"
 msgstr "A conexão a %s falhou"

-#: ../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 conta"

-#: ../js/ui/components/telepathyClient.js:1409
+#: ../js/ui/components/telepathyClient.js:1413
 msgid "Unknown reason"
 msgstr "Razão desconhecida"

-#: ../js/ui/dash.js:245 ../js/ui/dash.js:273
+#: ../js/ui/dash.js:254 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "Mostrar aplicativos"

@@ -909,14 +922,14 @@ msgstr "Mostrar aplicativos"
 msgid "Date and Time Settings"
 msgstr "Configurações de data e hora"

-#: ../js/ui/dateMenu.js:109
+#: ../js/ui/dateMenu.js:111
 msgid "Open Calendar"
 msgstr "Abrir calendário"

 #. 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 de %B de %Y"

@@ -924,7 +937,7 @@ msgstr "%A, %e de %B de %Y"
 #, c-format
 msgctxt "title"
 msgid "Log Out %s"
-msgstr "Encerrar sessão %s"
+msgstr "Encerrar sessão de %s"

 #: ../js/ui/endSessionDialog.js:62
 msgctxt "title"
@@ -1018,11 +1031,11 @@ msgstr "Instalar"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Baixar e instalar \"%s\" de extensions.gnome.org?"

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

-#: ../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 "Teclado"
@@ -1075,23 +1088,23 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Página web"

-#: ../js/ui/messageTray.js:1080
+#: ../js/ui/messageTray.js:1084
 msgid "Open"
 msgstr "Abrir"

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

-#: ../js/ui/messageTray.js:2055
+#: ../js/ui/messageTray.js:1531
 msgid "Message Tray"
 msgstr "Área de notificações"

-#: ../js/ui/messageTray.js:2511
+#: ../js/ui/messageTray.js:2553
 msgid "System Information"
 msgstr "Informações 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 "Desconhecido"
@@ -1102,7 +1115,7 @@ msgstr "Desfazer"

 #: ../js/ui/overview.js:127
 msgid "Overview"
-msgstr "Visão Geral"
+msgstr "Visão geral"

 #. Translators: this is the text displayed
 #. in the search entry when no search is
@@ -1147,18 +1160,18 @@ msgstr "Por favor, digite um comando:"

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

-#: ../js/ui/screenShield.js:144
+#: ../js/ui/screenShield.js:146
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nova mensagem"
 msgstr[1] "%d novas mensagens"

-#: ../js/ui/screenShield.js:146
+#: ../js/ui/screenShield.js:148
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@@ -1197,7 +1210,7 @@ msgstr "Senha"
 msgid "Remember Password"
 msgstr "Lembrar senha"

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

@@ -1239,7 +1252,7 @@ msgstr "Teclas do mouse"

 #: ../js/ui/status/accessibility.js:75
 msgid "Universal Access Settings"
-msgstr "Configurações de acesso universal"
+msgstr "Configurações de acessibilidade"

 #: ../js/ui/status/accessibility.js:109
 msgid "High Contrast"
@@ -1315,7 +1328,7 @@ msgstr "Configurações de teclado"
 msgid "Mouse Settings"
 msgstr "Configurações do mouse"

-#: ../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 "Configurações de som"

@@ -1600,7 +1613,7 @@ msgid "Unknown"
 msgstr "Desconhecido"

 #. 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 "Volume"

@@ -1608,67 +1621,63 @@ msgstr "Volume"
 msgid "Microphone"
 msgstr "Microfone"

-#: ../js/ui/unlockDialog.js:176
+#: ../js/ui/unlockDialog.js:178
 msgid "Log in as another user"
 msgstr "Iniciar sessão como outro usuário"

-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "Disponível"

-#: ../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ível"

-#: ../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 "Inativo"

-#: ../js/ui/userMenu.js:195
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "Indisponível"

-#: ../js/ui/userMenu.js:618 ../js/ui/userMenu.js:759
-msgid "Switch User"
-msgstr "Alternar usuário"
-
-#: ../js/ui/userMenu.js:619
-msgid "Switch Session"
-msgstr "Alternar sessão"
-
-#: ../js/ui/userMenu.js:743
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "Notificações"

-#: ../js/ui/userMenu.js:751
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "Configurações do sistema"

-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "Alternar usuário"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "Encerrar sessão"

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

-#: ../js/ui/userMenu.js:784
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "Instalar atualizações e reiniciar"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "Seu status no bate-papo ficará como ocupado"

-#: ../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."
@@ -1689,7 +1698,7 @@ msgstr "Aplicativos"
 msgid "Search"
 msgstr "Pesquisar"

-#: ../js/ui/wanda.js:119
+#: ../js/ui/wanda.js:117
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@@ -1698,12 +1707,12 @@ msgstr ""
 "Desculpe, sem frases para hoje:\n"
 "%s"

-#: ../js/ui/wanda.js:123
+#: ../js/ui/wanda.js:121
 #, c-format
 msgid "%s the Oracle says"
 msgstr "%s o oráculo diz"

-#: ../js/ui/wanda.js:164
+#: ../js/ui/wanda.js:162
 msgid "Your favorite Easter Egg"
 msgstr "Seu Easter Egg favorito"

@@ -1738,23 +1747,23 @@ msgstr[1] "%u entradas"
 msgid "System Sounds"
 msgstr "Sons do sistema"

-#: ../src/main.c:330
+#: ../src/main.c:332
 msgid "Print version"
 msgstr "Versão de impressão"

-#: ../src/main.c:336
+#: ../src/main.c:338
 msgid "Mode used by GDM for login screen"
 msgstr "Modo usado pelo GDM para a tela de início de sessão"

-#: ../src/main.c:342
+#: ../src/main.c:344
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr "Utilizar um modo específico, ex.: \"gdm\" para a tela de login"

-#: ../src/main.c:348
+#: ../src/main.c:350
 msgid "List possible modes"
 msgstr "Listar modos possíveis"

-#: ../src/shell-app.c:621
+#: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "Erro ao lançar \"%s\""
@@ -1779,6 +1788,9 @@ msgstr "Padrão"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "O diálogo de autenticação foi descartado pelo usuário"

+#~ msgid "Switch Session"
+#~ msgstr "Alternar sessão"
+
 #~ msgid "disabled OpenSearch providers"
 #~ msgstr "Provedores OpenSearch desabilitados"

@@ -1877,13 +1889,3 @@ msgstr "O diálogo de autenticação foi descartado pelo usuário"

 #~ msgid "Home Folder"
 #~ msgstr "Pasta pessoal"
-
-#~| msgid "Network error"
-#~ msgid "Network"
-#~ msgstr "Rede"
-
-#~ msgid "Show password"
-#~ msgstr "Mostrar senha"
-
-#~ msgid "%s has finished starting"
-#~ msgstr "%s terminou sua inicialização"
--- 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
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/ta.po
+++ b/po/ta.po
--- a/po/te.po
+++ b/po/te.po
@@ -2,26 +2,27 @@
 # Copyright (C) 2011, 2012 Swecha telugu translations team <localization@swecha.net>
 # This file is distributed under the same license as the gnome-shell package.
 #
+#
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2011, 2012.
 # Hari Krishna <hari@swecha.net>, 2011.
 # Sasi Bhushan Boddepalli <sasi@swecha.net>, 2012.
 # Praveen Illa <mail2ipn@gmail.com>, 2011, 2012.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell gnome-3-0\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-19 10:13+0000\n"
-"PO-Revision-Date: 2012-09-19 16:21+0530\n"
-"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
-"Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2012-11-28 11:02+0000\n"
+"PO-Revision-Date: 2012-11-28 16:40+0530\n"
+"Last-Translator: Krishnababu Krothapalli <kkrothap@redhat.com>\n"
+"Language-Team: Telugu <Fedora-trans-te@redhat.com>\n"
 "Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.5\n"
+"X-DamnedLies-Scope: partial\n"
+"X-Generator: Lokalize 1.5\n"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
 msgid "Screenshots"
@@ -58,14 +59,16 @@ msgstr "గ్నోమ్ షెల్ పొడిగింతలను స్

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr "అభివృద్ధికారులకు మరియు పరీక్షకులకు ఉపయోగపడే సాధనాలను Alt-F2 నుండి చేతనపరుచు"
+msgstr ""
+"అభివృద్ధికారులకు మరియు పరీక్షకులకు ఉపయోగపడే సాధనాలను Alt-F2 నుండి చేతనపరుచు"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
 msgstr ""
-"Alt-F2 డైలాగుని వాడి అంతర్గత దోషశుద్ది మరియు సాధనాలను పర్యవేక్షించుటకు సౌలభ్యతను అనుమతిస్తుంది."
+"Alt-F2 డైలాగుని వాడి అంతర్గత దోషశుద్ది మరియు సాధనాలను పర్యవేక్షించుటకు "
+"సౌలభ్యతను అనుమతిస్తుంది."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "Uuids of extensions to enable"
@@ -78,8 +81,10 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
-"గ్నోమ్ షెల్ పొడిగింతలు ఒక uuid లక్షణాన్ని కలిగివున్నాయి; ఏ పొడిగింతలు లోడుచేయదగినవి కాదో ఈ కీ జాబితాచేయును. "
-"ఏ పొడిగింత లోడవ్వాలో అది ఈ జాబితా నందు ఉండాలి. అంతేకాకుండా మీరు ఈ జాబితాను పాడిగింతను చేతనపరుచు లేదా "
+"గ్నోమ్ షెల్ పొడిగింతలు ఒక uuid లక్షణాన్ని కలిగివున్నాయి; ఏ పొడిగింతలు "
+"లోడుచేయదగినవి కాదో ఈ కీ జాబితాచేయును. "
+"ఏ పొడిగింత లోడవ్వాలో అది ఈ జాబితా నందు ఉండాలి. అంతేకాకుండా మీరు ఈ జాబితాను "
+"పాడిగింతను చేతనపరుచు లేదా "
 "పొడిగింతను అచేతనపరుచు డిబస్ పద్ధతులలో గ్నోమ్ షెల్ నందు మార్చవచ్చును."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
@@ -93,9 +98,12 @@ 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"
@@ -105,7 +113,8 @@ 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"
@@ -120,7 +129,8 @@ msgid ""
 "Internally used to store the last IM presence explicitly set by the user. "
 "The value here is from the TpConnectionPresenceType enumeration."
 msgstr ""
-"అంతర్గతంగా స్పష్టంగా వినియోగదారుని  ద్వారా సెట్ చివరి IM ఉనికిని నిల్వ చేయడానికి ఉపయోగించారు. ఇక్కడ విలువ "
+"అంతర్గతంగా స్పష్టంగా వినియోగదారుని  ద్వారా సెట్ చివరి IM ఉనికిని నిల్వ "
+"చేయడానికి ఉపయోగించారు. ఇక్కడ విలువ "
 "Tp కనెక్షన్ ఉనికి పద్ధతి వయనము నుండి ఉంది."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:12
@@ -128,66 +138,80 @@ msgid ""
 "Internally used to store the last session presence status for the user. The "
 "value here is from the GsmPresenceStatus enumeration."
 msgstr ""
-"అంతర్గతంగా యూజర్ కోసం చివరి సెషన్ ఉనికిని స్థితి నిల్వ చేయడానికి ఉపయోగించారు. ఇక్కడ విలువ GSM ఉనికి స్థితి "
+"అంతర్గతంగా యూజర్ కోసం చివరి సెషన్ ఉనికిని స్థితి నిల్వ చేయడానికి ఉపయోగించారు. "
+"ఇక్కడ విలువ GSM ఉనికి స్థితి "
 "వయనము నుండి ఉంది."

 #: ../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."
 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 "
@@ -201,28 +225,38 @@ 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 ""
-"రికార్డింగులను ఎన్‌కోడ్ చేయడానికి జిస్ట్రీమర్ పైప్‌లైన్‌ను అమర్చును. ఇది gst-launch కొరకు వ్యాక్యనిర్మాణాన్ని "
-"అనుసరిస్తుంది. వీడియో ఎక్కడైతే రికార్డు అవుతుందో అక్కడ ఒక అనుసంధానం కాని సింక్ ప్యాడ్‌ని కలిగివుండాలి. "
-"ఇది సాధారణంగా ఒక అనుసంధానము కాని మూలము ప్యాడ్ అయివుంటుంది; ఈ ప్యాడ్ నుండి వచ్చు అవుట్‌పుట్ "
-"అవుట్‌పుట్ దస్త్రంలోనికి వ్రాయబడుతుంది. ఏదిఏమైనప్పటికీ పైప్ లైన్ కూడా దాని అవుట్‌పుట్ గురించి భద్రత "
-"వహిస్తుంది - ఇది అవుట్‌పుట్‌ని ఐస్‌కాస్ట్ సేవకానికి shout2send లేదా ఇటువంటి వాటి ద్వారా పంపుటకు "
-"వాడబడుతుంది. అమర్చకపోయినా లేక ఒక ఖాళీ విలువకి అమర్చినా, అప్రమేయ పైప్‌లైన్ వాడబడుతుంది, ఇది ప్రస్తుతం "
+"రికార్డింగులను ఎన్‌కోడ్ చేయడానికి జిస్ట్రీమర్ పైప్‌లైన్‌ను అమర్చును. ఇది "
+"gst-launch కొరకు వ్యాక్యనిర్మాణాన్ని "
+"అనుసరిస్తుంది. వీడియో ఎక్కడైతే రికార్డు అవుతుందో అక్కడ ఒక అనుసంధానం కాని "
+"సింక్ ప్యాడ్‌ని కలిగివుండాలి. "
+"ఇది సాధారణంగా ఒక అనుసంధానము కాని మూలము ప్యాడ్ అయివుంటుంది; ఈ ప్యాడ్ నుండి "
+"వచ్చు అవుట్‌పుట్ "
+"అవుట్‌పుట్ దస్త్రంలోనికి వ్రాయబడుతుంది. ఏదిఏమైనప్పటికీ పైప్ లైన్ కూడా దాని "
+"అవుట్‌పుట్ గురించి భద్రత "
+"వహిస్తుంది - ఇది అవుట్‌పుట్‌ని ఐస్‌కాస్ట్ సేవకానికి shout2send లేదా ఇటువంటి "
+"వాటి ద్వారా పంపుటకు "
+"వాడబడుతుంది. అమర్చకపోయినా లేక ఒక ఖాళీ విలువకి అమర్చినా, అప్రమేయ పైప్‌లైన్ "
+"వాడబడుతుంది, ఇది ప్రస్తుతం "
 "'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 "
-"threads=%T ! queue ! webmmux' మరియు VP8 కొడెక్ వాడి WEBMకి రికార్డుచేస్తుంది. %T అనేది "
-"వ్యవస్థ పై ఒక ప్లేస్‌హోల్డర్ వలె గ్వెస్ కొరకు ఆప్టిమల్ త్రెడ్ కౌంట్ వాడబడుతుంది."
+"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
@@ -237,15 +271,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:653
-msgid "Configuration problem: Could not connect to GDM"
-msgstr "స్వరూపణం సమస్య: జీడిఎంకు అనుసంధానం కాలేకపోతోంది"
-
-#: ../js/gdm/loginDialog.js:679
+#: ../js/gdm/loginDialog.js:680
 msgctxt "title"
 msgid "Sign In"
 msgstr "ప్రవేశించండి"
@@ -253,51 +283,64 @@ 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:746
+#: ../js/gdm/loginDialog.js:740
 msgid "Not listed?"
 msgstr "జాబితా చేయలేదా?"

-#: ../js/gdm/loginDialog.js:899 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:898 ../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:172
+#: ../js/ui/status/bluetooth.js:427 ../js/ui/unlockDialog.js:168
 msgid "Cancel"
 msgstr "రద్దుచేయి"

-#: ../js/gdm/loginDialog.js:904
+#: ../js/gdm/loginDialog.js:903
 msgctxt "button"
 msgid "Sign In"
 msgstr "ప్రవేశించండి"

-#: ../js/gdm/loginDialog.js:1243
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. is not visible here since we only care about phase2 authentication
+#. (and don't even care of which one)
+#: ../js/gdm/loginDialog.js:962 ../js/ui/components/networkAgent.js:260
+#: ../js/ui/components/networkAgent.js:278
+msgid "Username: "
+msgstr "వాడుకరిపేరు: "
+
+#: ../js/gdm/loginDialog.js:1269
 msgid "Login Window"
 msgstr "ప్రవేశ కిటికీ"

-#: ../js/gdm/powerMenu.js:88 ../js/ui/userMenu.js:658 ../js/ui/userMenu.js:662
-#: ../js/ui/userMenu.js:773
+#. 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:660 ../js/ui/userMenu.js:662
-#: ../js/ui/userMenu.js:772
+#: ../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
+#: ../js/gdm/util.js:152
 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:265
+#: ../js/gdm/util.js:269
 msgid "(or swipe finger)"
 msgstr "(లేదా వ్రేలు స్వైప్‌చేయి)"

-#: ../js/gdm/util.js:290
+#: ../js/gdm/util.js:294
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(ఉదా., వాడుకరి లేదా %s)"
@@ -334,7 +377,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 "ఇష్టాంశాల నుండి తొలగించు"

@@ -498,16 +541,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 "బయటకునెట్టు"

@@ -537,14 +580,6 @@ msgstr "సంకేతపదం:"
 msgid "Key: "
 msgstr "కీ: "

-#. TTLS and PEAP are actually much more complicated, but this complication
-#. is not visible here since we only care about phase2 authentication
-#. (and don't even care of which one)
-#: ../js/ui/components/networkAgent.js:260
-#: ../js/ui/components/networkAgent.js:278
-msgid "Username: "
-msgstr "వాడుకరిపేరు: "
-
 #: ../js/ui/components/networkAgent.js:266
 msgid "Identity: "
 msgstr "గుర్తింపు: "
@@ -566,7 +601,9 @@ msgstr "వైర్‌లెస్ నెట్‌వర్క్ చేత ధ
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
-msgstr "వైర్‌లెస్ నెట్‌వర్కు '%s' యాక్సెస్ చేయుటకు సంకేతపదాలు లేదా ఎన్క్రిప్షన్ కీలు అవసరం."
+msgstr ""
+"వైర్‌లెస్ నెట్‌వర్కు '%s' యాక్సెస్ చేయుటకు సంకేతపదాలు లేదా ఎన్క్రిప్షన్ కీలు "
+"అవసరం."

 #: ../js/ui/components/networkAgent.js:314
 msgid "Wired 802.1X authentication"
@@ -662,35 +699,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>%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: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కు ఆహ్వానం"
@@ -698,42 +735,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 "సమాధానం"

@@ -742,140 +779,142 @@ 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"
 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
+#: ../js/ui/dash.js:254 ../js/ui/dash.js:292
 msgid "Show Applications"
 msgstr "అనువర్తనాలను చూపించు"

@@ -883,14 +922,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"

@@ -907,7 +946,9 @@ 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
@@ -939,7 +980,9 @@ 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
@@ -969,7 +1012,9 @@ 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
@@ -991,11 +1036,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:194
+#: ../js/ui/keyboard.js:584 ../js/ui/status/keyboard.js:195
 #: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "కీబోర్డు"
@@ -1048,23 +1093,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:2052
+#: ../js/ui/messageTray.js:1531
 msgid "Message Tray"
 msgstr "సందేశ పళ్ళెం"

-#: ../js/ui/messageTray.js:2508
+#: ../js/ui/messageTray.js:2543
 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 "తెలియదు"
@@ -1120,18 +1165,18 @@ msgstr "దయచేసి ఒక ఆదేశమును ప్రవేశప

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

-#: ../js/ui/screenShield.js:144
+#: ../js/ui/screenShield.js:145
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d కొత్త సందేశం"
 msgstr[1] "%d కొత్త సందేశాలు"

-#: ../js/ui/screenShield.js:146
+#: ../js/ui/screenShield.js:147
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@@ -1170,7 +1215,7 @@ msgstr "సంకేతపదం"
 msgid "Remember Password"
 msgstr "సంకేతపదాన్ని గుర్తుంచుకొను"

-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:175
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:171
 msgid "Unlock"
 msgstr "తాళంతీయి"

@@ -1288,7 +1333,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 "శబ్దపు అమరికలు"

@@ -1323,7 +1368,8 @@ msgstr "%s పరికరము ఈ కంప్యూటరుతో జతక
 #: ../js/ui/status/bluetooth.js:379
 #, c-format
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
-msgstr "పిన్ '%06d' పరికరము మీద ఉన్న దానితో సరిపోలుతుందో లేదో దయచేసి నిర్ధారించండి."
+msgstr ""
+"పిన్ '%06d' పరికరము మీద ఉన్న దానితో సరిపోలుతుందో లేదో దయచేసి నిర్ధారించండి."

 #: ../js/ui/status/bluetooth.js:381
 msgid "Matches"
@@ -1346,11 +1392,11 @@ msgstr "దయచేసి పరికరం పై నిర్దేశిం
 msgid "OK"
 msgstr "సరే"

-#: ../js/ui/status/keyboard.js:227
+#: ../js/ui/status/keyboard.js:228
 msgid "Show Keyboard Layout"
 msgstr "కీబోర్డు నమూనాను చూపించు"

-#: ../js/ui/status/keyboard.js:232
+#: ../js/ui/status/keyboard.js:233
 msgid "Region and Language Settings"
 msgstr "ప్రాంతము మరియు భాష అమర్పులు"

@@ -1573,7 +1619,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 "ధ్వనిస్థాయి"

@@ -1581,71 +1627,63 @@ msgstr "ధ్వనిస్థాయి"
 msgid "Microphone"
 msgstr "మైక్రోఫోను"

-#: ../js/ui/unlockDialog.js:137
-msgid "Could not connect to GDM. Screen locking was automatically disabled."
-msgstr "GDMకు అనుసంధానం సాధ్యం కాలేదు. తెర తాళం స్వయంచాలకంగా అచేతనించబడింది."
-
-#: ../js/ui/unlockDialog.js:182
+#: ../js/ui/unlockDialog.js:178
 msgid "Log in as another user"
 msgstr "వేరొక వాడుకరి వలె ప్రవేశించండి"

-#: ../js/ui/userMenu.js:175
+#: ../js/ui/userMenu.js:181
 msgid "Available"
 msgstr "అందుబాటులోవున్నారు"

-#: ../js/ui/userMenu.js:178
+#: ../js/ui/userMenu.js:184
 msgid "Busy"
 msgstr "తీరికలేదు"

-#: ../js/ui/userMenu.js:181
+#: ../js/ui/userMenu.js:187
 msgid "Invisible"
 msgstr "అదృశ్యం"

-#: ../js/ui/userMenu.js:184
+#: ../js/ui/userMenu.js:190
 msgid "Away"
 msgstr "దూరంగా ఉన్నారు"

-#: ../js/ui/userMenu.js:187
+#: ../js/ui/userMenu.js:193
 msgid "Idle"
 msgstr "వాడుకలేదు"

-#: ../js/ui/userMenu.js:190
+#: ../js/ui/userMenu.js:196
 msgid "Unavailable"
 msgstr "అందుబాటులోలేరు"

-#: ../js/ui/userMenu.js:613 ../js/ui/userMenu.js:754
-msgid "Switch User"
-msgstr "వాడుకరిని మార్చు"
-
-#: ../js/ui/userMenu.js:614
-msgid "Switch Session"
-msgstr "చర్యాకాలాన్ని మార్చు"
-
-#: ../js/ui/userMenu.js:738
+#: ../js/ui/userMenu.js:744
 msgid "Notifications"
 msgstr "ప్రకటనలు"

-#: ../js/ui/userMenu.js:746
+#: ../js/ui/userMenu.js:752
 msgid "System Settings"
 msgstr "వ్యవస్థ అమరికలు"

-#: ../js/ui/userMenu.js:759
+#: ../js/ui/userMenu.js:760
+msgid "Switch User"
+msgstr "వాడుకరిని మార్చు"
+
+#: ../js/ui/userMenu.js:765
 msgid "Log Out"
 msgstr "నిష్క్రమించు"

-#: ../js/ui/userMenu.js:764
+#: ../js/ui/userMenu.js:770
 msgid "Lock"
 msgstr "తాళంవేయి"

-#: ../js/ui/userMenu.js:779
+#: ../js/ui/userMenu.js:785
 msgid "Install Updates & Restart"
 msgstr "నవీకరణలను స్థాపించి, పునఃప్రారంభించు"

-#: ../js/ui/userMenu.js:797
+#: ../js/ui/userMenu.js:803
 msgid "Your chat status will be set to busy"
 msgstr "మీ చాట్ స్థితి రద్దీగా ఉన్నారని అమర్చును"

-#: ../js/ui/userMenu.js:798
+#: ../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."
@@ -1665,7 +1703,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"
@@ -1674,12 +1712,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 "మీ ప్రియమైన ఈస్టర్ గుడ్డు"

@@ -1714,23 +1752,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' ప్రారంభించుటలో విఫలమైంది"
@@ -1755,6 +1793,15 @@ msgstr "అప్రమేయం"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "ప్రమాణీకరణ డైలాగు వాడుకరిచే రద్దుచేయబడింది"

+#~ msgid "Configuration problem: Could not connect to GDM"
+#~ msgstr "స్వరూపణం సమస్య: జీడిఎంకు అనుసంధానం కాలేకపోతోంది"
+
+#~ msgid "Could not connect to GDM. Screen locking was automatically disabled."
+#~ msgstr "GDMకు అనుసంధానం సాధ్యం కాలేదు. తెర తాళం స్వయంచాలకంగా అచేతనించబడింది."
+
+#~ msgid "Switch Session"
+#~ msgstr "చర్యాకాలాన్ని మార్చు"
+
 #~ msgid "disabled OpenSearch providers"
 #~ msgstr "బహిరంగఅన్వేషణ సమకూర్పకాలను అచేతపరుచు"

--- a/po/tr.po
+++ b/po/tr.po
--- a/po/ug.po
+++ b/po/ug.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -113,12 +113,14 @@ 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		\
 	shell-network-agent.h		\
 	shell-perf-log.h		\
 	shell-screenshot.h		\
+	shell-screen-grabber.h		\
 	shell-slicer.h			\
 	shell-stack.h			\
 	shell-tp-client.h		\
@@ -156,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		\
@@ -166,6 +169,7 @@ libgnome_shell_la_SOURCES =		\
 	shell-polkit-authentication-agent.h	\
 	shell-polkit-authentication-agent.c	\
 	shell-screenshot.c		\
+	shell-screen-grabber.c		\
 	shell-secure-text-buffer.c	\
 	shell-secure-text-buffer.h	\
 	shell-slicer.c			\
@@ -230,6 +234,8 @@ test_recorder_LDADD = $(TEST_SHELL_RECORDER_LIBS)

 test_recorder_SOURCES =     \
 	$(shell_recorder_sources) $(shell_recorder_private_sources) \
+	shell-screen-grabber.c	\
+	shell-screen-grabber.h	\
 	test-recorder.c
 endif BUILD_RECORDER

--- a/src/calendar-server/gnome-shell-calendar-server.c
+++ b/src/calendar-server/gnome-shell-calendar-server.c
@@ -1035,6 +1035,8 @@ main (int    argc,
  name_owner_id = 0;
  stdin_channel = NULL;

+  g_type_init ();
+
  introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
  g_assert (introspection_data != NULL);

--- a/src/gnome-shell-perf-tool.in
+++ b/src/gnome-shell-perf-tool.in
@@ -28,7 +28,7 @@ def show_version(option, opt_str, value, parser):
 def wait_for_dbus_name(wait_name):
    loop = GLib.MainLoop()

-    def on_name_appeared(connection, name, new_owner, *args):
+    def on_name_appeared(connection, name, name_owner, *args):
        if not (name == wait_name and new_owner != ''):
            return
        loop.quit()
@@ -60,18 +60,13 @@ def start_perf_helper():
    wait_for_dbus_name (PERF_HELPER_NAME)

 def stop_perf_helper():
-    bus = Gio.bus_get_sync(Gio.BusType.SESSION, None)
-
-    proxy = Gio.DBusProxy.new_sync(bus,
-                                   Gio.DBusProxyFlags.NONE,
-                                   None,
-                                   PERF_HELPER_NAME,
-                                   PERF_HELPER_PATH,
-                                   PERF_HELPER_IFACE,
-                                   None)
+    proxy = Gio.DBusProxy(g_bus_type=Gio.BusType.SESSION,
+                          g_name=PERF_HELPER_NAME,
+                          g_interface=PERF_HELPER_IFACE,
+                          g_object_path=PERF_HELPER_PATH)
    proxy.Exit()

-def start_shell(perf_output=None):
+def start_shell(extra_args, perf_output=None):
    # Set up environment
    env = dict(os.environ)
    env['SHELL_PERF_MODULE'] = options.perf
@@ -81,21 +76,19 @@ def start_shell(perf_output=None):
        env['SHELL_PERF_OUTPUT'] = perf_output

    self_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
-    args = []
    args.append(os.path.join(self_dir, 'gnome-shell'))
-
-    if options.replace:
-        args.append('--replace')
+    # pass on any additional arguments
+    args += extra_args

    return subprocess.Popen(args, env=env)

-def run_shell(perf_output=None):
+def run_shell(args, perf_output=None):
    # we do no additional supervision of gnome-shell,
    # beyond that of wait
    # in particular, we don't kill the shell upon
    # receving a KeyboardInterrupt, as we expect to be
    # in the same process group
-    shell = start_shell(perf_output=perf_output)
+    shell = start_shell(extra_args, perf_output=perf_output)
    shell.wait()
    return shell.returncode == 0

@@ -180,7 +173,7 @@ def upload_performance_report(report_text):
        print "Performance report upload failed with status %d" % response.status
        print response.read()

-def run_performance_test():
+def run_performance_test(args):
    iters = options.perf_iters
    if options.perf_warmup:
        iters += 1
@@ -199,7 +192,7 @@ def run_performance_test():
        # Run the performance test and collect the output as JSON
        normal_exit = False
        try:
-            normal_exit = run_shell(perf_output=output_file)
+            normal_exit = run_shell(args, perf_output=output_file)
        except:
            stop_perf_helper()
            raise
@@ -295,8 +288,7 @@ def run_performance_test():

 parser = optparse.OptionParser()
 parser.add_option("", "--perf", metavar="PERF_MODULE",
-		  help="Specify the name of a performance module to run",
-                  default="core")
+		  help="Specify the name of a performance module to run")
 parser.add_option("", "--perf-iters", type="int", metavar="ITERS",
 		  help="Numbers of iterations of performance module to run",
                  default=1)
@@ -309,16 +301,9 @@ parser.add_option("", "--perf-upload", action="store_true",
 parser.add_option("", "--version", action="callback", callback=show_version,
                  help="Display version and exit")

-parser.add_option("-r", "--replace", action="store_true",
-                  help="Replace the running window manager")
-
 options, args = parser.parse_args()

-if args:
-    parser.print_usage()
-    sys.exit(1)
-
-normal_exit = run_performance_test()
+normal_exit = run_performance_test(args)
 if normal_exit:
    sys.exit(0)
 else:
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -72,9 +72,6 @@ static void gnome_shell_plugin_kill_switch_workspace (MetaPlugin      *plugin);

 static gboolean              gnome_shell_plugin_xevent_filter (MetaPlugin *plugin,
                                                               XEvent     *event);
-
-static gboolean              gnome_shell_plugin_keybinding_filter (MetaPlugin *plugin,
-                                                                   MetaKeyBinding *binding);
 static const MetaPluginInfo *gnome_shell_plugin_plugin_info   (MetaPlugin *plugin);


@@ -129,9 +126,8 @@ gnome_shell_plugin_class_init (GnomeShellPluginClass *klass)
  plugin_class->kill_window_effects   = gnome_shell_plugin_kill_window_effects;
  plugin_class->kill_switch_workspace = gnome_shell_plugin_kill_switch_workspace;

-  plugin_class->xevent_filter     = gnome_shell_plugin_xevent_filter;
-  plugin_class->keybinding_filter = gnome_shell_plugin_keybinding_filter;
-  plugin_class->plugin_info       = gnome_shell_plugin_plugin_info;
+  plugin_class->xevent_filter    = gnome_shell_plugin_xevent_filter;
+  plugin_class->plugin_info      = gnome_shell_plugin_plugin_info;
 }

 static void
@@ -341,13 +337,6 @@ gnome_shell_plugin_xevent_filter (MetaPlugin *plugin,
  return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
 }

-static gboolean
-gnome_shell_plugin_keybinding_filter (MetaPlugin     *plugin,
-                                      MetaKeyBinding *binding)
-{
-  return _shell_wm_filter_keybinding (get_shell_wm (), binding);
-}
-
 static const
 MetaPluginInfo *gnome_shell_plugin_plugin_info (MetaPlugin *plugin)
 {
--- 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
@@ -38,7 +38,7 @@ extern GType gnome_shell_plugin_get_type (void);
 #define OVERRIDES_SCHEMA "org.gnome.shell.overrides"

 #define WM_NAME "GNOME Shell"
-#define GNOME_WM_KEYBINDINGS "Mutter,GNOME Shell"
+#define GNOME_WM_KEYBINDINGS "Metacity,Mutter,GNOME Shell"

 static gboolean is_gdm_mode = FALSE;
 static char *session_mode = NULL;
@@ -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-mobile-providers.c
+++ b/src/shell-mobile-providers.c
@@ -37,11 +37,10 @@

 #define ISO_3166_COUNTRY_CODES DATADIR "/zoneinfo/iso3166.tab"

-static ShellCountryMobileProvider *country_mobile_provider_new (const char *country_code,
-                                                                const gchar *country_name);
+

 static GHashTable *
-read_country_codes (const gchar *country_codes)
+read_country_codes (void)
 {
    GHashTable *table;
    GIOChannel *channel;
@@ -49,21 +48,18 @@ read_country_codes (const gchar *country_codes)
    GError *error = NULL;
    GIOStatus status;

-    channel = g_io_channel_new_file (country_codes, "r", &error);
+    channel = g_io_channel_new_file (ISO_3166_COUNTRY_CODES, "r", &error);
    if (!channel) {
        if (error) {
-            g_warning ("Could not read %s: %s", country_codes, error->message);
+            g_warning ("Could not read " ISO_3166_COUNTRY_CODES ": %s", error->message);
            g_error_free (error);
        } else
-            g_warning ("Could not read %s: Unknown error", country_codes);
+            g_warning ("Could not read " ISO_3166_COUNTRY_CODES ": Unknown error");

        return NULL;
    }

-    table = g_hash_table_new_full (g_str_hash,
-                                   g_str_equal,
-                                   g_free,
-                                   (GDestroyNotify)shell_country_mobile_provider_unref);
+    table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
    buffer = g_string_sized_new (32);

    status = G_IO_STATUS_NORMAL;
@@ -73,7 +69,6 @@ read_country_codes (const gchar *country_codes)
        switch (status) {
        case G_IO_STATUS_NORMAL:
            if (buffer->str[0] != '#') {
-                ShellCountryMobileProvider *country_provider;
                char **pieces;

                pieces = g_strsplit (buffer->str, "\t", 2);
@@ -85,8 +80,7 @@ read_country_codes (const gchar *country_codes)
                    pieces[1] = g_strdup (_("United Kingdom"));
                }

-                country_provider = country_mobile_provider_new (pieces[0], pieces[1]);
-                g_hash_table_insert (table, pieces[0], country_provider);
+                g_hash_table_insert (table, pieces[0], pieces[1]);
                g_free (pieces);
            }

@@ -123,6 +117,7 @@ typedef enum {
 } MobileContextState;

 typedef struct {
+    GHashTable *country_codes;
    GHashTable *table;

    char *current_country;
@@ -281,86 +276,6 @@ shell_mobile_provider_get_type (void)
    return type;
 }

-static ShellCountryMobileProvider *
-country_mobile_provider_new (const char *country_code,
-                             const gchar *country_name)
-{
-    ShellCountryMobileProvider *country_provider;
-
-    country_provider = g_slice_new0 (ShellCountryMobileProvider);
-    country_provider->refs = 1;
-    country_provider->country_code = g_strdup (country_code);
-    country_provider->country_name = g_strdup (country_name);
-    return country_provider;
-}
-
-ShellCountryMobileProvider *
-shell_country_mobile_provider_ref (ShellCountryMobileProvider *country_provider)
-{
-    country_provider->refs++;
-
-    return country_provider;
-}
-
-void
-shell_country_mobile_provider_unref (ShellCountryMobileProvider *country_provider)
-{
-    if (--country_provider->refs == 0) {
-        g_free (country_provider->country_code);
-        g_free (country_provider->country_name);
-        g_slist_free_full (country_provider->providers,
-                           (GDestroyNotify) shell_mobile_provider_unref);
-        g_slice_free (ShellCountryMobileProvider, country_provider);
-    }
-}
-
-/**
- * shell_country_mobile_provider_get_country_code:
- *
- * Returns: (transfer none): the code of the country.
- */
-const gchar *
-shell_country_mobile_provider_get_country_code (ShellCountryMobileProvider *country_provider)
-{
-    return country_provider->country_code;
-}
-
-/**
- * shell_country_mobile_provider_get_country_name:
- *
- * Returns: (transfer none): the name of the country.
- */
-const gchar *
-shell_country_mobile_provider_get_country_name (ShellCountryMobileProvider *country_provider)
-{
-    return country_provider->country_name;
-}
-
-/**
- * shell_country_mobile_provider_get_providers:
- *
- * Returns: (element-type Shell.MobileProvider) (transfer none): the
- *   list of #ShellMobileProvider this country exposes.
- */
-GSList *
-shell_country_mobile_provider_get_providers (ShellCountryMobileProvider *country_provider)
-{
-    return country_provider->providers;
-}
-
-GType
-shell_country_mobile_provider_get_type (void)
-{
-    static GType type = 0;
-
-    if (G_UNLIKELY (type == 0)) {
-        type = g_boxed_type_register_static ("ShellCountryMobileProvider",
-                                             (GBoxedCopyFunc) shell_country_mobile_provider_ref,
-                                             (GBoxedFreeFunc) shell_country_mobile_provider_unref);
-    }
-    return type;
-}
-
 static void
 provider_list_free (gpointer data)
 {
@@ -395,17 +310,15 @@ parser_toplevel_start (MobileParser *parser,
        for (i = 0; attribute_names && attribute_names[i]; i++) {
            if (!strcmp (attribute_names[i], "code")) {
                char *country_code;
-                ShellCountryMobileProvider *country_provider;
+                char *country;

                country_code = g_ascii_strup (attribute_values[i], -1);
-                country_provider = g_hash_table_lookup (parser->table, country_code);
-                /* Ensure we have a country provider for this country code */
-                if (!country_provider) {
-                    g_warning ("%s: adding providers for unknown country '%s'", __func__, country_code);
-                    country_provider = country_mobile_provider_new (country_code, NULL);
-                    g_hash_table_insert (parser->table, country_code, country_provider);
-                }
-                parser->current_country = country_code;
+                country = g_hash_table_lookup (parser->country_codes, country_code);
+                if (country) {
+                    parser->current_country = g_strdup (country);
+                    g_free (country_code);
+                } else
+                    parser->current_country = country_code;

                parser->state = PARSER_COUNTRY;
                break;
@@ -542,13 +455,7 @@ parser_country_end (MobileParser *parser,
                    const char *name)
 {
    if (!strcmp (name, "country")) {
-        ShellCountryMobileProvider *country_provider;
-
-        country_provider = g_hash_table_lookup (parser->table, parser->current_country);
-        if (country_provider)
-            /* Store providers for this country */
-            country_provider->providers = parser->current_providers;
-
+        g_hash_table_insert (parser->table, parser->current_country, parser->current_providers);
        parser->current_country = NULL;
        parser->current_providers = NULL;
        parser->text_buffer = NULL;
@@ -709,16 +616,15 @@ static const GMarkupParser mobile_parser = {

 /**
 * shell_mobile_providers_parse:
- * @country_codes: (allow-none) File with the list of country codes.
- * @service_providers: (allow-none) File with the list of service providers.
+ * @out_ccs: (out) (allow-none): (element-type utf8 utf8): a #GHashTable containing
+ *   country codes
 *
- * Returns: (element-type utf8 Shell.CountryMobileProvider) (transfer full): a
- *   hash table where keys are country names #gchar and values are #ShellCountryMobileProvider.
- *   Everything is destroyed with g_hash_table_destroy().
- */
+ * Returns: (element-type utf8 GList) (transfer container): a
+ *   hash table where keys are country names #gchar, values are a #GSList
+ *   of #ShellMobileProvider. Everything is destroyed with g_hash_table_destroy().
+*/
 GHashTable *
-shell_mobile_providers_parse (const gchar *country_codes,
-                              const gchar *service_providers)
+shell_mobile_providers_parse (GHashTable **out_ccs)
 {
    GMarkupParseContext *ctx;
    GIOChannel *channel;
@@ -728,29 +634,24 @@ shell_mobile_providers_parse (const gchar *country_codes,
    GIOStatus status;
    gsize len = 0;

-    /* Use default paths if none given */
-    if (!country_codes)
-        country_codes = ISO_3166_COUNTRY_CODES;
-    if (!service_providers)
-        service_providers = MOBILE_BROADBAND_PROVIDER_INFO;
-
    memset (&parser, 0, sizeof (MobileParser));

-    parser.table = read_country_codes (country_codes);
-    if (!parser.table)
+    parser.country_codes = read_country_codes ();
+    if (!parser.country_codes)
        goto out;

-    channel = g_io_channel_new_file (service_providers, "r", &error);
+    channel = g_io_channel_new_file (MOBILE_BROADBAND_PROVIDER_INFO, "r", &error);
    if (!channel) {
        if (error) {
-            g_warning ("Could not read %s: %s", service_providers, error->message);
+            g_warning ("Could not read " MOBILE_BROADBAND_PROVIDER_INFO ": %s", error->message);
            g_error_free (error);
        } else
-            g_warning ("Could not read %s: Unknown error", service_providers);
+            g_warning ("Could not read " MOBILE_BROADBAND_PROVIDER_INFO ": Unknown error");

        goto out;
    }

+    parser.table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, provider_list_free);
    parser.state = PARSER_TOPLEVEL;

    ctx = g_markup_parse_context_new (&mobile_parser, 0, &parser, NULL);
@@ -795,7 +696,13 @@ shell_mobile_providers_parse (const gchar *country_codes,
    g_free (parser.current_country);
    g_free (parser.text_buffer);

-out:
+ out:
+    if (parser.country_codes) {
+        if (out_ccs)
+            *out_ccs = parser.country_codes;
+        else
+            g_hash_table_destroy (parser.country_codes);
+    }

    return parser.table;
 }
@@ -837,17 +744,12 @@ dump_gsm (ShellMobileAccessMethod *method)
 static void
 dump_country (gpointer key, gpointer value, gpointer user_data)
 {
-    GSList *miter, *citer;
-    ShellCountryMobileProvider *country_provider = value;
+    GSList *citer, *miter;

-    g_print ("Country: %s (%s)\n",
-             country_provider->country_code,
-             country_provider->country_name);
-
-    for (citer = country_provider->providers; citer; citer = g_slist_next (citer)) {
+    for (citer = value; citer; citer = g_slist_next (citer)) {
        ShellMobileProvider *provider = citer->data;

-        g_print ("    Provider: %s (%s)\n", provider->name, (const char *) key);
+        g_print ("Provider: %s (%s)\n", provider->name, (const char *) key);
        for (miter = provider->methods; miter; miter = g_slist_next (miter)) {
            ShellMobileAccessMethod *method = miter->data;
            GSList *liter;
@@ -877,10 +779,10 @@ dump_country (gpointer key, gpointer value, gpointer user_data)
 }

 void
-shell_mobile_providers_dump (GHashTable *country_providers)
+shell_mobile_providers_dump (GHashTable *providers)
 {
-    g_return_if_fail (country_providers != NULL);
-    g_hash_table_foreach (country_providers, dump_country, NULL);
+    g_return_if_fail (providers != NULL);
+    g_hash_table_foreach (providers, dump_country, NULL);
 }

 /* All the following don't exist in nm-applet, because C doesn't need
--- a/src/shell-mobile-providers.h
+++ b/src/shell-mobile-providers.h
@@ -76,19 +76,10 @@ typedef struct {
    gint refs;
 } ShellMobileProvider;

-typedef struct {
-    char *country_code;
-    char *country_name;
-    GSList *providers;
-
-    gint refs;
-} ShellCountryMobileProvider;
-

 GType shell_gsm_mcc_mnc_get_type (void); /* added in porting */
-GType shell_mobile_access_method_get_type (void);
 GType shell_mobile_provider_get_type (void);
-GType shell_country_mobile_provider_get_type (void);
+GType shell_mobile_access_method_get_type (void);

 ShellMobileProvider *shell_mobile_provider_ref   (ShellMobileProvider *provider);
 void                 shell_mobile_provider_unref (ShellMobileProvider *provider);
@@ -98,14 +89,8 @@ GSList *             shell_mobile_provider_get_cdma_sid (ShellMobileProvider *pr
 ShellMobileAccessMethod *shell_mobile_access_method_ref   (ShellMobileAccessMethod *method);
 void                     shell_mobile_access_method_unref (ShellMobileAccessMethod *method);

-ShellCountryMobileProvider *shell_country_mobile_provider_ref              (ShellCountryMobileProvider *country_provider);
-void                        shell_country_mobile_provider_unref            (ShellCountryMobileProvider *country_provider);
-const gchar                *shell_country_mobile_provider_get_country_code (ShellCountryMobileProvider *country_provider);
-const gchar                *shell_country_mobile_provider_get_country_name (ShellCountryMobileProvider *country_provider);
-GSList                     *shell_country_mobile_provider_get_providers    (ShellCountryMobileProvider *country_provider);
+GHashTable *shell_mobile_providers_parse (GHashTable **out_ccs);

-GHashTable *shell_mobile_providers_parse (const gchar *country_codes,
-                                          const gchar *service_providers);
-void        shell_mobile_providers_dump  (GHashTable *country_providers);
+void shell_mobile_providers_dump (GHashTable *providers);

 #endif /* SHELL_MOBILE_PROVIDERS_H */
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@@ -11,11 +11,9 @@
 #define GST_USE_UNSTABLE_API
 #include <gst/gst.h>

-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-
 #include "shell-recorder-src.h"
 #include "shell-recorder.h"
+#include "shell-screen-grabber.h"

 #include <clutter/x11/clutter-x11.h>
 #include <X11/extensions/Xfixes.h>
@@ -48,7 +46,7 @@ struct _ShellRecorder {
  int stage_width;
  int stage_height;

-  GdkScreen *gdk_screen;
+  ShellScreenGrabber *grabber;

  gboolean have_pointer;
  int pointer_x;
@@ -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);
@@ -259,11 +256,11 @@ shell_recorder_init (ShellRecorder *recorder)

  shell_recorder_src_register ();

-  recorder->gdk_screen = gdk_screen_get_default ();
-
  recorder->recording_icon = create_recording_icon ();
  recorder->memory_target = get_memory_target();

+  recorder->grabber = shell_screen_grabber_new ();
+
  recorder->state = RECORDER_STATE_CLOSED;
  recorder->framerate = DEFAULT_FRAMES_PER_SECOND;
 }
@@ -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,9 @@ 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);

  cogl_handle_unref (recorder->recording_icon);

@@ -460,12 +471,6 @@ static void
 recorder_draw_buffer_meter (ShellRecorder *recorder)
 {
  int fill_level;
-  GdkRectangle primary_monitor;
-  float rects[16];
-
-  gdk_screen_get_monitor_geometry (recorder->gdk_screen,
-                                   gdk_screen_get_primary_monitor (recorder->gdk_screen),
-                                   &primary_monitor);

  recorder_update_memory_used (recorder, FALSE);

@@ -480,27 +485,14 @@ recorder_draw_buffer_meter (ShellRecorder *recorder)
  fill_level = MIN (60, (recorder->memory_used * 60) / recorder->memory_target);

  /* A hollow rectangle filled from the left to fill_level */
-  rects[0] = primary_monitor.x + primary_monitor.width - 64;
-  rects[1] = primary_monitor.y + primary_monitor.height - 10;
-  rects[2] = primary_monitor.x + primary_monitor.width - 2;
-  rects[3] = primary_monitor.y + primary_monitor.height - 9;
-
-  rects[4] = primary_monitor.x + primary_monitor.width - 64;
-  rects[5] = primary_monitor.y + primary_monitor.height - 9;
-  rects[6] = primary_monitor.x + primary_monitor.width - (63 - fill_level);
-  rects[7] = primary_monitor.y + primary_monitor.height - 3;
-
-  rects[8] = primary_monitor.x + primary_monitor.width - 3;
-  rects[9] = primary_monitor.y + primary_monitor.height - 9;
-  rects[10] = primary_monitor.x + primary_monitor.width - 2;
-  rects[11] = primary_monitor.y + primary_monitor.height - 3;
-
-  rects[12] = primary_monitor.x + primary_monitor.width - 64;
-  rects[13] = primary_monitor.y + primary_monitor.height - 3;
-  rects[14] = primary_monitor.x + primary_monitor.width - 2;
-  rects[15] = primary_monitor.y + primary_monitor.height - 2;
-
-  cogl_rectangles (rects, 4);
+  cogl_rectangle (recorder->stage_width - 64, recorder->stage_height - 10,
+                  recorder->stage_width - 2,  recorder->stage_height - 9);
+  cogl_rectangle (recorder->stage_width - 64, recorder->stage_height - 9,
+                  recorder->stage_width - (63 - fill_level), recorder->stage_height - 3);
+  cogl_rectangle (recorder->stage_width - 3,  recorder->stage_height - 9,
+                  recorder->stage_width - 2,  recorder->stage_height - 3);
+  cogl_rectangle (recorder->stage_width - 64, recorder->stage_height - 3,
+                  recorder->stage_width - 2,  recorder->stage_height - 2);
 }

 /* We want to time-stamp each frame based on the actual time it was
@@ -550,13 +542,8 @@ recorder_record_frame (ShellRecorder *recorder)

  size = recorder->stage_width * recorder->stage_height * 4;

-  data = g_malloc (recorder->stage_width * 4 * recorder->stage_height);
-  cogl_read_pixels (0, 0, /* x/y */
-                    recorder->stage_width,
-                    recorder->stage_height,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    CLUTTER_CAIRO_FORMAT_ARGB32,
-                    data);
+  data = shell_screen_grabber_grab (recorder->grabber,
+                                    0, 0, recorder->stage_width, recorder->stage_height);

  buffer = gst_buffer_new();
  gst_buffer_insert_memory (buffer, -1,
@@ -584,17 +571,12 @@ recorder_on_stage_paint (ClutterActor  *actor,
 {
  if (recorder->state == RECORDER_STATE_RECORDING)
    {
-      GdkRectangle primary_monitor;
-
-      gdk_screen_get_monitor_geometry (recorder->gdk_screen,
-                                       gdk_screen_get_primary_monitor (recorder->gdk_screen),
-                                       &primary_monitor);
      if (!recorder->only_paint)
        recorder_record_frame (recorder);

      cogl_set_source_texture (recorder->recording_icon);
-      cogl_rectangle (primary_monitor.x + primary_monitor.width - 32, primary_monitor.y + primary_monitor.height - 42,
-                      primary_monitor.x + primary_monitor.width,      primary_monitor.y + primary_monitor.height - 10);
+      cogl_rectangle (recorder->stage_width - 32, recorder->stage_height - 42,
+                      recorder->stage_width,      recorder->stage_height - 10);
    }

  if (recorder->state == RECORDER_STATE_RECORDING || recorder->memory_used != 0)
@@ -935,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
@@ -972,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);
@@ -1000,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);
@@ -1045,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));
@@ -1167,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;

@@ -1249,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;
        }

@@ -1292,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;

@@ -1368,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);
 }

@@ -1421,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)
        {
@@ -1433,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);
    }

@@ -1493,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;
@@ -1596,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
@@ -1614,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);

 }

@@ -1634,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.
@@ -1730,6 +1689,9 @@ shell_recorder_close (ShellRecorder *recorder)
      recorder->repaint_hook_id = 0;
    }

+  recorder_remove_redraw_timeout (recorder);
+  recorder_close_pipeline (recorder);
+
  recorder->state = RECORDER_STATE_CLOSED;

  /* Release the refcount we took when we started recording */
--- 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
@@ -0,0 +1,219 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#include <string.h>
+
+#include <clutter/clutter.h>
+#include <cogl/cogl.h>
+#include <GL/gl.h>
+#include <GL/glx.h>
+#include <GL/glext.h>
+
+#include "shell-screen-grabber.h"
+
+PFNGLBINDBUFFERARBPROC pf_glBindBufferARB;
+PFNGLBUFFERDATAARBPROC pf_glBufferDataARB;
+PFNGLDELETEBUFFERSARBPROC pf_glDeleteBuffersARB;
+PFNGLGENBUFFERSARBPROC pf_glGenBuffersARB;
+PFNGLMAPBUFFERARBPROC pf_glMapBufferARB;
+PFNGLUNMAPBUFFERARBPROC pf_glUnmapBufferARB;
+
+struct _ShellScreenGrabberClass
+{
+  GObjectClass parent_class;
+};
+
+struct _ShellScreenGrabber
+{
+  GObject parent_instance;
+
+  int have_pixel_buffers;
+  int have_pack_invert;
+  int width, height;
+  GLuint pixel_buffer;
+};
+
+G_DEFINE_TYPE(ShellScreenGrabber, shell_screen_grabber, G_TYPE_OBJECT);
+
+static void
+shell_screen_grabber_finalize (GObject *gobject)
+{
+  ShellScreenGrabber *grabber = SHELL_SCREEN_GRABBER (gobject);
+
+  if (grabber->pixel_buffer != 0)
+    pf_glDeleteBuffersARB (1, &grabber->pixel_buffer);
+}
+
+static void
+shell_screen_grabber_class_init (ShellScreenGrabberClass *grabber_class)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (grabber_class);
+
+  gobject_class->finalize = shell_screen_grabber_finalize;
+}
+
+static void
+shell_screen_grabber_init (ShellScreenGrabber *grabber)
+{
+  grabber->have_pixel_buffers = -1;
+  grabber->width = -1;
+  grabber->height= -1;
+  grabber->pixel_buffer = 0;
+}
+
+ShellScreenGrabber *
+shell_screen_grabber_new  (void)
+{
+  return g_object_new (SHELL_TYPE_SCREEN_GRABBER, NULL);
+}
+
+/**
+ * shell_screen_grabber_grab:
+ * x: X coordinate of the rectangle to grab
+ * y: Y coordinate of the rectangle to grab
+ * width: width of the rectangle to grab
+ * height: heigth of the rectangle to grab
+ *
+ * Grabs pixel data from a portion of the screen.
+ *
+ * Return value: buffer holding the grabbed data. The data is stored as 32-bit
+ *  words with native-endian xRGB pixels (i.e., the same as CAIRO_FORMAT_RGB24)
+ *  with no padding on the rows. So, the size of the buffer is width * height * 4
+ *  bytes. Free with g_free().
+ **/
+guchar *
+shell_screen_grabber_grab (ShellScreenGrabber *grabber,
+                           int                 x,
+                           int                 y,
+                           int                 width,
+                           int                 height)
+{
+  guchar *data;
+  gsize row_bytes;
+  gsize data_size;
+
+  row_bytes = width * 4;
+  data_size = row_bytes * height;
+  data = g_malloc (data_size);
+
+  if (grabber->have_pixel_buffers == -1)
+    {
+      const GLubyte* extensions = glGetString (GL_EXTENSIONS);
+      grabber->have_pixel_buffers = strstr ((const char *)extensions, "GL_EXT_pixel_buffer_object") != NULL;
+      grabber->have_pack_invert = strstr ((const char *)extensions, "GL_MESA_pack_invert") != NULL;
+    }
+
+  if (grabber->have_pixel_buffers)
+    {
+      GLubyte *mapped_data;
+      GLint old_swap_bytes, old_lsb_first, old_row_length, old_skip_pixels, old_skip_rows, old_alignment;
+      GLint old_pack_invert = GL_FALSE;
+      GLint vp_size[4];
+      guchar *src_row, *dest_row;
+      int i;
+
+      cogl_flush ();
+
+      if (pf_glBindBufferARB == NULL)
+        {
+          pf_glBindBufferARB = (PFNGLBINDBUFFERARBPROC) cogl_get_proc_address ("glBindBufferARB");
+          pf_glBufferDataARB = (PFNGLBUFFERDATAARBPROC) cogl_get_proc_address ("glBufferDataARB");
+          pf_glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC) cogl_get_proc_address ("glDeleteBuffersARB");
+          pf_glGenBuffersARB = (PFNGLGENBUFFERSARBPROC) cogl_get_proc_address ("glGenBuffersARB");
+          pf_glMapBufferARB = (PFNGLMAPBUFFERARBPROC) cogl_get_proc_address ("glMapBufferARB");
+          pf_glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC) cogl_get_proc_address ("glUnmapBufferARB");
+        }
+
+      glGetIntegerv (GL_PACK_SWAP_BYTES, &old_swap_bytes);
+      glGetIntegerv (GL_PACK_LSB_FIRST, &old_lsb_first);
+      glGetIntegerv (GL_PACK_ROW_LENGTH, &old_row_length);
+      glGetIntegerv (GL_PACK_SKIP_PIXELS, &old_skip_pixels);
+      glGetIntegerv (GL_PACK_SKIP_ROWS, &old_skip_rows);
+      glGetIntegerv (GL_PACK_ALIGNMENT, &old_alignment);
+
+      glPixelStorei (GL_PACK_SWAP_BYTES, GL_FALSE);
+      glPixelStorei (GL_PACK_LSB_FIRST, GL_FALSE);
+      glPixelStorei (GL_PACK_ROW_LENGTH, 0);
+      glPixelStorei (GL_PACK_SKIP_PIXELS, 0);
+      glPixelStorei (GL_PACK_SKIP_ROWS, 0);
+      glPixelStorei (GL_PACK_ALIGNMENT, 1);
+
+      if (grabber->have_pack_invert)
+        {
+          glGetIntegerv (GL_PACK_INVERT_MESA, &old_pack_invert);
+          glPixelStorei (GL_PACK_INVERT_MESA, GL_FALSE);
+        }
+
+      if (grabber->pixel_buffer != 0 &&
+          (grabber->width != width ||
+           grabber->height != height))
+        {
+          pf_glDeleteBuffersARB (1, &grabber->pixel_buffer);
+          grabber->pixel_buffer = 0;
+        }
+
+      if (grabber->pixel_buffer == 0)
+        {
+          pf_glGenBuffersARB (1, &grabber->pixel_buffer);
+
+          pf_glBindBufferARB (GL_PIXEL_PACK_BUFFER_ARB, grabber->pixel_buffer);
+          pf_glBufferDataARB (GL_PIXEL_PACK_BUFFER_ARB, data_size, 0, GL_STREAM_READ_ARB);
+
+          grabber->width = width;
+          grabber->height = height;
+        }
+      else
+        {
+          pf_glBindBufferARB (GL_PIXEL_PACK_BUFFER_ARB, grabber->pixel_buffer);
+        }
+
+      /* In OpenGL, (x,y) specifies the bottom-left corner rather than the
+       * 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);
+
+      src_row = mapped_data + (height - 1) * row_bytes;
+      dest_row = data;
+
+      for (i = 0; i < height; i++)
+        {
+          memcpy (dest_row, src_row, row_bytes);
+          src_row -= row_bytes;
+          dest_row += row_bytes;
+        }
+
+      pf_glUnmapBufferARB (GL_PIXEL_PACK_BUFFER_ARB);
+      pf_glBindBufferARB (GL_PIXEL_PACK_BUFFER_ARB, 0);
+
+      glPixelStorei (GL_PACK_SWAP_BYTES, old_swap_bytes);
+      glPixelStorei (GL_PACK_LSB_FIRST, old_lsb_first);
+      glPixelStorei (GL_PACK_ROW_LENGTH, old_row_length);
+      glPixelStorei (GL_PACK_SKIP_PIXELS, old_skip_pixels);
+      glPixelStorei (GL_PACK_SKIP_ROWS, old_skip_rows);
+      glPixelStorei (GL_PACK_ALIGNMENT, old_alignment);
+
+      if (grabber->have_pack_invert)
+        glPixelStorei (GL_PACK_INVERT_MESA, old_pack_invert);
+    }
+  else
+    {
+      cogl_read_pixels (x, y,
+                        width, height,
+                        COGL_READ_PIXELS_COLOR_BUFFER,
+                        CLUTTER_CAIRO_FORMAT_ARGB32,
+                        data);
+    }
+
+  return data;
+}
--- a/src/shell-screen-grabber.h
+++ b/src/shell-screen-grabber.h
@@ -0,0 +1,44 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+#ifndef __SHELL_SCREEN_GRABBER_H__
+#define __SHELL_SCREEN_GRABBER_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/**
+ * SECTION:shell-screen-grabber
+ * @short_description: Grab pixel data from the screen
+ *
+ * The #ShellScreenGrabber object is used to download previous drawn
+ * content to the screen. It internally uses pixel-buffer objects if
+ * available, otherwise falls back to cogl_read_pixels().
+ *
+ * If you are repeatedly grabbing images of the same size from the
+ * screen, it makes sense to create one #ShellScreenGrabber and keep
+ * it around. Otherwise, it's fine to simply create one as needed and
+ * then get rid of it.
+ */
+
+typedef struct _ShellScreenGrabber      ShellScreenGrabber;
+typedef struct _ShellScreenGrabberClass ShellScreenGrabberClass;
+
+#define SHELL_TYPE_SCREEN_GRABBER              (shell_screen_grabber_get_type ())
+#define SHELL_SCREEN_GRABBER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), SHELL_TYPE_SCREEN_GRABBER, ShellScreenGrabber))
+#define SHELL_SCREEN_GRABBER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), SHELL_TYPE_SCREEN_GRABBER, ShellScreenGrabberClass))
+#define SHELL_IS_SCREEN_GRABBER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), SHELL_TYPE_SCREEN_GRABBER))
+#define SHELL_IS_SCREEN_GRABBER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), SHELL_TYPE_SCREEN_GRABBER))
+#define SHELL_SCREEN_GRABBER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), SHELL_TYPE_SCREEN_GRABBER, ShellScreenGrabberClass))
+
+GType shell_screen_grabber_get_type (void) G_GNUC_CONST;
+
+ShellScreenGrabber *shell_screen_grabber_new  (void);
+guchar *            shell_screen_grabber_grab (ShellScreenGrabber *grabber,
+                                               int                 x,
+                                               int                 y,
+                                               int                 width,
+                                               int                 height);
+
+G_END_DECLS
+
+#endif /* __SHELL_SCREEN_GRABBER_H__ */
--- a/src/shell-screenshot.c
+++ b/src/shell-screenshot.c
@@ -1,8 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-#define COGL_ENABLE_EXPERIMENTAL_API
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-
 #include <X11/extensions/Xfixes.h>
 #include <clutter/x11/clutter-x11.h>
 #include <clutter/clutter.h>
@@ -13,6 +10,7 @@
 #include <meta/meta-shaped-texture.h>

 #include "shell-global.h"
+#include "shell-screen-grabber.h"
 #include "shell-screenshot.h"

 struct _ShellScreenshotClass
@@ -92,33 +90,18 @@ do_grab_screenshot (_screenshot_data *screenshot_data,
                    int               width,
                    int               height)
 {
-  CoglBitmap *bitmap;
-  ClutterBackend *backend;
-  CoglContext *context;
-  int stride;
+  ShellScreenGrabber *grabber;
+  static const cairo_user_data_key_t key;
  guchar *data;

-  backend = clutter_get_default_backend ();
-  context = clutter_backend_get_cogl_context (backend);
+  grabber = shell_screen_grabber_new ();
+  data = shell_screen_grabber_grab (grabber, x, y, width, height);
+  g_object_unref (grabber);

-  screenshot_data->image = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
-                                                       width, height);
-
-
-  data = cairo_image_surface_get_data (screenshot_data->image);
-  stride = cairo_image_surface_get_stride (screenshot_data->image);
-
-  bitmap = cogl_bitmap_new_for_data (context,
-                                     width,
-                                     height,
-                                     CLUTTER_CAIRO_FORMAT_ARGB32,
-                                     stride,
-                                     data);
-  cogl_framebuffer_read_pixels_into_bitmap (cogl_get_draw_framebuffer (),
-                                            x, y,
-                                            COGL_READ_PIXELS_COLOR_BUFFER,
-                                            bitmap);
-  cogl_object_unref (bitmap);
+  screenshot_data->image = cairo_image_surface_create_for_data (data, CAIRO_FORMAT_RGB24,
+                                                               width, height, width * 4);
+  cairo_surface_set_user_data (screenshot_data->image, &key,
+                               data, (cairo_destroy_func_t)g_free);
 }

 static void
--- a/src/shell-wm-private.h
+++ b/src/shell-wm-private.h
@@ -35,9 +35,6 @@ void _shell_wm_kill_window_effects   (ShellWM             *wm,
                                      MetaWindowActor     *actor);
 void _shell_wm_kill_switch_workspace (ShellWM             *wm);

-gboolean _shell_wm_filter_keybinding (ShellWM             *wm,
-                                      MetaKeyBinding      *binding);
-
 G_END_DECLS

 #endif /* __SHELL_WM_PRIVATE_H__ */
--- a/src/shell-wm.c
+++ b/src/shell-wm.c
@@ -26,7 +26,6 @@ enum
  SWITCH_WORKSPACE,
  KILL_SWITCH_WORKSPACE,
  KILL_WINDOW_EFFECTS,
-  FILTER_KEYBINDING,

  LAST_SIGNAL
 };
@@ -116,14 +115,6 @@ shell_wm_class_init (ShellWMClass *klass)
          NULL, NULL, NULL,
 		  G_TYPE_NONE, 1,
 		  META_TYPE_WINDOW_ACTOR);
-  shell_wm_signals[FILTER_KEYBINDING] =
-    g_signal_new ("filter-keybinding",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  g_signal_accumulator_true_handled, NULL, NULL,
-                  G_TYPE_BOOLEAN, 1,
-                  META_TYPE_KEY_BINDING);
 }

 void
@@ -276,17 +267,6 @@ _shell_wm_destroy (ShellWM         *wm,
  g_signal_emit (wm, shell_wm_signals[DESTROY], 0, actor);
 }

-gboolean
-_shell_wm_filter_keybinding (ShellWM             *wm,
-                             MetaKeyBinding      *binding)
-{
-  gboolean rv;
-
-  g_signal_emit (wm, shell_wm_signals[FILTER_KEYBINDING], 0, binding, &rv);
-
-  return rv;
-}
-
 /**
 * shell_wm_new:
 * @plugin: the #MetaPlugin
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -65,10 +65,6 @@
 #include "st-clipboard.h"
 #include "st-private.h"

-#include <clutter/x11/clutter-x11.h>
-#include <X11/Xlib.h>
-#include <X11/cursorfont.h>
-
 #include "st-widget-accessible.h"

 #define HAS_FOCUS(actor) (clutter_actor_get_stage (actor) && clutter_stage_get_key_focus ((ClutterStage *) clutter_actor_get_stage (actor)) == actor)
@@ -617,38 +613,6 @@ st_entry_key_focus_in (ClutterActor *actor)
  clutter_actor_grab_key_focus (priv->entry);
 }

-static void
-st_entry_set_cursor (StEntry  *entry,
-                     gboolean  use_ibeam)
-{
-  Display *dpy;
-  ClutterActor *stage, *actor = CLUTTER_ACTOR (entry);
-  Window wid;
-  static Cursor ibeam = None;
-
-  dpy = clutter_x11_get_default_display ();
-  stage = clutter_actor_get_stage (actor);
-  wid = clutter_x11_get_stage_window (CLUTTER_STAGE (stage));
-
-  if (ibeam == None)
-    ibeam = XCreateFontCursor (dpy, XC_xterm);
-
-  if (use_ibeam)
-    XDefineCursor (dpy, wid, ibeam);
-  else
-    XUndefineCursor (dpy, wid);
-}
-
-static gboolean
-st_entry_crossing_event (ClutterActor         *actor,
-                         ClutterCrossingEvent *event)
-{
-  if (event->source == ST_ENTRY (actor)->priv->entry && event->related != NULL)
-    st_entry_set_cursor (ST_ENTRY (actor), (event->type == CLUTTER_ENTER));
-
-  return FALSE;
-}
-
 static void
 st_entry_class_init (StEntryClass *klass)
 {
@@ -671,9 +635,6 @@ st_entry_class_init (StEntryClass *klass)
  actor_class->key_press_event = st_entry_key_press_event;
  actor_class->key_focus_in = st_entry_key_focus_in;

-  actor_class->enter_event = st_entry_crossing_event;
-  actor_class->leave_event = st_entry_crossing_event;
-
  widget_class->style_changed = st_entry_style_changed;
  widget_class->navigate_focus = st_entry_navigate_focus;
  widget_class->get_accessible_type = st_entry_accessible_get_type;
--- 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,58 +1039,10 @@ 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;
  ClutterActor *actor;
-  GFunc load_callback;
-  gpointer load_callback_data;
 } AsyncImageData;

 static void
@@ -1091,7 +1059,6 @@ on_sliced_image_loaded (GObject *source_object,
                        GAsyncResult *res,
                        gpointer user_data)
 {
-  GObject *cache = source_object;
  AsyncImageData *data = (AsyncImageData *)user_data;
  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
  GList *list;
@@ -1105,9 +1072,6 @@ on_sliced_image_loaded (GObject *source_object,
      clutter_actor_hide (actor);
      clutter_actor_add_child (data->actor, actor);
    }
-
-  if (data->load_callback != NULL)
-    data->load_callback (cache, data->load_callback_data);
 }

 static void
@@ -1162,8 +1126,6 @@ load_sliced_image (GSimpleAsyncResult *result,
 * @path: Path to a filename
 * @grid_width: Width in pixels
 * @grid_height: Height in pixels
- * @load_callback: (scope async) (allow-none): Function called when the image is loaded, or %NULL
- * @user_data: Data to pass to the load callback
 *
 * This function reads a single image file which contains multiple images internally.
 * The image file will be divided using @grid_width and @grid_height;
@@ -1173,12 +1135,10 @@ load_sliced_image (GSimpleAsyncResult *result,
 * Returns: (transfer none): A new #ClutterActor
 */
 ClutterActor *
-st_texture_cache_load_sliced_image (StTextureCache *cache,
-                                    const gchar    *path,
-                                    gint            grid_width,
-                                    gint            grid_height,
-                                    GFunc           load_callback,
-                                    gpointer        user_data)
+st_texture_cache_load_sliced_image (StTextureCache    *cache,
+                                    const gchar       *path,
+                                    gint               grid_width,
+                                    gint               grid_height)
 {
  AsyncImageData *data;
  GSimpleAsyncResult *result;
@@ -1189,8 +1149,6 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
  data->grid_height = grid_height;
  data->path = g_strdup (path);
  data->actor = actor;
-  data->load_callback = load_callback;
-  data->load_callback_data = user_data;
  g_object_ref (G_OBJECT (actor));

  result = g_simple_async_result_new (G_OBJECT (cache), on_sliced_image_loaded, data, st_texture_cache_load_sliced_image);
@@ -1203,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
@@ -1253,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);
 }

@@ -1292,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;
@@ -1333,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/Show More
+++ b/Show More