status/keyboard: Disregard the backwards flag for the popup switcher

This seems to cause more harm than good. It puzzles users looking at the shortcuts list in g-c-c and it prevents otherwise valid shortcuts like Shift+Hangul from working. https://bugzilla.gnome.org/show_bug.cgi?id=695823
status/keyboard: Allow switching input source in the message tray
2013-04-05 18:12:48 +02:00 · 2013-04-05 18:12:48 +02:00 · 2013-04-05 18:12:48 +02:00 · 2013-04-05 18:12:47 +02:00
25 changed files with 627 additions and 575 deletions
--- a/28
+++ b/28
@ -1,31 +1,3 @@
-3.8.1
-=====
-* Clip window group during startup animation [Jasper; #696323]
-* Check for logind rather than systemd [Martin; #696252]
-* Don't special-case last remote search provider position [Giovanni; #694974]
-* Fix memory leaks [Ray, Jasper; ##697119, #697295, #697300, #697395]
-* AppSwitcherPopup: Activate only the selected window if any [Rui; #697480]
-* Enable screen recorder keybinding in all modes [Florian; #696200]
-* Remove box-shadow from screen shield for performance reasons [Adel; #697274]
-* Add support for -st-natural-width/height CSS properties [Giovanni; #664411]
-* Remove excessive padding from notification buttons [Allan; #664411]
-* Fix thumbnail dragging in overview [Jasper; #697504]
-* theme-node: Add get_url()/lookup_url() methods [Florian; #693688]
-* Misc bug fixes and cleanups [Jasper, Rui, Colin, David, Ray, Matthias:
-  #695859, #696259, #696585, #696436, #697432, #697435, #697560, #697722,
-  #697709]
-
-Contributors:
-  Giovanni Campagna, Matthias Clasen, Allan Day, Adel Gadllah, David Gumberg,
-  Rui Matos, Florian Müllner, Martin Pitt, Jasper St. Pierre, Ray Strode,
-  Colin Walters
-
-Translations:
-  Daniel Martinez [an], Bruce Cowan [en_GB], Khaled Hosny [ar],
-  Ihar Hrachyshka [be], Aron Xu [zh_CN], Wojciech Szczęsny [pl],
-  Inaki Larranaga Murgoitio [eu], Kjartan Maraas [nb],
-  Милош Поповић [sr, sr@latin], Trần Ngọc Quân [vi]
-
 3.8.0.1
 =======
 * Background bug fixes [Ray; #696712]
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.8.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.8.0.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -63,7 +63,7 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.35.4
-MUTTER_MIN_VERSION=3.8.1
+MUTTER_MIN_VERSION=3.8.0
 GTK_MIN_VERSION=3.7.9
 GIO_MIN_VERSION=2.35.0
 LIBECAL_MIN_VERSION=3.5.3
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -512,7 +512,6 @@ StScrollBar StButton#vhandle:active {
 }

 #appMenu {
-    spinner-image: url("process-working.svg");
    spacing: 4px;
 }

@ -1454,13 +1453,11 @@ StScrollBar StButton#vhandle:active {
 }

 .notification-button {
-    -st-natural-width: 140px;
-    padding: 4px 4px 5px;
+    padding: 4px 42px 5px;
 }

 .notification-button:focus {
-    -st-natural-width: 138px;
-    padding: 3px 4px 4px;
+    padding: 3px 41px 4px;
 }

 .notification-icon-button {
@ -2448,6 +2445,7 @@ StScrollBar StButton#vhandle:active {

 .screen-shield-background {
    background: black;
+    box-shadow: 0px 4px 8px rgba(0,0,0,0.9);
 }

 #lockDialogGroup {
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -774,8 +774,7 @@ const LoginDialog = new Lang.Class({
    },

    _prepareDialog: function(forSecret, hold) {
-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
-        this._workSpinner = new Panel.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
+        this._workSpinner = new Panel.AnimatedIcon('process-working.svg', WORK_SPINNER_ICON_SIZE);
        this._workSpinner.actor.opacity = 0;
        this._workSpinner.actor.show();

--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -233,10 +233,8 @@ const AppSwitcherPopup = new Lang.Class({

    _finish : function(timestamp) {
        let appIcon = this._items[this._selectedIndex];
-        if (this._currentWindow < 0)
-            appIcon.app.activate_full(-1, timestamp);
-        else
-            Main.activateWindow(appIcon.cachedWindows[this._currentWindow], timestamp);
+        let window = this._currentWindow > 0 ? this._currentWindow : 0;
+        appIcon.app.activate_window(appIcon.cachedWindows[window], timestamp);

        this.parent();
    },
--- a/js/ui/background.js
+++ b/js/ui/background.js
@ -126,11 +126,6 @@ const BackgroundCache = new Lang.Class({
    },

    removeImageContent: function(content) {
-        let filename = content.get_filename();
-
-        if (filename && this._fileMonitors[filename])
-            delete this._fileMonitors[filename];
-
        this._removeContent(this._images, content);
    },

@ -431,7 +426,7 @@ const Background = new Lang.Class({
        content.brightness = this._brightness;
        content.vignette_sharpness = this._vignetteSharpness;

-        this._cache.removeImageContent(this._images[index].content);
+        this._cache.removeImageContent(content);
        this._images[index].content = content;
        this._watchCacheFile(filename);
    },
@ -747,15 +742,11 @@ const BackgroundManager = new Lang.Class({
                                   time: FADE_ANIMATION_TIME,
                                   transition: 'easeOutQuad',
                                   onComplete: Lang.bind(this, function() {
-                                       if (this._newBackground == newBackground) {
+                                       if (this.background == background) {
                                           this.background = newBackground;
                                           this._newBackground = null;
-                                       } else {
-                                           newBackground.actor.destroy();
+                                           background.actor.destroy();
                                       }
-
-                                       background.actor.destroy();
-
                                       this.emit('changed');
                                   })
                                 });
--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@ -60,7 +60,5 @@ function addBackgroundMenu(actor) {
                      actor._backgroundMenu.destroy();
                      actor._backgroundMenu = null;
                      actor._backgroundManager = null;
-
-                      cursor.destroy();
                  });
 }
--- a/js/ui/components/recorder.js
+++ b/js/ui/components/recorder.js
@ -20,7 +20,8 @@ const Recorder = new Lang.Class({
        Main.wm.addKeybinding('toggle-recording',
                              this._bindingSettings,
                              Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.ALL,
+                              Shell.KeyBindingMode.NORMAL |
+                              Shell.KeyBindingMode.OVERVIEW,
                              Lang.bind(this, this._toggleRecorder));
    },

--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -291,19 +291,19 @@ const _Draggable = new Lang.Class({
            this._dragOrigY = this._dragActor.y;
            this._dragOrigScale = this._dragActor.scale_x;

-            // Set the actor's scale such that it will keep the same
-            // transformed size when it's reparented to the uiGroup
-            let [scaledWidth, scaledHeight] = this.actor.get_transformed_size();
-            this._dragActor.set_scale(scaledWidth / this.actor.width,
-                                      scaledHeight / this.actor.height);
+            this._dragActor.reparent(Main.uiGroup);
+            this._dragActor.raise_top();
+            Shell.util_set_hidden_from_pick(this._dragActor, true);

            let [actorStageX, actorStageY] = this.actor.get_transformed_position();
            this._dragOffsetX = actorStageX - this._dragStartX;
            this._dragOffsetY = actorStageY - this._dragStartY;

-            this._dragActor.reparent(Main.uiGroup);
-            this._dragActor.raise_top();
-            Shell.util_set_hidden_from_pick(this._dragActor, true);
+            // Set the actor's scale such that it will keep the same
+            // transformed size when it's reparented to the uiGroup
+            let [scaledWidth, scaledHeight] = this.actor.get_transformed_size();
+            this.actor.set_scale(scaledWidth / this.actor.width,
+                                 scaledHeight / this.actor.height);
        }

        this._dragOrigOpacity = this._dragActor.opacity;
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -1721,9 +1721,6 @@ const MessageTray = new Lang.Class({
        this.actor.add_action(clickAction);

        clickAction.connect('clicked', Lang.bind(this, function(action) {
-            if (this._trayState != State.SHOWN)
-                return;
-
            let button = action.get_button();
            if (button == 3)
                this._openContextMenu();
@ -1734,7 +1731,7 @@ const MessageTray = new Lang.Class({
        clickAction.connect('long-press', Lang.bind(this, function(action, actor, state) {
            switch (state) {
            case Clutter.LongPressState.QUERY:
-                return this._trayState == State.SHOWN;
+                return true;
            case Clutter.LongPressState.ACTIVATE:
                this._openContextMenu();
            }
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -144,8 +144,8 @@ const AnimatedIcon = new Lang.Class({
    Name: 'AnimatedIcon',
    Extends: Animation,

-    _init: function(filename, size) {
-        this.parent(filename, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
+    _init: function(name, size) {
+        this.parent(global.datadir + '/theme/' + name, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
    }
 });

@ -258,7 +258,6 @@ const AppMenuButton = new Lang.Class({
        this._actionGroupNotifyId = 0;

        let bin = new St.Bin({ name: 'appMenu' });
-        bin.connect('style-changed', Lang.bind(this, this._onStyleChanged));
        this.actor.add_actor(bin);

        this.actor.bind_property("reactive", this.actor, "can-focus", 0);
@ -298,7 +297,11 @@ const AppMenuButton = new Lang.Class({

        this._stop = true;

-        this._spinner = null;
+        this._spinner = new AnimatedIcon('process-working.svg',
+                                         PANEL_ICON_SIZE);
+        this._container.add_actor(this._spinner.actor);
+        this._spinner.actor.hide();
+        this._spinner.actor.lower_bottom();

        let tracker = Shell.WindowTracker.get_default();
        let appSys = Shell.AppSystem.get_default();
@ -351,18 +354,6 @@ const AppMenuButton = new Lang.Class({
                           onCompleteScope: this });
    },

-    _onStyleChanged: function(actor) {
-        let node = actor.get_theme_node();
-        let [success, icon] = node.lookup_url('spinner-image', false);
-        if (!success || this._spinnerIcon == icon)
-            return;
-        this._spinnerIcon = icon;
-        this._spinner = new AnimatedIcon(this._spinnerIcon, PANEL_ICON_SIZE);
-        this._container.add_actor(this._spinner.actor);
-        this._spinner.actor.hide();
-        this._spinner.actor.lower_bottom();
-    },
-
    _onIconBoxStyleChanged: function() {
        let node = this._iconBox.get_theme_node();
        this._iconBottomClip = node.get_length('app-icon-bottom-clip');
@ -394,10 +385,6 @@ const AppMenuButton = new Lang.Class({

        this._stop = true;
        this.actor.reactive = true;
-
-        if (this._spinner == null)
-            return;
-
        Tweener.addTween(this._spinner.actor,
                         { opacity: 0,
                           time: SPINNER_ANIMATION_TIME,
@ -414,10 +401,6 @@ const AppMenuButton = new Lang.Class({
    startAnimation: function() {
        this._stop = false;
        this.actor.reactive = false;
-
-        if (this._spinner == null)
-            return;
-
        this._spinner.play();
        this._spinner.actor.show();
    },
@ -480,9 +463,6 @@ const AppMenuButton = new Lang.Class({
        }
        this._label.actor.allocate(childBox, flags);

-        if (this._spinner == null)
-            return;
-
        if (direction == Clutter.TextDirection.LTR) {
            childBox.x1 = Math.floor(iconWidth / 2) + this._label.actor.width;
            childBox.x2 = childBox.x1 + this._spinner.actor.width;
@ -573,8 +553,7 @@ const AppMenuButton = new Lang.Class({
            return;
        }

-        if (this._spinner)
-            this._spinner.actor.hide();
+        this._spinner.actor.hide();
        if (this._iconBox.child != null)
            this._iconBox.child.destroy();
        this._iconBox.hide();
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -1157,7 +1157,6 @@ const PopupMenuBase = new Lang.Class({
    },

    destroy: function() {
-        this.close();
        this.removeAll();
        this.actor.destroy();

--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -35,8 +35,7 @@ const RunDialog = new Lang.Class({
    Extends: ModalDialog.ModalDialog,

    _init : function() {
-        this.parent({ styleClass: 'run-dialog',
-                      destroyOnClose: false });
+        this.parent({ styleClass: 'run-dialog' });

        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
        this._terminalSettings = new Gio.Settings({ schema: TERMINAL_SCHEMA });
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -562,7 +562,6 @@ const ScreenShield = new Lang.Class({
            this._bgManagers[i].destroy();

        this._bgManagers = [];
-        this._backgroundGroup.destroy_all_children();

        for (let i = 0; i < Main.layoutManager.monitors.length; i++)
            this._createBackground(i);
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@ -81,7 +81,7 @@ const _modes = {
    'initial-setup': {
        hasWindows: true,
        isPrimary: true,
-        components: ['networkAgent', 'keyring'],
+        components: ['keyring'],
        panel: {
            left: [],
            center: ['dateMenu'],
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@ -82,6 +82,11 @@ const EntryMenu = new Lang.Class({
            this.actor.grab_key_focus();
    },

+    close: function(animate) {
+        this._entry.grab_key_focus();
+        this.parent(animate);
+    },
+
    _updateCopyItem: function() {
        let selection = this._entry.clutter_text.get_selection();
        this._copyItem.setSensitive(!this._entry.clutter_text.password_char &&
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -33,6 +33,36 @@ const KEY_INPUT_SOURCES = 'sources';
 const INPUT_SOURCE_TYPE_XKB = 'xkb';
 const INPUT_SOURCE_TYPE_IBUS = 'ibus';

+// This is longest we'll keep the keyboard frozen until an input
+// source is active.
+const MAX_INPUT_SOURCE_ACTIVATION_TIME = 2000; // ms
+
+const BUS_NAME = 'org.gnome.SettingsDaemon.Keyboard';
+const OBJECT_PATH = '/org/gnome/SettingsDaemon/Keyboard';
+
+const KeyboardManagerInterface =
+<interface name="org.gnome.SettingsDaemon.Keyboard">
+<method name="SetInputSource">
+    <arg type="u" direction="in" />
+</method>
+</interface>;
+
+const KeyboardManagerProxy = Gio.DBusProxy.makeProxyWrapper(KeyboardManagerInterface);
+
+function releaseKeyboard() {
+    if (Main.modalCount > 0)
+        global.display.unfreeze_keyboard(global.get_current_time());
+    else
+        global.display.ungrab_keyboard(global.get_current_time());
+}
+
+function holdKeyboard() {
+    if (Main.modalCount > 0)
+        global.display.freeze_keyboard(global.get_current_time());
+    else
+        global.display.grab_keyboard(global.get_current_time());
+}
+
 const IBusManager = new Lang.Class({
    Name: 'IBusManager',

@ -230,6 +260,7 @@ const InputSource = new Lang.Class({
    },

    activate: function() {
+        holdKeyboard();
        this.emit('activate');
    },
 });
@ -262,11 +293,11 @@ const InputSourcePopup = new Lang.Class({
        this._select(this._selectedIndex);
    },

-    _keyPressHandler: function(keysym, backwards, action) {
+    _keyPressHandler: function(keysym, _ignored, action) {
        if (action == this._action)
-            this._select(backwards ? this._previous() : this._next());
+            this._select(this._next());
        else if (action == this._actionBackward)
-            this._select(backwards ? this._next() : this._previous());
+            this._select(this._previous());
        else if (keysym == Clutter.Left)
            this._select(this._previous());
        else if (keysym == Clutter.Right)
@ -336,15 +367,14 @@ const InputSourceIndicator = new Lang.Class({
        this._keybindingAction =
            Main.wm.addKeybinding('switch-input-source',
                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
-                                  Meta.KeyBindingFlags.REVERSES,
-                                  Shell.KeyBindingMode.ALL & ~Shell.KeyBindingMode.MESSAGE_TRAY,
+                                  Meta.KeyBindingFlags.NONE,
+                                  Shell.KeyBindingMode.ALL,
                                  Lang.bind(this, this._switchInputSource));
        this._keybindingActionBackward =
            Main.wm.addKeybinding('switch-input-source-backward',
                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
-                                  Meta.KeyBindingFlags.REVERSES |
-                                  Meta.KeyBindingFlags.REVERSED,
-                                  Shell.KeyBindingMode.ALL & ~Shell.KeyBindingMode.MESSAGE_TRAY,
+                                  Meta.KeyBindingFlags.NONE,
+                                  Shell.KeyBindingMode.ALL,
                                  Lang.bind(this, this._switchInputSource));
        this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA });
        this._settings.connect('changed::' + KEY_CURRENT_INPUT_SOURCE, Lang.bind(this, this._currentInputSourceChanged));
@ -364,6 +394,13 @@ const InputSourceIndicator = new Lang.Class({
        this._ibusManager.connect('property-updated', Lang.bind(this, this._ibusPropertyUpdated));
        this._inputSourcesChanged();

+        this._keyboardManager = new KeyboardManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
+                                                         function(proxy, error) {
+                                                             if (error)
+                                                                 log(error.message);
+                                                         });
+        global.display.connect('modifiers-accelerator-activated', Lang.bind(this, this._modifiersSwitcher));
+
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this._showLayoutItem = this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, this._showLayout));

@ -397,13 +434,44 @@ const InputSourceIndicator = new Lang.Class({
        this._inputSourcesChanged();
    },

+    _modifiersSwitcher: function() {
+        let sourceIndexes = Object.keys(this._inputSources);
+        if (sourceIndexes.length == 0) {
+            releaseKeyboard();
+            return;
+        }
+
+        let is = this._currentSource;
+        if (!is)
+            is = this._inputSources[sourceIndexes[0]];
+
+        let nextIndex = is.index + 1;
+        if (nextIndex > sourceIndexes[sourceIndexes.length - 1])
+            nextIndex = 0;
+
+        while (!(is = this._inputSources[nextIndex]))
+            nextIndex += 1;
+
+        is.activate();
+    },
+
    _switchInputSource: function(display, screen, window, binding) {
        if (this._mruSources.length < 2)
            return;

+        // HACK: Fall back on simple input source switching since we
+        // can't show a popup switcher while the message tray is up
+        // without considerable work to consolidate the usage of
+        // pushModal/popModal and grabHelper. See
+        // https://bugzilla.gnome.org/show_bug.cgi?id=695143 .
+        if (Main.keybindingMode == Shell.KeyBindingMode.MESSAGE_TRAY) {
+            this._modifiersSwitcher();
+            return;
+        }
+
        let popup = new InputSourcePopup(this._mruSources, this._keybindingAction, this._keybindingActionBackward);
        let modifiers = binding.get_modifiers();
-        let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
+        let backwards = false;  // Not using this
        if (!popup.show(backwards, binding.get_name(), binding.get_mask()))
            popup.destroy();
    },
@ -487,10 +555,10 @@ const InputSourceIndicator = new Lang.Class({
            let is = new InputSource(type, id, displayName, shortName, i);

            is.connect('activate', Lang.bind(this, function() {
-                if (this._currentSource && this._currentSource.index == is.index)
-                    return;
-                this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
-                                         GLib.Variant.new_uint32(is.index));
+                let inVariant = new GLib.Variant('(u)', [is.index]);
+                this._keyboardManager.call('SetInputSource', inVariant, 0,
+                                           MAX_INPUT_SOURCE_ACTIVATION_TIME,
+                                           null, releaseKeyboard);
            }));

            if (!(is.shortName in inputSourcesByShortName))
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@ -91,8 +91,7 @@ const UnlockDialog = new Lang.Class({
        this._promptLoginHint.hide();
        this.contentLayout.add_actor(this._promptLoginHint);

-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
-        this._workSpinner = new Panel.AnimatedIcon(spinnerIcon, LoginDialog.WORK_SPINNER_ICON_SIZE);
+        this._workSpinner = new Panel.AnimatedIcon('process-working.svg', LoginDialog.WORK_SPINNER_ICON_SIZE);
        this._workSpinner.actor.opacity = 0;

        this.allowCancel = false;
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -55,7 +55,6 @@ js/ui/viewSelector.js
 js/ui/wanda.js
 js/ui/windowAttentionHandler.js
 src/calendar-server/evolution-calendar.desktop.in.in
-# Please do not remove this file from POTFILES.in. Run "git submodule init && git submodule update" to get it.
 src/gvc/gvc-mixer-control.c
 src/main.c
 src/shell-app.c
--- a/po/sr.po
+++ b/po/sr.po
@ -8,7 +8,7 @@ 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: 2013-03-31 01:48+0000\n"
+"POT-Creation-Date: 2013-03-04 08:38+0000\n"
 "PO-Revision-Date: 2013-03-08 20:26+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
@ -365,52 +365,53 @@ msgid "Select an extension to configure using the combobox above."
 msgstr "Изаберите проширење за подешавање користећи прозорче за избор."

 #: ../js/gdm/loginDialog.js:405
+#| msgid "Session..."
 msgid "Session…"
 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:630
+#: ../js/gdm/loginDialog.js:629
 msgid "Not listed?"
 msgstr "Није на списку?"

-#: ../js/gdm/loginDialog.js:786 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:783 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:375
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:99
-#: ../js/ui/userMenu.js:938
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:126
+#: ../js/ui/userMenu.js:934
 msgid "Cancel"
 msgstr "Откажи"

-#: ../js/gdm/loginDialog.js:802
+#: ../js/gdm/loginDialog.js:799
 msgctxt "button"
 msgid "Sign In"
 msgstr "Пријави ме"

-#: ../js/gdm/loginDialog.js:802
+#: ../js/gdm/loginDialog.js:799
 msgid "Next"
 msgstr "Даље"

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:917 ../js/ui/components/networkAgent.js:260
+#: ../js/gdm/loginDialog.js:904 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
 msgstr "Корисничко име: "

-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1157
 msgid "Login Window"
 msgstr "Прозор за пријављивање"

 #. Translators: accessible name of the power menu in the login screen
 #: ../js/gdm/powerMenu.js:36
 msgid "Power"
-msgstr "Напајање"
+msgstr "Угаси"

-#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:696 ../js/ui/userMenu.js:700
-#: ../js/ui/userMenu.js:816
+#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:695 ../js/ui/userMenu.js:699
+#: ../js/ui/userMenu.js:815
 msgid "Suspend"
 msgstr "Обустави"

@ -418,58 +419,58 @@ msgstr "Обустави"
 msgid "Restart"
 msgstr "Поново покрени"

-#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:698
-#: ../js/ui/userMenu.js:700 ../js/ui/userMenu.js:815 ../js/ui/userMenu.js:942
+#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:697
+#: ../js/ui/userMenu.js:699 ../js/ui/userMenu.js:814 ../js/ui/userMenu.js:938
 msgid "Power Off"
-msgstr "Искључи"
+msgstr "Угаси"

-#: ../js/gdm/util.js:249
+#: ../js/gdm/util.js:182
 msgid "Authentication error"
 msgstr "Грешка потврђивања идентитета"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:366
+#: ../js/gdm/util.js:299
 msgid "(or swipe finger)"
 msgstr "(или лупите прст)"

-#: ../js/gdm/util.js:391
+#: ../js/gdm/util.js:324
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(нпр., корисник или %s)"

-#: ../js/misc/util.js:97
+#: ../js/misc/util.js:94
 msgid "Command not found"
 msgstr "Наредба није нађена"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:130
+#: ../js/misc/util.js:127
 msgid "Could not parse command:"
 msgstr "Не могу да обрадим наредбу:"

-#: ../js/misc/util.js:138
+#: ../js/misc/util.js:135
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Није успело покретање „%s“:"

-#: ../js/ui/appDisplay.js:349
+#: ../js/ui/appDisplay.js:348
 msgid "Frequent"
 msgstr "Често"

-#: ../js/ui/appDisplay.js:356
+#: ../js/ui/appDisplay.js:355
 msgid "All"
 msgstr "Све"

-#: ../js/ui/appDisplay.js:914
+#: ../js/ui/appDisplay.js:913
 msgid "New Window"
 msgstr "Нови прозор"

-#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:916 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Уклони из омиљених"

-#: ../js/ui/appDisplay.js:918
+#: ../js/ui/appDisplay.js:917
 msgid "Add to Favorites"
 msgstr "Додај у омиљене"

@ -483,7 +484,7 @@ msgstr "„%s“ је додат међу омиљене."
 msgid "%s has been removed from your favorites."
 msgstr "„%s“ је уклоњен из омиљених."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:789
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:788
 msgid "Settings"
 msgstr "Подешавања"

@ -506,7 +507,7 @@ msgctxt "event list time"
 msgid "%H\\u2236%M"
 msgstr "%H\\u2236%M"

-#. Translators: Shown in calendar event list, if 12h format,
+#. Transators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space
 #: ../js/ui/calendar.js:77
@ -608,35 +609,35 @@ msgid "S"
 msgstr "Суб"

 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:720
+#: ../js/ui/calendar.js:692
 msgid "Nothing Scheduled"
 msgstr "Ништа планирано"

 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:736
+#: ../js/ui/calendar.js:708
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d"

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

-#: ../js/ui/calendar.js:749
+#: ../js/ui/calendar.js:721
 msgid "Today"
 msgstr "Данас"

-#: ../js/ui/calendar.js:753
+#: ../js/ui/calendar.js:725
 msgid "Tomorrow"
 msgstr "Сутра"

-#: ../js/ui/calendar.js:764
+#: ../js/ui/calendar.js:736
 msgid "This week"
 msgstr "Ове недеље"

-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:744
 msgid "Next week"
 msgstr "Следеће недеље"

@ -652,12 +653,12 @@ msgstr "Спољни уређај је искључен"
 msgid "Removable Devices"
 msgstr "Уклоњиви уређаји"

-#: ../js/ui/components/autorunManager.js:594
+#: ../js/ui/components/autorunManager.js:593
 #, c-format
 msgid "Open with %s"
 msgstr "Отвори програмом %s"

-#: ../js/ui/components/autorunManager.js:620
+#: ../js/ui/components/autorunManager.js:619
 msgid "Eject"
 msgstr "Избаци"

@ -1037,7 +1038,7 @@ msgstr "Подешавања датума и времена"
 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:215
+#: ../js/ui/dateMenu.js:205
 msgid "%A %B %e, %Y"
 msgstr "%A, %e. %b., %R"

@ -1212,6 +1213,7 @@ msgid "Remove"
 msgstr "Уклони"

 #: ../js/ui/messageTray.js:1501
+#| msgid "No Messages"
 msgid "Clear Messages"
 msgstr "Очисти поруке"

@ -1219,15 +1221,15 @@ msgstr "Очисти поруке"
 msgid "Notification Settings"
 msgstr "Поставке обавештења"

-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1707
 msgid "No Messages"
 msgstr "Нема порука"

-#: ../js/ui/messageTray.js:1782
+#: ../js/ui/messageTray.js:1787
 msgid "Message Tray"
 msgstr "Фиока порука"

-#: ../js/ui/messageTray.js:2810
+#: ../js/ui/messageTray.js:2864
 msgid "System Information"
 msgstr "Подаци о систему"

@ -1236,7 +1238,7 @@ msgctxt "program"
 msgid "Unknown"
 msgstr "Непознат"

-#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
+#: ../js/ui/overviewControls.js:460 ../js/ui/screenShield.js:153
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1245,7 +1247,7 @@ msgstr[1] "%d нове поруке"
 msgstr[2] "%d нових порука"
 msgstr[3] "Једна нова порука"

-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:82
 msgid "Undo"
 msgstr "Опозови"

@ -1257,21 +1259,22 @@ msgstr "Преглед"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:271
+#: ../js/ui/overview.js:284
+#| msgid "Type to search..."
 msgid "Type to search…"
 msgstr "Упишите текст за претрагу…"

-#: ../js/ui/panel.js:612
+#: ../js/ui/panel.js:613
 msgid "Quit"
 msgstr "Изађи"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:636
+#: ../js/ui/panel.js:642
 msgid "Activities"
 msgstr "Активности"

-#: ../js/ui/panel.js:933
+#: ../js/ui/panel.js:983
 msgid "Top Bar"
 msgstr "Горња трака"

@ -1284,21 +1287,21 @@ msgstr "Горња трака"
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:73
+#: ../js/ui/runDialog.js:205
 msgid "Enter a Command"
 msgstr "Унесите наредбу"

-#: ../js/ui/runDialog.js:109
+#: ../js/ui/runDialog.js:241
 msgid "Close"
 msgstr "Затвори"

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

-#: ../js/ui/screenShield.js:151
+#: ../js/ui/screenShield.js:155
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1307,11 +1310,11 @@ msgstr[1] "%d нова обавештења"
 msgstr[2] "%d нових обавештења"
 msgstr[3] "Једно ново обавештење"

-#: ../js/ui/screenShield.js:438 ../js/ui/userMenu.js:807
+#: ../js/ui/screenShield.js:442 ../js/ui/userMenu.js:806
 msgid "Lock"
 msgstr "Закључај"

-#: ../js/ui/screenShield.js:640
+#: ../js/ui/screenShield.js:639
 msgid "GNOME needs to lock the screen"
 msgstr "Гном мора да закључа екран"

@ -1322,19 +1325,21 @@ msgstr "Гном мора да закључа екран"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:761 ../js/ui/screenShield.js:1197
+#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1169
+#| msgid "Unable to connect to %s"
 msgid "Unable to lock"
 msgstr "Не могу да закључам"

-#: ../js/ui/screenShield.js:762 ../js/ui/screenShield.js:1198
+#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1170
 msgid "Lock was blocked by an application"
 msgstr "Неки програм је блокирао закључавање"

-#: ../js/ui/searchDisplay.js:453
+#: ../js/ui/searchDisplay.js:431
+#| msgid "Searching..."
 msgid "Searching…"
 msgstr "Тражим…"

-#: ../js/ui/searchDisplay.js:497
+#: ../js/ui/searchDisplay.js:475
 msgid "No results."
 msgstr "Нема одговарајућих резултата."

@ -1346,11 +1351,11 @@ msgstr "Умножи"
 msgid "Paste"
 msgstr "Убаци"

-#: ../js/ui/shellEntry.js:106
+#: ../js/ui/shellEntry.js:105
 msgid "Show Text"
 msgstr "Прикажи текст"

-#: ../js/ui/shellEntry.js:108
+#: ../js/ui/shellEntry.js:107
 msgid "Hide Text"
 msgstr "Сакриј текст"

@ -1362,7 +1367,7 @@ msgstr "Лозинка"
 msgid "Remember Password"
 msgstr "Запамти лозинку"

-#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:113
+#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:140
 msgid "Unlock"
 msgstr "Откључај"

@ -1426,10 +1431,12 @@ msgid "Visibility"
 msgstr "Видљивост"

 #: ../js/ui/status/bluetooth.js:59
+#| msgid "Send Files to Device..."
 msgid "Send Files to Device…"
 msgstr "Пошаљи датотеке на уређај…"

 #: ../js/ui/status/bluetooth.js:60
+#| msgid "Set Up a New Device..."
 msgid "Set Up a New Device…"
 msgstr "Подеси нови уређај…"

@ -1456,6 +1463,7 @@ msgid "connecting..."
 msgstr "повезујем се..."

 #: ../js/ui/status/bluetooth.js:239
+#| msgid "Send Files..."
 msgid "Send Files…"
 msgstr "Пошаљи датотеке…"

@ -1668,6 +1676,7 @@ msgstr "Подешавања напајања"
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
 #: ../js/ui/status/power.js:99
+#| msgid "Estimating..."
 msgid "Estimating…"
 msgstr "Приближно…"

@ -1775,11 +1784,11 @@ msgstr "Јачина звука"
 msgid "Microphone"
 msgstr "Микрофон"

-#: ../js/ui/unlockDialog.js:124
+#: ../js/ui/unlockDialog.js:151
 msgid "Log in as another user"
 msgstr "Пријавите се као други корсник"

-#: ../js/ui/unlockDialog.js:145
+#: ../js/ui/unlockDialog.js:177
 msgid "Unlock Window"
 msgstr "Откључај прозор"

@ -1807,27 +1816,27 @@ msgstr "Мирује"
 msgid "Offline"
 msgstr "Ван мреже"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:780
 msgid "Notifications"
 msgstr "Обавештења"

-#: ../js/ui/userMenu.js:797
+#: ../js/ui/userMenu.js:796
 msgid "Switch User"
 msgstr "Промени корисника"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:801
 msgid "Log Out"
 msgstr "Одјави ме"

-#: ../js/ui/userMenu.js:822
+#: ../js/ui/userMenu.js:821
 msgid "Install Updates & Restart"
 msgstr "Инсталирај ажурирања и поново покрени"

-#: ../js/ui/userMenu.js:840
+#: ../js/ui/userMenu.js:839
 msgid "Your chat status will be set to busy"
 msgstr "Ваше стање ћаскања ће бити постављено на заузето"

-#: ../js/ui/userMenu.js:841
+#: ../js/ui/userMenu.js:840
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@ -1836,22 +1845,20 @@ msgstr ""
 "мрежи је подешено тако да ће остали знати да ви не можете видети њихове "
 "поруке."

-#: ../js/ui/userMenu.js:888
+#: ../js/ui/userMenu.js:886
 msgid "Other users are logged in."
 msgstr "Други корисници су пријављени."

-#: ../js/ui/userMenu.js:893
+#: ../js/ui/userMenu.js:891
 msgid "Shutting down might cause them to lose unsaved work."
 msgstr "Искључивање може да доведе до тога да изгубе несачувани рад."

-#. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/userMenu.js:921
+#: ../js/ui/userMenu.js:918
 #, c-format
 msgid "%s (remote)"
 msgstr "%s (удаљено)"

-#. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/userMenu.js:924
+#: ../js/ui/userMenu.js:920
 #, c-format
 msgid "%s (console)"
 msgstr "%s (љуска)"
@ -1864,7 +1871,7 @@ msgstr "Програми"
 msgid "Search"
 msgstr "Тражи"

-#: ../js/ui/wanda.js:77
+#: ../js/ui/wanda.js:92
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1873,7 +1880,7 @@ msgstr ""
 "Извините, данас за вас нема мудрости:\n"
 "%s"

-#: ../js/ui/wanda.js:81
+#: ../js/ui/wanda.js:96
 #, c-format
 msgid "%s the Oracle says"
 msgstr "Пророк је рекао %s"
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@ -8,7 +8,7 @@ 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: 2013-03-31 01:48+0000\n"
+"POT-Creation-Date: 2013-03-04 08:38+0000\n"
 "PO-Revision-Date: 2013-03-08 20:26+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"

 #: ../data/50-gnome-shell-screenshot.xml.in.h:1
@ -365,52 +365,53 @@ msgid "Select an extension to configure using the combobox above."
 msgstr "Izaberite proširenje za podešavanje koristeći prozorče za izbor."

 #: ../js/gdm/loginDialog.js:405
+#| msgid "Session..."
 msgid "Session…"
 msgstr "Sesija…"

 #. 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:630
+#: ../js/gdm/loginDialog.js:629
 msgid "Not listed?"
 msgstr "Nije na spisku?"

-#: ../js/gdm/loginDialog.js:786 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:783 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:375
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:99
-#: ../js/ui/userMenu.js:938
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:126
+#: ../js/ui/userMenu.js:934
 msgid "Cancel"
 msgstr "Otkaži"

-#: ../js/gdm/loginDialog.js:802
+#: ../js/gdm/loginDialog.js:799
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prijavi me"

-#: ../js/gdm/loginDialog.js:802
+#: ../js/gdm/loginDialog.js:799
 msgid "Next"
 msgstr "Dalje"

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:917 ../js/ui/components/networkAgent.js:260
+#: ../js/gdm/loginDialog.js:904 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
 msgstr "Korisničko ime: "

-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1157
 msgid "Login Window"
 msgstr "Prozor za prijavljivanje"

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

-#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:696 ../js/ui/userMenu.js:700
-#: ../js/ui/userMenu.js:816
+#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:695 ../js/ui/userMenu.js:699
+#: ../js/ui/userMenu.js:815
 msgid "Suspend"
 msgstr "Obustavi"

@ -418,58 +419,58 @@ msgstr "Obustavi"
 msgid "Restart"
 msgstr "Ponovo pokreni"

-#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:698
-#: ../js/ui/userMenu.js:700 ../js/ui/userMenu.js:815 ../js/ui/userMenu.js:942
+#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:697
+#: ../js/ui/userMenu.js:699 ../js/ui/userMenu.js:814 ../js/ui/userMenu.js:938
 msgid "Power Off"
-msgstr "Isključi"
+msgstr "Ugasi"

-#: ../js/gdm/util.js:249
+#: ../js/gdm/util.js:182
 msgid "Authentication error"
 msgstr "Greška potvrđivanja identiteta"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:366
+#: ../js/gdm/util.js:299
 msgid "(or swipe finger)"
 msgstr "(ili lupite prst)"

-#: ../js/gdm/util.js:391
+#: ../js/gdm/util.js:324
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(npr., korisnik ili %s)"

-#: ../js/misc/util.js:97
+#: ../js/misc/util.js:94
 msgid "Command not found"
 msgstr "Naredba nije nađena"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:130
+#: ../js/misc/util.js:127
 msgid "Could not parse command:"
 msgstr "Ne mogu da obradim naredbu:"

-#: ../js/misc/util.js:138
+#: ../js/misc/util.js:135
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Nije uspelo pokretanje „%s“:"

-#: ../js/ui/appDisplay.js:349
+#: ../js/ui/appDisplay.js:348
 msgid "Frequent"
 msgstr "Često"

-#: ../js/ui/appDisplay.js:356
+#: ../js/ui/appDisplay.js:355
 msgid "All"
 msgstr "Sve"

-#: ../js/ui/appDisplay.js:914
+#: ../js/ui/appDisplay.js:913
 msgid "New Window"
 msgstr "Novi prozor"

-#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:916 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Ukloni iz omiljenih"

-#: ../js/ui/appDisplay.js:918
+#: ../js/ui/appDisplay.js:917
 msgid "Add to Favorites"
 msgstr "Dodaj u omiljene"

@ -483,7 +484,7 @@ msgstr "„%s“ je dodat među omiljene."
 msgid "%s has been removed from your favorites."
 msgstr "„%s“ je uklonjen iz omiljenih."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:789
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:788
 msgid "Settings"
 msgstr "Podešavanja"

@ -506,7 +507,7 @@ msgctxt "event list time"
 msgid "%H\\u2236%M"
 msgstr "%H\\u2236%M"

-#. Translators: Shown in calendar event list, if 12h format,
+#. Transators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space
 #: ../js/ui/calendar.js:77
@ -608,35 +609,35 @@ msgid "S"
 msgstr "Sub"

 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:720
+#: ../js/ui/calendar.js:692
 msgid "Nothing Scheduled"
 msgstr "Ništa planirano"

 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:736
+#: ../js/ui/calendar.js:708
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d"

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

-#: ../js/ui/calendar.js:749
+#: ../js/ui/calendar.js:721
 msgid "Today"
 msgstr "Danas"

-#: ../js/ui/calendar.js:753
+#: ../js/ui/calendar.js:725
 msgid "Tomorrow"
 msgstr "Sutra"

-#: ../js/ui/calendar.js:764
+#: ../js/ui/calendar.js:736
 msgid "This week"
 msgstr "Ove nedelje"

-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:744
 msgid "Next week"
 msgstr "Sledeće nedelje"

@ -652,12 +653,12 @@ msgstr "Spoljni uređaj je isključen"
 msgid "Removable Devices"
 msgstr "Uklonjivi uređaji"

-#: ../js/ui/components/autorunManager.js:594
+#: ../js/ui/components/autorunManager.js:593
 #, c-format
 msgid "Open with %s"
 msgstr "Otvori programom %s"

-#: ../js/ui/components/autorunManager.js:620
+#: ../js/ui/components/autorunManager.js:619
 msgid "Eject"
 msgstr "Izbaci"

@ -1037,7 +1038,7 @@ msgstr "Podešavanja datuma i vremena"
 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:215
+#: ../js/ui/dateMenu.js:205
 msgid "%A %B %e, %Y"
 msgstr "%A, %e. %b., %R"

@ -1212,6 +1213,7 @@ msgid "Remove"
 msgstr "Ukloni"

 #: ../js/ui/messageTray.js:1501
+#| msgid "No Messages"
 msgid "Clear Messages"
 msgstr "Očisti poruke"

@ -1219,15 +1221,15 @@ msgstr "Očisti poruke"
 msgid "Notification Settings"
 msgstr "Postavke obaveštenja"

-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1707
 msgid "No Messages"
 msgstr "Nema poruka"

-#: ../js/ui/messageTray.js:1782
+#: ../js/ui/messageTray.js:1787
 msgid "Message Tray"
 msgstr "Fioka poruka"

-#: ../js/ui/messageTray.js:2810
+#: ../js/ui/messageTray.js:2864
 msgid "System Information"
 msgstr "Podaci o sistemu"

@ -1236,7 +1238,7 @@ msgctxt "program"
 msgid "Unknown"
 msgstr "Nepoznat"

-#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
+#: ../js/ui/overviewControls.js:460 ../js/ui/screenShield.js:153
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1245,7 +1247,7 @@ msgstr[1] "%d nove poruke"
 msgstr[2] "%d novih poruka"
 msgstr[3] "Jedna nova poruka"

-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:82
 msgid "Undo"
 msgstr "Opozovi"

@ -1257,21 +1259,22 @@ msgstr "Pregled"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:271
+#: ../js/ui/overview.js:284
+#| msgid "Type to search..."
 msgid "Type to search…"
 msgstr "Upišite tekst za pretragu…"

-#: ../js/ui/panel.js:612
+#: ../js/ui/panel.js:613
 msgid "Quit"
 msgstr "Izađi"

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

-#: ../js/ui/panel.js:933
+#: ../js/ui/panel.js:983
 msgid "Top Bar"
 msgstr "Gornja traka"

@ -1284,21 +1287,21 @@ msgstr "Gornja traka"
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:73
+#: ../js/ui/runDialog.js:205
 msgid "Enter a Command"
 msgstr "Unesite naredbu"

-#: ../js/ui/runDialog.js:109
+#: ../js/ui/runDialog.js:241
 msgid "Close"
 msgstr "Zatvori"

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

-#: ../js/ui/screenShield.js:151
+#: ../js/ui/screenShield.js:155
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
@ -1307,11 +1310,11 @@ msgstr[1] "%d nova obaveštenja"
 msgstr[2] "%d novih obaveštenja"
 msgstr[3] "Jedno novo obaveštenje"

-#: ../js/ui/screenShield.js:438 ../js/ui/userMenu.js:807
+#: ../js/ui/screenShield.js:442 ../js/ui/userMenu.js:806
 msgid "Lock"
 msgstr "Zaključaj"

-#: ../js/ui/screenShield.js:640
+#: ../js/ui/screenShield.js:639
 msgid "GNOME needs to lock the screen"
 msgstr "Gnom mora da zaključa ekran"

@ -1322,19 +1325,21 @@ msgstr "Gnom mora da zaključa ekran"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:761 ../js/ui/screenShield.js:1197
+#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1169
+#| msgid "Unable to connect to %s"
 msgid "Unable to lock"
 msgstr "Ne mogu da zaključam"

-#: ../js/ui/screenShield.js:762 ../js/ui/screenShield.js:1198
+#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1170
 msgid "Lock was blocked by an application"
 msgstr "Neki program je blokirao zaključavanje"

-#: ../js/ui/searchDisplay.js:453
+#: ../js/ui/searchDisplay.js:431
+#| msgid "Searching..."
 msgid "Searching…"
 msgstr "Tražim…"

-#: ../js/ui/searchDisplay.js:497
+#: ../js/ui/searchDisplay.js:475
 msgid "No results."
 msgstr "Nema odgovarajućih rezultata."

@ -1346,11 +1351,11 @@ msgstr "Umnoži"
 msgid "Paste"
 msgstr "Ubaci"

-#: ../js/ui/shellEntry.js:106
+#: ../js/ui/shellEntry.js:105
 msgid "Show Text"
 msgstr "Prikaži tekst"

-#: ../js/ui/shellEntry.js:108
+#: ../js/ui/shellEntry.js:107
 msgid "Hide Text"
 msgstr "Sakrij tekst"

@ -1362,7 +1367,7 @@ msgstr "Lozinka"
 msgid "Remember Password"
 msgstr "Zapamti lozinku"

-#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:113
+#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:140
 msgid "Unlock"
 msgstr "Otključaj"

@ -1426,10 +1431,12 @@ msgid "Visibility"
 msgstr "Vidljivost"

 #: ../js/ui/status/bluetooth.js:59
+#| msgid "Send Files to Device..."
 msgid "Send Files to Device…"
 msgstr "Pošalji datoteke na uređaj…"

 #: ../js/ui/status/bluetooth.js:60
+#| msgid "Set Up a New Device..."
 msgid "Set Up a New Device…"
 msgstr "Podesi novi uređaj…"

@ -1456,6 +1463,7 @@ msgid "connecting..."
 msgstr "povezujem se..."

 #: ../js/ui/status/bluetooth.js:239
+#| msgid "Send Files..."
 msgid "Send Files…"
 msgstr "Pošalji datoteke…"

@ -1668,6 +1676,7 @@ msgstr "Podešavanja napajanja"
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
 #: ../js/ui/status/power.js:99
+#| msgid "Estimating..."
 msgid "Estimating…"
 msgstr "Približno…"

@ -1775,11 +1784,11 @@ msgstr "Jačina zvuka"
 msgid "Microphone"
 msgstr "Mikrofon"

-#: ../js/ui/unlockDialog.js:124
+#: ../js/ui/unlockDialog.js:151
 msgid "Log in as another user"
 msgstr "Prijavite se kao drugi korsnik"

-#: ../js/ui/unlockDialog.js:145
+#: ../js/ui/unlockDialog.js:177
 msgid "Unlock Window"
 msgstr "Otključaj prozor"

@ -1807,27 +1816,27 @@ msgstr "Miruje"
 msgid "Offline"
 msgstr "Van mreže"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:780
 msgid "Notifications"
 msgstr "Obaveštenja"

-#: ../js/ui/userMenu.js:797
+#: ../js/ui/userMenu.js:796
 msgid "Switch User"
 msgstr "Promeni korisnika"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:801
 msgid "Log Out"
 msgstr "Odjavi me"

-#: ../js/ui/userMenu.js:822
+#: ../js/ui/userMenu.js:821
 msgid "Install Updates & Restart"
 msgstr "Instaliraj ažuriranja i ponovo pokreni"

-#: ../js/ui/userMenu.js:840
+#: ../js/ui/userMenu.js:839
 msgid "Your chat status will be set to busy"
 msgstr "Vaše stanje ćaskanja će biti postavljeno na zauzeto"

-#: ../js/ui/userMenu.js:841
+#: ../js/ui/userMenu.js:840
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@ -1836,22 +1845,20 @@ msgstr ""
 "mreži je podešeno tako da će ostali znati da vi ne možete videti njihove "
 "poruke."

-#: ../js/ui/userMenu.js:888
+#: ../js/ui/userMenu.js:886
 msgid "Other users are logged in."
 msgstr "Drugi korisnici su prijavljeni."

-#: ../js/ui/userMenu.js:893
+#: ../js/ui/userMenu.js:891
 msgid "Shutting down might cause them to lose unsaved work."
 msgstr "Isključivanje može da dovede do toga da izgube nesačuvani rad."

-#. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/userMenu.js:921
+#: ../js/ui/userMenu.js:918
 #, c-format
 msgid "%s (remote)"
 msgstr "%s (udaljeno)"

-#. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/userMenu.js:924
+#: ../js/ui/userMenu.js:920
 #, c-format
 msgid "%s (console)"
 msgstr "%s (ljuska)"
@ -1864,7 +1871,7 @@ msgstr "Programi"
 msgid "Search"
 msgstr "Traži"

-#: ../js/ui/wanda.js:77
+#: ../js/ui/wanda.js:92
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1873,7 +1880,7 @@ msgstr ""
 "Izvinite, danas za vas nema mudrosti:\n"
 "%s"

-#: ../js/ui/wanda.js:81
+#: ../js/ui/wanda.js:96
 #, c-format
 msgid "%s the Oracle says"
 msgstr "Prorok je rekao %s"
--- a/po/vi.po
+++ b/po/vi.po
@ -1,19 +1,18 @@
 # Vietnamese translation for gnome-shell.
-# Copyright (C) 2013 GNOME i18n Project for Vietnamese.
+# Copyright (C) 2010 GNOME i18n Project for Vietnamese.
 # This file is distributed under the same license as the gnome-shell package.
 # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2010-2013.
 # Ngô Chin <ndtrung4419@gmail.com>, 2011.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-23 11:49+0000\n"
-"PO-Revision-Date: 2013-04-13 17:51+1000\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2013-03-02 23:02+0000\n"
+"PO-Revision-Date: 2013-03-03 11:13+0700\n"
+"Last-Translator: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -50,7 +49,7 @@ msgstr "Mở trình đơn ứng dụng"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
-msgstr "Hệ vỏ GNOME"
+msgstr "GNOME Shell"

 #: ../data/gnome-shell.desktop.in.in.h:2
 msgid "Window management and application launching"
@ -59,11 +58,11 @@ msgstr "Quản lý cửa sổ và chạy ứng dụng"
 #: ../data/gnome-shell-extension-prefs.desktop.in.in.h:1
 #: ../js/extensionPrefs/main.js:153
 msgid "GNOME Shell Extension Preferences"
-msgstr "Cá nhân hóa phần mở rộng hệ vỏ GNOME"
+msgstr "Tuỳ thích phần mở rộng GNOME Shell"

 #: ../data/gnome-shell-extension-prefs.desktop.in.in.h:2
 msgid "Configure GNOME Shell Extensions"
-msgstr "Cấu hình phần mở rộng Hệ vỏ GNOME"
+msgstr "Cấu hình phần mở rộng GNOME Shell"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
@ -88,7 +87,7 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
-"Phần mở rộng Hệ vỏ GNOME có thuộc tính uuid; khóa này liệt kê danh sách phần "
+"Phần mở rộng GNOME Shell có thuộc tính uuid. Khoá này liệt kê danh sách phần "
 "mở rộng nên nạp. Bất kỳ phần mở rộng nào muốn nạp phải nằm trong danh sách "
 "này. Bạn có thể thao tác trên danh sách này với phương thức DBus "
 "EnableExtension và DisableExtension trên org.gnome.Shell."
@ -121,15 +120,13 @@ msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "List of categories that should be displayed as folders"
-msgstr "Liệt kê các các-ta-lốc mà nó có thể hiển thị như một thư mục"
+msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:10
 msgid ""
 "Each category name in this list will be represented as folder in the "
 "application view, rather than being displayed inline in the main view."
 msgstr ""
-"Mỗi tên các-ta-lốc trong danh sách này sẽ được xuất hiện như là một thư mục "
-"trong trình bày ứng dụng, thay vì hiển thị  cùng dòng trong trình bày chính. "

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
@ -157,22 +154,18 @@ msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Always show the 'Log out' menuitem in the user menu."
-msgstr "Luôn hiện mục “Đăng xuất” trên trình đơn người dùng."
+msgstr "Luôn hiện mục \"Đăng xuất\" trên trình đơn người dùng."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menuitem in single-"
 "user, single-session situations."
 msgstr ""
-"Khóa này sẽ đè lên việc tự động ẩn trình đơn 'Đăng xuất' ở chế độ đơn-người-"
-"dùng, đơn-phiên-làm-việc. "

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
-"Hoặc là ghi nhớ mật khẩu dành cho việc gắn hệ thống tập tin đã mã hóa hoặc "
-"hệ thống tập tin trên máy chủ"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid ""
@ -181,10 +174,6 @@ msgid ""
 "'Remember Password' checkbox will be present. This key sets the default "
 "state of the checkbox."
 msgstr ""
-"Hệ vỏ sẽ yêu cầu mật khẩu khi có thư mục được mã hóa hay hệ thống tập tin "
-"máy mạng được gắn. Nếu mật khẩu có thể ghi lại để dùng trong lần sau, hộp "
-"dấu kiểm “Nhớ mật khẩu” sẽ xuất hiện. Khóa này đặt trạng thái mặc định cho "
-"hộp dấu kiểm."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "Show the week date in the calendar"
@ -237,27 +226,27 @@ msgstr "Phím chạy hoặc ngừng trình thu màn hình."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
-msgstr "Bàn phím cần dùng"
+msgstr "Loại bàn phím cần dùng"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
-msgstr "Kiểu bàn phím cần dùng."
+msgstr "Loại bàn phím cần dùng."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Framerate used for recording screencasts."
-msgstr "Tốc độ khung hình sẽ dùng khi ghi screencast."
+msgstr "Tốc độ khung dùng lưu screencast."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
 msgstr ""
-"Tốc độ khung hình của screencast được ghi bởi bộ thu Hệ vỏ GNOME tính theo "
-"số khung mỗi giây."
+"Tốc độ khung của screencast lưu bởi bộ thu GNOME Shell theo số khung mỗi "
+"giây."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The gstreamer pipeline used to encode the screencast"
-msgstr "Ống dẫn gstreamer dùng để thu screencast"
+msgstr "Ống dẫn gstreamer để thu screencast"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 #, no-c-format
@ -278,9 +267,9 @@ msgstr ""
 "source pad không kết nối; đầu ra từ pad sẽ được ghi vào tập tin kết quả. Tuy "
 "nhiên ống dẫn có thể tự lưu đầu ra riêng - có thể hữu dụng để gửi kết quả "
 "đến máy chủ icecast thông qua shout2send hoặc tương tự. Nếu bỏ chọn hoặc đặt "
-"giá trị rỗng, ống dẫn mặc định sẽ được dùng, hiện thời là “vp8enc "
+"giá trị rỗng, ống dẫn mặc định sẽ được dùng, hiện thời là 'vp8enc "
 "min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! "
-"queue ! webmmux” và lưu ở dạng WEBM dùng VP8 codec. %T được dùng để thế chỗ "
+"queue ! webmmux' và lưu ở dạng WEBM dùng VP8 codec. %T được dùng để thế chỗ "
 "cho số thread dự đoán tối ưu cho hệ thống."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:38
@ -307,31 +296,25 @@ msgid ""
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
 "only' (shows only the application icon) or 'both'."
 msgstr ""
-"Cấu hình về cách hiển thị các cửa sổ ở bảng chuyển đổi. Các kiểu có thể là "
-"'thumbnail-only' (hiển thị ảnh thu nhỏ của cửa sổ), 'app-icon-only' (chỉ "
-"hiển thị biểu tượng của ứng dụng) hoặc 'both' (cả hai)."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Attach modal dialog to the parent window"
-msgstr "Gắn hộp thoại dạng modal vào cửa sổ mẹ"
+msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
-"Khóa này sẽ đè lên khóa có trong org.gnome.mutter khi chạy hệ vỏ GNOME."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:44
 msgid "Arrangement of buttons on the titlebar"
-msgstr "Sắp đặt các nút trên thanh tiêu đề"
+msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:45
 msgid ""
 "This key overrides the key in org.gnome.desktop.wm.preferences when running "
 "GNOME Shell."
 msgstr ""
-"Khóa này đè lên khóa có trong org.gnome.desktop.wm.preferences khi chạy hệ "
-"vỏ GNOME."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:46
 msgid "Enable edge tiling when dropping windows on screen edges"
@ -365,46 +348,46 @@ msgstr "Phiên làm việc…"
 #. 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:630
+#: ../js/gdm/loginDialog.js:629
 msgid "Not listed?"
 msgstr "Không có trong danh sách?"

-#: ../js/gdm/loginDialog.js:786 ../js/ui/components/networkAgent.js:137
+#: ../js/gdm/loginDialog.js:783 ../js/ui/components/networkAgent.js:137
 #: ../js/ui/components/polkitAgent.js:162 ../js/ui/endSessionDialog.js:375
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:99
-#: ../js/ui/userMenu.js:938
+#: ../js/ui/status/bluetooth.js:415 ../js/ui/unlockDialog.js:126
+#: ../js/ui/userMenu.js:932
 msgid "Cancel"
 msgstr "Thôi"

-#: ../js/gdm/loginDialog.js:802
+#: ../js/gdm/loginDialog.js:799
 msgctxt "button"
 msgid "Sign In"
 msgstr "Đăng nhập"

-#: ../js/gdm/loginDialog.js:802
+#: ../js/gdm/loginDialog.js:799
 msgid "Next"
-msgstr "Kế tiếp"
+msgstr "Tới"

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:917 ../js/ui/components/networkAgent.js:260
+#: ../js/gdm/loginDialog.js:904 ../js/ui/components/networkAgent.js:260
 #: ../js/ui/components/networkAgent.js:278
 msgid "Username: "
-msgstr "Tài khoản: "
+msgstr "Tên người dùng: "

-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1157
 msgid "Login Window"
-msgstr "Cửa sổ đăng nhập"
+msgstr "Cửa sổ đặt nhập"

 #. Translators: accessible name of the power menu in the login screen
 #: ../js/gdm/powerMenu.js:36
 msgid "Power"
 msgstr "Nguồn"

-#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:696 ../js/ui/userMenu.js:700
-#: ../js/ui/userMenu.js:816
+#: ../js/gdm/powerMenu.js:93 ../js/ui/userMenu.js:694 ../js/ui/userMenu.js:698
+#: ../js/ui/userMenu.js:814
 msgid "Suspend"
 msgstr "Ngưng"

@ -412,58 +395,58 @@ msgstr "Ngưng"
 msgid "Restart"
 msgstr "Khởi động lại"

-#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:698
-#: ../js/ui/userMenu.js:700 ../js/ui/userMenu.js:815 ../js/ui/userMenu.js:942
+#: ../js/gdm/powerMenu.js:103 ../js/ui/userMenu.js:696
+#: ../js/ui/userMenu.js:698 ../js/ui/userMenu.js:813 ../js/ui/userMenu.js:936
 msgid "Power Off"
 msgstr "Tắt máy"

-#: ../js/gdm/util.js:249
+#: ../js/gdm/util.js:182
 msgid "Authentication error"
 msgstr "Lỗi xác thực"

 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: ../js/gdm/util.js:366
+#: ../js/gdm/util.js:299
 msgid "(or swipe finger)"
 msgstr "(hoặc quẹt ngón tay)"

-#: ../js/gdm/util.js:391
+#: ../js/gdm/util.js:324
 #, c-format
 msgid "(e.g., user or %s)"
-msgstr "(ví dụ: tài khoản hoặc %s)"
+msgstr "(ví dụ người dùng hoặc %s)"

-#: ../js/misc/util.js:97
+#: ../js/misc/util.js:94
 msgid "Command not found"
 msgstr "Không tìm thấy lệnh"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:130
+#: ../js/misc/util.js:127
 msgid "Could not parse command:"
 msgstr "Không thể phân tích lệnh:"

-#: ../js/misc/util.js:138
+#: ../js/misc/util.js:135
 #, c-format
 msgid "Execution of '%s' failed:"
-msgstr "Lỗi thực hiện “%s”:"
+msgstr "Lỗi thực hiện '%s':"

-#: ../js/ui/appDisplay.js:349
+#: ../js/ui/appDisplay.js:348
 msgid "Frequent"
 msgstr "Thường dùng"

-#: ../js/ui/appDisplay.js:356
+#: ../js/ui/appDisplay.js:355
 msgid "All"
 msgstr "Tất cả"

-#: ../js/ui/appDisplay.js:914
+#: ../js/ui/appDisplay.js:913
 msgid "New Window"
 msgstr "Cửa sổ mới"

-#: ../js/ui/appDisplay.js:917 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:916 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Bỏ đánh dấu ưa thích"

-#: ../js/ui/appDisplay.js:918
+#: ../js/ui/appDisplay.js:917
 msgid "Add to Favorites"
 msgstr "Đánh dấu ưa thích"

@ -477,13 +460,13 @@ msgstr "Đã được đánh dấu ưa thích cho %s."
 msgid "%s has been removed from your favorites."
 msgstr "Đã bỏ đánh dấu ưa thích cho %s"

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:789
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/userMenu.js:787
 msgid "Settings"
-msgstr "Cài đặt"
+msgstr "Thiết lập"

 #: ../js/ui/backgroundMenu.js:21
 msgid "Change Background…"
-msgstr "Đổi ảnh nền…"
+msgstr "Thay đổi nền…"

 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
@ -602,35 +585,35 @@ msgid "S"
 msgstr "T7"

 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:720
+#: ../js/ui/calendar.js:692
 msgid "Nothing Scheduled"
 msgstr "Không có lịch hẹn"

 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:736
+#: ../js/ui/calendar.js:708
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"

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

-#: ../js/ui/calendar.js:749
+#: ../js/ui/calendar.js:721
 msgid "Today"
 msgstr "Hôm nay"

-#: ../js/ui/calendar.js:753
+#: ../js/ui/calendar.js:725
 msgid "Tomorrow"
 msgstr "Ngày mai"

-#: ../js/ui/calendar.js:764
+#: ../js/ui/calendar.js:736
 msgid "This week"
 msgstr "Tuần này"

-#: ../js/ui/calendar.js:772
+#: ../js/ui/calendar.js:744
 msgid "Next week"
 msgstr "Tuần tới"

@ -646,12 +629,12 @@ msgstr "Ổ ngoài đã ngắt kết nối"
 msgid "Removable Devices"
 msgstr "Thiết bị di động"

-#: ../js/ui/components/autorunManager.js:594
+#: ../js/ui/components/autorunManager.js:593
 #, c-format
 msgid "Open with %s"
 msgstr "Mở bằng %s"

-#: ../js/ui/components/autorunManager.js:620
+#: ../js/ui/components/autorunManager.js:619
 msgid "Eject"
 msgstr "Đẩy ra"

@ -702,7 +685,7 @@ msgstr "Mạng không dây cần xác thực"
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
-msgstr "Cần mật mã hoặc khoá mã để truy cập mạng không dây “%s”"
+msgstr "Cần mật mã hoặc khoá mã để truy cập mạng không dây '%s'"

 #: ../js/ui/components/networkAgent.js:314
 msgid "Wired 802.1X authentication"
@ -735,7 +718,7 @@ msgstr "Mật khẩu mạng băng thông rộng"
 #: ../js/ui/components/networkAgent.js:337
 #, c-format
 msgid "A password is required to connect to '%s'."
-msgstr "Cần mật khẩu để kết nối đến “%s”."
+msgstr "Cần mật khẩu để kết nối đến '%s'."

 #: ../js/ui/components/polkitAgent.js:55
 msgid "Authentication Required"
@ -789,7 +772,7 @@ msgstr "Ngừng im lặng"

 #: ../js/ui/components/telepathyClient.js:480
 msgid "Mute"
-msgstr "Câm"
+msgstr "Im lặng"

 #. Translators: this is the word "Yesterday" followed by a time string. i.e. "Yesterday, 14:30"
 #: ../js/ui/components/telepathyClient.js:942
@ -1000,7 +983,7 @@ msgstr "Xem tài khoản"
 msgid "Unknown reason"
 msgstr "Lý do không biết"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:96
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:97
 msgid "Windows"
 msgstr "Cửa sổ"

@ -1029,7 +1012,7 @@ msgstr "Thiết lập ngày giờ"
 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:215
+#: ../js/ui/dateMenu.js:205
 msgid "%A %B %e, %Y"
 msgstr "%A %e %B, %Y"

@ -1125,7 +1108,7 @@ msgstr "Cài đặt"
 #: ../js/ui/extensionDownloader.js:204
 #, c-format
 msgid "Download and install '%s' from extensions.gnome.org?"
-msgstr "Tải và cài đặt “%s” từ extensions.gnome.org chứ?"
+msgstr "Tải và cài đặt '%s' từ extensions.gnome.org chứ?"

 #: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:314
 #: ../js/ui/status/power.js:211
@ -1154,7 +1137,9 @@ msgstr "Hiện lỗi"
 msgid "Enabled"
 msgstr "Bật"

-#: ../js/ui/lookingGlass.js:769
+#. translators:
+#. * The device has been disabled
+#: ../js/ui/lookingGlass.js:769 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Tắt"

@ -1194,15 +1179,15 @@ msgstr "Xoá thông báo"
 msgid "Notification Settings"
 msgstr "Thiết lập thông báo"

-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1707
 msgid "No Messages"
 msgstr "Không có thông báo"

-#: ../js/ui/messageTray.js:1782
+#: ../js/ui/messageTray.js:1787
 msgid "Message Tray"
 msgstr "Khay thông báo"

-#: ../js/ui/messageTray.js:2810
+#: ../js/ui/messageTray.js:2864
 msgid "System Information"
 msgstr "Thông tin hệ thống"

@ -1211,13 +1196,13 @@ msgctxt "program"
 msgid "Unknown"
 msgstr "Không biết"

-#: ../js/ui/overviewControls.js:463 ../js/ui/screenShield.js:149
+#: ../js/ui/overviewControls.js:460 ../js/ui/screenShield.js:153
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d tin nhắn mới"

-#: ../js/ui/overview.js:84
+#: ../js/ui/overview.js:82
 msgid "Undo"
 msgstr "Hoàn lại"

@ -1229,21 +1214,21 @@ msgstr "Tổng quan"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:271
+#: ../js/ui/overview.js:284
 msgid "Type to search…"
 msgstr "Nhập để tìm…"

-#: ../js/ui/panel.js:612
+#: ../js/ui/panel.js:613
 msgid "Quit"
 msgstr "Thoát"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:636
+#: ../js/ui/panel.js:642
 msgid "Activities"
 msgstr "Hoạt động"

-#: ../js/ui/panel.js:933
+#: ../js/ui/panel.js:983
 msgid "Top Bar"
 msgstr "Thanh đỉnh"

@ -1256,31 +1241,31 @@ msgstr "Thanh đỉnh"
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:73
+#: ../js/ui/runDialog.js:205
 msgid "Enter a Command"
 msgstr "Nhập lệnh"

-#: ../js/ui/runDialog.js:109
+#: ../js/ui/runDialog.js:241
 msgid "Close"
 msgstr "Đóng"

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

-#: ../js/ui/screenShield.js:151
+#: ../js/ui/screenShield.js:155
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d thông báo mới"

-#: ../js/ui/screenShield.js:438 ../js/ui/userMenu.js:807
+#: ../js/ui/screenShield.js:442 ../js/ui/userMenu.js:805
 msgid "Lock"
 msgstr "Khoá"

-#: ../js/ui/screenShield.js:637
+#: ../js/ui/screenShield.js:639
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME cần khoá màn hình"

@ -1291,19 +1276,19 @@ msgstr "GNOME cần khoá màn hình"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1194
+#: ../js/ui/screenShield.js:758 ../js/ui/screenShield.js:1169
 msgid "Unable to lock"
 msgstr "Không thể khoá"

-#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1195
+#: ../js/ui/screenShield.js:759 ../js/ui/screenShield.js:1170
 msgid "Lock was blocked by an application"
 msgstr "Một ứng dụng đã ngăn cản khoá"

-#: ../js/ui/searchDisplay.js:453
+#: ../js/ui/searchDisplay.js:431
 msgid "Searching…"
 msgstr "Đang tìm…"

-#: ../js/ui/searchDisplay.js:497
+#: ../js/ui/searchDisplay.js:475
 msgid "No results."
 msgstr "Không có kết quả."

@ -1315,11 +1300,11 @@ msgstr "Chép"
 msgid "Paste"
 msgstr "Dán"

-#: ../js/ui/shellEntry.js:106
+#: ../js/ui/shellEntry.js:105
 msgid "Show Text"
 msgstr "Hiện chữ"

-#: ../js/ui/shellEntry.js:108
+#: ../js/ui/shellEntry.js:107
 msgid "Hide Text"
 msgstr "Ẩn chữ"

@ -1331,7 +1316,7 @@ msgstr "Mật khẩu"
 msgid "Remember Password"
 msgstr "Nhớ mật khẩu"

-#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:113
+#: ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:140
 msgid "Unlock"
 msgstr "Bỏ khoá"

@ -1448,7 +1433,7 @@ msgstr "Yêu cầu cấp quyền từ %s"
 #: ../js/ui/status/bluetooth.js:328
 #, c-format
 msgid "Device %s wants access to the service '%s'"
-msgstr "Thiết bị %s muốn truy cập dịch vụ “%s”"
+msgstr "Thiết bị %s muốn truy cập dịch vụ '%s'"

 #: ../js/ui/status/bluetooth.js:330
 msgid "Always grant access"
@ -1476,7 +1461,7 @@ msgstr "Thiết bị %s muốn kết nối với máy tính này"
 #: ../js/ui/status/bluetooth.js:366
 #, c-format
 msgid "Please confirm whether the PIN '%06d' matches the one on the device."
-msgstr "Vui lòng xác nhận PIN “%06d” khớp với số trên thiết bị."
+msgstr "Vui lòng xác nhận PIN '%06d' khớp với số trên thiết bị."

 #. Translators: this is the verb, not the noun
 #: ../js/ui/status/bluetooth.js:369
@ -1732,59 +1717,59 @@ msgstr "Âm lượng"
 msgid "Microphone"
 msgstr "Micrô"

-#: ../js/ui/unlockDialog.js:124
+#: ../js/ui/unlockDialog.js:151
 msgid "Log in as another user"
 msgstr "Đăng nhập người dùng khác"

-#: ../js/ui/unlockDialog.js:145
+#: ../js/ui/unlockDialog.js:177
 msgid "Unlock Window"
 msgstr "Bỏ khoá cửa sổ"

-#: ../js/ui/userMenu.js:193
+#: ../js/ui/userMenu.js:192
 msgid "Available"
 msgstr "Có mặt"

-#: ../js/ui/userMenu.js:196
+#: ../js/ui/userMenu.js:195
 msgid "Busy"
 msgstr "Bận"

-#: ../js/ui/userMenu.js:199
+#: ../js/ui/userMenu.js:198
 msgid "Invisible"
 msgstr "Giấu mặt"

-#: ../js/ui/userMenu.js:202
+#: ../js/ui/userMenu.js:201
 msgid "Away"
 msgstr "Vắng mặt"

-#: ../js/ui/userMenu.js:205
+#: ../js/ui/userMenu.js:204
 msgid "Idle"
 msgstr "Nhàn rỗi"

-#: ../js/ui/userMenu.js:208
+#: ../js/ui/userMenu.js:207
 msgid "Offline"
 msgstr "Ngoại tuyến"

-#: ../js/ui/userMenu.js:781
+#: ../js/ui/userMenu.js:779
 msgid "Notifications"
 msgstr "Thông báo"

-#: ../js/ui/userMenu.js:797
+#: ../js/ui/userMenu.js:795
 msgid "Switch User"
 msgstr "Chuyển người dùng"

-#: ../js/ui/userMenu.js:802
+#: ../js/ui/userMenu.js:800
 msgid "Log Out"
 msgstr "Đăng xuất"

-#: ../js/ui/userMenu.js:822
+#: ../js/ui/userMenu.js:820
 msgid "Install Updates & Restart"
 msgstr "Cài đặt bản cập nhật và khởi động lại"

-#: ../js/ui/userMenu.js:840
+#: ../js/ui/userMenu.js:838
 msgid "Your chat status will be set to busy"
 msgstr "Trạng thái nhắn tin của bạn sẽ được đặt là bận"

-#: ../js/ui/userMenu.js:841
+#: ../js/ui/userMenu.js:839
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@ -1792,35 +1777,33 @@ msgstr ""
 "Thông báo đã bị tắt, bao gồm tin nhắn. Trạng thái trực tuyến của bạn đã được "
 "điều chỉnh để mọi người biết bạn sẽ không xem tin nhắn họ gửi đến."

-#: ../js/ui/userMenu.js:888
+#: ../js/ui/userMenu.js:885
 msgid "Other users are logged in."
 msgstr "Người dùng khác đang đăng nhập."

-#: ../js/ui/userMenu.js:893
+#: ../js/ui/userMenu.js:890
 msgid "Shutting down might cause them to lose unsaved work."
 msgstr "Tắt sẽ làm mất những kết quả chưa được lưu."

-#. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/userMenu.js:921
+#: ../js/ui/userMenu.js:916
 #, c-format
 msgid "%s (remote)"
 msgstr "%s (ở xa)"

-#. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/userMenu.js:924
+#: ../js/ui/userMenu.js:918
 #, c-format
 msgid "%s (console)"
 msgstr "%s (console)"

-#: ../js/ui/viewSelector.js:100
+#: ../js/ui/viewSelector.js:101
 msgid "Applications"
 msgstr "Ứng dụng"

-#: ../js/ui/viewSelector.js:104
+#: ../js/ui/viewSelector.js:105
 msgid "Search"
 msgstr "Tìm"

-#: ../js/ui/wanda.js:77
+#: ../js/ui/wanda.js:92
 #, c-format
 msgid ""
 "Sorry, no wisdom for you today:\n"
@ -1829,7 +1812,7 @@ msgstr ""
 "Rất tiếc, không có lời thông thái nào hôm nay:\n"
 "%s"

-#: ../js/ui/wanda.js:81
+#: ../js/ui/wanda.js:96
 #, c-format
 msgid "%s the Oracle says"
 msgstr "Nhà tiên tri %s nói"
@ -1837,12 +1820,32 @@ msgstr "Nhà tiên tri %s nói"
 #: ../js/ui/windowAttentionHandler.js:19
 #, c-format
 msgid "'%s' is ready"
-msgstr "“%s” đã sẵn sàng"
+msgstr "'%s' đã sẵn sàng"

 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Lịch Evolution"

+#. translators:
+#. * The number of sound outputs on a particular device
+#: ../src/gvc/gvc-mixer-control.c:1837
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u đầu ra"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: ../src/gvc/gvc-mixer-control.c:1847
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u đầu vào"
+
+#: ../src/gvc/gvc-mixer-control.c:2371
+msgid "System Sounds"
+msgstr "Âm thanh hệ thống"
+
 #: ../src/main.c:347
 msgid "Print version"
 msgstr "In phiên bản"
@ -1853,7 +1856,7 @@ msgstr "Chể độ dùng bởi GDM cho màn hình đăng nhập"

 #: ../src/main.c:359
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
-msgstr "Dùng chế độ đặc biệt, ví dụ “gdm” cho màn hình đăng nhập"
+msgstr "Dùng chế độ đặc biệt, ví dụ \"gdm\" cho màn hình đăng nhập"

 #: ../src/main.c:365
 msgid "List possible modes"
@ -1862,7 +1865,7 @@ msgstr "Danh sách chế độ"
 #: ../src/shell-app.c:622
 #, c-format
 msgid "Failed to launch '%s'"
-msgstr "Lỗi chạy “%s”"
+msgstr "Lỗi chạy '%s'"

 #: ../src/shell-keyring-prompt.c:708
 msgid "Passwords do not match."
@ -1876,17 +1879,6 @@ msgstr "Mật khẩu không thể không có"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Hộp thoại xác thực bị người dùng bỏ qua"

-#~ msgid "%u Output"
-#~ msgid_plural "%u Outputs"
-#~ msgstr[0] "%u đầu ra"
-
-#~ msgid "%u Input"
-#~ msgid_plural "%u Inputs"
-#~ msgstr[0] "%u đầu vào"
-
-#~ msgid "System Sounds"
-#~ msgstr "Âm thanh hệ thống"
-
 #~ msgctxt "title"
 #~ msgid "Sign In"
 #~ msgstr "Đăng nhập"
@ -1918,7 +1910,7 @@ msgstr "Hộp thoại xác thực bị người dùng bỏ qua"
 #~ msgstr "%l:%M %p"

 #~ msgid "Failed to unmount '%s'"
-#~ msgstr "Lỗi bỏ gắn kết “%s”"
+#~ msgstr "Lỗi bỏ gắn kết '%s'"

 #~ msgid "Retry"
 #~ msgstr "Thử lại"
@ -1933,7 +1925,7 @@ msgstr "Hộp thoại xác thực bị người dùng bỏ qua"
 #~ msgstr "Lỗi duyệt tập tin"

 #~ msgid "The requested device cannot be browsed, error is '%s'"
-#~ msgstr "Không thể duyệt thiết bị yêu cầu , lỗi là “%s”"
+#~ msgstr "Không thể duyệt thiết bị yêu cầu , lỗi là '%s'"

 #~ msgid "Wireless"
 #~ msgstr "Mạng không dây"
@ -2078,3 +2070,155 @@ msgstr "Hộp thoại xác thực bị người dùng bỏ qua"

 #~ msgid "Show password"
 #~ msgstr "Hiện mật khẩu"
+
+#~| msgid "If true, display seconds in time."
+#~ msgid "If true, display onscreen keyboard."
+#~ msgstr "Nếu đúng (true), hiện bàn phím màn hình."
+
+#~| msgid "Screen Keyboard"
+#~ msgid "Show the onscreen keyboard"
+#~ msgstr "Hiện bàn phím màn hình"
+
+#~ msgid "%s has finished starting"
+#~ msgstr "%s đã hoàn tất khởi chạy"
+
+#~ msgid "Uuids of extensions to disable"
+#~ msgstr "UUID của phần mở rộng cần tắt"
+
+#~ msgid "You're now connected to mobile broadband connection '%s'"
+#~ msgstr "Đã nối mạng '%s' (băng thông rộng)"
+
+#~ msgid "You're now connected to wireless network '%s'"
+#~ msgstr "Đã nối mạng '%s' (không dây)"
+
+#~ msgid "You're now connected to wired network '%s'"
+#~ msgstr "Đã nối mạng '%s' (dây)"
+
+#~ msgid "You're now connected to VPN network '%s'"
+#~ msgstr "Đã nối mạng VPN '%s'"
+
+#~ msgid "Localization Settings"
+#~ msgstr "Thiết lập bản địa hoá"
+
+#~ msgid "Less than a minute ago"
+#~ msgstr "Chưa đến một phút"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "%d phút trước"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "%d giờ trước"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d ngày trước"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "%d tuần trước"
+
+#~ msgid "Shut Down"
+#~ msgstr "Tắt máy"
+
+#~ msgid "Click Shut Down to quit these applications and shut down the system."
+#~ msgstr "Nhấn Tắt máy để thoát những ứng dụng này và tắt hệ thống."
+
+#~ msgid "The system will shut down automatically in %d seconds."
+#~ msgstr "Hệ thống sẽ tự động tắt sau %d giây."
+
+#~ msgid "Shutting down the system."
+#~ msgstr "Tắt hệ thống."
+
+#~ msgid "Confirm"
+#~ msgstr "Xác nhận"
+
+#~ msgid "Clip the crosshairs at the center"
+#~ msgstr "Cắt lưới chéo ở giữa"
+
+#~ msgid "Color of the crosshairs"
+#~ msgstr "Màu lưới chéo"
+
+#~ msgid ""
+#~ "Determines the length of the vertical and horizontal lines that make up "
+#~ "the crosshairs."
+#~ msgstr "Xác định độ dài và rộng của những dòng tạo nên lưới chéo."
+
+#~ msgid ""
+#~ "Determines the transparency of the crosshairs, from fully opaque to fully "
+#~ "transparent."
+#~ msgstr "Xác định độ trong suốt của lưới chéo, từ đặc đến trong suốt."
+
+#~ msgid "Enable lens mode"
+#~ msgstr "Bật chế độ gương"
+
+#~ msgid "Show or hide crosshairs"
+#~ msgstr "Hiện hoặc ẩn lưới chéo"
+
+#~ msgid "Show or hide the magnifier"
+#~ msgstr "Hiện hoặc ẩn kính lúp"
+
+#~ msgid "Thickness of the crosshairs"
+#~ msgstr "Độ dày lưới chéo"
+
+#~ msgid ""
+#~ "Width of the vertical and horizontal lines that make up the crosshairs."
+#~ msgstr "Độ rộng của đường dọc/ngang hình thành dấu gạch chéo."
+
+#~ msgid "PREFERENCES"
+#~ msgstr "TUỲ THÍCH"
+
+#~ msgid "Shut Down..."
+#~ msgstr "Tắt máy..."
+
+#~ msgid "Search your computer"
+#~ msgstr "Tìm trong máy"
+
+#~ msgid "Customize the panel clock"
+#~ msgstr "Tuỳ biến đồng hồ"
+
+#~ msgid "Clock Format"
+#~ msgstr "Dạng đồng hồ"
+
+#~| msgid "System Preferences..."
+#~ msgid "Clock Preferences"
+#~ msgstr "Thiết lập đồng hồ"
+
+#~ msgid "Panel Display"
+#~ msgstr "Khung hiển thị"
+
+#~ msgid "Show seco_nds"
+#~ msgstr "Hiện _giây"
+
+#~ msgid "_12 hour format"
+#~ msgstr "Dạng _12 giờ"
+
+#~ msgid "_24 hour format"
+#~ msgstr "Dạng _24 giờ"
+
+#~| msgid "System Preferences..."
+#~ msgid "Preferences"
+#~ msgstr "Thiết lập"
+
+#~ msgid ""
+#~ "Can't add a new workspace because maximum workspaces limit has been "
+#~ "reached."
+#~ msgstr ""
+#~ "Không thể thêm vùng làm việc mới vì đã đạt giới hạn số vùng làm việc tối "
+#~ "đa."
+
+#~ msgid "Can't remove the first workspace."
+#~ msgstr "Không thể bỏ vùng làm việc đầu tiên."
+
+#~ msgid "Drag here to add favorites"
+#~ msgstr "Kéo vào đây để thêm vào danh mục ưa thích"
+
+#~ msgid "Find..."
+#~ msgstr "Tìm"
+
+#~ msgid "Sidebar"
+#~ msgstr "Thanh bên"
+
+#~ msgid "Recent Documents"
+#~ msgstr "Tài liệu gần đây"
--- a/src/st/st-im-text.c
+++ b/src/st/st-im-text.c
@ -74,24 +74,27 @@ st_im_text_dispose (GObject *object)
 }

 static void
-st_im_text_cursor_event (ClutterText           *self,
-                         const ClutterGeometry *geometry)
+update_im_cursor_location (StIMText *self)
 {
-  StIMTextPrivate *priv = ST_IM_TEXT (self)->priv;
+  StIMTextPrivate *priv = self->priv;
+  ClutterText *clutter_text = CLUTTER_TEXT (self);
+  gint position;
+  gfloat cursor_x, cursor_y, cursor_height;
  gfloat actor_x, actor_y;
  GdkRectangle area;

+  position = clutter_text_get_cursor_position (clutter_text);
+  clutter_text_position_to_coords (clutter_text, position,
+                                   &cursor_x, &cursor_y, &cursor_height);
+
  clutter_actor_get_transformed_position (CLUTTER_ACTOR (self), &actor_x, &actor_y);

-  area.x = (int)(0.5 + geometry->x + actor_x);
-  area.y = (int)(0.5 + geometry->y + actor_y);
-  area.width = geometry->width;
-  area.height = geometry->height;
+  area.x = (int)(0.5 + cursor_x + actor_x);
+  area.y = (int)(0.5 + cursor_y + actor_y);
+  area.width = 0;
+  area.height = (int)(0.5 + cursor_height);

  gtk_im_context_set_cursor_location (priv->im_context, &area);
-
-  if (CLUTTER_TEXT_CLASS (st_im_text_parent_class)->cursor_event)
-    CLUTTER_TEXT_CLASS (st_im_text_parent_class)->cursor_event (self, geometry);
 }

 static void
@ -187,6 +190,20 @@ reset_im_context (StIMText *self)
    }
 }

+static void
+st_im_text_paint (ClutterActor *actor)
+{
+  StIMText *self = ST_IM_TEXT (actor);
+  ClutterText *clutter_text = CLUTTER_TEXT (actor);
+
+  /* This updates the cursor position as a side-effect */
+  if (CLUTTER_ACTOR_CLASS (st_im_text_parent_class)->paint)
+    CLUTTER_ACTOR_CLASS (st_im_text_parent_class)->paint (actor);
+
+  if (clutter_text_get_editable (clutter_text))
+    update_im_cursor_location (self);
+}
+
 static gboolean
 st_im_text_get_paint_volume (ClutterActor       *self,
                             ClutterPaintVolume *volume)
@ -409,12 +426,12 @@ st_im_text_class_init (StIMTextClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
-  ClutterTextClass *text_class = CLUTTER_TEXT_CLASS (klass);

  g_type_class_add_private (klass, sizeof (StIMTextPrivate));

  object_class->dispose = st_im_text_dispose;

+  actor_class->paint = st_im_text_paint;
  actor_class->get_paint_volume = st_im_text_get_paint_volume;
  actor_class->realize = st_im_text_realize;
  actor_class->unrealize = st_im_text_unrealize;
@ -423,8 +440,6 @@ st_im_text_class_init (StIMTextClass *klass)
  actor_class->captured_event = st_im_text_captured_event;
  actor_class->key_focus_in = st_im_text_key_focus_in;
  actor_class->key_focus_out = st_im_text_key_focus_out;
-
-  text_class->cursor_event = st_im_text_cursor_event;
 }

 static void
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@ -879,101 +879,6 @@ st_theme_node_get_double (StThemeNode *node,
    }
 }

-/**
- * st_theme_node_lookup_url:
- * @node: a #StThemeNode
- * @property_name: The name of the string property
- * @inherit: if %TRUE, if a value is not found for the property on the
- *   node, then it will be looked up on the parent node, and then on the
- *   parent's parent, and so forth. Note that if the property has a
- *   value of 'inherit' it will be inherited even if %FALSE is passed
- *   in for @inherit; this only affects the default behavior for inheritance.
- * @value: (out): location to store the newly allocated value that was
- *   determined. If the property is not found, the value in this location
- *   will not be changed.
- *
- * Looks up a property containing a single URL value.
- *
- * See also st_theme_node_get_url(), which provides a simpler API.
- *
- * Return value: %TRUE if the property was found in the properties for this
- *  theme node (or in the properties of parent nodes when inheriting.)
- */
-gboolean
-st_theme_node_lookup_url (StThemeNode  *node,
-                          const char   *property_name,
-                          gboolean      inherit,
-                          char        **value)
-{
-  gboolean result = FALSE;
-  int i;
-
-  ensure_properties (node);
-
-  for (i = node->n_properties - 1; i >= 0; i--)
-    {
-      CRDeclaration *decl = node->properties[i];
-
-      if (strcmp (decl->property->stryng->str, property_name) == 0)
-        {
-          CRTerm *term = decl->value;
-          CRStyleSheet *base_stylesheet;
-          GFile *file;
-
-          if (term->type != TERM_URI && term->type != TERM_STRING)
-            continue;
-
-          if (decl->parent_statement != NULL)
-            base_stylesheet = decl->parent_statement->parent_sheet;
-          else
-            base_stylesheet = NULL;
-
-          file = _st_theme_resolve_url (node->theme,
-                                        base_stylesheet,
-                                        decl->value->content.str->stryng->str);
-          *value = g_file_get_path (file);
-          g_object_unref (file);
-          result = TRUE;
-          break;
-        }
-    }
-
-  if (!result && inherit && node->parent_node)
-    result = st_theme_node_lookup_url (node->parent_node, property_name, inherit, value);
-
-  return result;
-}
-
-/*
- * st_theme_node_get_url:
- * @node: a #StThemeNode
- * @property_name: The name of the string property
- *
- * Looks up a property containing a single URL value.
- *
- * See also st_theme_node_lookup_url(), which provides more options,
- * and lets you handle the case where the theme does not specify the
- * indicated value.
- *
- * Return value: the newly allocated value if found.
- *  If @property_name is not found, a warning will be logged and %NULL
- *  will be returned.
- */
-char *
-st_theme_node_get_url (StThemeNode *node,
-                       const char  *property_name)
-{
-  char *value;
-
-  if (st_theme_node_lookup_url (node, property_name, FALSE, &value))
-    return value;
-  else
-    {
-      g_warning ("Did not find string property '%s'", property_name);
-      return NULL;
-    }
-}
-
 static const PangoFontDescription *
 get_parent_font (StThemeNode *node)
 {
@ -1649,7 +1554,6 @@ void
 _st_theme_node_ensure_geometry (StThemeNode *node)
 {
  int i, j;
-  int width, height;

  if (node->geometry_computed)
    return;
@ -1667,8 +1571,6 @@ _st_theme_node_ensure_geometry (StThemeNode *node)
  node->outline_width = 0;
  node->outline_color = TRANSPARENT_COLOR;

-  width = -1;
-  height = -1;
  node->width = -1;
  node->height = -1;
  node->min_width = -1;
@ -1688,12 +1590,8 @@ _st_theme_node_ensure_geometry (StThemeNode *node)
      else if (g_str_has_prefix (property_name, "padding"))
        do_padding_property (node, decl);
      else if (strcmp (property_name, "width") == 0)
-        do_size_property (node, decl, &width);
-      else if (strcmp (property_name, "height") == 0)
-        do_size_property (node, decl, &height);
-      else if (strcmp (property_name, "-st-natural-width") == 0)
        do_size_property (node, decl, &node->width);
-      else if (strcmp (property_name, "-st-natural-height") == 0)
+      else if (strcmp (property_name, "height") == 0)
        do_size_property (node, decl, &node->height);
      else if (strcmp (property_name, "min-width") == 0)
        do_size_property (node, decl, &node->min_width);
@ -1705,43 +1603,29 @@ _st_theme_node_ensure_geometry (StThemeNode *node)
        do_size_property (node, decl, &node->max_height);
    }

-  /*
-   * Setting width sets max-width, min-width and -st-natural-width,
-   * unless one of them is set individually.
-   * Setting min-width sets natural width too, so that the minimum
-   * width reported by get_preferred_width() is always not greater
-   * than the natural width.
-   * The natural width in node->width is actually a lower bound, the
-   * actor is allowed to request something greater than that, but
-   * not greater than max-width.
-   * We don't need to clamp node->width to be less than max_width,
-   * that's done by adjust_preferred_width.
-   */
-  if (width != -1)
+  if (node->width != -1)
    {
-      if (node->width == -1)
-        node->width = width;
      if (node->min_width == -1)
-        node->min_width = width;
+        node->min_width = node->width;
+      else if (node->width < node->min_width)
+        node->width = node->min_width;
      if (node->max_width == -1)
-        node->max_width = width;
+        node->max_width = node->width;
+      else if (node->width > node->max_width)
+        node->width = node->max_width;
    }

-  if (node->width < node->min_width)
-    node->width = node->min_width;
-
-  if (height != -1)
+  if (node->height != -1)
    {
-      if (node->height == -1)
-        node->height = height;
      if (node->min_height == -1)
-        node->min_height = height;
+        node->min_height = node->height;
+      else if (node->height < node->min_height)
+        node->height = node->min_height;
      if (node->max_height == -1)
-        node->max_height = height;
+        node->max_height = node->height;
+      else if (node->height > node->max_height)
+        node->height = node->max_height;
    }
-
-  if (node->height < node->min_height)
-    node->height = node->min_height;
 }

 int
@ -3541,7 +3425,7 @@ st_theme_node_adjust_preferred_width (StThemeNode  *node,
  if (natural_width_p)
    {
      if (node->width != -1)
-        *natural_width_p = MAX (*natural_width_p, node->width);
+        *natural_width_p = node->width;
      if (node->max_width != -1)
        *natural_width_p = MIN (*natural_width_p, node->max_width);
      *natural_width_p += width_inc;
@ -3607,7 +3491,7 @@ st_theme_node_adjust_preferred_height (StThemeNode  *node,
  if (natural_height_p)
    {
      if (node->height != -1)
-        *natural_height_p = MAX (*natural_height_p, node->height);
+        *natural_height_p = node->height;
      if (node->max_height != -1)
        *natural_height_p = MIN (*natural_height_p, node->max_height);
      *natural_height_p += height_inc;
--- a/src/st/st-theme-node.h
+++ b/src/st/st-theme-node.h
@ -142,10 +142,6 @@ gboolean st_theme_node_lookup_shadow (StThemeNode  *node,
                                      const char   *property_name,
                                      gboolean      inherit,
                                      StShadow    **shadow);
-gboolean st_theme_node_lookup_url    (StThemeNode  *node,
-                                      const char   *property_name,
-                                      gboolean      inherit,
-                                      char        **value);

 /* Easier-to-use variants of the above, for application-level use */
 void          st_theme_node_get_color  (StThemeNode  *node,
@ -157,8 +153,6 @@ gdouble       st_theme_node_get_length (StThemeNode  *node,
                                        const char   *property_name);
 StShadow     *st_theme_node_get_shadow (StThemeNode  *node,
                                        const char   *property_name);
-char         *st_theme_node_get_url    (StThemeNode  *node,
-                                        const char   *property_name);

 /* Specific getters for particular properties: cached
 */
Author	SHA1	Message	Date
Rui Matos	11bf65e2b4	status/keyboard: Disregard the backwards flag for the popup switcher This seems to cause more harm than good. It puzzles users looking at the shortcuts list in g-c-c and it prevents otherwise valid shortcuts like Shift+Hangul from working. https://bugzilla.gnome.org/show_bug.cgi?id=695823	2013-04-05 18:12:48 +02:00
Rui Matos	a8b7e559aa	status/keyboard: Allow switching input source in the message tray We still can't show a popup switcher in the message tray but we can at least degrade gracefully and advance to the next input source. https://bugzilla.gnome.org/show_bug.cgi?id=697009	2013-04-05 18:12:48 +02:00
Rui Matos	b733e30a4a	status/keyboard: Switch input source on special modifiers accelerator This simply mimics the X server's layout switching behavior by advancing to the next input source and wrapping around. https://bugzilla.gnome.org/show_bug.cgi?id=697008	2013-04-05 18:12:48 +02:00
Rui Matos	b607958134	status/keyboard: Synchronize input source switching with key events Currently we simply set the gsettings key when activating an input source. This obviously introduces a time window, between the event that activates the switch and when the switch is complete, under which key events are being delivered to applications and interpreted according to the previous input source. The patches in bug 696996 introduce a DBus API in g-s-d that allows us to know when an input source if effectively active. Using that and freezing keyboard events in the X server until we hear back from g-s-d we can ensure that events won't be misinterpreted after an input source switch. https://bugzilla.gnome.org/show_bug.cgi?id=697007	2013-04-05 18:12:47 +02:00