Bump version to 3.5.5

Update NEWS
ScreenShield: when explicitly locking, tween the shield from the top
2012-08-07 21:26:18 +02:00 · 2012-08-07 21:26:17 +02:00 · 2012-08-07 21:05:25 +02:00 · 2012-08-07 20:35:54 +02:00 · 2012-08-07 20:35:29 +02:00 · 2012-08-07 20:35:29 +02:00
21 changed files with 1602 additions and 1868 deletions
--- a/40
+++ b/40
@ -1,3 +1,43 @@
+3.5.5
+=====
+* Update style to match mockups [Allan]
+  - improve calendar layout and legibility
+  - update notifications and menus
+  - use a common style for entries
+  - update scrollbars to match GTK+
+  - improve clock/unlock button in lock screen
+  - update polkit dialogs [Jasper]
+* Fix login dialog growing when selecting different users [Florian; #675076]
+* Implement screen lock in the shell [Giovanni]
+  - restructure login code to be shared with session unlock [#619955]
+  - add initial screen shield / unlock dialog implementation [#619955]
+  - implement (optional) notification list on lock shield [#619955]
+  - update login dialog style to match lock screen [#619955]
+  - filter notifications to only show new ones on the screen lock [#681143]
+  - make notifications scrollable if necessary [#681143]
+  - use correct application names in notifications [#681143]
+  - allow to return to the shield by pressing Escape [#681143]
+* Minor login dialog improvements [Florian]
+  - update style to match the overall visuals [#660913]
+  - indicate whether users are logged in [#658185]
+* Add support for background-repeat CSS property [Jasper; #680801]
+* Add :active pseudo class on scroll handles [Florian]
+* Remove markup from translated strings [Matthias; #681270]
+* Misc bug fixes and cleanups: [Alban, Florian, Giovanni, Jasper, Jeremy,
+  Matthias, Piotr; #677893, #679944, #680064, #680170, #680216, #680426,
+  #681101, #681382]
+
+Contributors:
+  Jeremy Bicha, Alban Browaeys, Giovanni Campagna, Matthias Clasen, Allan Day,
+  Piotr Drąg , Florian Müllner, Jasper St. Pierre
+
+Translations:
+  Matej Urbančič [sl], Tom Tryfonidis [el], Yaron Shahrabani [he],
+  Kjartan Maraas [nb], Baurzhan Muftakhidinov [kk], Praveen Illa [te],
+  Khaled Hosny [ar], Daniel Mustieles [es], Gabor Kelemen [hu],
+  Fran Diéguez [gl], Sweta Kothari [gu], Aleksej Kabanov [ru],
+  Nilamdyuti Goswami [as], Arash Mousavi [fa], Мирослав Николић [sr, sr@latin]
+
 3.5.4
 =====
 * Fix wrong result handling of remote calls [Florian; #678852]
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.5.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.5.5],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -63,7 +63,7 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 CLUTTER_MIN_VERSION=1.9.16
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.33.2
-MUTTER_MIN_VERSION=3.5.4
+MUTTER_MIN_VERSION=3.5.5
 GTK_MIN_VERSION=3.3.9
 GIO_MIN_VERSION=2.31.6
 LIBECAL_MIN_VERSION=3.5.3
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -1220,17 +1220,17 @@ StButton.popup-menu-item:insensitive {
    padding-bottom: 12px;
 }

-#summary-notification-stack-scrollview {
+.summary-notification-stack-scrollview {
    max-height: 18em;
    padding-top: 6px;
    padding-bottom: 6px;
 }

-#summary-notification-stack-scrollview:ltr {
+.summary-notification-stack-scrollview:ltr {
    padding-right: 8px;
 }

-#summary-notification-stack-scrollview:rtl {
+.summary-notification-stack-scrollview:rtl {
    padding-left: 8px;
 }

@ -2092,6 +2092,7 @@ StButton.popup-menu-item:insensitive {
    font-size: 10.5pt;
    font-weight: bold;
    color: #666666;
+    padding-top: 1em;
 }

 .login-dialog-not-listed-button:hover .login-dialog-not-listed-label {
@ -2200,12 +2201,12 @@ StButton.popup-menu-item:insensitive {

 /* Screen shield */

-#screenShieldGroup {
+#lockDialogGroup {
    background: #2e3436 url(noise-texture.png);
    background-repeat: repeat;
 }

-#screenShieldGroup .arrow {
+#lockScreenGroup .arrow {
    color: #333333;
    width: 100px;
    height: 50px;
@ -2216,6 +2217,7 @@ StButton.popup-menu-item:insensitive {
    text-shadow: 0px 1px 2px rgba(0,0,0,0.6);
    font-weight: bold;
    text-align: center;
+    padding-bottom: 1.5em;
 }

 .screen-shield-clock-time {
@ -2228,17 +2230,19 @@ StButton.popup-menu-item:insensitive {
 }

 #screenShieldNotifications {
-    border-radius: 24px;
+    border-radius: 8px;
    background-color: rgba(0.0, 0.0, 0.0, 0.9);
    border: 2px solid #868686;
+    max-height: 500px;
+    padding: 12px 0;
 }

-#screenShieldNotifications, .screen-shield-notifications-box {
-    spacing: 8px;
+.screen-shield-notifications-box {
+    spacing: 12px;
 }

 .screen-shield-notification-source {
-    padding: 24px 8px;
+    padding: 0 24px;
    spacing: 5px;
 }

@ -2253,3 +2257,12 @@ StButton.popup-menu-item:insensitive {
 .screen-shield-notifications-box .notification {
    background-color: transparent;
 }
+
+/* Override padding on resident notifications, since
+   the notifications box has its own spacing
+*/
+.screen-shield-notifications-box .summary-notification-stack-scrollview {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -974,7 +974,6 @@ const LoginDialog = new Lang.Class({
                     function() {
                         this._promptFingerprintMessage.hide();
                         this._promptEntry.reactive = true;
-                         this._promptEntry.remove_style_pseudo_class('insensitive');
                         this._promptEntry.set_text('');
                     }];

@ -994,7 +993,6 @@ const LoginDialog = new Lang.Class({
                     function() {
                         let _text = this._promptEntry.get_text();
                         this._promptEntry.reactive = false;
-                         this._promptEntry.add_style_pseudo_class('insensitive');
                         this._userVerifier.answerQuery(serviceName, _text);
                     }];

--- a/js/misc/util.js
+++ b/js/misc/util.js
@ -84,7 +84,7 @@ function trySpawn(argv)
    try {
        [success, pid] = GLib.spawn_async(null, argv, null,
                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                          null, null);
+                                          null);
    } catch (err) {
        /* Rewrite the error in case of ENOENT */
        if (err.matches(GLib.SpawnError, GLib.SpawnError.NOENT)) {
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -421,6 +421,7 @@ const Notification = new Lang.Class({
        this.isTransient = false;
        this.expanded = false;
        this.showWhenLocked = false;
+        this.acknowledged = false;
        this._destroyed = false;
        this._useActionIcons = false;
        this._customContent = false;
@ -1062,7 +1063,7 @@ const SourceActor = new Lang.Class({
        this.actor.add_actor(this._iconBin);
        this.actor.add_actor(this._counterBin);

-        this._source.connect('count-changed', Lang.bind(this, this._updateCount));
+        this._source.connect('count-updated', Lang.bind(this, this._updateCount));
        this._updateCount();
    },

@ -1124,8 +1125,6 @@ const Source = new Lang.Class({
        this.iconName = iconName;
        this.iconType = iconType;

-        this.count = 0;
-
        this.isTransient = false;
        this.isChat = false;
        this.isMuted = false;
@ -1136,18 +1135,20 @@ const Source = new Lang.Class({
        this._setSummaryIcon(this.createIcon(this.ICON_SIZE));
    },

-    _setCount: function(count, visible) {
-        if (isNaN(parseInt(count)))
-            throw new Error("Invalid notification count: " + count);
-
-        this.count = count;
-        this.countVisible = visible;
-        this.emit('count-changed');
+    get count() {
+        return this.notifications.length;
    },

-    _updateCount: function() {
-        let count = this.notifications.length;
-        this._setCount(count, count > 1);
+    get unseenCount() {
+        return this.notifications.filter(function(n) { return !n.acknowledged; }).length;
+    },
+
+    get countVisible() {
+        return this.count > 1;
+    },
+
+    countUpdated: function() {
+        this.emit('count-updated');
    },

    setTransient: function(isTransient) {
@ -1198,13 +1199,14 @@ const Source = new Lang.Class({
                if (this.notifications.length == 0)
                    this._lastNotificationRemoved();

-                this._updateCount();
+                this.countUpdated();
            }));

-        this._updateCount();
+        this.countUpdated();
    },

    notify: function(notification) {
+        notification.acknowledged = false;
        this.pushNotification(notification);
        if (!this.isMuted)
             this.emit('notify', notification);
@ -1236,7 +1238,7 @@ const Source = new Lang.Class({
            if (!this.notifications[i].resident)
                this.notifications[i].destroy();

-        this._updateCount();
+        this.countUpdated();
    },

    // Default implementation is to destroy this source, but subclasses can override
@ -1284,12 +1286,12 @@ const SummaryItem = new Lang.Class({
        this._sourceBox.add(this._sourceTitleBin, { expand: true, y_fill: false });
        this.actor.child = this._sourceBox;

-        this.notificationStackView = new St.ScrollView({ name: source.isChat ? '' : 'summary-notification-stack-scrollview',
+        this.notificationStackView = new St.ScrollView({ style_class: source.isChat ? '' : 'summary-notification-stack-scrollview',
                                                         vscrollbar_policy: source.isChat ? Gtk.PolicyType.NEVER : Gtk.PolicyType.AUTOMATIC,
-                                                         hscrollbar_policy: Gtk.PolicyType.NEVER,
-                                                         style_class: 'vfade' });
-        this.notificationStack = new St.BoxLayout({ name: 'summary-notification-stack',
-                                                     vertical: true });
+                                                         hscrollbar_policy: Gtk.PolicyType.NEVER });
+        this.notificationStackView.add_style_class_name('vfade');
+        this.notificationStack = new St.BoxLayout({ style_class: 'summary-notification-stack',
+                                                    vertical: true });
        this.notificationStackView.add_actor(this.notificationStack);
        this._stackedNotifications = [];

@ -1807,7 +1809,7 @@ const MessageTray = new Lang.Class({

    _onNotify: function(source, notification) {
        if (this._summaryBoxPointerItem && this._summaryBoxPointerItem.source == source) {
-            if (this._summaryBoxPointerState == State.HIDING)
+            if (this._summaryBoxPointerState == State.HIDING) {
                // We are in the process of hiding the summary box pointer.
                // If there is an update for one of the notifications or
                // a new notification to be added to the notification stack
@ -1818,6 +1820,14 @@ const MessageTray = new Lang.Class({
                // need to be able to re-parent its actor to a different
                // part of the stage.
                this._reNotifyAfterHideNotification = notification;
+            } else {
+                // The summary box pointer is showing or shown (otherwise,
+                // this._summaryBoxPointerItem would be null)
+                // Immediately mark the notification as acknowledged, as it's
+                // not going into the queue
+                notification.acknowledged = true;
+            }
+
            return;
        }

@ -2309,6 +2319,8 @@ const MessageTray = new Lang.Class({
    },

    _updateShowingNotification: function() {
+        this._notification.acknowledged = true;
+
        Tweener.removeTweens(this._notificationBin);

        // We auto-expand notifications with CRITICAL urgency.
@ -2511,10 +2523,17 @@ const MessageTray = new Lang.Class({
        this._summaryBoxPointerDoneDisplayingId = this._summaryBoxPointerItem.connect('done-displaying-content',
                                                                                      Lang.bind(this, this._escapeTray));
        if (this._clickedSummaryItemMouseButton == 1) {
-            this._notificationQueue = this._notificationQueue.filter( Lang.bind(this,
-                function(notification) {
-                    return this._summaryBoxPointerItem.source != notification.source;
-                }));
+            let newQueue = [];
+            for (let i = 0; i < this._notificationQueue.length; i++) {
+                let notification = this._notificationQueue[i];
+                let sameSource = this._summaryBoxPointerItem.source == notification.source;
+                if (sameSource)
+                    notification.acknowledged = true;
+                else
+                    newQueue.push(notification);
+            }
+            this._notificationQueue = newQueue;
+
            this._summaryBoxPointerItem.prepareNotificationStackForShowing();
            this._summaryBoxPointer.bin.child = this._summaryBoxPointerItem.notificationStackView;
            this._summaryBoxPointerItem.scrollTo(St.Side.BOTTOM);
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -61,10 +61,10 @@ const ModalDialog = new Lang.Class({
        this._backgroundBin = new St.Bin();
        this._group.add_actor(this._backgroundBin);

-        this._dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog',
-                                                vertical:    true });
+        this.dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog',
+                                               vertical:    true });
        if (params.styleClass != null) {
-            this._dialogLayout.add_style_class_name(params.styleClass);
+            this.dialogLayout.add_style_class_name(params.styleClass);
        }

        if (!this._shellReactive) {
@ -77,29 +77,29 @@ const ModalDialog = new Lang.Class({

            this._eventBlocker = new Clutter.Group({ reactive: true });
            stack.add_actor(this._eventBlocker);
-            stack.add_actor(this._dialogLayout);
+            stack.add_actor(this.dialogLayout);
        } else {
-            this._backgroundBin.child = this._dialogLayout;
+            this._backgroundBin.child = this.dialogLayout;
        }


        this.contentLayout = new St.BoxLayout({ vertical: true });
-        this._dialogLayout.add(this.contentLayout,
-                               { x_fill:  true,
-                                 y_fill:  true,
-                                 x_align: St.Align.MIDDLE,
-                                 y_align: St.Align.START });
+        this.dialogLayout.add(this.contentLayout,
+                              { x_fill:  true,
+                                y_fill:  true,
+                                x_align: St.Align.MIDDLE,
+                                y_align: St.Align.START });

        this._buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
                                                visible:     false,
                                                vertical:    false });
-        this._dialogLayout.add(this._buttonLayout,
-                               { expand:  true,
-                                 x_align: St.Align.MIDDLE,
-                                 y_align: St.Align.END });
+        this.dialogLayout.add(this._buttonLayout,
+                              { expand:  true,
+                                x_align: St.Align.MIDDLE,
+                                y_align: St.Align.END });

-        global.focus_manager.add_group(this._dialogLayout);
-        this._initialKeyFocus = this._dialogLayout;
+        global.focus_manager.add_group(this.dialogLayout);
+        this._initialKeyFocus = this.dialogLayout;
        this._initialKeyFocusDestroyId = 0;
        this._savedKeyFocus = null;
    },
@ -203,7 +203,7 @@ const ModalDialog = new Lang.Class({

        this.state = State.OPENING;

-        this._dialogLayout.opacity = 255;
+        this.dialogLayout.opacity = 255;
        if (this._lightbox)
            this._lightbox.show();
        this._group.opacity = 0;
@ -227,7 +227,7 @@ const ModalDialog = new Lang.Class({
        this._initialKeyFocus = actor;

        this._initialKeyFocusDestroyId = actor.connect('destroy', Lang.bind(this, function() {
-            this._initialKeyFocus = this._dialogLayout;
+            this._initialKeyFocus = this.dialogLayout;
            this._initialKeyFocusDestroyId = 0;
        }));
    },
@ -320,7 +320,7 @@ const ModalDialog = new Lang.Class({
            return;

        this.popModal(timestamp);
-        Tweener.addTween(this._dialogLayout,
+        Tweener.addTween(this.dialogLayout,
                         { opacity: 0,
                           time:    FADE_OUT_DIALOG_TIME,
                           transition: 'easeOutQuad',
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -629,6 +629,16 @@ const Source = new Lang.Class({
        }
    },

+    setTitle: function(title) {
+        // Do nothing if .app is set, we don't want to override the
+        // app name with whatever is provided through libnotify (usually
+        // garbage)
+        if (this.app)
+            return;
+
+        this.parent(title);
+    },
+
    open: function(notification) {
        this.destroyNonResidentNotifications();
        this.openApp();
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -17,7 +17,7 @@ const Tweener = imports.ui.tweener;
 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
 const LOCK_ENABLED_KEY = 'lock-enabled';

-const CURTAIN_SLIDE_TIME = 1.2;
+const CURTAIN_SLIDE_TIME = 0.8;
 // fraction of screen height the arrow must reach before completing
 // the slide up automatically
 const ARROW_DRAG_TRESHOLD = 0.1;
@ -28,7 +28,7 @@ const SUMMARY_ICON_SIZE = 48;
 // STANDARD_FADE_TIME is used when the session goes idle, while
 // SHORT_FADE_TIME is used when requesting lock explicitly from the user menu
 const STANDARD_FADE_TIME = 10;
-const SHORT_FADE_TIME = 2;
+const SHORT_FADE_TIME = 0.8;

 const Clock = new Lang.Class({
    Name: 'ScreenShieldClock',
@ -73,16 +73,17 @@ const NotificationsBox = new Lang.Class({
    _init: function() {
        this.actor = new St.BoxLayout({ vertical: true,
                                        name: 'screenShieldNotifications',
-                                        margin_top: 20
-                                      });
+                                        style_class: 'screen-shield-notifications-box' });

        this._residentNotificationBox = new St.BoxLayout({ vertical: true,
                                                           style_class: 'screen-shield-notifications-box' });
+        let scrollView = new St.ScrollView({ x_fill: false, x_align: St.Align.MIDDLE });
        this._persistentNotificationBox = new St.BoxLayout({ vertical: true,
                                                             style_class: 'screen-shield-notifications-box' });
+        scrollView.add_actor(this._persistentNotificationBox);

        this.actor.add(this._residentNotificationBox, { x_fill: true });
-        this.actor.add(this._persistentNotificationBox, { x_fill: false, x_align: St.Align.MIDDLE });
+        this.actor.add(scrollView, { x_fill: true, x_align: St.Align.MIDDLE });

        this._items = [];
        Main.messageTray.getSummaryItems().forEach(Lang.bind(this, function(item) {
@ -119,11 +120,11 @@ const NotificationsBox = new Lang.Class({
        return source.hasResidentNotification() && !source.isChat;
    },

-    _makeNotificationCountText: function(source) {
-        if (source.isChat)
-            return ngettext("%d new message", "%d new messages", source.count).format(source.count);
+    _makeNotificationCountText: function(count, isChat) {
+        if (isChat)
+            return ngettext("%d new message", "%d new messages", count).format(count);
        else
-            return ngettext("%d new notification", "%d new notifications", source.count).format(source.count);
+            return ngettext("%d new notification", "%d new notifications", count).format(count);
    },

    _makeNotificationSource: function(source) {
@ -135,17 +136,18 @@ const NotificationsBox = new Lang.Class({
        box.add(sourceActor.actor, { y_fill: true });

        let textBox = new St.BoxLayout({ vertical: true });
-        box.add(textBox, { y_fill: true, expand: true });
+        box.add(textBox);

        let label = new St.Label({ text: source.title,
                                   style_class: 'screen-shield-notification-label' });
        textBox.add(label);

-        let countLabel = new St.Label({ text: this._makeNotificationCountText(source),
+        let count = source.unseenCount;
+        let countLabel = new St.Label({ text: this._makeNotificationCountText(count, source.isChat),
                                        style_class: 'screen-shield-notification-count-text' });
        textBox.add(countLabel);

-        box.visible = source.count != 0;
+        box.visible = count != 0;
        return [box, countLabel];
    },

@ -169,11 +171,12 @@ const NotificationsBox = new Lang.Class({
            this._residentNotificationBox.add(item.notificationStackView);
        } else {
            [obj.sourceBox, obj.countLabel] = this._makeNotificationSource(item.source);
-            this._persistentNotificationBox.add(obj.sourceBox);
+            this._persistentNotificationBox.add(obj.sourceBox, { x_fill: false, x_align: St.Align.MIDDLE });
        }

        obj.contentUpdatedId = item.connect('content-updated', Lang.bind(this, this._onItemContentUpdated));
-        obj.sourceCountChangedId = item.source.connect('count-changed', Lang.bind(this, this._onSourceCountChanged));
+        obj.sourceCountChangedId = item.source.connect('count-updated', Lang.bind(this, this._onSourceChanged));
+        obj.sourceTitleChangedId = item.source.connect('title-changed', Lang.bind(this, this._onSourceChanged));
        obj.sourceDestroyId = item.source.connect('destroy', Lang.bind(this, this._onSourceDestroy));
        this._items.push(obj);

@ -194,7 +197,7 @@ const NotificationsBox = new Lang.Class({
        this._updateItem(obj);
    },

-    _onSourceCountChanged: function(source) {
+    _onSourceChanged: function(source) {
        let obj = this._items[this._findSource(source)];
        this._updateItem(obj);
    },
@ -217,13 +220,15 @@ const NotificationsBox = new Lang.Class({
            // make into a resident item
            obj.sourceBox.destroy();
            obj.sourceBox = obj.countLabel = null;
+            obj.resident = true;

            obj.item.prepareNotificationStackForShowing();
            this._residentNotificationBox.add(obj.item.notificationStackView);
        } else {
            // just update the counter
-            obj.countLabel.text = this._makeNotificationCountText(obj.item.source);
-            obj.sourceBox.visible = obj.source.count != 0;
+            let count = obj.source.unseenCount;
+            obj.countLabel.text = this._makeNotificationCountText(count, obj.source.isChat);
+            obj.sourceBox.visible = count != 0;
        }

        this._updateVisibility();
@ -252,6 +257,23 @@ const NotificationsBox = new Lang.Class({
    },
 });

+const LockDialogGroup = new Lang.Class({
+    Name: 'LockDialogGroup',
+    Extends: St.Widget,
+
+    _init: function(params) {
+        this.parent(params);
+    },
+
+    vfunc_get_preferred_height: function(forWidth) {
+        return [global.screen_height, global.screen_height];
+    },
+
+    vfunc_get_preferred_width: function(forHeight) {
+        return [global.screen_width, global.screen_width];
+    }
+});
+
 /**
 * To test screen shield, make sure to kill gnome-screensaver.
 *
@ -272,7 +294,8 @@ const ScreenShield = new Lang.Class({
                                                y_expand: true,
                                                reactive: true,
                                                can_focus: true,
-                                                layout_manager: new Clutter.BinLayout()
+                                                layout_manager: new Clutter.BinLayout(),
+                                                name: 'lockScreenGroup',
                                              });
        this._lockScreenGroup.connect('key-release-event',
                                      Lang.bind(this, this._onLockScreenKeyRelease));
@ -299,9 +322,7 @@ const ScreenShield = new Lang.Class({
        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 });
-
+        this._lockDialogGroup = new LockDialogGroup({ name: 'lockDialogGroup' });
        this.actor.add_actor(this._lockDialogGroup);
        this.actor.add_actor(this._lockScreenGroup);

@ -473,26 +494,35 @@ const ScreenShield = new Lang.Class({
    },

    _resetLockScreen: function(animate) {
+        this._lockScreenGroup.show();
+        this._arrow.show();
+
        if (animate) {
-            this.actor.opacity = 0;
-            Tweener.removeTweens(this.actor);
-            Tweener.addTween(this.actor,
-                             { opacity: 255,
+            this._lockScreenGroup.y = -global.screen_height;
+            Tweener.removeTweens(this._lockScreenGroup);
+            Tweener.addTween(this._lockScreenGroup,
+                             { y: 0,
                               time: SHORT_FADE_TIME,
-                               transition: 'easeOutQuad',
+                               transition: 'linear',
                               onComplete: function() {
+                                   this._lockScreenGroup.fixed_position_set = false;
                                   this.emit('lock-screen-shown');
                               },
                               onCompleteScope: this
                             });
+
+            this._lockDialogGroup.opacity = 0;
+            Tweener.removeTweens(this._lockDialogGroup);
+            Tweener.addTween(this._lockDialogGroup,
+                             { opacity: 255,
+                               time: SHORT_FADE_TIME,
+                               transition: 'easeOutQuad' });
        } else {
+            this._lockScreenGroup.fixed_position_set = false;
+            this._lockDialogGroup.opacity = 255;
            this.emit('lock-screen-shown');
        }

-        this._lockScreenGroup.fixed_position_set = false;
-        this._lockScreenGroup.show();
-        this._arrow.show();
-
        this._lockScreenGroup.grab_key_focus();
    },

--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -178,7 +178,9 @@ const InputSourceIndicator = new Lang.Class({
    },

    setLockedState: function(locked) {
-        this._showLayoutItem.actor.visible = !locked;
+        if (Main.sessionMode.allowSettings) {
+            this._showLayoutItem.actor.visible = !locked;
+        }
        this.menu.setSettingsVisibility(!locked);
    },

--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@ -578,7 +578,7 @@ const ChatSource = new Lang.Class({
            this._pendingMessages.push(message);
        }

-        this._updateCount();
+        this.countUpdated();

        let showTimestamp = false;

@ -624,8 +624,17 @@ const ChatSource = new Lang.Class({
        this.destroy();
    },

-    _updateCount: function() {
-        this._setCount(this._pendingMessages.length, this._pendingMessages.length > 0);
+    /* All messages are new messages for Telepathy sources */
+    get count() {
+        return this._pendingMessages.length;
+    },
+
+    get unseenCount() {
+        return this.count;
+    },
+
+    get countVisible() {
+        return this.count > 0;
    },

    _messageReceived: function(channel, message) {
@ -633,7 +642,7 @@ const ChatSource = new Lang.Class({
            return;

        this._pendingMessages.push(message);
-        this._updateCount();
+        this.countUpdated();

        message = makeMessageFromTpMessage(message, NotificationDirection.RECEIVED);
        this._notification.appendMessage(message);
@ -710,7 +719,7 @@ const ChatSource = new Lang.Class({

        if (idx >= 0) {
            this._pendingMessages.splice(idx, 1);
-            this._updateCount();
+            this.countUpdated();
        }
        else
            throw new Error('Message not in our pending list: ' + message);
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@ -101,7 +101,7 @@ const UnlockDialog = new Lang.Class({
        this.contentLayout.add_actor(this._userWidget.actor);

        this._promptLayout = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
-                                                vertical: false });
+                                                vertical: true });

        this._promptLabel = new St.Label({ style_class: 'login-dialog-prompt-label' });
        this._promptLayout.add(this._promptLabel,
@ -126,6 +126,15 @@ const UnlockDialog = new Lang.Class({
        this._promptFingerprintMessage.hide();
        this.contentLayout.add_actor(this._promptFingerprintMessage);

+        this._okButton = { label: _("Unlock"),
+                           action: Lang.bind(this, this._doUnlock),
+                           default: true };
+        this.setButtons([this._okButton]);
+        this.setActionKey(Clutter.KEY_Escape, Lang.bind(this, this._escape));
+
+        this._updateOkButton(false);
+        this._reset();
+
        let otherUserLabel = new St.Label({ text: _("Login as another user"),
                                            style_class: 'login-dialog-not-listed-label' });
        this._otherUserButton = new St.Button({ style_class: 'login-dialog-not-listed-button',
@ -135,18 +144,9 @@ const UnlockDialog = new Lang.Class({
                                                x_align: St.Align.START,
                                                x_fill: true });
        this._otherUserButton.connect('clicked', Lang.bind(this, this._otherUserClicked));
-        this.contentLayout.add(this._otherUserButton,
-                               { x_align: St.Align.START,
-                                 x_fill: false });
-
-        this._okButton = { label: _("Unlock"),
-                           action: Lang.bind(this, this._doUnlock),
-                           default: true };
-        this.setButtons([this._okButton]);
-        this.setActionKey(Clutter.KEY_Escape, Lang.bind(this, this._escape));
-
-        this._updateOkButton(false);
-        this._reset();
+        this.dialogLayout.add(this._otherUserButton,
+                              { x_align: St.Align.START,
+                                x_fill: false });

        GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
            this.emit('loaded');
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@ -654,8 +654,10 @@ const UserMenuButton = new Lang.Class({
    },

    _onAccountRemoved: function(accountMgr, account) {
-        account.disconnect(account._changingId);
-        account._changingId = 0;
+        if (account._changingId) {
+            account.disconnect(account._changingId);
+            account._changingId = 0;
+        }
        this._updateChangingPresence();
    },

--- a/po/as.po
+++ b/po/as.po
@ -9,8 +9,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-07-21 17:14+0000\n"
-"PO-Revision-Date: 2012-08-03 15:19+0530\n"
+"POT-Creation-Date: 2012-08-06 17:11+0000\n"
+"PO-Revision-Date: 2012-08-07 15:03+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
 "Language: \n"
@ -213,48 +213,49 @@ msgid "There was an error loading the preferences dialog for %s:"
 msgstr "%s ৰ বাবে পছন্দসমূহ ডাইলগ ল'ড কৰোতে এটা ত্ৰুটি হৈছিল:"

 #: ../js/extensionPrefs/main.js:164
-msgid "<b>Extension</b>"
-msgstr "<b>সম্প্ৰসাৰন</b>"
+#| msgid "<b>Extension</b>"
+msgid "Extension"
+msgstr "প্ৰসাৰন"

 #: ../js/extensionPrefs/main.js:188
 msgid "Select an extension to configure using the combobox above."
 msgstr "উপৰত দিয়া কম্বোবাকচ ব্যৱহাৰ কৰি সংৰূপণ কৰিবলে এটা সম্প্ৰসাৰন বাছক।"

-#: ../js/gdm/loginDialog.js:550
+#: ../js/gdm/loginDialog.js:572
 msgid "Session..."
 msgstr "অধিবেশন..."

-#: ../js/gdm/loginDialog.js:699
+#: ../js/gdm/loginDialog.js:721
 msgctxt "title"
 msgid "Sign In"
 msgstr "ছাইন ইন কৰক"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/loginDialog.js:744 ../js/ui/unlockDialog.js:124
+#: ../js/gdm/loginDialog.js:766 ../js/ui/unlockDialog.js:124
 msgid "(or swipe finger)"
 msgstr "(অথবা আঙুলি স্বাইপ কৰক)"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:765
+#: ../js/gdm/loginDialog.js:787
 msgid "Not listed?"
 msgstr "তালিকাভুক্ত নহয়?"

-#: ../js/gdm/loginDialog.js:908 ../js/ui/endSessionDialog.js:406
+#: ../js/gdm/loginDialog.js:930 ../js/ui/endSessionDialog.js:406
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/networkAgent.js:153
 #: ../js/ui/polkitAuthenticationAgent.js:176
-#: ../js/ui/shellMountOperation.js:396 ../js/ui/status/bluetooth.js:436
+#: ../js/ui/shellMountOperation.js:396 ../js/ui/status/bluetooth.js:432
 msgid "Cancel"
 msgstr "বাতিল কৰক"

-#: ../js/gdm/loginDialog.js:913
+#: ../js/gdm/loginDialog.js:935
 msgctxt "button"
 msgid "Sign In"
 msgstr "ছাইন ইন কৰক"

-#: ../js/gdm/loginDialog.js:1256
+#: ../js/gdm/loginDialog.js:1280
 msgid "Login Window"
 msgstr "লগিন উইন্ডো"

@ -326,12 +327,12 @@ msgstr "%s ক আপোনাৰ পছন্দৰ পৰা আতৰোৱ
 msgid "Removable Devices"
 msgstr "আতৰাব পৰা ডিভাইচসমূহ"

-#: ../js/ui/autorunManager.js:549
+#: ../js/ui/autorunManager.js:548
 #, c-format
 msgid "Open with %s"
 msgstr "%s ৰ সৈতে খোলক"

-#: ../js/ui/autorunManager.js:575
+#: ../js/ui/autorunManager.js:574
 msgid "Eject"
 msgstr "উলিৱাওক"

@ -481,7 +482,7 @@ msgstr "এই সপ্তাহ"
 msgid "Next week"
 msgstr "অহা সপ্তাহ"

-#: ../js/ui/dash.js:238 ../js/ui/messageTray.js:1321
+#: ../js/ui/dash.js:238 ../js/ui/messageTray.js:1317
 msgid "Remove"
 msgstr "আতৰাওক"

@ -601,8 +602,8 @@ msgstr "extensions.gnome.org ৰ পৰা  '%s' ক ডাউনল'ড আৰ
 msgid "tray"
 msgstr "ট্ৰে"

-#: ../js/ui/keyboard.js:545 ../js/ui/status/keyboard.js:149
-#: ../js/ui/status/power.js:209
+#: ../js/ui/keyboard.js:545 ../js/ui/status/keyboard.js:146
+#: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "কিবৰ্ড"

@ -663,24 +664,24 @@ msgid "Web Page"
 msgstr "ৱেব পৃষ্ঠা"

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/main.js:140
+#: ../js/ui/main.js:138
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "%d %t ৰ পৰা স্ক্ৰিনকাস্ট দেখুৱাওক"

-#: ../js/ui/messageTray.js:1314
+#: ../js/ui/messageTray.js:1310
 msgid "Open"
 msgstr "খোলক"

-#: ../js/ui/messageTray.js:1331
+#: ../js/ui/messageTray.js:1327
 msgid "Unmute"
 msgstr "অমৌন কৰক"

-#: ../js/ui/messageTray.js:1331
+#: ../js/ui/messageTray.js:1327
 msgid "Mute"
 msgstr "মোন কৰক"

-#: ../js/ui/messageTray.js:2642
+#: ../js/ui/messageTray.js:2638
 msgid "System Information"
 msgstr "চিস্টেম তথ্য"

@ -763,7 +764,7 @@ msgstr "মবাইল ব্ৰডবেণ্ড নেটৱাৰ্ক প
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' লে সংযোগ কৰিবলে এটা পাছৱাৰ্ডৰ প্ৰয়োজন।"

-#: ../js/ui/notificationDaemon.js:484 ../src/shell-app.c:374
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
@ -800,7 +801,7 @@ msgstr "প্ৰস্থান কৰক"
 msgid "Activities"
 msgstr "কাৰ্য্যসমূহ"

-#: ../js/ui/panel.js:975
+#: ../js/ui/panel.js:971
 msgid "Top Bar"
 msgstr "উপৰৰ বাৰ"

@ -847,7 +848,7 @@ msgstr "ক্ষমা কৰিব, সেয়া কাম নকৰিলে
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:727
+#: ../js/ui/popupMenu.js:723
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"

@ -891,322 +892,322 @@ msgstr "পাচফ্ৰেইছ মনত ৰাখক"
 msgid "Unlock"
 msgstr "আনলক কৰক"

-#: ../js/ui/status/accessibility.js:47
+#: ../js/ui/status/accessibility.js:39
 msgid "Accessibility"
 msgstr "অভিগম্যতা"

-#: ../js/ui/status/accessibility.js:52
+#: ../js/ui/status/accessibility.js:44
 msgid "Zoom"
 msgstr "জুম কৰক"

-#: ../js/ui/status/accessibility.js:59
+#: ../js/ui/status/accessibility.js:51
 msgid "Screen Reader"
 msgstr "পৰ্দা ৰিডাৰ"

-#: ../js/ui/status/accessibility.js:63
+#: ../js/ui/status/accessibility.js:55
 msgid "Screen Keyboard"
 msgstr "পৰ্দা কিবৰ্ড"

-#: ../js/ui/status/accessibility.js:67
+#: ../js/ui/status/accessibility.js:59
 msgid "Visual Alerts"
 msgstr "চক্ষ সতৰ্কবাৰ্তাসমূহ"

-#: ../js/ui/status/accessibility.js:70
+#: ../js/ui/status/accessibility.js:62
 msgid "Sticky Keys"
 msgstr "স্টিকি কি'সমূহ"

-#: ../js/ui/status/accessibility.js:73
+#: ../js/ui/status/accessibility.js:65
 msgid "Slow Keys"
 msgstr "মন্থৰ কি'সমূহ"

-#: ../js/ui/status/accessibility.js:76
+#: ../js/ui/status/accessibility.js:68
 msgid "Bounce Keys"
 msgstr "বাউঞ্চ কি'সমূহ"

-#: ../js/ui/status/accessibility.js:79
+#: ../js/ui/status/accessibility.js:71
 msgid "Mouse Keys"
 msgstr "মাউছ কি'সমূহ"

-#: ../js/ui/status/accessibility.js:83
+#: ../js/ui/status/accessibility.js:75
 msgid "Universal Access Settings"
 msgstr "সাৰ্বভৈমক অভিগম সংহতিসমূহ"

-#: ../js/ui/status/accessibility.js:121
+#: ../js/ui/status/accessibility.js:113
 msgid "High Contrast"
 msgstr "উচ্চ কন্ট্ৰাস্ট"

-#: ../js/ui/status/accessibility.js:158
+#: ../js/ui/status/accessibility.js:150
 msgid "Large Text"
 msgstr "ডাঙৰ লিখনী"

-#: ../js/ui/status/bluetooth.js:31 ../js/ui/status/bluetooth.js:35
-#: ../js/ui/status/bluetooth.js:260 ../js/ui/status/bluetooth.js:313
-#: ../js/ui/status/bluetooth.js:344 ../js/ui/status/bluetooth.js:380
-#: ../js/ui/status/bluetooth.js:409 ../js/ui/status/network.js:844
+#: ../js/ui/status/bluetooth.js:27 ../js/ui/status/bluetooth.js:31
+#: ../js/ui/status/bluetooth.js:256 ../js/ui/status/bluetooth.js:309
+#: ../js/ui/status/bluetooth.js:340 ../js/ui/status/bluetooth.js:376
+#: ../js/ui/status/bluetooth.js:405 ../js/ui/status/network.js:841
 msgid "Bluetooth"
 msgstr "ব্লুটুথ"

-#: ../js/ui/status/bluetooth.js:48
+#: ../js/ui/status/bluetooth.js:44
 msgid "Visibility"
 msgstr "দৃশ্যমানতা"

-#: ../js/ui/status/bluetooth.js:62
+#: ../js/ui/status/bluetooth.js:58
 msgid "Send Files to Device..."
 msgstr "নথিপত্ৰসমূহক ডিভাইচলে পঠাওক..."

-#: ../js/ui/status/bluetooth.js:63
+#: ../js/ui/status/bluetooth.js:59
 msgid "Set up a New Device..."
 msgstr "এটা নতুন ডিভাইচ সংহতি কৰক..."

-#: ../js/ui/status/bluetooth.js:87
+#: ../js/ui/status/bluetooth.js:83
 msgid "Bluetooth Settings"
 msgstr "ব্লুটুথ সংহতিসমূহ"

 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
-#: ../js/ui/status/bluetooth.js:112 ../js/ui/status/network.js:211
+#: ../js/ui/status/bluetooth.js:108 ../js/ui/status/network.js:208
 msgid "hardware disabled"
 msgstr "হাৰ্ডৱেৰ অসামৰ্থবান কৰা আছে"

-#: ../js/ui/status/bluetooth.js:205
+#: ../js/ui/status/bluetooth.js:201
 msgid "Connection"
 msgstr "সংযোগ"

-#: ../js/ui/status/bluetooth.js:216 ../js/ui/status/network.js:445
+#: ../js/ui/status/bluetooth.js:212 ../js/ui/status/network.js:442
 msgid "disconnecting..."
 msgstr "বিচ্ছিনিত কৰা হৈ আছে..."

-#: ../js/ui/status/bluetooth.js:229 ../js/ui/status/network.js:451
-#: ../js/ui/status/network.js:911
+#: ../js/ui/status/bluetooth.js:225 ../js/ui/status/network.js:448
+#: ../js/ui/status/network.js:908
 msgid "connecting..."
 msgstr "সংযোগ কৰা হৈ আছে..."

-#: ../js/ui/status/bluetooth.js:247
+#: ../js/ui/status/bluetooth.js:243
 msgid "Send Files..."
 msgstr "নথিপত্ৰসমূহ পঠাওক..."

-#: ../js/ui/status/bluetooth.js:252
+#: ../js/ui/status/bluetooth.js:248
 msgid "Browse Files..."
 msgstr "নথিপত্ৰসমূহ ব্ৰাউছ কৰক..."

-#: ../js/ui/status/bluetooth.js:261
+#: ../js/ui/status/bluetooth.js:257
 msgid "Error browsing device"
 msgstr "ডিভাইচ ব্ৰাউছ কৰোতে ত্ৰুটি"

-#: ../js/ui/status/bluetooth.js:262
+#: ../js/ui/status/bluetooth.js:258
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "অনুৰোধিত ডিভাইচ ব্ৰাউছ কৰিব নোৱাৰি, ত্ৰুটি '%s'"

-#: ../js/ui/status/bluetooth.js:270
+#: ../js/ui/status/bluetooth.js:266
 msgid "Keyboard Settings"
 msgstr "কিবৰ্ড সংহতিসমূহ"

-#: ../js/ui/status/bluetooth.js:273
+#: ../js/ui/status/bluetooth.js:269
 msgid "Mouse Settings"
 msgstr "মাউছ আৰু টাচপেড সংহতিসমূহ"

-#: ../js/ui/status/bluetooth.js:278 ../js/ui/status/volume.js:59
+#: ../js/ui/status/bluetooth.js:274 ../js/ui/status/volume.js:54
 msgid "Sound Settings"
 msgstr "শব্দ সংহতিসমূহ"

-#: ../js/ui/status/bluetooth.js:345
+#: ../js/ui/status/bluetooth.js:341
 #, c-format
 msgid "Authorization request from %s"
 msgstr "%s ৰ পৰা প্ৰমাণীকৰণ অনুৰোধ"

-#: ../js/ui/status/bluetooth.js:351
+#: ../js/ui/status/bluetooth.js:347
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "ডিভাইচ %s এ সেৱা '%s' লে অভিগম বিচাৰে"

-#: ../js/ui/status/bluetooth.js:353
+#: ../js/ui/status/bluetooth.js:349
 msgid "Always grant access"
 msgstr "সদায় অভিগম প্ৰদান কৰক"

-#: ../js/ui/status/bluetooth.js:354
+#: ../js/ui/status/bluetooth.js:350
 msgid "Grant this time only"
 msgstr "কেৱল এইবাৰৰ কাৰণে প্ৰদান কৰক"

-#: ../js/ui/status/bluetooth.js:355 ../js/ui/telepathyClient.js:1097
+#: ../js/ui/status/bluetooth.js:351 ../js/ui/telepathyClient.js:1097
 msgid "Reject"
 msgstr "নাকচ কৰক"

-#: ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:377
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s ৰ কাৰণে যোৰ প্ৰতিশ্ৰুতি"

-#: ../js/ui/status/bluetooth.js:387 ../js/ui/status/bluetooth.js:417
+#: ../js/ui/status/bluetooth.js:383 ../js/ui/status/bluetooth.js:413
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "ডিভাইচ %s এ এই কমপিউটাৰৰ লগত সংযোগ কৰিব বিচাৰে"

-#: ../js/ui/status/bluetooth.js:388
+#: ../js/ui/status/bluetooth.js:384
 #, c-format
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
 msgstr "অনুগ্ৰহ কৰি সুনিশ্চিত কৰক যে PIN '%06d' ডিভাইচত থকাটোৰ সৈতে মিল খায়।"

-#: ../js/ui/status/bluetooth.js:390
+#: ../js/ui/status/bluetooth.js:386
 msgid "Matches"
 msgstr "মিলসমূহ"

-#: ../js/ui/status/bluetooth.js:391
+#: ../js/ui/status/bluetooth.js:387
 msgid "Does not match"
 msgstr "মিল নাখায়"

-#: ../js/ui/status/bluetooth.js:410
+#: ../js/ui/status/bluetooth.js:406
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s ৰ কাৰণে যোৰ অনুৰোধ"

-#: ../js/ui/status/bluetooth.js:418
+#: ../js/ui/status/bluetooth.js:414
 msgid "Please enter the PIN mentioned on the device."
 msgstr "অনুগ্ৰহ কৰি ডিভাইচত উল্লেখ কৰা PIN সুমুৱাওক।"

-#: ../js/ui/status/bluetooth.js:435
+#: ../js/ui/status/bluetooth.js:431
 msgid "OK"
 msgstr "ঠিক আছে"

-#: ../js/ui/status/keyboard.js:178
+#: ../js/ui/status/keyboard.js:175
 msgid "Show Keyboard Layout"
 msgstr "কিবৰ্ড বিন্যাস দেখুৱাওক"

-#: ../js/ui/status/keyboard.js:180
+#: ../js/ui/status/keyboard.js:177
 msgid "Region and Language Settings"
 msgstr "অঞ্চল আৰু ভাষা সংহতিসমূহ"

-#: ../js/ui/status/network.js:96
+#: ../js/ui/status/network.js:93
 msgid "<unknown>"
 msgstr "<unknown>"

 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:233
+#: ../js/ui/status/network.js:230
 msgid "disabled"
 msgstr "অসামৰ্থবান"

 #. 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:443
+#: ../js/ui/status/network.js:440
 msgid "unmanaged"
 msgstr "অব্যৱস্থাপিত"

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:454 ../js/ui/status/network.js:914
+#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:911
 msgid "authentication required"
 msgstr "প্ৰমাণীকৰণৰ প্ৰয়োজন"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:464
+#: ../js/ui/status/network.js:461
 msgid "firmware missing"
 msgstr "ফাৰ্মৱেৰ সন্ধানহীন"

 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:471
+#: ../js/ui/status/network.js:468
 msgid "cable unplugged"
 msgstr "কেবুল আনপ্লাগ্গড"

 #. 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:476
+#: ../js/ui/status/network.js:473
 msgid "unavailable"
 msgstr "উপলব্ধ নাই"

-#: ../js/ui/status/network.js:478 ../js/ui/status/network.js:916
+#: ../js/ui/status/network.js:475 ../js/ui/status/network.js:913
 msgid "connection failed"
 msgstr "সংযোগ ব্যৰ্থ"

-#: ../js/ui/status/network.js:539 ../js/ui/status/network.js:1537
+#: ../js/ui/status/network.js:536 ../js/ui/status/network.js:1534
 msgid "More..."
 msgstr "অধিক..."

 #. 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:575 ../js/ui/status/network.js:1467
+#: ../js/ui/status/network.js:572 ../js/ui/status/network.js:1464
 msgid "Connected (private)"
 msgstr "সংযোগিত (ব্যক্তিগত)"

-#: ../js/ui/status/network.js:650
+#: ../js/ui/status/network.js:647
 msgid "Auto Ethernet"
 msgstr "স্বচালিত ইথাৰনেট"

-#: ../js/ui/status/network.js:708
+#: ../js/ui/status/network.js:705
 msgid "Auto broadband"
 msgstr "স্বচালিত ব্ৰডবেণ্ড"

-#: ../js/ui/status/network.js:711
+#: ../js/ui/status/network.js:708
 msgid "Auto dial-up"
 msgstr "স্বচালিত ডায়েল-আপ"

 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:830 ../js/ui/status/network.js:1484
+#: ../js/ui/status/network.js:827 ../js/ui/status/network.js:1481
 #, c-format
 msgid "Auto %s"
 msgstr "স্বচালিত %s"

-#: ../js/ui/status/network.js:832
+#: ../js/ui/status/network.js:829
 msgid "Auto bluetooth"
 msgstr "স্বচালিত ব্লুটুথ"

-#: ../js/ui/status/network.js:1486
+#: ../js/ui/status/network.js:1483
 msgid "Auto wireless"
 msgstr "স্বচালিত বেতাঁৰ"

-#: ../js/ui/status/network.js:1595
+#: ../js/ui/status/network.js:1592
 msgid "Enable networking"
 msgstr "নেটৱাৰ্কিং সামৰ্থবান কৰক"

-#: ../js/ui/status/network.js:1617
+#: ../js/ui/status/network.js:1614
 msgid "Wired"
 msgstr "তাৰঁযুক্ত"

-#: ../js/ui/status/network.js:1628
+#: ../js/ui/status/network.js:1625
 msgid "Wireless"
 msgstr "বেতাঁৰ"

-#: ../js/ui/status/network.js:1638
+#: ../js/ui/status/network.js:1635
 msgid "Mobile broadband"
 msgstr "মবাইল ব্ৰডবেণ্ড"

-#: ../js/ui/status/network.js:1648
+#: ../js/ui/status/network.js:1645
 msgid "VPN Connections"
 msgstr "VPN সংযোগসমূহ"

-#: ../js/ui/status/network.js:1655
+#: ../js/ui/status/network.js:1652
 msgid "Network Settings"
 msgstr "নেটৱাৰ্ক সংহতিসমূহ"

-#: ../js/ui/status/network.js:1712
+#: ../js/ui/status/network.js:1709
 msgid "Network Manager"
 msgstr "নেটৱাৰ্ক ব্যৱস্থাপক"

-#: ../js/ui/status/network.js:1805
+#: ../js/ui/status/network.js:1802
 msgid "Connection failed"
 msgstr "সংযোগ ব্যৰ্থ"

-#: ../js/ui/status/network.js:1806
+#: ../js/ui/status/network.js:1803
 msgid "Activation of network connection failed"
 msgstr "নেটৱাৰ্ক সংযোগ সক্ৰিয়কৰণ ব্যৰ্থ হল"

-#: ../js/ui/status/network.js:2069
+#: ../js/ui/status/network.js:2066
 msgid "Networking is disabled"
 msgstr "নেটৱাৰ্কিং অসামৰ্থবান কৰা আছে"

-#: ../js/ui/status/power.js:59
+#: ../js/ui/status/power.js:55
 msgid "Battery"
 msgstr "বেটাৰি"

-#: ../js/ui/status/power.js:76
+#: ../js/ui/status/power.js:72
 msgid "Power Settings"
 msgstr "শক্তি সংহতিসমূহ"

 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:104
+#: ../js/ui/status/power.js:100
 msgid "Estimating..."
 msgstr "অনুমান কৰা হৈ আছে..."

-#: ../js/ui/status/power.js:111
+#: ../js/ui/status/power.js:107
 #, c-format
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
@ -1214,87 +1215,87 @@ msgstr[0] "%d ঘন্টা অৱশিষ্ট"
 msgstr[1] "%d ঘন্টা অৱশিষ্ট"

 #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:114
+#: ../js/ui/status/power.js:110
 #, c-format
 msgid "%d %s %d %s remaining"
 msgstr "%d %s %d %s অৱশিষ্ট"

-#: ../js/ui/status/power.js:116
+#: ../js/ui/status/power.js:112
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ঘন্টা"
 msgstr[1] "ঘন্টা"

-#: ../js/ui/status/power.js:116
+#: ../js/ui/status/power.js:112
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "মিনিট"
 msgstr[1] "মিনিট"

-#: ../js/ui/status/power.js:119
+#: ../js/ui/status/power.js:115
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "%d মিনিট অৱশিষ্ট"
 msgstr[1] "%d মিনিট অৱশিষ্ট"

-#: ../js/ui/status/power.js:122 ../js/ui/status/power.js:192
+#: ../js/ui/status/power.js:118 ../js/ui/status/power.js:188
 #, c-format
 msgctxt "percent of battery remaining"
 msgid "%d%%"
 msgstr "%d%%"

-#: ../js/ui/status/power.js:199
+#: ../js/ui/status/power.js:195
 msgid "AC adapter"
 msgstr "AC এডাপ্টাৰ"

-#: ../js/ui/status/power.js:201
+#: ../js/ui/status/power.js:197
 msgid "Laptop battery"
 msgstr "লেপটপ বেটাৰি"

-#: ../js/ui/status/power.js:203
+#: ../js/ui/status/power.js:199
 msgid "UPS"
 msgstr "UPS"

-#: ../js/ui/status/power.js:205
+#: ../js/ui/status/power.js:201
 msgid "Monitor"
 msgstr "মনিটৰ"

-#: ../js/ui/status/power.js:207
+#: ../js/ui/status/power.js:203
 msgid "Mouse"
 msgstr "মাউছ"

-#: ../js/ui/status/power.js:211
+#: ../js/ui/status/power.js:207
 msgid "PDA"
 msgstr "PDA"

-#: ../js/ui/status/power.js:213
+#: ../js/ui/status/power.js:209
 msgid "Cell phone"
 msgstr "চেল ফোন"

-#: ../js/ui/status/power.js:215
+#: ../js/ui/status/power.js:211
 msgid "Media player"
 msgstr "মিডিয়া প্লেয়াৰ"

-#: ../js/ui/status/power.js:217
+#: ../js/ui/status/power.js:213
 msgid "Tablet"
 msgstr "টেবলেট"

-#: ../js/ui/status/power.js:219
+#: ../js/ui/status/power.js:215
 msgid "Computer"
 msgstr "কমপিউটাৰ"

-#: ../js/ui/status/power.js:221
+#: ../js/ui/status/power.js:217
 msgctxt "device"
 msgid "Unknown"
 msgstr "অজ্ঞাত"

 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:25 ../js/ui/status/volume.js:39
+#: ../js/ui/status/volume.js:20 ../js/ui/status/volume.js:34
 msgid "Volume"
 msgstr "ভলিউম"

-#: ../js/ui/status/volume.js:51
+#: ../js/ui/status/volume.js:46
 msgid "Microphone"
 msgstr "মাইক্ৰোফোন"

--- a/po/es.po
+++ b/po/es.po
@ -10,16 +10,16 @@ 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-07-21 17:14+0000\n"
-"PO-Revision-Date: 2012-07-27 11:31+0200\n"
+"POT-Creation-Date: 2012-08-06 17:11+0000\n"
+"PO-Revision-Date: 2012-08-07 20:21+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.5\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@ -189,16 +189,16 @@ msgid ""
 "thread count on the system."
 msgstr ""
 "Establece la tubería GStreamer usada para codificar grabaciones. Sigue la "
-"sintaxis usada para gst-launch. La tubería debería tener un sumidero («sink») "
-"desconectado donde grabar el vídeo que se está grabando. Generalmente tendrá "
-"un punto de origen desconectado; la salida de ese punto se escribirá en el "
-"archivo de salida. Sin embargo, la tubería también puede tomar parte en su "
-"propia salida; esto se puede usar para enviar la salida a un servidor "
-"«icecast» a través de shout2send o similar. Cuando no está establecido o lo "
-"está a un valor vacío, se usará la tubería predeterminada. Actualmente es "
-"«'vp8enc quality=8 speed=6 threads=%T ! queue ! webmmux» y graba en WEBM "
-"usando el códec VP8. Se usa %T como marcador de posición para el número de "
-"hilos óptimos en el sistema."
+"sintaxis usada para gst-launch. La tubería debería tener un sumidero "
+"(«sink») desconectado donde grabar el vídeo que se está grabando. "
+"Generalmente tendrá un punto de origen desconectado; la salida de ese punto "
+"se escribirá en el archivo de salida. Sin embargo, la tubería también puede "
+"tomar parte en su propia salida; esto se puede usar para enviar la salida a "
+"un servidor «icecast» a través de shout2send o similar. Cuando no está "
+"establecido o lo está a un valor vacío, se usará la tubería predeterminada. "
+"Actualmente es «'vp8enc quality=8 speed=6 threads=%T ! queue ! webmmux» y "
+"graba en WEBM usando el códec VP8. Se usa %T como marcador de posición para "
+"el número de hilos óptimos en el sistema."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "File extension used for storing the screencast"
@ -220,49 +220,50 @@ msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Hubo un error al lanzar el diálogo de preferencias para %s:"

 #: ../js/extensionPrefs/main.js:164
-msgid "<b>Extension</b>"
-msgstr "<b>Extensión</b>"
+#| msgid "<b>Extension</b>"
+msgid "Extension"
+msgstr "Extensión"

 #: ../js/extensionPrefs/main.js:188
 msgid "Select an extension to configure using the combobox above."
 msgstr ""
 "Seleccione una extensión que configurar usando la caja combinada de arriba."

-#: ../js/gdm/loginDialog.js:550
+#: ../js/gdm/loginDialog.js:572
 msgid "Session..."
 msgstr "Sesión…"

-#: ../js/gdm/loginDialog.js:699
+#: ../js/gdm/loginDialog.js:721
 msgctxt "title"
 msgid "Sign In"
 msgstr "Iniciar sesión"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/loginDialog.js:744 ../js/ui/unlockDialog.js:124
+#: ../js/gdm/loginDialog.js:766 ../js/ui/unlockDialog.js:124
 msgid "(or swipe finger)"
 msgstr "(o pase el dedo)"

 #. 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:765
+#: ../js/gdm/loginDialog.js:787
 msgid "Not listed?"
 msgstr "¿No está en la lista?"

-#: ../js/gdm/loginDialog.js:908 ../js/ui/endSessionDialog.js:406
+#: ../js/gdm/loginDialog.js:930 ../js/ui/endSessionDialog.js:406
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/networkAgent.js:153
 #: ../js/ui/polkitAuthenticationAgent.js:176
-#: ../js/ui/shellMountOperation.js:396 ../js/ui/status/bluetooth.js:436
+#: ../js/ui/shellMountOperation.js:396 ../js/ui/status/bluetooth.js:432
 msgid "Cancel"
 msgstr "Cancelar"

-#: ../js/gdm/loginDialog.js:913
+#: ../js/gdm/loginDialog.js:935
 msgctxt "button"
 msgid "Sign In"
 msgstr "Iniciar sesión"

-#: ../js/gdm/loginDialog.js:1256
+#: ../js/gdm/loginDialog.js:1280
 msgid "Login Window"
 msgstr "Ventana de inicio de sesión"

@ -334,12 +335,12 @@ msgstr "Se ha quitado %s de sus favoritos."
 msgid "Removable Devices"
 msgstr "Dispositivos extraíbles"

-#: ../js/ui/autorunManager.js:549
+#: ../js/ui/autorunManager.js:548
 #, c-format
 msgid "Open with %s"
 msgstr "Abrir con %s"

-#: ../js/ui/autorunManager.js:575
+#: ../js/ui/autorunManager.js:574
 msgid "Eject"
 msgstr "Expulsar"

@ -489,7 +490,7 @@ msgstr "Esta semana"
 msgid "Next week"
 msgstr "La semana que viene"

-#: ../js/ui/dash.js:238 ../js/ui/messageTray.js:1321
+#: ../js/ui/dash.js:238 ../js/ui/messageTray.js:1317
 msgid "Remove"
 msgstr "Quitar"

@ -612,8 +613,8 @@ msgstr "¿Descargar e instalar «%s» desde extensions.gnome.org?"
 msgid "tray"
 msgstr "bandeja"

-#: ../js/ui/keyboard.js:545 ../js/ui/status/keyboard.js:149
-#: ../js/ui/status/power.js:209
+#: ../js/ui/keyboard.js:545 ../js/ui/status/keyboard.js:146
+#: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "Teclado"

@ -674,24 +675,24 @@ msgid "Web Page"
 msgstr "Página web"

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

-#: ../js/ui/messageTray.js:1314
+#: ../js/ui/messageTray.js:1310
 msgid "Open"
 msgstr "Abrir"

-#: ../js/ui/messageTray.js:1331
+#: ../js/ui/messageTray.js:1327
 msgid "Unmute"
 msgstr "Dar voz"

-#: ../js/ui/messageTray.js:1331
+#: ../js/ui/messageTray.js:1327
 msgid "Mute"
 msgstr "Silenciar"

-#: ../js/ui/messageTray.js:2642
+#: ../js/ui/messageTray.js:2638
 msgid "System Information"
 msgstr "Información del sistema"

@ -737,8 +738,8 @@ msgstr "La red inalámbrica requiere autenticación"
 #: ../js/ui/networkAgent.js:325
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
 msgstr ""
 "Se necesitan contraseñas o claves de cifrado para acceder a la red "
 "inalámbrica «%s»."
@ -776,7 +777,7 @@ msgstr "Contraseña de la red de banda ancha móvil"
 msgid "A password is required to connect to '%s'."
 msgstr "Se requiere una contraseña para conectar a «%s»."

-#: ../js/ui/notificationDaemon.js:484 ../src/shell-app.c:374
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "Desconocido"
@ -813,7 +814,7 @@ msgstr "Salir"
 msgid "Activities"
 msgstr "Actividades"

-#: ../js/ui/panel.js:975
+#: ../js/ui/panel.js:971
 msgid "Top Bar"
 msgstr "Barra superior"

@ -860,7 +861,7 @@ msgstr "Inténtelo de nuevo,"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:727
+#: ../js/ui/popupMenu.js:723
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

@ -904,322 +905,323 @@ msgstr "Recordar contraseña"
 msgid "Unlock"
 msgstr "Desbloquear"

-#: ../js/ui/status/accessibility.js:47
+#: ../js/ui/status/accessibility.js:39
 msgid "Accessibility"
 msgstr "Accesibilidad"

-#: ../js/ui/status/accessibility.js:52
+#: ../js/ui/status/accessibility.js:44
 msgid "Zoom"
 msgstr "Ampliación"

-#: ../js/ui/status/accessibility.js:59
+#: ../js/ui/status/accessibility.js:51
 msgid "Screen Reader"
 msgstr "Lector de pantalla"

-#: ../js/ui/status/accessibility.js:63
+#: ../js/ui/status/accessibility.js:55
 msgid "Screen Keyboard"
 msgstr "Teclado en pantalla"

-#: ../js/ui/status/accessibility.js:67
+#: ../js/ui/status/accessibility.js:59
 msgid "Visual Alerts"
 msgstr "Alertas visuales"

-#: ../js/ui/status/accessibility.js:70
+#: ../js/ui/status/accessibility.js:62
 msgid "Sticky Keys"
 msgstr "Teclas persistentes"

-#: ../js/ui/status/accessibility.js:73
+#: ../js/ui/status/accessibility.js:65
 msgid "Slow Keys"
 msgstr "Teclas lentas"

-#: ../js/ui/status/accessibility.js:76
+#: ../js/ui/status/accessibility.js:68
 msgid "Bounce Keys"
 msgstr "Rechazo de teclas"

-#: ../js/ui/status/accessibility.js:79
+#: ../js/ui/status/accessibility.js:71
 msgid "Mouse Keys"
 msgstr "Teclas del ratón"

-#: ../js/ui/status/accessibility.js:83
+#: ../js/ui/status/accessibility.js:75
 msgid "Universal Access Settings"
 msgstr "Configuración del acceso universal"

-#: ../js/ui/status/accessibility.js:121
+#: ../js/ui/status/accessibility.js:113
 msgid "High Contrast"
 msgstr "Contraste alto"

-#: ../js/ui/status/accessibility.js:158
+#: ../js/ui/status/accessibility.js:150
 msgid "Large Text"
 msgstr "Texto grande"

-#: ../js/ui/status/bluetooth.js:31 ../js/ui/status/bluetooth.js:35
-#: ../js/ui/status/bluetooth.js:260 ../js/ui/status/bluetooth.js:313
-#: ../js/ui/status/bluetooth.js:344 ../js/ui/status/bluetooth.js:380
-#: ../js/ui/status/bluetooth.js:409 ../js/ui/status/network.js:844
+#: ../js/ui/status/bluetooth.js:27 ../js/ui/status/bluetooth.js:31
+#: ../js/ui/status/bluetooth.js:256 ../js/ui/status/bluetooth.js:309
+#: ../js/ui/status/bluetooth.js:340 ../js/ui/status/bluetooth.js:376
+#: ../js/ui/status/bluetooth.js:405 ../js/ui/status/network.js:841
 msgid "Bluetooth"
 msgstr "Bluetooth"

-#: ../js/ui/status/bluetooth.js:48
+#: ../js/ui/status/bluetooth.js:44
 msgid "Visibility"
 msgstr "Visibilidad"

-#: ../js/ui/status/bluetooth.js:62
+#: ../js/ui/status/bluetooth.js:58
 msgid "Send Files to Device..."
 msgstr "Enviar archivos al dispositivo…"

-#: ../js/ui/status/bluetooth.js:63
+#: ../js/ui/status/bluetooth.js:59
 msgid "Set up a New Device..."
 msgstr "Configurar un dispositivo nuevo…"

-#: ../js/ui/status/bluetooth.js:87
+#: ../js/ui/status/bluetooth.js:83
 msgid "Bluetooth Settings"
 msgstr "Configuración de Bluetooth"

 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
-#: ../js/ui/status/bluetooth.js:112 ../js/ui/status/network.js:211
+#: ../js/ui/status/bluetooth.js:108 ../js/ui/status/network.js:208
 msgid "hardware disabled"
 msgstr "hardware desactivado"

-#: ../js/ui/status/bluetooth.js:205
+#: ../js/ui/status/bluetooth.js:201
 msgid "Connection"
 msgstr "Conexión"

-#: ../js/ui/status/bluetooth.js:216 ../js/ui/status/network.js:445
+#: ../js/ui/status/bluetooth.js:212 ../js/ui/status/network.js:442
 msgid "disconnecting..."
 msgstr "deconectando…"

-#: ../js/ui/status/bluetooth.js:229 ../js/ui/status/network.js:451
-#: ../js/ui/status/network.js:911
+#: ../js/ui/status/bluetooth.js:225 ../js/ui/status/network.js:448
+#: ../js/ui/status/network.js:908
 msgid "connecting..."
 msgstr "conectando…"

-#: ../js/ui/status/bluetooth.js:247
+#: ../js/ui/status/bluetooth.js:243
 msgid "Send Files..."
 msgstr "Enviar archivos…"

-#: ../js/ui/status/bluetooth.js:252
+#: ../js/ui/status/bluetooth.js:248
 msgid "Browse Files..."
 msgstr "Examinar archivos…"

-#: ../js/ui/status/bluetooth.js:261
+#: ../js/ui/status/bluetooth.js:257
 msgid "Error browsing device"
 msgstr "Error al examinar el dispositivo"

-#: ../js/ui/status/bluetooth.js:262
+#: ../js/ui/status/bluetooth.js:258
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "No se puede examinar el dispositivo solicitado, el error es «%s»"

-#: ../js/ui/status/bluetooth.js:270
+#: ../js/ui/status/bluetooth.js:266
 msgid "Keyboard Settings"
 msgstr "Configuración del teclado"

-#: ../js/ui/status/bluetooth.js:273
+#: ../js/ui/status/bluetooth.js:269
 msgid "Mouse Settings"
 msgstr "Ajustes del ratón…"

-#: ../js/ui/status/bluetooth.js:278 ../js/ui/status/volume.js:59
+#: ../js/ui/status/bluetooth.js:274 ../js/ui/status/volume.js:54
 msgid "Sound Settings"
 msgstr "Configuración del sonido"

-#: ../js/ui/status/bluetooth.js:345
+#: ../js/ui/status/bluetooth.js:341
 #, c-format
 msgid "Authorization request from %s"
 msgstr "Solicitud de autorización de %s"

-#: ../js/ui/status/bluetooth.js:351
+#: ../js/ui/status/bluetooth.js:347
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "El dispositivo %s quiere acceder al servicio «%s»"

-#: ../js/ui/status/bluetooth.js:353
+#: ../js/ui/status/bluetooth.js:349
 msgid "Always grant access"
 msgstr "Conceder acceso siempre"

-#: ../js/ui/status/bluetooth.js:354
+#: ../js/ui/status/bluetooth.js:350
 msgid "Grant this time only"
 msgstr "Conceder sólo esta vez"

-#: ../js/ui/status/bluetooth.js:355 ../js/ui/telepathyClient.js:1097
+#: ../js/ui/status/bluetooth.js:351 ../js/ui/telepathyClient.js:1097
 msgid "Reject"
 msgstr "Rechazar"

-#: ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:377
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Confirmación de emparejamiento para «%s»"

-#: ../js/ui/status/bluetooth.js:387 ../js/ui/status/bluetooth.js:417
+#: ../js/ui/status/bluetooth.js:383 ../js/ui/status/bluetooth.js:413
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "El dispositivo «%s» quiere emparejarse con este equipo"

-#: ../js/ui/status/bluetooth.js:388
+#: ../js/ui/status/bluetooth.js:384
 #, c-format
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
-msgstr "Confirme que el PIN mostrado en «%06d» coincide con el del dispositivo."
+msgstr ""
+"Confirme que el PIN mostrado en «%06d» coincide con el del dispositivo."

-#: ../js/ui/status/bluetooth.js:390
+#: ../js/ui/status/bluetooth.js:386
 msgid "Matches"
 msgstr "Coincide"

-#: ../js/ui/status/bluetooth.js:391
+#: ../js/ui/status/bluetooth.js:387
 msgid "Does not match"
 msgstr "No coincide"

-#: ../js/ui/status/bluetooth.js:410
+#: ../js/ui/status/bluetooth.js:406
 #, c-format
 msgid "Pairing request for %s"
 msgstr "Solicitud de emparejamiento para «%s»"

-#: ../js/ui/status/bluetooth.js:418
+#: ../js/ui/status/bluetooth.js:414
 msgid "Please enter the PIN mentioned on the device."
 msgstr "Introduzca el PIN mencionado en el dispositivo."

-#: ../js/ui/status/bluetooth.js:435
+#: ../js/ui/status/bluetooth.js:431
 msgid "OK"
 msgstr "Aceptar"

-#: ../js/ui/status/keyboard.js:178
+#: ../js/ui/status/keyboard.js:175
 msgid "Show Keyboard Layout"
 msgstr "Mostrar la distribución del teclado"

-#: ../js/ui/status/keyboard.js:180
+#: ../js/ui/status/keyboard.js:177
 msgid "Region and Language Settings"
 msgstr "Configuración de región e idioma"

-#: ../js/ui/status/network.js:96
+#: ../js/ui/status/network.js:93
 msgid "<unknown>"
 msgstr "<desconocido>"

 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:233
+#: ../js/ui/status/network.js:230
 msgid "disabled"
 msgstr "desactivada"

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

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:454 ../js/ui/status/network.js:914
+#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:911
 msgid "authentication required"
 msgstr "se necesita autenticación"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:464
+#: ../js/ui/status/network.js:461
 msgid "firmware missing"
 msgstr "falta el «firmware»"

 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:471
+#: ../js/ui/status/network.js:468
 msgid "cable unplugged"
 msgstr "cable desconectado"

 #. 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:476
+#: ../js/ui/status/network.js:473
 msgid "unavailable"
 msgstr "no disponible"

-#: ../js/ui/status/network.js:478 ../js/ui/status/network.js:916
+#: ../js/ui/status/network.js:475 ../js/ui/status/network.js:913
 msgid "connection failed"
 msgstr "falló la conexión"

-#: ../js/ui/status/network.js:539 ../js/ui/status/network.js:1537
+#: ../js/ui/status/network.js:536 ../js/ui/status/network.js:1534
 msgid "More..."
 msgstr "Más…"

 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
-#: ../js/ui/status/network.js:575 ../js/ui/status/network.js:1467
+#: ../js/ui/status/network.js:572 ../js/ui/status/network.js:1464
 msgid "Connected (private)"
 msgstr "Conectada (privada)"

-#: ../js/ui/status/network.js:650
+#: ../js/ui/status/network.js:647
 msgid "Auto Ethernet"
 msgstr "Ethernet automática"

-#: ../js/ui/status/network.js:708
+#: ../js/ui/status/network.js:705
 msgid "Auto broadband"
 msgstr "Banda ancha automática"

-#: ../js/ui/status/network.js:711
+#: ../js/ui/status/network.js:708
 msgid "Auto dial-up"
 msgstr "Marcado automático"

 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:830 ../js/ui/status/network.js:1484
+#: ../js/ui/status/network.js:827 ../js/ui/status/network.js:1481
 #, c-format
 msgid "Auto %s"
 msgstr "%s automática"

-#: ../js/ui/status/network.js:832
+#: ../js/ui/status/network.js:829
 msgid "Auto bluetooth"
 msgstr "Bluetooth automático"

-#: ../js/ui/status/network.js:1486
+#: ../js/ui/status/network.js:1483
 msgid "Auto wireless"
 msgstr "Inalámbrica automática"

-#: ../js/ui/status/network.js:1595
+#: ../js/ui/status/network.js:1592
 msgid "Enable networking"
 msgstr "Activar red"

-#: ../js/ui/status/network.js:1617
+#: ../js/ui/status/network.js:1614
 msgid "Wired"
 msgstr "Cableada"

-#: ../js/ui/status/network.js:1628
+#: ../js/ui/status/network.js:1625
 msgid "Wireless"
 msgstr "Inalámbrica"

-#: ../js/ui/status/network.js:1638
+#: ../js/ui/status/network.js:1635
 msgid "Mobile broadband"
 msgstr "Banda ancha móvil"

-#: ../js/ui/status/network.js:1648
+#: ../js/ui/status/network.js:1645
 msgid "VPN Connections"
 msgstr "Conexiones VPN"

-#: ../js/ui/status/network.js:1655
+#: ../js/ui/status/network.js:1652
 msgid "Network Settings"
 msgstr "Configuración de la red"

-#: ../js/ui/status/network.js:1712
+#: ../js/ui/status/network.js:1709
 msgid "Network Manager"
 msgstr "Gestor de la red"

-#: ../js/ui/status/network.js:1805
+#: ../js/ui/status/network.js:1802
 msgid "Connection failed"
 msgstr "Falló la conexión"

-#: ../js/ui/status/network.js:1806
+#: ../js/ui/status/network.js:1803
 msgid "Activation of network connection failed"
 msgstr "Falló la activación de la conexión de red"

-#: ../js/ui/status/network.js:2069
+#: ../js/ui/status/network.js:2066
 msgid "Networking is disabled"
 msgstr "La red está desactivada"

-#: ../js/ui/status/power.js:59
+#: ../js/ui/status/power.js:55
 msgid "Battery"
 msgstr "Batería"

-#: ../js/ui/status/power.js:76
+#: ../js/ui/status/power.js:72
 msgid "Power Settings"
 msgstr "Configuración de energía"

 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:104
+#: ../js/ui/status/power.js:100
 msgid "Estimating..."
 msgstr "Estimando…"

-#: ../js/ui/status/power.js:111
+#: ../js/ui/status/power.js:107
 #, c-format
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
@ -1227,87 +1229,87 @@ msgstr[0] "Queda %d hora"
 msgstr[1] "Queda %d horas"

 #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:114
+#: ../js/ui/status/power.js:110
 #, c-format
 msgid "%d %s %d %s remaining"
 msgstr "Quedan %d %s %d %s"

-#: ../js/ui/status/power.js:116
+#: ../js/ui/status/power.js:112
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"

-#: ../js/ui/status/power.js:116
+#: ../js/ui/status/power.js:112
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"

-#: ../js/ui/status/power.js:119
+#: ../js/ui/status/power.js:115
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "Queda %d minuto"
 msgstr[1] "Quedan %d minutos"

-#: ../js/ui/status/power.js:122 ../js/ui/status/power.js:192
+#: ../js/ui/status/power.js:118 ../js/ui/status/power.js:188
 #, c-format
 msgctxt "percent of battery remaining"
 msgid "%d%%"
 msgstr "%d%%"

-#: ../js/ui/status/power.js:199
+#: ../js/ui/status/power.js:195
 msgid "AC adapter"
 msgstr "Adaptador de corriente"

-#: ../js/ui/status/power.js:201
+#: ../js/ui/status/power.js:197
 msgid "Laptop battery"
 msgstr "Batería del portátil"

-#: ../js/ui/status/power.js:203
+#: ../js/ui/status/power.js:199
 msgid "UPS"
 msgstr "SAI"

-#: ../js/ui/status/power.js:205
+#: ../js/ui/status/power.js:201
 msgid "Monitor"
 msgstr "Monitor"

-#: ../js/ui/status/power.js:207
+#: ../js/ui/status/power.js:203
 msgid "Mouse"
 msgstr "Ratón"

-#: ../js/ui/status/power.js:211
+#: ../js/ui/status/power.js:207
 msgid "PDA"
 msgstr "PDA"

-#: ../js/ui/status/power.js:213
+#: ../js/ui/status/power.js:209
 msgid "Cell phone"
 msgstr "Teléfono móvil"

-#: ../js/ui/status/power.js:215
+#: ../js/ui/status/power.js:211
 msgid "Media player"
 msgstr "Reproductor multimedia"

-#: ../js/ui/status/power.js:217
+#: ../js/ui/status/power.js:213
 msgid "Tablet"
 msgstr "Tableta"

-#: ../js/ui/status/power.js:219
+#: ../js/ui/status/power.js:215
 msgid "Computer"
 msgstr "Equipo"

-#: ../js/ui/status/power.js:221
+#: ../js/ui/status/power.js:217
 msgctxt "device"
 msgid "Unknown"
 msgstr "Desconocido"

 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:25 ../js/ui/status/volume.js:39
+#: ../js/ui/status/volume.js:20 ../js/ui/status/volume.js:34
 msgid "Volume"
 msgstr "Volumen"

-#: ../js/ui/status/volume.js:51
+#: ../js/ui/status/volume.js:46
 msgid "Microphone"
 msgstr "Micrófono"

@ -2094,8 +2096,8 @@ msgstr "%1$s: %2$s"
 #~ "If true and format is either \"12-hour\" or \"24-hour\", display seconds "
 #~ "in time."
 #~ msgstr ""
-#~ "Si es cierta y el formato es «12-horas» o «24-horas», muestra los segundos "
-#~ "en la hora."
+#~ "Si es cierta y el formato es «12-horas» o «24-horas», muestra los "
+#~ "segundos en la hora."

 #~ msgid ""
 #~ "This key specifies the format used by the panel clock when the format key "
@ -2112,18 +2114,19 @@ msgstr "%1$s: %2$s"
 #~ msgid ""
 #~ "This key specifies the hour format used by the panel clock. Possible "
 #~ "values are \"12-hour\", \"24-hour\", \"unix\" and \"custom\". If set to "
-#~ "\"unix\", the clock will display time in seconds since Epoch, i.e. 1970-"
-#~ "01-01. If set to \"custom\", the clock will display time according to the "
-#~ "format specified in the custom_format key. Note that if set to either "
-#~ "\"unix\" or \"custom\", the show_date and show_seconds keys are ignored."
+#~ "\"unix\", the clock will display time in seconds since Epoch, i.e. "
+#~ "1970-01-01. If set to \"custom\", the clock will display time according "
+#~ "to the format specified in the custom_format key. Note that if set to "
+#~ "either \"unix\" or \"custom\", the show_date and show_seconds keys are "
+#~ "ignored."
 #~ msgstr ""
 #~ "Esta clave especifica el formato de la hora especificado por el reloj del "
-#~ "panel. Los valores posibles son «12-hour» (12 horas), «24-hour» (24 horas), "
-#~ "«unix» y «custom» (personalizado).Si se establece a «unix» el reloj mostrará "
-#~ "la hora en segundos desde la época (1 de enero de 1970). Si se establece "
-#~ "a «custom» el reloj mostrará la hora según el formato especificado en la "
-#~ "clave «custom_format». Note que si se establece a «unix» o «custom» se "
-#~ "ignoran las claves «show_date» y «show_seconds»."
+#~ "panel. Los valores posibles son «12-hour» (12 horas), «24-hour» (24 "
+#~ "horas), «unix» y «custom» (personalizado).Si se establece a «unix» el "
+#~ "reloj mostrará la hora en segundos desde la época (1 de enero de 1970). "
+#~ "Si se establece a «custom» el reloj mostrará la hora según el formato "
+#~ "especificado en la clave «custom_format». Note que si se establece a "
+#~ "«unix» o «custom» se ignoran las claves «show_date» y «show_seconds»."

 #~ msgid "Clock Format"
 #~ msgstr "Formato del reloj"
--- a/po/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-07-21 17:14+0000\n"
-"PO-Revision-Date: 2012-07-30 12:48+0530\n"
+"POT-Creation-Date: 2012-08-06 17:11+0000\n"
+"PO-Revision-Date: 2012-08-07 15:02+0530\n"
 "Last-Translator: \n"
 "Language-Team: gu_IN <kde-i18n-doc@kde.org>\n"
 "Language: \n"
@ -187,48 +187,49 @@ msgid "There was an error loading the preferences dialog for %s:"
 msgstr "ત્યાં %s માટે પસંદગી સંવાદને લાવવામાં ભૂલ હતી:"

 #: ../js/extensionPrefs/main.js:164
-msgid "<b>Extension</b>"
-msgstr "<b>ઍક્સટેન્શન</b>"
+#| msgid "<b>Extension</b>"
+msgid "Extension"
+msgstr "ઍક્સટેન્શન"

 #: ../js/extensionPrefs/main.js:188
 msgid "Select an extension to configure using the combobox above."
 msgstr "ઉપર કોમ્બોબોક્સની મદદથી રૂપરેખાંકિત કરવા માટે ઍક્સટેન્શનને પસંદ કરો."

-#: ../js/gdm/loginDialog.js:550
+#: ../js/gdm/loginDialog.js:572
 msgid "Session..."
 msgstr "સત્ર..."

-#: ../js/gdm/loginDialog.js:699
+#: ../js/gdm/loginDialog.js:721
 msgctxt "title"
 msgid "Sign In"
 msgstr "પ્રવેશો"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/loginDialog.js:744 ../js/ui/unlockDialog.js:124
+#: ../js/gdm/loginDialog.js:766 ../js/ui/unlockDialog.js:124
 msgid "(or swipe finger)"
 msgstr "(અથવા સ્વાઇપ આંગળી)"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:765
+#: ../js/gdm/loginDialog.js:787
 msgid "Not listed?"
 msgstr "શું યાદી થયેલ નથી?"

-#: ../js/gdm/loginDialog.js:908 ../js/ui/endSessionDialog.js:406
+#: ../js/gdm/loginDialog.js:930 ../js/ui/endSessionDialog.js:406
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/networkAgent.js:153
 #: ../js/ui/polkitAuthenticationAgent.js:176
-#: ../js/ui/shellMountOperation.js:396 ../js/ui/status/bluetooth.js:436
+#: ../js/ui/shellMountOperation.js:396 ../js/ui/status/bluetooth.js:432
 msgid "Cancel"
 msgstr "રદ કરો"

-#: ../js/gdm/loginDialog.js:913
+#: ../js/gdm/loginDialog.js:935
 msgctxt "button"
 msgid "Sign In"
 msgstr "પ્રવેશો"

-#: ../js/gdm/loginDialog.js:1256
+#: ../js/gdm/loginDialog.js:1280
 msgid "Login Window"
 msgstr "પ્રવેશ વિન્ડો"

@ -300,12 +301,12 @@ msgstr "%s ને તમારી પસંદીદામાંથી દૂર
 msgid "Removable Devices"
 msgstr "દૂર કરી શકાય તેવા ઉપકરણો"

-#: ../js/ui/autorunManager.js:549
+#: ../js/ui/autorunManager.js:548
 #, c-format
 msgid "Open with %s"
 msgstr "%s સાથે ખોલો"

-#: ../js/ui/autorunManager.js:575
+#: ../js/ui/autorunManager.js:574
 msgid "Eject"
 msgstr "રદ કરો"

@ -455,7 +456,7 @@ msgstr "આ અઠવાડિયે"
 msgid "Next week"
 msgstr "આગળનું અઠવાડિયું"

-#: ../js/ui/dash.js:238 ../js/ui/messageTray.js:1321
+#: ../js/ui/dash.js:238 ../js/ui/messageTray.js:1317
 msgid "Remove"
 msgstr "દૂર કરો"

@ -578,8 +579,8 @@ msgstr "extensions.gnome.org માંથી '%s' ને સ્થાપિત
 msgid "tray"
 msgstr "ટ્રે"

-#: ../js/ui/keyboard.js:545 ../js/ui/status/keyboard.js:149
-#: ../js/ui/status/power.js:209
+#: ../js/ui/keyboard.js:545 ../js/ui/status/keyboard.js:146
+#: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "કિબોર્ડ"

@ -640,24 +641,24 @@ msgid "Web Page"
 msgstr "વેબ પાનું"

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/main.js:140
+#: ../js/ui/main.js:138
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "%d %t માંથી સ્ક્રીનકાસ્ટ"

-#: ../js/ui/messageTray.js:1314
+#: ../js/ui/messageTray.js:1310
 msgid "Open"
 msgstr "ખોલો"

-#: ../js/ui/messageTray.js:1331
+#: ../js/ui/messageTray.js:1327
 msgid "Unmute"
 msgstr "અવાજ ચાલુ રાખો"

-#: ../js/ui/messageTray.js:1331
+#: ../js/ui/messageTray.js:1327
 msgid "Mute"
 msgstr "મૂંગુ"

-#: ../js/ui/messageTray.js:2642
+#: ../js/ui/messageTray.js:2638
 msgid "System Information"
 msgstr "સિસ્ટમ જાણકારી"

@ -740,8 +741,7 @@ msgstr "મોબાઇલ બ્રોડબેન્ડ નેટવર્ક
 msgid "A password is required to connect to '%s'."
 msgstr "પાસવર્ડ '%s' સાથે જોડાવા માટે જરૂરી છે."

-#: ../js/ui/notificationDaemon.js:484 ../src/shell-app.c:374
-#| msgid "Unknown"
+#: ../js/ui/notificationDaemon.js:506 ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
 msgstr "અજ્ઞાત"
@ -778,7 +778,7 @@ msgstr "બહાર નીકળો"
 msgid "Activities"
 msgstr "પ્રવૃત્તિઓ"

-#: ../js/ui/panel.js:975
+#: ../js/ui/panel.js:971
 msgid "Top Bar"
 msgstr "ટોચની પટ્ટી"

@ -825,7 +825,7 @@ msgstr "દિલગીર છું, કામ કરતુ નથી. મહ
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:727
+#: ../js/ui/popupMenu.js:723
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"

@ -867,326 +867,325 @@ msgstr "પાસફ્રેજને યાદ રાખો"

 #: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:142
 msgid "Unlock"
-msgstr ""
+msgstr "તાળું ખોલો"

-#: ../js/ui/status/accessibility.js:47
+#: ../js/ui/status/accessibility.js:39
 msgid "Accessibility"
 msgstr "ઉપલબ્ધતા"

-#: ../js/ui/status/accessibility.js:52
+#: ../js/ui/status/accessibility.js:44
 msgid "Zoom"
 msgstr "નાનુ મોટુ કરો"

-#: ../js/ui/status/accessibility.js:59
-#| msgid "Screen Keyboard"
+#: ../js/ui/status/accessibility.js:51
 msgid "Screen Reader"
 msgstr "સ્ક્રીન રીડર"

-#: ../js/ui/status/accessibility.js:63
+#: ../js/ui/status/accessibility.js:55
 msgid "Screen Keyboard"
 msgstr "સ્ક્રીન કિબોર્ડ"

-#: ../js/ui/status/accessibility.js:67
+#: ../js/ui/status/accessibility.js:59
 msgid "Visual Alerts"
 msgstr "દેખાતી ચેતવણીઓ"

-#: ../js/ui/status/accessibility.js:70
+#: ../js/ui/status/accessibility.js:62
 msgid "Sticky Keys"
 msgstr "સ્ટીકી કી"

-#: ../js/ui/status/accessibility.js:73
+#: ../js/ui/status/accessibility.js:65
 msgid "Slow Keys"
 msgstr "ધીમી કી"

-#: ../js/ui/status/accessibility.js:76
+#: ../js/ui/status/accessibility.js:68
 msgid "Bounce Keys"
 msgstr "બાઉન્સ કી"

-#: ../js/ui/status/accessibility.js:79
+#: ../js/ui/status/accessibility.js:71
 msgid "Mouse Keys"
 msgstr "માઉસ કીઓ"

-#: ../js/ui/status/accessibility.js:83
+#: ../js/ui/status/accessibility.js:75
 msgid "Universal Access Settings"
 msgstr "યુનિવર્સલ વપરાશ સુયોજનો"

-#: ../js/ui/status/accessibility.js:121
+#: ../js/ui/status/accessibility.js:113
 msgid "High Contrast"
 msgstr "ઉચ્ચ વિરોધાભાસ"

-#: ../js/ui/status/accessibility.js:158
+#: ../js/ui/status/accessibility.js:150
 msgid "Large Text"
 msgstr "લાંબુ લખાણ"

-#: ../js/ui/status/bluetooth.js:31 ../js/ui/status/bluetooth.js:35
-#: ../js/ui/status/bluetooth.js:260 ../js/ui/status/bluetooth.js:313
-#: ../js/ui/status/bluetooth.js:344 ../js/ui/status/bluetooth.js:380
-#: ../js/ui/status/bluetooth.js:409 ../js/ui/status/network.js:844
+#: ../js/ui/status/bluetooth.js:27 ../js/ui/status/bluetooth.js:31
+#: ../js/ui/status/bluetooth.js:256 ../js/ui/status/bluetooth.js:309
+#: ../js/ui/status/bluetooth.js:340 ../js/ui/status/bluetooth.js:376
+#: ../js/ui/status/bluetooth.js:405 ../js/ui/status/network.js:841
 msgid "Bluetooth"
 msgstr "બ્લુટુથ"

-#: ../js/ui/status/bluetooth.js:48
+#: ../js/ui/status/bluetooth.js:44
 msgid "Visibility"
 msgstr "દૃશ્યતા"

-#: ../js/ui/status/bluetooth.js:62
+#: ../js/ui/status/bluetooth.js:58
 msgid "Send Files to Device..."
 msgstr "ઉપકરણમાં ફાઇલોને મોકલો..."

-#: ../js/ui/status/bluetooth.js:63
+#: ../js/ui/status/bluetooth.js:59
 msgid "Set up a New Device..."
 msgstr "નવા ઉપકરણને સુયોજિત કરો..."

-#: ../js/ui/status/bluetooth.js:87
+#: ../js/ui/status/bluetooth.js:83
 msgid "Bluetooth Settings"
 msgstr "બ્લુટુથ સુયોજનો"

 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
-#: ../js/ui/status/bluetooth.js:112 ../js/ui/status/network.js:211
+#: ../js/ui/status/bluetooth.js:108 ../js/ui/status/network.js:208
 msgid "hardware disabled"
 msgstr "હાર્ડવેર નિષ્ક્રિય"

-#: ../js/ui/status/bluetooth.js:205
+#: ../js/ui/status/bluetooth.js:201
 msgid "Connection"
 msgstr "જોડાણ"

-#: ../js/ui/status/bluetooth.js:216 ../js/ui/status/network.js:445
+#: ../js/ui/status/bluetooth.js:212 ../js/ui/status/network.js:442
 msgid "disconnecting..."
 msgstr "જોડાઇ તૂટી રહ્યુ છે..."

-#: ../js/ui/status/bluetooth.js:229 ../js/ui/status/network.js:451
-#: ../js/ui/status/network.js:911
+#: ../js/ui/status/bluetooth.js:225 ../js/ui/status/network.js:448
+#: ../js/ui/status/network.js:908
 msgid "connecting..."
 msgstr "જોડાઇ રહ્યા છે..."

-#: ../js/ui/status/bluetooth.js:247
+#: ../js/ui/status/bluetooth.js:243
 msgid "Send Files..."
 msgstr "ફાઇલોને મોકલો..."

-#: ../js/ui/status/bluetooth.js:252
+#: ../js/ui/status/bluetooth.js:248
 msgid "Browse Files..."
 msgstr "ફાઇલોને બ્રાઉઝ કરો..."

-#: ../js/ui/status/bluetooth.js:261
+#: ../js/ui/status/bluetooth.js:257
 msgid "Error browsing device"
 msgstr "ઉપકરણને બ્રાઉઝ કરતી વખતે ભૂલ"

-#: ../js/ui/status/bluetooth.js:262
+#: ../js/ui/status/bluetooth.js:258
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "સુચિત ઉપકરણને બ્રાઉઝ કરી શકાતુ નથી, ભૂલ '%s' છે"

-#: ../js/ui/status/bluetooth.js:270
+#: ../js/ui/status/bluetooth.js:266
 msgid "Keyboard Settings"
 msgstr "કીબોર્ડ સુયોજનો"

-#: ../js/ui/status/bluetooth.js:273
+#: ../js/ui/status/bluetooth.js:269
 msgid "Mouse Settings"
 msgstr "માઉસ સુયોજનો"

-#: ../js/ui/status/bluetooth.js:278 ../js/ui/status/volume.js:59
+#: ../js/ui/status/bluetooth.js:274 ../js/ui/status/volume.js:54
 msgid "Sound Settings"
 msgstr "સાઇન્ડ સુયોજનો"

-#: ../js/ui/status/bluetooth.js:345
+#: ../js/ui/status/bluetooth.js:341
 #, c-format
 msgid "Authorization request from %s"
 msgstr "%s માંથી સત્તાધિકરણ માંગણી"

-#: ../js/ui/status/bluetooth.js:351
+#: ../js/ui/status/bluetooth.js:347
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "ઉપકરણ %s એ સેવા %s' માટે પ્રવેશ ઇચ્છે છે"

-#: ../js/ui/status/bluetooth.js:353
+#: ../js/ui/status/bluetooth.js:349
 msgid "Always grant access"
 msgstr "હંમેશા વપરાશ મંજૂર કરો"

-#: ../js/ui/status/bluetooth.js:354
+#: ../js/ui/status/bluetooth.js:350
 msgid "Grant this time only"
 msgstr "ફક્ત આ સમયે સંમતિ આપો"

-#: ../js/ui/status/bluetooth.js:355 ../js/ui/telepathyClient.js:1097
+#: ../js/ui/status/bluetooth.js:351 ../js/ui/telepathyClient.js:1097
 msgid "Reject"
 msgstr "રદ કરો"

-#: ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:377
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s માટો જોડીની ખાતરી"

-#: ../js/ui/status/bluetooth.js:387 ../js/ui/status/bluetooth.js:417
+#: ../js/ui/status/bluetooth.js:383 ../js/ui/status/bluetooth.js:413
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "ઉપકરણ %s આ કમ્પ્યૂટર સાથે જોડી કરવા માંગે છે"

-#: ../js/ui/status/bluetooth.js:388
+#: ../js/ui/status/bluetooth.js:384
 #, fuzzy, c-format
 #| msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
 msgstr "મહેરબાની કરીને ખાતરી કરો કે શું PIN '%s' એ ઉપકરણ પર એક સાથે બંધબેસે છે."

-#: ../js/ui/status/bluetooth.js:390
+#: ../js/ui/status/bluetooth.js:386
 msgid "Matches"
 msgstr "બંધબેસે છે"

-#: ../js/ui/status/bluetooth.js:391
+#: ../js/ui/status/bluetooth.js:387
 msgid "Does not match"
 msgstr "બંધબેસતુ નથી"

-#: ../js/ui/status/bluetooth.js:410
+#: ../js/ui/status/bluetooth.js:406
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s માટે જોડી માંગણી"

-#: ../js/ui/status/bluetooth.js:418
+#: ../js/ui/status/bluetooth.js:414
 msgid "Please enter the PIN mentioned on the device."
 msgstr "મહેરબાની કરીને ઉપકરણ પર દર્શાવેલ PIN દાખલ કરો."

-#: ../js/ui/status/bluetooth.js:435
+#: ../js/ui/status/bluetooth.js:431
 msgid "OK"
 msgstr "બરાબર"

-#: ../js/ui/status/keyboard.js:178
+#: ../js/ui/status/keyboard.js:175
 msgid "Show Keyboard Layout"
 msgstr "કીબોર્ડ લેઆઉટને બતાવો"

-#: ../js/ui/status/keyboard.js:180
+#: ../js/ui/status/keyboard.js:177
 msgid "Region and Language Settings"
 msgstr "વિસ્તાર અને ભાષા સુયોજનો"

-#: ../js/ui/status/network.js:96
+#: ../js/ui/status/network.js:93
 msgid "<unknown>"
 msgstr "<અજ્ઞાત>"

 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:233
+#: ../js/ui/status/network.js:230
 msgid "disabled"
 msgstr "નિષ્ક્રિય"

 #. 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:443
+#: ../js/ui/status/network.js:440
 msgid "unmanaged"
 msgstr "સંચાલિત થયેલ નથી"

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:454 ../js/ui/status/network.js:914
+#: ../js/ui/status/network.js:451 ../js/ui/status/network.js:911
 msgid "authentication required"
 msgstr "સત્તાધિકરણ જરૂરી"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:464
+#: ../js/ui/status/network.js:461
 msgid "firmware missing"
 msgstr "ફર્મવેર ગેરહાજર"

 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:471
+#: ../js/ui/status/network.js:468
 msgid "cable unplugged"
 msgstr "કેબલ પ્લગ થયેલ નથી"

 #. 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:476
+#: ../js/ui/status/network.js:473
 msgid "unavailable"
 msgstr "બિનઉપલબ્ધ"

-#: ../js/ui/status/network.js:478 ../js/ui/status/network.js:916
+#: ../js/ui/status/network.js:475 ../js/ui/status/network.js:913
 msgid "connection failed"
 msgstr "જોડાણ નિષ્ફળ"

-#: ../js/ui/status/network.js:539 ../js/ui/status/network.js:1537
+#: ../js/ui/status/network.js:536 ../js/ui/status/network.js:1534
 msgid "More..."
 msgstr "વધારે..."

 #. 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:575 ../js/ui/status/network.js:1467
+#: ../js/ui/status/network.js:572 ../js/ui/status/network.js:1464
 msgid "Connected (private)"
 msgstr "જોડાયેલ (ખાનગી)"

-#: ../js/ui/status/network.js:650
+#: ../js/ui/status/network.js:647
 msgid "Auto Ethernet"
 msgstr "આપમેળે ઇથરનેટ"

-#: ../js/ui/status/network.js:708
+#: ../js/ui/status/network.js:705
 msgid "Auto broadband"
 msgstr "આપમેળે બ્રોડબેન્ડ"

-#: ../js/ui/status/network.js:711
+#: ../js/ui/status/network.js:708
 msgid "Auto dial-up"
 msgstr ""

 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:830 ../js/ui/status/network.js:1484
+#: ../js/ui/status/network.js:827 ../js/ui/status/network.js:1481
 #, c-format
 msgid "Auto %s"
 msgstr "આપમેળે %s"

-#: ../js/ui/status/network.js:832
+#: ../js/ui/status/network.js:829
 msgid "Auto bluetooth"
 msgstr "આપમેળે બ્લુટુથ"

-#: ../js/ui/status/network.js:1486
+#: ../js/ui/status/network.js:1483
 msgid "Auto wireless"
 msgstr ""

-#: ../js/ui/status/network.js:1595
+#: ../js/ui/status/network.js:1592
 msgid "Enable networking"
 msgstr "નેટવર્કીંગ સક્રિય કરો"

-#: ../js/ui/status/network.js:1617
+#: ../js/ui/status/network.js:1614
 msgid "Wired"
 msgstr "વાયરવાળું"

-#: ../js/ui/status/network.js:1628
+#: ../js/ui/status/network.js:1625
 msgid "Wireless"
 msgstr "વાયરલેસ"

-#: ../js/ui/status/network.js:1638
+#: ../js/ui/status/network.js:1635
 msgid "Mobile broadband"
 msgstr "મોબાઇલ બ્રોડબેન્ડ"

-#: ../js/ui/status/network.js:1648
+#: ../js/ui/status/network.js:1645
 msgid "VPN Connections"
 msgstr "VPN જોડાણો"

-#: ../js/ui/status/network.js:1655
+#: ../js/ui/status/network.js:1652
 msgid "Network Settings"
 msgstr "નેટવર્ક સુયોજનો"

-#: ../js/ui/status/network.js:1712
+#: ../js/ui/status/network.js:1709
 msgid "Network Manager"
 msgstr "નેટવર્ક સંચાલક"

-#: ../js/ui/status/network.js:1805
+#: ../js/ui/status/network.js:1802
 msgid "Connection failed"
 msgstr "જોડાણ નિષ્ફળ"

-#: ../js/ui/status/network.js:1806
+#: ../js/ui/status/network.js:1803
 msgid "Activation of network connection failed"
 msgstr "નેટવર્ક જોડાણનું સક્રિયકરણ નિષ્ફળ થયેલ છે"

-#: ../js/ui/status/network.js:2069
+#: ../js/ui/status/network.js:2066
 msgid "Networking is disabled"
 msgstr "નેટવર્કીંગ નિષ્ક્રિય થયેલ છે"

-#: ../js/ui/status/power.js:59
+#: ../js/ui/status/power.js:55
 msgid "Battery"
 msgstr "બેટરી"

-#: ../js/ui/status/power.js:76
+#: ../js/ui/status/power.js:72
 msgid "Power Settings"
 msgstr "પાવર સુયોજનો"

 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:104
+#: ../js/ui/status/power.js:100
 msgid "Estimating..."
 msgstr "અંદાજ કરી રહ્યા છે..."

-#: ../js/ui/status/power.js:111
+#: ../js/ui/status/power.js:107
 #, c-format
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
@ -1194,88 +1193,87 @@ msgstr[0] "%d કલાક બાકી રહેલ છે"
 msgstr[1] "%d કલાક બાકી રહેલ છે"

 #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:114
+#: ../js/ui/status/power.js:110
 #, c-format
 msgid "%d %s %d %s remaining"
 msgstr "%d %s %d %s બાકી રહેલ છે"

-#: ../js/ui/status/power.js:116
+#: ../js/ui/status/power.js:112
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "કલાક"
 msgstr[1] "કલાકો"

-#: ../js/ui/status/power.js:116
+#: ../js/ui/status/power.js:112
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "મિનિટ"
 msgstr[1] "મિનિટો"

-#: ../js/ui/status/power.js:119
+#: ../js/ui/status/power.js:115
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "%d મિનિટ બાકી રહી છે"
 msgstr[1] "%d મિનિટ બાકી રહી છે"

-#: ../js/ui/status/power.js:122 ../js/ui/status/power.js:192
+#: ../js/ui/status/power.js:118 ../js/ui/status/power.js:188
 #, c-format
 msgctxt "percent of battery remaining"
 msgid "%d%%"
 msgstr "%d%%"

-#: ../js/ui/status/power.js:199
+#: ../js/ui/status/power.js:195
 msgid "AC adapter"
 msgstr "AC ઍડપ્ટર"

-#: ../js/ui/status/power.js:201
+#: ../js/ui/status/power.js:197
 msgid "Laptop battery"
 msgstr "લેપટોપ બેટરી"

-#: ../js/ui/status/power.js:203
+#: ../js/ui/status/power.js:199
 msgid "UPS"
 msgstr "UPS"

-#: ../js/ui/status/power.js:205
+#: ../js/ui/status/power.js:201
 msgid "Monitor"
 msgstr "મોનિટર"

-#: ../js/ui/status/power.js:207
+#: ../js/ui/status/power.js:203
 msgid "Mouse"
 msgstr "માઉસ"

-#: ../js/ui/status/power.js:211
+#: ../js/ui/status/power.js:207
 msgid "PDA"
 msgstr "PDA"

-#: ../js/ui/status/power.js:213
+#: ../js/ui/status/power.js:209
 msgid "Cell phone"
 msgstr "સેલ ફોન"

-#: ../js/ui/status/power.js:215
+#: ../js/ui/status/power.js:211
 msgid "Media player"
 msgstr "મીડિયા પ્લેયર"

-#: ../js/ui/status/power.js:217
+#: ../js/ui/status/power.js:213
 msgid "Tablet"
 msgstr "ટૅબલેટ"

-#: ../js/ui/status/power.js:219
+#: ../js/ui/status/power.js:215
 msgid "Computer"
 msgstr "કમ્પ્યૂટર"

-#: ../js/ui/status/power.js:221
-#| msgid "Unknown"
+#: ../js/ui/status/power.js:217
 msgctxt "device"
 msgid "Unknown"
 msgstr "અજ્ઞાત"

 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:25 ../js/ui/status/volume.js:39
+#: ../js/ui/status/volume.js:20 ../js/ui/status/volume.js:34
 msgid "Volume"
 msgstr "વોલ્યુમ"

-#: ../js/ui/status/volume.js:51
+#: ../js/ui/status/volume.js:46
 msgid "Microphone"
 msgstr "માઇક્રોફોન"

@ -1540,7 +1538,6 @@ msgid "Switch User"
 msgstr "વપરાશકર્તાને બદલો"

 #: ../js/ui/userMenu.js:568
-#| msgid "Switch User"
 msgid "Switch Session"
 msgstr "સત્ર બદલો"

@ -1553,8 +1550,6 @@ msgid "System Settings"
 msgstr "સિસ્ટમ સુયોજનો"

 #: ../js/ui/userMenu.js:711
-#| msgctxt "title"
-#| msgid "Log Out"
 msgid "Log Out"
 msgstr "બહાર નીકળો"

@ -1610,7 +1605,6 @@ msgid "'%s' is ready"
 msgstr "'%s' તૈયાર છે"

 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
-#| msgid "Open Calendar"
 msgid "Evolution Calendar"
 msgstr "Evolution કૅલેન્ડર"

--- a/po/sl.po
+++ b/po/sl.po
@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-07-29 08:27+0000\n"
-"PO-Revision-Date: 2012-07-29 14:11+0100\n"
+"POT-Creation-Date: 2012-08-06 22:25+0000\n"
+"PO-Revision-Date: 2012-08-07 08:42+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: Slovenian\n"
@ -153,25 +153,25 @@ msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Prišlo je do napake med nalaganjem pogovornega okna z možnosti za %s:"

 #: ../js/extensionPrefs/main.js:164
-msgid "<b>Extension</b>"
-msgstr "<b>Pripona</b>"
+msgid "Extension"
+msgstr "Pripona"

 #: ../js/extensionPrefs/main.js:188
 msgid "Select an extension to configure using the combobox above."
 msgstr "Razširitev za nastavljanje je mogoče izbrati iz spustnega seznama zgoraj."

-#: ../js/gdm/loginDialog.js:550
+#: ../js/gdm/loginDialog.js:572
 msgid "Session..."
 msgstr "Seja ..."

-#: ../js/gdm/loginDialog.js:699
+#: ../js/gdm/loginDialog.js:721
 msgctxt "title"
 msgid "Sign In"
 msgstr "Prijava"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/loginDialog.js:744
+#: ../js/gdm/loginDialog.js:766
 #: ../js/ui/unlockDialog.js:124
 msgid "(or swipe finger)"
 msgstr "(ali pa povlecite prst)"
@ -179,26 +179,26 @@ msgstr "(ali pa povlecite prst)"
 #. 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:765
+#: ../js/gdm/loginDialog.js:787
 msgid "Not listed?"
 msgstr "Ali je ni na seznamu?"

-#: ../js/gdm/loginDialog.js:908
+#: ../js/gdm/loginDialog.js:930
 #: ../js/ui/endSessionDialog.js:406
 #: ../js/ui/extensionDownloader.js:195
 #: ../js/ui/networkAgent.js:153
 #: ../js/ui/polkitAuthenticationAgent.js:176
 #: ../js/ui/shellMountOperation.js:396
-#: ../js/ui/status/bluetooth.js:436
+#: ../js/ui/status/bluetooth.js:432
 msgid "Cancel"
 msgstr "Prekliči"

-#: ../js/gdm/loginDialog.js:913
+#: ../js/gdm/loginDialog.js:935
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prijava"

-#: ../js/gdm/loginDialog.js:1256
+#: ../js/gdm/loginDialog.js:1280
 msgid "Login Window"
 msgstr "Prijavno okno"

@ -274,12 +274,12 @@ msgstr "Program \"%s\" je odstranjen iz priljubljenih."
 msgid "Removable Devices"
 msgstr "Odstranljive naprave"

-#: ../js/ui/autorunManager.js:549
+#: ../js/ui/autorunManager.js:548
 #, c-format
 msgid "Open with %s"
 msgstr "Odpri s programom %s"

-#: ../js/ui/autorunManager.js:575
+#: ../js/ui/autorunManager.js:574
 msgid "Eject"
 msgstr "Izvrzi"

@ -560,8 +560,8 @@ msgid "tray"
 msgstr "sistemska vrstica"

 #: ../js/ui/keyboard.js:545
-#: ../js/ui/status/keyboard.js:149
-#: ../js/ui/status/power.js:209
+#: ../js/ui/status/keyboard.js:146
+#: ../js/ui/status/power.js:205
 msgid "Keyboard"
 msgstr "Tipkovnica"

@ -625,7 +625,7 @@ msgid "Web Page"
 msgstr "Spletna stran"

 #. Translators: this is a filename used for screencast recording
-#: ../js/ui/main.js:140
+#: ../js/ui/main.js:138
 #, no-c-format
 msgid "Screencast from %d %t"
 msgstr "Screencast z %d %t"
@ -726,7 +726,7 @@ msgstr "Geslo mobilnega širokopasovnega dostopa"
 msgid "A password is required to connect to '%s'."
 msgstr "Za povezavo z omrežjem '%s' je zahtevano geslo."

-#: ../js/ui/notificationDaemon.js:484
+#: ../js/ui/notificationDaemon.js:506
 #: ../src/shell-app.c:374
 msgctxt "program"
 msgid "Unknown"
@ -764,7 +764,7 @@ msgstr "Končaj"
 msgid "Activities"
 msgstr "Dejavnosti"

-#: ../js/ui/panel.js:975
+#: ../js/ui/panel.js:971
 msgid "Top Bar"
 msgstr "Vrhnja vrstica"

@ -856,337 +856,337 @@ msgstr "Zapomni si šifrirno geslo"
 msgid "Unlock"
 msgstr "Odkleni"

-#: ../js/ui/status/accessibility.js:47
+#: ../js/ui/status/accessibility.js:39
 msgid "Accessibility"
 msgstr "Dostopnost"

-#: ../js/ui/status/accessibility.js:52
+#: ../js/ui/status/accessibility.js:44
 msgid "Zoom"
 msgstr "Približanje"

-#: ../js/ui/status/accessibility.js:59
+#: ../js/ui/status/accessibility.js:51
 msgid "Screen Reader"
 msgstr "Zaslonski bralnik"

-#: ../js/ui/status/accessibility.js:63
+#: ../js/ui/status/accessibility.js:55
 msgid "Screen Keyboard"
 msgstr "Zaslonska tipkovnica"

-#: ../js/ui/status/accessibility.js:67
+#: ../js/ui/status/accessibility.js:59
 msgid "Visual Alerts"
 msgstr "Vidna opozorila"

-#: ../js/ui/status/accessibility.js:70
+#: ../js/ui/status/accessibility.js:62
 msgid "Sticky Keys"
 msgstr "Lepljive tipke"

-#: ../js/ui/status/accessibility.js:73
+#: ../js/ui/status/accessibility.js:65
 msgid "Slow Keys"
 msgstr "Počasne tipke"

-#: ../js/ui/status/accessibility.js:76
+#: ../js/ui/status/accessibility.js:68
 msgid "Bounce Keys"
 msgstr "Odskočne tipke"

-#: ../js/ui/status/accessibility.js:79
+#: ../js/ui/status/accessibility.js:71
 msgid "Mouse Keys"
 msgstr "Miškine tipke"

-#: ../js/ui/status/accessibility.js:83
+#: ../js/ui/status/accessibility.js:75
 msgid "Universal Access Settings"
 msgstr "Splošne nastavitve dostopa"

-#: ../js/ui/status/accessibility.js:121
+#: ../js/ui/status/accessibility.js:113
 msgid "High Contrast"
 msgstr "Visok kontrast"

-#: ../js/ui/status/accessibility.js:158
+#: ../js/ui/status/accessibility.js:150
 msgid "Large Text"
 msgstr "Veliko besedilo"

+#: ../js/ui/status/bluetooth.js:27
 #: ../js/ui/status/bluetooth.js:31
-#: ../js/ui/status/bluetooth.js:35
-#: ../js/ui/status/bluetooth.js:260
-#: ../js/ui/status/bluetooth.js:313
-#: ../js/ui/status/bluetooth.js:344
-#: ../js/ui/status/bluetooth.js:380
-#: ../js/ui/status/bluetooth.js:409
-#: ../js/ui/status/network.js:844
+#: ../js/ui/status/bluetooth.js:256
+#: ../js/ui/status/bluetooth.js:309
+#: ../js/ui/status/bluetooth.js:340
+#: ../js/ui/status/bluetooth.js:376
+#: ../js/ui/status/bluetooth.js:405
+#: ../js/ui/status/network.js:841
 msgid "Bluetooth"
 msgstr "Bluetooth"

-#: ../js/ui/status/bluetooth.js:48
+#: ../js/ui/status/bluetooth.js:44
 msgid "Visibility"
 msgstr "Vidnost"

-#: ../js/ui/status/bluetooth.js:62
+#: ../js/ui/status/bluetooth.js:58
 msgid "Send Files to Device..."
 msgstr "Pošilji datoteke na napravo ..."

-#: ../js/ui/status/bluetooth.js:63
+#: ../js/ui/status/bluetooth.js:59
 msgid "Set up a New Device..."
 msgstr "Nastavitev nove naprave ..."

-#: ../js/ui/status/bluetooth.js:87
+#: ../js/ui/status/bluetooth.js:83
 msgid "Bluetooth Settings"
 msgstr "Nastavitve za Bluetooth"

 #. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
-#: ../js/ui/status/bluetooth.js:112
-#: ../js/ui/status/network.js:211
+#: ../js/ui/status/bluetooth.js:108
+#: ../js/ui/status/network.js:208
 msgid "hardware disabled"
 msgstr "strojno onemogočen"

-#: ../js/ui/status/bluetooth.js:205
+#: ../js/ui/status/bluetooth.js:201
 msgid "Connection"
 msgstr "Povezava"

-#: ../js/ui/status/bluetooth.js:216
-#: ../js/ui/status/network.js:445
+#: ../js/ui/status/bluetooth.js:212
+#: ../js/ui/status/network.js:442
 msgid "disconnecting..."
 msgstr "prekinjanje povezave ..."

-#: ../js/ui/status/bluetooth.js:229
-#: ../js/ui/status/network.js:451
-#: ../js/ui/status/network.js:911
+#: ../js/ui/status/bluetooth.js:225
+#: ../js/ui/status/network.js:448
+#: ../js/ui/status/network.js:908
 msgid "connecting..."
 msgstr "povezovanje ..."

-#: ../js/ui/status/bluetooth.js:247
+#: ../js/ui/status/bluetooth.js:243
 msgid "Send Files..."
 msgstr "Pošlji datoteke ..."

-#: ../js/ui/status/bluetooth.js:252
+#: ../js/ui/status/bluetooth.js:248
 msgid "Browse Files..."
 msgstr "Brskanje datotek ..."

-#: ../js/ui/status/bluetooth.js:261
+#: ../js/ui/status/bluetooth.js:257
 msgid "Error browsing device"
 msgstr "Napaka med brskanjem po napravi"

-#: ../js/ui/status/bluetooth.js:262
+#: ../js/ui/status/bluetooth.js:258
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "Po zahtevani naprave ni mogoče brskati, napaka je '%s'"

-#: ../js/ui/status/bluetooth.js:270
+#: ../js/ui/status/bluetooth.js:266
 msgid "Keyboard Settings"
 msgstr "Nastavitve tipkovnice"

-#: ../js/ui/status/bluetooth.js:273
+#: ../js/ui/status/bluetooth.js:269
 msgid "Mouse Settings"
 msgstr "Nastavitve miške"

-#: ../js/ui/status/bluetooth.js:278
-#: ../js/ui/status/volume.js:59
+#: ../js/ui/status/bluetooth.js:274
+#: ../js/ui/status/volume.js:54
 msgid "Sound Settings"
 msgstr "Nastavitve zvoka"

-#: ../js/ui/status/bluetooth.js:345
+#: ../js/ui/status/bluetooth.js:341
 #, c-format
 msgid "Authorization request from %s"
 msgstr "Zahteva za pooblastitev od %s"

-#: ../js/ui/status/bluetooth.js:351
+#: ../js/ui/status/bluetooth.js:347
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "Naprava %s želi dostop do storitve '%s'."

-#: ../js/ui/status/bluetooth.js:353
+#: ../js/ui/status/bluetooth.js:349
 msgid "Always grant access"
 msgstr "Vedno odobri dostop"

-#: ../js/ui/status/bluetooth.js:354
+#: ../js/ui/status/bluetooth.js:350
 msgid "Grant this time only"
 msgstr "Odobri le tokrat"

-#: ../js/ui/status/bluetooth.js:355
+#: ../js/ui/status/bluetooth.js:351
 #: ../js/ui/telepathyClient.js:1097
 msgid "Reject"
 msgstr "Zavrni"

-#: ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:377
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Potrditev razčlenjevanja za %s"

-#: ../js/ui/status/bluetooth.js:387
-#: ../js/ui/status/bluetooth.js:417
+#: ../js/ui/status/bluetooth.js:383
+#: ../js/ui/status/bluetooth.js:413
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "Naprava %s se poskuša seznaniti s tem računalnikom"

-#: ../js/ui/status/bluetooth.js:388
+#: ../js/ui/status/bluetooth.js:384
 #, c-format
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
 msgstr "Potrdite, ali se PIN '%06d' ujema s tistim na napravi."

-#: ../js/ui/status/bluetooth.js:390
+#: ../js/ui/status/bluetooth.js:386
 msgid "Matches"
 msgstr "Ujemanja"

-#: ../js/ui/status/bluetooth.js:391
+#: ../js/ui/status/bluetooth.js:387
 msgid "Does not match"
 msgstr "Se ne ujema"

-#: ../js/ui/status/bluetooth.js:410
+#: ../js/ui/status/bluetooth.js:406
 #, c-format
 msgid "Pairing request for %s"
 msgstr "Zahteva razčlenjevanja za %s"

-#: ../js/ui/status/bluetooth.js:418
+#: ../js/ui/status/bluetooth.js:414
 msgid "Please enter the PIN mentioned on the device."
 msgstr "Vnesite PIN, ki je naveden na napravi."

-#: ../js/ui/status/bluetooth.js:435
+#: ../js/ui/status/bluetooth.js:431
 msgid "OK"
 msgstr "V redu"

-#: ../js/ui/status/keyboard.js:178
+#: ../js/ui/status/keyboard.js:175
 msgid "Show Keyboard Layout"
 msgstr "Pokaži razporeditev tipkovnice"

-#: ../js/ui/status/keyboard.js:180
+#: ../js/ui/status/keyboard.js:177
 msgid "Region and Language Settings"
 msgstr "Nastavitve območja in jezika"

-#: ../js/ui/status/network.js:96
+#: ../js/ui/status/network.js:93
 msgid "<unknown>"
 msgstr "<neznano>"

 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:233
+#: ../js/ui/status/network.js:230
 msgid "disabled"
 msgstr "onemogočeno"

 #. 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:443
+#: ../js/ui/status/network.js:440
 msgid "unmanaged"
 msgstr "neupravljano"

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:454
-#: ../js/ui/status/network.js:914
+#: ../js/ui/status/network.js:451
+#: ../js/ui/status/network.js:911
 msgid "authentication required"
 msgstr "zahtevana je overitev"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:464
+#: ../js/ui/status/network.js:461
 msgid "firmware missing"
 msgstr "manjka strojna programska oprema"

 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:471
+#: ../js/ui/status/network.js:468
 msgid "cable unplugged"
 msgstr "kabel ni priklopljen"

 #. 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:476
+#: ../js/ui/status/network.js:473
 msgid "unavailable"
 msgstr "ni na voljo"

-#: ../js/ui/status/network.js:478
-#: ../js/ui/status/network.js:916
+#: ../js/ui/status/network.js:475
+#: ../js/ui/status/network.js:913
 msgid "connection failed"
 msgstr "povezovanje je spodletelo"

-#: ../js/ui/status/network.js:539
-#: ../js/ui/status/network.js:1537
+#: ../js/ui/status/network.js:536
+#: ../js/ui/status/network.js:1534
 msgid "More..."
 msgstr "Več ..."

 #. 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:575
-#: ../js/ui/status/network.js:1467
+#: ../js/ui/status/network.js:572
+#: ../js/ui/status/network.js:1464
 msgid "Connected (private)"
 msgstr "Povezano (zasebna povezava)"

-#: ../js/ui/status/network.js:650
+#: ../js/ui/status/network.js:647
 msgid "Auto Ethernet"
 msgstr "Samodejni eternet"

-#: ../js/ui/status/network.js:708
+#: ../js/ui/status/network.js:705
 msgid "Auto broadband"
 msgstr "Samodejni širokopasovni dostop"

-#: ../js/ui/status/network.js:711
+#: ../js/ui/status/network.js:708
 msgid "Auto dial-up"
 msgstr "Samodejni klicni dostop"

 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:830
-#: ../js/ui/status/network.js:1484
+#: ../js/ui/status/network.js:827
+#: ../js/ui/status/network.js:1481
 #, c-format
 msgid "Auto %s"
 msgstr "Samodejna povezava z %s"

-#: ../js/ui/status/network.js:832
+#: ../js/ui/status/network.js:829
 msgid "Auto bluetooth"
 msgstr "Samodejna povezava z Bluetooth"

-#: ../js/ui/status/network.js:1486
+#: ../js/ui/status/network.js:1483
 msgid "Auto wireless"
 msgstr "Samodejni brezžični dostop"

-#: ../js/ui/status/network.js:1595
+#: ../js/ui/status/network.js:1592
 msgid "Enable networking"
 msgstr "Omogoči omrežje"

-#: ../js/ui/status/network.js:1617
+#: ../js/ui/status/network.js:1614
 msgid "Wired"
 msgstr "Žično"

-#: ../js/ui/status/network.js:1628
+#: ../js/ui/status/network.js:1625
 msgid "Wireless"
 msgstr "Brezžično"

-#: ../js/ui/status/network.js:1638
+#: ../js/ui/status/network.js:1635
 msgid "Mobile broadband"
 msgstr "Mobilni širokopasovni dostop"

-#: ../js/ui/status/network.js:1648
+#: ../js/ui/status/network.js:1645
 msgid "VPN Connections"
 msgstr "Povezave VPN"

-#: ../js/ui/status/network.js:1655
+#: ../js/ui/status/network.js:1652
 msgid "Network Settings"
 msgstr "Omrežne nastavitve"

-#: ../js/ui/status/network.js:1712
+#: ../js/ui/status/network.js:1709
 msgid "Network Manager"
 msgstr "Upravljalnik omrežij"

-#: ../js/ui/status/network.js:1805
+#: ../js/ui/status/network.js:1802
 msgid "Connection failed"
 msgstr "Povezava je spodletela"

-#: ../js/ui/status/network.js:1806
+#: ../js/ui/status/network.js:1803
 msgid "Activation of network connection failed"
 msgstr "Omogočanje omrežne povezave je spodletelo."

-#: ../js/ui/status/network.js:2069
+#: ../js/ui/status/network.js:2066
 msgid "Networking is disabled"
 msgstr "Omrežje je onemogočeno"

-#: ../js/ui/status/power.js:59
+#: ../js/ui/status/power.js:55
 msgid "Battery"
 msgstr "Baterija"

-#: ../js/ui/status/power.js:76
+#: ../js/ui/status/power.js:72
 msgid "Power Settings"
 msgstr "Upravljanje napajanja"

 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:104
+#: ../js/ui/status/power.js:100
 msgid "Estimating..."
 msgstr "Ocenjevanje ...."

-#: ../js/ui/status/power.js:111
+#: ../js/ui/status/power.js:107
 #, c-format
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
@ -1196,12 +1196,12 @@ msgstr[2] "preostajata še %d uri"
 msgstr[3] "preostajajo še %d ure"

 #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:114
+#: ../js/ui/status/power.js:110
 #, c-format
 msgid "%d %s %d %s remaining"
 msgstr "Preostaja še %d %s %d %s"

-#: ../js/ui/status/power.js:116
+#: ../js/ui/status/power.js:112
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ur"
@ -1209,7 +1209,7 @@ msgstr[1] "ura"
 msgstr[2] "uri"
 msgstr[3] "ure"

-#: ../js/ui/status/power.js:116
+#: ../js/ui/status/power.js:112
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@ -1217,7 +1217,7 @@ msgstr[1] "minuta"
 msgstr[2] "minuti"
 msgstr[3] "minute"

-#: ../js/ui/status/power.js:119
+#: ../js/ui/status/power.js:115
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
@ -1226,65 +1226,65 @@ msgstr[1] "preostaja še %d minuta"
 msgstr[2] "preostajata še %d minuti"
 msgstr[3] "preostajajo še %d minute"

-#: ../js/ui/status/power.js:122
-#: ../js/ui/status/power.js:192
+#: ../js/ui/status/power.js:118
+#: ../js/ui/status/power.js:188
 #, c-format
 msgctxt "percent of battery remaining"
 msgid "%d%%"
 msgstr "%d%%"

-#: ../js/ui/status/power.js:199
+#: ../js/ui/status/power.js:195
 msgid "AC adapter"
 msgstr "Električni prilagodilnik"

-#: ../js/ui/status/power.js:201
+#: ../js/ui/status/power.js:197
 msgid "Laptop battery"
 msgstr "Baterija prenosnika"

-#: ../js/ui/status/power.js:203
+#: ../js/ui/status/power.js:199
 msgid "UPS"
 msgstr "UPS"

-#: ../js/ui/status/power.js:205
+#: ../js/ui/status/power.js:201
 msgid "Monitor"
 msgstr "Zaslon"

-#: ../js/ui/status/power.js:207
+#: ../js/ui/status/power.js:203
 msgid "Mouse"
 msgstr "Miška"

-#: ../js/ui/status/power.js:211
+#: ../js/ui/status/power.js:207
 msgid "PDA"
 msgstr "Dlančnik"

-#: ../js/ui/status/power.js:213
+#: ../js/ui/status/power.js:209
 msgid "Cell phone"
 msgstr "Mobilni telefon"

-#: ../js/ui/status/power.js:215
+#: ../js/ui/status/power.js:211
 msgid "Media player"
 msgstr "Predstavni predvajalnik"

-#: ../js/ui/status/power.js:217
+#: ../js/ui/status/power.js:213
 msgid "Tablet"
 msgstr "Tablični računalnik"

-#: ../js/ui/status/power.js:219
+#: ../js/ui/status/power.js:215
 msgid "Computer"
 msgstr "Računalnik"

-#: ../js/ui/status/power.js:221
+#: ../js/ui/status/power.js:217
 msgctxt "device"
 msgid "Unknown"
 msgstr "Neznano"

 #. Translators: This is the label for audio volume
-#: ../js/ui/status/volume.js:25
-#: ../js/ui/status/volume.js:39
+#: ../js/ui/status/volume.js:20
+#: ../js/ui/status/volume.js:34
 msgid "Volume"
 msgstr "Glasnost"

-#: ../js/ui/status/volume.js:51
+#: ../js/ui/status/volume.js:46
 msgid "Microphone"
 msgstr "Mikrofon"

--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -39,7 +39,6 @@ EXTRA_DIST += $(TEST_MISC)
 run-test.sh: run-test.sh.in
 	$(AM_V_GEN) sed \
 	    -e "s|@MUTTER_TYPELIB_DIR[@]|$(MUTTER_TYPELIB_DIR)|" \
-	    -e "s|@JHBUILD_TYPELIBDIR[@]|$(JHBUILD_TYPELIBDIR)|" \
 	    -e "s|@srcdir[@]|$(srcdir)|" \
 	    $< > $@ && chmod a+x $@

--- a/tests/run-test.sh.in
+++ b/tests/run-test.sh.in
@ -30,7 +30,7 @@ builddir=`cd $builddir && pwd`
 srcdir=$builddir/@srcdir@
 srcdir=`cd $srcdir && pwd`

-GI_TYPELIB_PATH="$GI_TYPELIB_PATH${GI_TYPELIB_PATH:+:}@MUTTER_TYPELIB_DIR@:@JHBUILD_TYPELIBDIR@:$builddir/../src"
+GI_TYPELIB_PATH="$GI_TYPELIB_PATH${GI_TYPELIB_PATH:+:}@MUTTER_TYPELIB_DIR@:$builddir/../src"
 GJS_PATH="$srcdir:$srcdir/../js"
 GJS_DEBUG_OUTPUT=stderr
 $verbose || GJS_DEBUG_TOPICS="JS ERROR;JS LOG"
Author	SHA1	Message	Date
Florian Müllner	e304854fa5	Bump version to 3.5.5 Update NEWS	2012-08-07 21:26:18 +02:00
Giovanni Campagna	d7f54213f1	ScreenShield: when explicitly locking, tween the shield from the top The curtain should appear to be an overlay on top of the system, and since it is lifted by dragging up, it makes sense to slide it down on lock. https://bugzilla.gnome.org/show_bug.cgi?id=681143	2012-08-07 21:26:17 +02:00
Daniel Mustieles	12a71be076	Updated Spanish translation	2012-08-07 21:05:25 +02:00
Giovanni Campagna	855f0dbcad	UnlockDialog: place the prompt above the entry, rather than on the side As indicated in the mockups https://bugzilla.gnome.org/show_bug.cgi?id=681143	2012-08-07 20:35:54 +02:00
Giovanni Campagna	03db0d630e	UnlockDialog: Move "Login as another user" at the bottom The Unlock button is more logically related to the entry than this link, and having the latter in the middle breaks the workflow. https://bugzilla.gnome.org/show_bug.cgi?id=681143	2012-08-07 20:35:29 +02:00
Giovanni Campagna	5a35c57866	ModalDialog: make dialogLayout public ModalDialog subclasses may want to add content outside contentLayout (in particular, UnlockDialog wants to have it after the buttons)	2012-08-07 20:35:29 +02:00
Jasper St. Pierre	d11027e8c8	util: Don't pass too many arguments to GLib.spawn_async	2012-08-07 15:09:28 -03:00
Giovanni Campagna	aa733b5e53	Only show new notifications in the screen shield Rework the count system in Source, to distinguish between the normal notification count and the count of unseen/unacknowledged notification. (A notification is considered unacknowledged until shown, as a banner or inside the summary box pointer). Includes some code cleanups and a test for multiple notifications in the same source. https://bugzilla.gnome.org/show_bug.cgi?id=681143	2012-08-07 18:10:49 +02:00
Giovanni Campagna	355ec9ceca	UserMenu: fix disconnecting a signal that was never connected If a disabled account is removed, we receive account-removed without ever seeing account-enabled, and thus _changingId is undefined. https://bugzilla.gnome.org/show_bug.cgi?id=681382	2012-08-07 17:44:17 +02:00
Jasper St. Pierre	aa30c6a323	loginDialog: Remove manual insensitive tracking StWidget does this for us now	2012-08-07 11:51:12 -03:00
Jasper St. Pierre	ad5572f275	tests: Remove JHBUILD_TYPELIBDIR It's unused and crufty, and potentially security leak.	2012-08-07 11:51:12 -03:00
Alban Browaeys	9082b4df48	keyboard: _showLayoutItem is only defined if allowSettings. Check Main.sessionMode.allowSettings is true before accessing the actor item of _showLayoutItem. https://bugzilla.gnome.org/show_bug.cgi?id=681101	2012-08-07 16:50:07 +02:00
Nilamdyuti Goswami	c3179583c3	Assamese translation updated	2012-08-07 15:03:43 +05:30
Sweta Kothari	4db87839a6	Updated gujarati file	2012-08-07 15:02:59 +05:30
Matej Urbančič	b018d49dc3	Updated Slovenian translation	2012-08-07 08:44:36 +02:00
Мирослав Николић	83362226cf	Updated Serbian translation	2012-08-07 00:24:59 +02:00
Giovanni Campagna	1e3796967e	NotificationDaemon: don't override the title for app notifications If a source is associated with an app, ignore the app name provided by libnotify, as that is often garbage. This fixes the "XChat-GNOME OSD" problem. https://bugzilla.gnome.org/show_bug.cgi?id=681143	2012-08-06 23:07:11 +02:00
Giovanni Campagna	8d7fa54af4	ScreenShield: fix spacing of notifications and sources Reduce padding around persistent sources, and ensure that spacing around resident notifications is only applied once. Also, add some padding to the clock. https://bugzilla.gnome.org/show_bug.cgi?id=681143	2012-08-06 23:02:34 +02:00
Giovanni Campagna	59cd9b4220	ScreenSheild: make notification view scrollable Place a maximum height on the notification view, and show scrollbars if the list of persistent sources would overflow. https://bugzilla.gnome.org/show_bug.cgi?id=681143	2012-08-06 23:02:34 +02:00
Giovanni Campagna	59dfb5866d	ScreenShield: update the displayed title when the source changes Notifications in the lock screen need to watch signals on source and react accordingly. https://bugzilla.gnome.org/show_bug.cgi?id=681143	2012-08-06 23:02:31 +02:00