Implement Sent signals for Telepathy.

This will allow us to update our notifications when someone uses a different Telepathy client to send messages. https://bugzilla.gnome.org/show_bug.cgi?id=635991
Add a search provider for the session's current windows.
2010-11-28 10:28:51 -05:00 · 2010-11-28 10:26:09 -05:00 · 2010-11-19 05:11:13 +01:00 · 2010-11-19 05:11:13 +01:00 · 2010-11-19 05:11:13 +01:00 · 2010-11-19 05:11:13 +01:00
40 changed files with 816 additions and 1570 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[2.91.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[2.91.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -57,7 +57,7 @@ fi

 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)

-CLUTTER_MIN_VERSION=1.5.8
+CLUTTER_MIN_VERSION=1.3.14
 GOBJECT_INTROSPECTION_MIN_VERSION=0.6.11
 GJS_MIN_VERSION=0.7
 MUTTER_MIN_VERSION=2.91.0
@@ -103,7 +103,11 @@ AC_SUBST(MUTTER_BIN_DIR)
 AC_SUBST(MUTTER_LIB_DIR)
 AC_SUBST(MUTTER_PLUGIN_DIR)

+GJS_JS_DIR=`$PKG_CONFIG --variable=jsdir gjs-1.0`
+GJS_JS_NATIVE_DIR=`$PKG_CONFIG --variable=jsnativedir gjs-1.0`
 GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
+AC_SUBST(GJS_JS_DIR)
+AC_SUBST(GJS_JS_NATIVE_DIR)
 AC_SUBST(GJS_CONSOLE)

 AC_CHECK_FUNCS(fdwalk)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -262,11 +262,54 @@ StTooltip StLabel {
    background-color: rgba(0,0,0,0.6);
 }

-.workspaces-view {
+.new-workspace-area {
+    border: 2px solid rgba(255, 255, 255, 0.8);
+    border-radius: 10px;
+    background-color: #111;
+}
+
+.new-workspace-area-internal {
+    background-gradient-direction: horizontal;
+    background-gradient-start: rgba(16, 16, 16, 0);
+    background-gradient-end: rgba(16, 16, 16, 1.0);
+    background-image: url("move-window-on-new.svg");
+}
+
+.new-workspace-area:hover {
+    border: 2px solid rgba(255, 255, 255, 1.0);
+    background-gradient-direction: horizontal;
+    background-gradient-start: rgba(130, 130, 130, 0.9);
+    background-gradient-end: rgba(16, 16, 16, 0.9);
+}
+
+.left-workspaces-shadow {
+    background-gradient-direction: horizontal;
+    background-gradient-start: rgba(16, 16, 16, 1.0);
+    background-gradient-end: rgba(16, 16, 16, 0.0);
+}
+
+.right-workspaces-shadow {
+    background-gradient-direction: horizontal;
+    background-gradient-end: rgba(16, 16, 16, 1.0);
+    background-gradient-start: rgba(16, 16, 16, 0);
+}
+
+.workspaces {
    color: white;
+}
+
+.workspaces.single {
    spacing: 25px;
 }

+.workspaces.mosaic {
+    spacing: 15px;
+}
+
+.workspaces-bar {
+    spacing: 5px;
+}
+
 .workspace-indicator-panel {
    spacing: 8px;
 }
@@ -281,6 +324,27 @@ StTooltip StLabel {
    background: rgba(255,255,255,0.8);
 }

+.window-caption {
+    background: rgba(0,0,0,0.8);
+    border: 1px solid rgba(128,128,128,0.40);
+    border-radius: 10px;
+    font-size: 12px;
+    padding: 2px 8px;
+    -shell-caption-spacing: 4px;
+}
+
+.window-close {
+    background-image: url("close-window.svg");
+    height: 24px;
+    width: 24px;
+    -st-shadow: -2px 2px 6px rgba(0,0,0,0.5);
+    -shell-close-overlap: 16px;
+}
+
+.single-view-controls {
+    padding: 8px 0px;
+}
+
 .workspace-controls {
    width: 48px;
    font-size: 32px;
@@ -307,23 +371,6 @@ StTooltip StLabel {
    background-color: rgba(128, 128, 128, 0.2);
 }

-.window-caption {
-    background: rgba(0,0,0,0.8);
-    border: 1px solid rgba(128,128,128,0.40);
-    border-radius: 10px;
-    font-size: 12px;
-    padding: 2px 8px;
-    -shell-caption-spacing: 4px;
-}
-
-.window-close {
-    background-image: url("close-window.svg");
-    height: 24px;
-    width: 24px;
-    -st-shadow: -2px 2px 6px rgba(0,0,0,0.5);
-    -shell-close-overlap: 16px;
-}
-
 /* Dash */

 #dash {
@@ -336,11 +383,6 @@ StTooltip StLabel {
    border-radius: 0px 9px 9px 0px;
 }

-#dash:empty {
-    height: 100px;
-    width: 60px;
-}
-
 .dash-placeholder {
    background-image: url("dash-placeholder.svg");
    height: 27px;
@@ -350,12 +392,8 @@ StTooltip StLabel {
    spacing: 16px;
 }

-#viewSelectorTabBar {
-    padding: 16px;
-}
-
 #searchArea {
-    padding: 0px 24px;
+    padding: 0px 12px;
 }

 #searchEntry {
@@ -489,21 +527,22 @@ StTooltip StLabel {
 }

 .icon-grid {
-    spacing: 36px;
+    spacing: 6px;
    -shell-grid-item-size: 70px;
 }

 .all-app {
-    padding: 16px 250px 10px 16px;
+    padding: 10px;
 }

 .app-section-divider-container {
-    padding-top: 36px;
-    padding-bottom: 36px;
+    padding-top: 10px;
+    padding-bottom: 10px;
 }

 .app-section-divider {
    height: 2px;
+    background-image: url("separator-white.png");
 }

 #dash > .app-well-app {
@@ -516,7 +555,6 @@ StTooltip StLabel {

 .remove-favorite-icon:hover {
    color: white;
-    -st-shadow: black 0px 2px 2px;
 }

 .app-well-app > .overview-icon,
@@ -776,10 +814,6 @@ StTooltip StLabel {
    color: #cccccc;
 }

-.url-highlighter {
-    link-color: #ccccff;
-}
-
 /* Message Tray */
 #message-tray {
    background-gradient-direction: vertical;
@@ -826,10 +860,6 @@ StTooltip StLabel {
    height: 1em;
 }

-#notification-scrollview > StScrollBar {
-    padding-left: 6px;
-}
-
 #notification-body {
    spacing: 5px;
 }
@@ -890,13 +920,6 @@ StTooltip StLabel {
    border-radius: 4px;
 }

-.chat-meta-message {
-    padding-left: 4px;
-    border-radius: 4px;
-    font-size: 14px;
-    color: #bbbbbb;
-}
-
 .chat-response {
    padding: 4px;
    border-radius: 4px;
@@ -905,6 +928,7 @@ StTooltip StLabel {
    background-color: #404040;
    caret-color: #ffffff;
    caret-size: 1px;
+    height: 18px;
 }

 .chat-response:focus {
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -8,7 +8,6 @@ nobase_dist_js_DATA = 	\
 	misc/gnomeSession.js	\
 	misc/params.js		\
 	misc/telepathy.js	\
-	misc/utils.js		\
 	perf/core.js		\
 	prefs/clockPreferences.js \
 	ui/altTab.js		\
--- a/js/misc/telepathy.js
+++ b/js/misc/telepathy.js
@@ -272,7 +272,9 @@ const ChannelTextIface = {
    ],
    signals: [
        { name: 'Received',
-          inSignature: 'uuuuus' }
+          inSignature: 'uuuuus' },
+        { name: 'Sent',
+          inSignature: 'uus' }
    ]
 };
 let ChannelText = DBus.makeProxyClass(ChannelTextIface);
--- a/js/misc/utils.js
+++ b/js/misc/utils.js
@@ -1,19 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-/* http://daringfireball.net/2010/07/improved_regex_for_matching_urls */
-const _urlRegexp = /\b(([a-z][\w-]+:(\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)([^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'\".,<>?«»“”‘’]))/gi;
-
-// findUrls:
-// @str: string to find URLs in
-//
-// Searches @str for URLs and returns an array of objects with %url
-// properties showing the matched URL string, and %pos properties indicating
-// the position within @str where the URL was found.
-//
-// Return value: the list of match objects, as described above
-function findUrls(str) {
-    let res = [], match;
-    while ((match = _urlRegexp.exec(str)))
-        res.push({ url: match[0], pos: match.index });
-    return res;
-}
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -30,7 +30,7 @@ function AlphabeticalView() {
 AlphabeticalView.prototype = {
    _init: function() {
        this.actor = new St.BoxLayout({ vertical: true });
-        this._grid = new IconGrid.IconGrid({ xAlign: St.Align.START });
+        this._grid = new IconGrid.IconGrid();
        this._appSystem = Shell.AppSystem.get_default();
        this.actor.add(this._grid.actor, { y_align: St.Align.START, expand: true });
    },
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -5,7 +5,7 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Pango = imports.gi.Pango;
-const Gettext_gtk30 = imports.gettext.domain('gtk30');
+const Gettext_gtk20 = imports.gettext.domain('gtk20');

 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 const WEEKDATE_HEADER_WIDTH_DIGITS = 3;
@@ -60,7 +60,7 @@ Calendar.prototype = {
        this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, Lang.bind(this, this._onSettingsChange));
        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);

-        let weekStartString = Gettext_gtk30.gettext('calendar:week_start:0');
+        let weekStartString = Gettext_gtk20.gettext('calendar:week_start:0');
        if (weekStartString.indexOf('calendar:week_start:') == 0) {
            this._weekStart = parseInt(weekStartString.substring(20));
        }
@@ -71,7 +71,7 @@ Calendar.prototype = {
        }

        // Find the ordering for month/year in the calendar heading
-        switch (Gettext_gtk30.gettext('calendar:MY')) {
+        switch (Gettext_gtk20.gettext('calendar:MY')) {
        case 'calendar:MY':
            this._headerFormat = '%B %Y';
            break;
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -78,6 +78,7 @@ function Dash() {

 Dash.prototype = {
    _init : function() {
+        this._placeholderText = null;
        this._menus = [];
        this._menuDisplays = [];
        this._maxHeight = -1;
@@ -215,6 +216,7 @@ Dash.prototype = {
        let contextId = '';

        let running = this._tracker.get_running_apps(contextId);
+        let runningIds = this._appIdListToHash(running);

        for (let id in favorites) {
            let app = favorites[id];
@@ -227,28 +229,29 @@ Dash.prototype = {
                continue;
            this._addApp(app);
        }
+        if (this._placeholderText) {
+            this._placeholderText.destroy();
+            this._placeholderText = null;
+        }

        let children = this._box.get_children();
        if (children.length == 0) {
-            this._box.add_style_pseudo_class('empty');
-        } else {
-            this._box.remove_style_pseudo_class('empty');
+            this._placeholderText = new St.Label({ text: _("Drag here to add favorites") });
+            this._box.add_actor(this._placeholderText);
+        } else if (this._maxHeight > -1) {
+            let iconSizes = [ 48, 32, 24, 22, 16 ];

-            if (this._maxHeight > -1) {
-                let iconSizes = [ 48, 32, 24, 22, 16 ];
+            for (let i = 0; i < iconSizes.length; i++) {
+                let minHeight, natHeight;

-                for (let i = 0; i < iconSizes.length; i++) {
-                    let minHeight, natHeight;
+                this._iconSize = iconSizes[i];
+                for (let j = 0; j < children.length; j++)
+                    children[j]._delegate.icon.setIconSize(this._iconSize);

-                    this._iconSize = iconSizes[i];
-                    for (let j = 0; j < children.length; j++)
-                        children[j]._delegate.icon.setIconSize(this._iconSize);
+                [minHeight, natHeight] = this.actor.get_preferred_height(-1);

-                    [minHeight, natHeight] = this.actor.get_preferred_height(-1);
-
-                    if (natHeight <= this._maxHeight)
-                        break;
-                }
+                if (natHeight <= this._maxHeight)
+                    break;
            }
        }
        this._box.show();
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -26,9 +26,9 @@ const DragMotionResult = {
 };

 const DRAG_CURSOR_MAP = {
-    0: Shell.Cursor.DND_UNSUPPORTED_TARGET,
-    1: Shell.Cursor.DND_COPY,
-    2: Shell.Cursor.DND_MOVE
+    0: Shell.Cursor.UNSUPPORTED_TARGET,
+    1: Shell.Cursor.COPY,
+    2: Shell.Cursor.MOVE
 };

 const DragDropResult = {
@@ -100,8 +100,6 @@ _Draggable.prototype = {
        this._buttonDown = false; // The mouse button has been pressed and has not yet been released.
        this._dragInProgress = false; // The drag has been started, and has not been dropped or cancelled yet.
        this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting).
-
-        this._eventsGrabbed = false;
    },

    _onButtonPress : function (actor, event) {
@@ -149,19 +147,13 @@ _Draggable.prototype = {
    },

    _grabEvents: function() {
-        if (!this._eventsGrabbed) {
-            Clutter.grab_pointer(_getEventHandlerActor());
-            Clutter.grab_keyboard(_getEventHandlerActor());
-            this._eventsGrabbed = true;
-        }
+        Clutter.grab_pointer(_getEventHandlerActor());
+        Clutter.grab_keyboard(_getEventHandlerActor());
    },

    _ungrabEvents: function() {
-        if (this._eventsGrabbed) {
-            Clutter.ungrab_pointer();
-            Clutter.ungrab_keyboard();
-            this._eventsGrabbed = false;
-        }
+        Clutter.ungrab_pointer();
+        Clutter.ungrab_keyboard();
    },

    _onEvent: function(actor, event) {
@@ -221,7 +213,7 @@ _Draggable.prototype = {
        if (this._onEventId)
            this._ungrabActor();
        this._grabEvents();
-        global.set_cursor(Shell.Cursor.DND_IN_DRAG);
+        global.set_cursor(Shell.Cursor.IN_DRAG);

        this._dragX = this._dragStartX = stageX;
        this._dragY = this._dragStartY = stageY;
@@ -382,7 +374,7 @@ _Draggable.prototype = {
                }
                target = target.get_parent();
            }
-            global.set_cursor(Shell.Cursor.DND_IN_DRAG);
+            global.set_cursor(Shell.Cursor.IN_DRAG);
        }

        return true;
@@ -448,44 +440,24 @@ _Draggable.prototype = {
        return true;
    },

+    // Get position of the drag actor's source if the source is still around,
+    // or return the original location if the actor itself was being dragged
+    // or the source is no longer around.
    _getRestoreLocation: function() {
-        let x, y, scale;
+        let locX = this._snapBackX;
+        let locY = this._snapBackY;

-        if (this._dragActorSource && this._dragActorSource.visible) {
-            // Snap the clone back to its source
-            [x, y] = this._dragActorSource.get_transformed_position();
-            let [sourceScaledWidth, sourceScaledHeight] = this._dragActorSource.get_transformed_size();
-            scale = this._dragActor.width / sourceScaledWidth;
-        } else if (this._dragOrigParent) {
-            // Snap the actor back to its original position within
-            // its parent, adjusting for the fact that the parent
-            // may have been moved or scaled
-            let [parentX, parentY] = this._dragOrigParent.get_transformed_position();
-            x = parentX + this._dragOrigParent.scale_x * this._dragOrigX;
-            y = parentY + this._dragOrigParent.scale_y * this._dragOrigY;
-
-            let [parentWidth, parentHeight] = this._dragOrigParent.get_size();
-            let [parentScaledWidth, parentScaledHeight] = this._dragOrigParent.get_transformed_size();
-            let parentScale = parentScaledWidth / parentWidth;
-            scale = this._dragOrigScale * parentScale;
-        } else {
-            // Snap back actor to its original stage position
-            x = this._snapBackX;
-            y = this._snapBackY;
-            scale = this._snapBackScale;
-        }
-
-        return [x, y, scale];
+        if (this._dragActorSource && this._dragActorSource.visible)
+            [locX, locY] = this._dragActorSource.get_transformed_position();
+        return [locX, locY];
    },

    _cancelDrag: function(eventTime) {
        this._dragInProgress = false;
-        let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();
+        let [snapBackX, snapBackY] = this._getRestoreLocation();

        if (this._actorDestroyed) {
            global.unset_cursor();
-            if (!this._buttonDown)
-                this._ungrabEvents();
            this.emit('drag-end', eventTime, false);
            return;
        }
@@ -495,8 +467,8 @@ _Draggable.prototype = {
        Tweener.addTween(this._dragActor,
                         { x: snapBackX,
                           y: snapBackY,
-                           scale_x: snapBackScale,
-                           scale_y: snapBackScale,
+                           scale_x: this._snapBackScale,
+                           scale_y: this._snapBackScale,
                           opacity: this._dragOrigOpacity,
                           time: SNAP_BACK_ANIMATION_TIME,
                           transition: 'easeOutQuad',
@@ -508,11 +480,11 @@ _Draggable.prototype = {

    _restoreDragActor: function(eventTime) {
        this._dragInProgress = false;
-        [restoreX, restoreY, restoreScale] = this._getRestoreLocation();
+        [restoreX, restoreY] = this._getRestoreLocation();

        // fade the actor back in at its original location
        this._dragActor.set_position(restoreX, restoreY);
-        this._dragActor.set_scale(restoreScale, restoreScale);
+        this._dragActor.set_scale(this._snapBackScale, this._snapBackScale);
        this._dragActor.opacity = 0;

        this._animationInProgress = true;
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -4,7 +4,7 @@ const Clutter = imports.gi.Clutter;;
 const GLib = imports.gi.GLib;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Gettext_gtk30 = imports.gettext.domain('gtk30');
+const Gettext_gtk20 = imports.gettext.domain('gtk20');

 const Tweener = imports.ui.tweener;

@@ -65,7 +65,7 @@ function init() {
    String.prototype.format = Format.format;

    // Set the default direction for St widgets (this needs to be done before any use of St)
-    if (Gettext_gtk30.gettext('default:LTR') == 'default:RTL') {
+    if (Gettext_gtk20.gettext('default:LTR') == 'default:RTL') {
        St.Widget.set_default_direction(St.TextDirection.RTL);
    }

--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1,8 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
@@ -16,7 +14,6 @@ const Tweener = imports.ui.tweener;
 const Main = imports.ui.main;
 const BoxPointer = imports.ui.boxpointer;
 const Params = imports.misc.params;
-const Utils = imports.misc.utils;

 const ANIMATION_TIME = 0.2;
 const NOTIFICATION_TIMEOUT = 4;
@@ -38,132 +35,15 @@ const State = {
    HIDING:  3
 };

-function _fixMarkup(text, allowMarkup) {
-    if (allowMarkup) {
-        // Support &amp;, &quot;, &apos;, &lt; and &gt;, escape all other
-        // occurrences of '&'.
-        let _text = text.replace(/&(?!amp;|quot;|apos;|lt;|gt;)/g, '&amp;');
-        // Support <b>, <i>, and <u>, escape anything else
-        // so it displays as raw markup.
-        return _text.replace(/<(\/?[^biu]>|[^>\/][^>])/g, '&lt;$1');
-    } else {
-        // Escape everything
-        let _text = text.replace(/&/g, '&amp;');
-        return _text.replace(/</g, '&lt;');
-    }
+function _cleanMarkup(text) {
+    // Support &amp;, &quot;, &apos;, &lt; and &gt;, escape all other
+    // occurrences of '&'.
+    let _text = text.replace(/&(?!amp;|quot;|apos;|lt;|gt;)/g, '&amp;');
+    // Support <b>, <i>, and <u>, escape anything else
+    // so it displays as raw markup.
+    return _text.replace(/<(\/?[^biu]>|[^>\/][^>])/g, '&lt;$1');
 }

-function URLHighlighter(text, lineWrap, allowMarkup) {
-    this._init(text, lineWrap, allowMarkup);
-}
-
-URLHighlighter.prototype = {
-    _init: function(text, lineWrap, allowMarkup) {
-        if (!text)
-            text = '';
-        this.actor = new St.Label({ reactive: true, style_class: 'url-highlighter' });
-        this._linkColor = '#ccccff';
-        this.actor.connect('style-changed', Lang.bind(this, function() {
-            let color = new Clutter.Color();
-            let hasColor = this.actor.get_theme_node().get_color('link-color', color);
-            if (hasColor) {
-                let linkColor = color.to_string().substr(0, 7);
-                if (linkColor != this._linkColor) {
-                    this._linkColor = linkColor;
-                    this._highlightUrls();
-                }
-            }
-        }));
-        if (lineWrap) {
-            this.actor.clutter_text.line_wrap = true;
-            this.actor.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
-            this.actor.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        }
-
-        this.setMarkup(text, allowMarkup);
-        this.actor.connect('button-release-event', Lang.bind(this, function (actor, event) {
-            let urlId = this._findUrlAtPos(event);
-            if (urlId != -1) {
-                let url = this._urls[urlId].url;
-                if (url.indexOf(':') == -1)
-                    url = 'http://' + url;
-                try {
-                    Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context());
-                    return true;
-                } catch (e) {
-                    // TODO: remove this after gnome 3 release
-                    let p = new Shell.Process({ 'args' : ['gvfs-open', url] });
-                    p.run();
-                    return true;
-                }
-            }
-            return false;
-        }));
-        this.actor.connect('motion-event', Lang.bind(this, function(actor, event) {
-            let urlId = this._findUrlAtPos(event);
-            if (urlId != -1 && !this._cursorChanged) {
-                global.set_cursor(Shell.Cursor.POINTING_HAND);
-                this._cursorChanged = true;
-            } else if (urlId == -1) {
-                global.unset_cursor();
-                this._cursorChanged = false;
-            }
-            return false;
-        }));
-        this.actor.connect('leave-event', Lang.bind(this, function() {
-            if (this._cursorChanged) {
-                this._cursorChanged = false;
-                global.unset_cursor();
-            }
-        }));
-    },
-
-    setMarkup: function(text, allowMarkup) {
-        text = text ? _fixMarkup(text, allowMarkup) : '';
-        this._text = text;
-
-        this.actor.clutter_text.set_markup(text);
-        /* clutter_text.text contain text without markup */
-        this._urls = Utils.findUrls(this.actor.clutter_text.text);
-        this._highlightUrls();
-    },
-
-    _highlightUrls: function() {
-        // text here contain markup
-        let urls = Utils.findUrls(this._text);
-        let markup = '';
-        let pos = 0;
-        for (let i = 0; i < urls.length; i++) {
-            let url = urls[i];
-            let str = this._text.substr(pos, url.pos - pos);
-            markup += str + '<span foreground="' + this._linkColor + '"><u>' + url.url + '</u></span>';
-            pos = url.pos + url.url.length;
-        }
-        markup += this._text.substr(pos);
-        this.actor.clutter_text.set_markup(markup);
-    },
-
-    _findUrlAtPos: function(event) {
-        let success;
-        let [x, y] = event.get_coords();
-        [success, x, y] = this.actor.transform_stage_point(x, y);
-        let find_pos = -1;
-        for (let i = 0; i < this.actor.clutter_text.text.length; i++) {
-            let [success, px, py, line_height] = this.actor.clutter_text.position_to_coords(i);
-            if (py > y || py + line_height < y || x < px)
-                continue;
-            find_pos = i;
-        }
-        if (find_pos != -1) {
-            for (let i = 0; i < this._urls.length; i++)
-            if (find_pos >= this._urls[i].pos &&
-                this._urls[i].pos + this._urls[i].url.length > find_pos)
-                return i;
-        }
-        return -1;
-    }
-};
-
 // Notification:
 // @source: the notification's Source
 // @title: the title
@@ -193,8 +73,7 @@ URLHighlighter.prototype = {
 // area.
 //
 // @params can contain values for 'customContent', 'body', 'icon',
-// 'titleMarkup', 'bannerMarkup', 'bodyMarkup', and 'clear'
-// parameters.
+// and 'clear' parameters.
 //
 // If @params contains a 'customContent' parameter with the value %true,
 // then @banner will not be shown in the body of the notification when the
@@ -208,12 +87,6 @@ URLHighlighter.prototype = {
 // source.createNotificationIcon(). However, if @params contains an 'icon'
 // parameter, the passed in icon will be used.
 //
-// If @params contains a 'titleMarkup', 'bannerMarkup', or
-// 'bodyMarkup' parameter with the value %true, then the corresponding
-// element is assumed to use pango markup. If the parameter is not
-// present for an element, then anything that looks like markup in
-// that element will appear literally in the output.
-//
 // If @params contains a 'clear' parameter with the value %true, then
 // the content and the action area of the notification will be cleared.
 // The content area is also always cleared if 'customContent' is false
@@ -230,7 +103,6 @@ Notification.prototype = {
        this._useActionIcons = false;
        this._customContent = false;
        this._bannerBodyText = null;
-        this._bannerBodyMarkup = false;
        this._titleFitsInBannerMode = true;
        this._spacing = 0;

@@ -276,8 +148,7 @@ Notification.prototype = {

        this._titleLabel = new St.Label();
        this._bannerBox.add_actor(this._titleLabel);
-        this._bannerUrlHighlighter = new URLHighlighter();
-        this._bannerLabel = this._bannerUrlHighlighter.actor;
+        this._bannerLabel = new St.Label();
        this._bannerBox.add_actor(this._bannerLabel);

        this.update(title, banner, params);
@@ -304,9 +175,6 @@ Notification.prototype = {
        params = Params.parse(params, { customContent: false,
                                        body: null,
                                        icon: null,
-                                        titleMarkup: false,
-                                        bannerMarkup: false,
-                                        bodyMarkup: false,
                                        clear: false });

        this._customContent = params.customContent;
@@ -337,7 +205,7 @@ Notification.prototype = {
                                     y_fill: false,
                                     y_align: St.Align.START });

-        title = title ? _fixMarkup(title.replace(/\n/g, ' '), params.titleMarkup) : '';
+        title = title ? _cleanMarkup(title.replace(/\n/g, ' ')) : '';
        this._titleLabel.clutter_text.set_markup('<b>' + title + '</b>');

        // Unless the notification has custom content, we save this._bannerBodyText
@@ -345,11 +213,9 @@ Notification.prototype = {
        // expandable due to other elements in its content area or due to the banner
        // not fitting fully in the single-line mode.
        this._bannerBodyText = this._customContent ? null : banner;
-        this._bannerBodyMarkup = params.bannerMarkup;

-        banner = banner ? banner.replace(/\n/g, '  ') : '';
-
-        this._bannerUrlHighlighter.setMarkup(banner, params.bannerMarkup);
+        banner = banner ? _cleanMarkup(banner.replace(/\n/g, '  ')) : '';
+        this._bannerLabel.clutter_text.set_markup(banner);
        this._bannerLabel.queue_relayout();

        // Add the bannerBody now if we know for sure we'll need it
@@ -357,7 +223,7 @@ Notification.prototype = {
            this._addBannerBody();

        if (params.body)
-            this.addBody(params.body, params.bodyMarkup);
+            this.addBody(params.body);
        this._updated();
    },

@@ -365,7 +231,7 @@ Notification.prototype = {
    // @actor: actor to add to the body of the notification
    //
    // Appends @actor to the notification's body
-    addActor: function(actor, style) {
+    addActor: function(actor) {
        if (!this._scrollArea) {
            this.actor.add_style_class_name('multi-line-notification');
            this._scrollArea = new St.ScrollView({ name: 'notification-scrollview',
@@ -382,30 +248,34 @@ Notification.prototype = {
            this._addBannerBody();
        }

-        this._contentArea.add(actor, style ? style : {});
+        this._contentArea.add(actor);
        this._updated();
    },

    // addBody:
    // @text: the text
-    // @markup: %true if @text contains pango markup
-    // @style: style to use when adding the actor containing the text
    //
    // Adds a multi-line label containing @text to the notification.
    //
    // Return value: the newly-added label
-    addBody: function(text, markup, style) {
-        let label = new URLHighlighter(text, true, markup);
+    addBody: function(text) {
+        let body = new St.Label();
+        body.clutter_text.line_wrap = true;
+        body.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
+        body.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;

-        this.addActor(label.actor, style);
-        return label.actor;
+        text = text ? _cleanMarkup(text) : '';
+        body.clutter_text.set_markup(text);
+
+        this.addActor(body);
+        return body;
    },

    _addBannerBody: function() {
        if (this._bannerBodyText) {
            let text = this._bannerBodyText;
            this._bannerBodyText = null;
-            this.addBody(text, this._bannerBodyMarkup);
+            this.addBody(text);
        }
    },

--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -75,11 +75,11 @@ const Urgency = {
 const rewriteRules = {
    'XChat': [
        { pattern:     /^XChat: Private message from: (\S*) \(.*\)$/,
-          replacement: '<$1>' },
+          replacement: '&lt;$1&gt;' },
        { pattern:     /^XChat: New public message from: (\S*) \((.*)\)$/,
-          replacement: '$2 <$1>' },
+          replacement: '$2 &lt;$1&gt;' },
        { pattern:     /^XChat: Highlighted message from: (\S*) \((.*)\)$/,
-          replacement: '$2 <$1>' }
+          replacement: '$2 &lt;$1&gt;' }
    ]
 };

@@ -205,6 +205,8 @@ NotificationDaemon.prototype = {
            return id;
        }

+        summary = GLib.markup_escape_text(summary, -1);
+
        let rewrites = rewriteRules[appName];
        if (rewrites) {
            for (let i = 0; i < rewrites.length; i++) {
@@ -279,9 +281,7 @@ NotificationDaemon.prototype = {
        let iconActor = this._iconForNotificationData(icon, hints, source.ICON_SIZE);

        if (notification == null) {
-            notification = new MessageTray.Notification(source, summary, body,
-                                                        { icon: iconActor,
-                                                          bannerMarkup: true });
+            notification = new MessageTray.Notification(source, summary, body, { icon: iconActor });
            ndata.notification = notification;
            notification.connect('clicked', Lang.bind(this,
                function(n) {
@@ -294,7 +294,6 @@ NotificationDaemon.prototype = {
            notification.connect('action-invoked', Lang.bind(this, this._actionInvoked, source, id));
        } else {
            notification.update(summary, body, { icon: iconActor,
-                                                 bannerMarkup: true,
                                                 clear: true });
        }

--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -124,15 +124,15 @@ function Overview() {

 Overview.prototype = {
    _init : function() {
+        this._desktopFade = new St.Bin();
+        global.overlay_group.add_actor(this._desktopFade);
+
        // The actual global.background_actor is inside global.window_group,
        // which is hidden when displaying the overview, so we display a clone.
        this._background = new Clutter.Clone({ source: global.background_actor });
        this._background.hide();
        global.overlay_group.add_actor(this._background);

-        this._desktopFade = new St.Bin();
-        global.overlay_group.add_actor(this._desktopFade);
-
        this._spacing = 0;

        this._group = new St.Group({ name: 'overview' });
@@ -181,6 +181,7 @@ Overview.prototype = {
        this.viewSelector.addSearchProvider(new AppDisplay.PrefsSearchProvider());
        this.viewSelector.addSearchProvider(new PlaceDisplay.PlaceSearchProvider());
        this.viewSelector.addSearchProvider(new DocDisplay.DocSearchProvider());
+        this.viewSelector.addSearchProvider(new WorkspacesView.WindowSearchProvider());

        // TODO - recalculate everything when desktop size changes
        this._dash = new Dash.Dash();
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -296,15 +296,15 @@ PopupBaseMenuItem.prototype = {
 };
 Signals.addSignalMethods(PopupBaseMenuItem.prototype);

-function PopupMenuItem() {
-    this._init.apply(this, arguments);
+function PopupMenuItem(text) {
+    this._init(text);
 }

 PopupMenuItem.prototype = {
    __proto__: PopupBaseMenuItem.prototype,

-    _init: function (text, params) {
-        PopupBaseMenuItem.prototype._init.call(this, params);
+    _init: function (text) {
+        PopupBaseMenuItem.prototype._init.call(this);

        this.label = new St.Label({ text: text });
        this.addActor(this.label);
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -26,10 +26,7 @@ const UPDeviceType = {
    MOUSE: 5,
    KEYBOARD: 6,
    PDA: 7,
-    PHONE: 8,
-    MEDIA_PLAYER: 9,
-    TABLET: 10,
-    COMPUTER: 11
+    PHONE: 8
 };

 const UPDeviceState = {
@@ -71,19 +68,12 @@ Indicator.prototype = {
        this._deviceItems = [ ];
        this._hasPrimary = false;
        this._primaryDeviceId = null;
-
        this._batteryItem = new PopupMenu.PopupMenuItem('');
-        this._primaryPercentage = new St.Label();
-        let percentBin = new St.Bin();
-        percentBin.set_child(this._primaryPercentage, { x_align: St.Align.END });
-        this._batteryItem.addActor(percentBin);
        this.menu.addMenuItem(this._batteryItem);
-
        this._deviceSep = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(this._deviceSep);
        this._otherDevicePosition = 2;
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
        this.menu.addAction(_("What's using power..."),function() {
            GLib.spawn_command_line_async('gnome-power-statistics --device wakeups');
        });
@@ -105,12 +95,10 @@ Indicator.prototype = {
                this._deviceSep.actor.hide();
                return;
            }
-            let [device_id, device_type, icon, percentage, state, time] = device;
+            let [device_id, device_type, summary, percentage, state, time] = device;
            if (device_type == UPDeviceType.BATTERY) {
                this._hasPrimary = true;
-                let minutes = Math.floor(time / 60);
-                this._batteryItem.label.text = Gettext.ngettext("%d minute remaining", "%d minutes remaining", minutes).format(minutes);
-                this._primaryPercentage.text = '%d%%'.format(Math.round(percentage));
+                this._batteryItem.label.text = summary;
                this._batteryItem.actor.show();
                if (this._deviceItems.length > 0)
                    this._deviceSep.actor.show();
@@ -193,12 +181,24 @@ DeviceItem.prototype = {
    _init: function(device) {
        PopupMenu.PopupBaseMenuItem.prototype._init.call(this);

-        let [device_id, device_type, icon, percentage, state, time] = device;
+        let [device_id, device_type, summary, percentage, state, time] = device;

        this._box = new St.BoxLayout({ style_class: 'popup-device-menu-item' });
-        this._label = new St.Label({ text: this._deviceTypeToString(device_type) });
+        this._label = new St.Label({ text: summary });

-        this._icon = new St.Icon({ gicon: Shell.util_icon_from_string(icon),
+        let icon;
+        switch (state) {
+        case UPDeviceState.FULLY_CHARGED:
+            icon = 'battery-full-charged';
+            break;
+        case UPDeviceState.UNKNOWN:
+            icon = 'battery-missing';
+            break;
+        default:
+            icon = this._percentageToIcon(percentage) + (state == UPDeviceState.CHARGING ? '-charging' : '');
+        }
+
+        this._icon = new St.Icon({ icon_name: icon,
                                   icon_type: St.IconType.SYMBOLIC,
                                   style_class: 'popup-menu-icon' });

@@ -212,32 +212,15 @@ DeviceItem.prototype = {
        this.addActor(percentBin);
    },

-    _deviceTypeToString: function(type) {
-	switch (type) {
-	case UPDeviceType.AC_POWER:
-            return _("AC adapter");
-        case UPDeviceType.BATTERY:
-            return _("Laptop battery");
-        case UPDeviceType.UPS:
-            return _("UPS");
-        case UPDeviceType.MONITOR:
-            return _("Monitor");
-        case UPDeviceType.MOUSE:
-            return _("Mouse");
-        case UPDeviceType.KEYBOARD:
-            return _("Keyboard");
-        case UPDeviceType.PDA:
-            return _("PDA");
-        case UPDeviceType.PHONE:
-            return _("Cell phone");
-        case UPDeviceType.MEDIA_PLAYER:
-            return _("Media player");
-        case UPDeviceType.TABLET:
-            return _("Tablet");
-        case UPDeviceType.COMPUTER:
-            return _("Computer");
-        default:
-            return _("Unknown");
-        }
+    _percentageToIcon: function(p) {
+        if (p > 60)
+            return 'battery-full';
+        if (p > 30)
+            return 'battery-good';
+        if (p > 10)
+            return 'battery-low';
+        if (p > 0)
+            return 'battery-caution';
+        return 'battery-empty';
    }
 }
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -38,11 +38,12 @@ Indicator.prototype = {
        this._output = null;
        this._outputVolumeId = 0;
        this._outputMutedId = 0;
-        this._outputTitle = new PopupMenu.PopupMenuItem(_("Volume"), { reactive: false });
+        this._outputSwitch = new PopupMenu.PopupSwitchMenuItem(_("Volume: Muted"), false);
+        this._outputSwitch.connect('toggled', Lang.bind(this, this._switchToggled, '_output'));
        this._outputSlider = new PopupMenu.PopupSliderMenuItem(0);
        this._outputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_output'));
        this._outputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
-        this.menu.addMenuItem(this._outputTitle);
+        this.menu.addMenuItem(this._outputSwitch);
        this.menu.addMenuItem(this._outputSlider);

        this._separator = new PopupMenu.PopupSeparatorMenuItem();
@@ -51,11 +52,12 @@ Indicator.prototype = {
        this._input = null;
        this._inputVolumeId = 0;
        this._inputMutedId = 0;
-        this._inputTitle = new PopupMenu.PopupMenuItem(_("Microphone"), { reactive: false });
+        this._inputSwitch = new PopupMenu.PopupSwitchMenuItem(_("Microphone: Muted"), false);
+        this._inputSwitch.connect('toggled', Lang.bind(this, this._switchToggled, '_input'));
        this._inputSlider = new PopupMenu.PopupSliderMenuItem(0);
        this._inputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_input'));
        this._inputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
-        this.menu.addMenuItem(this._inputTitle);
+        this.menu.addMenuItem(this._inputSwitch);
        this.menu.addMenuItem(this._inputSlider);

        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@@ -73,18 +75,11 @@ Indicator.prototype = {
        let currentVolume = this._output.volume;

        if (direction == Clutter.ScrollDirection.DOWN) {
-            let prev_muted = this._output.is_muted;
            this._output.volume = Math.max(0, currentVolume - VOLUME_MAX * VOLUME_ADJUSTMENT_STEP);
-            if (this._output.volume < 1) {
-                this._output.volume = 0;
-                if (!prev_muted)
-                    this._output.change_is_muted(true);
-            }
            this._output.push_volume();
        }
        else if (direction == Clutter.ScrollDirection.UP) {
            this._output.volume = Math.min(VOLUME_MAX, currentVolume + VOLUME_MAX * VOLUME_ADJUSTMENT_STEP);
-            this._output.change_is_muted(false);
            this._output.push_volume();
        }
    },
@@ -108,7 +103,8 @@ Indicator.prototype = {
            this._mutedChanged (null, null, '_output');
            this._volumeChanged (null, null, '_output');
        } else {
-            this._outputSlider.setValue(0);
+            this._outputSwitch.label.text = _("Volume: Muted");
+            this._outputSwitch.setToggleState(false);
            this.setIcon('audio-volume-muted-symbolic');
        }
    },
@@ -128,7 +124,7 @@ Indicator.prototype = {
            this._volumeChanged (null, null, '_input');
        } else {
            this._separator.actor.hide();
-            this._inputTitle.actor.hide();
+            this._inputSwitch.actor.hide();
            this._inputSlider.actor.hide();
        }
    },
@@ -151,11 +147,11 @@ Indicator.prototype = {
        }
        if (showInput) {
            this._separator.actor.show();
-            this._inputTitle.actor.show();
+            this._inputSwitch.actor.show();
            this._inputSlider.actor.show();
        } else {
            this._separator.actor.hide();
-            this._inputTitle.actor.hide();
+            this._inputSwitch.actor.hide();
            this._inputSlider.actor.hide();
        }
    },
@@ -178,17 +174,7 @@ Indicator.prototype = {
            log ('Volume slider changed for %s, but %s does not exist'.format(property, property));
            return;
        }
-        let volume = value * VOLUME_MAX;
-        let prev_muted = this[property].is_muted;
-        if (volume < 1) {
-            this[property].volume = 0;
-            if (!prev_muted)
-                this[property].change_is_muted(true);
-        } else {
-            this[property].volume = volume;
-            if (prev_muted)
-                this[property].change_is_muted(false);
-        }
+        this[property].volume = value * VOLUME_MAX;
        this[property].push_volume();
    },

@@ -196,10 +182,20 @@ Indicator.prototype = {
        global.play_theme_sound('audio-volume-change');
    },

+    _switchToggled: function(switchItem, state, property) {
+        if (this[property] == null) {
+            log ('Volume mute switch toggled for %s, but %s does not exist'.format(property, property));
+            return;
+        }
+        this[property].change_is_muted(!state);
+        this._notifyVolumeChange();
+    },
+
    _mutedChanged: function(object, param_spec, property) {
        let muted = this[property].is_muted;
-        let slider = this[property+'Slider'];
-        slider.setValue(muted ? 0 : (this[property].volume / VOLUME_MAX));
+        let toggleSwitch = this[property+'Switch'];
+        toggleSwitch.setToggleState(!muted);
+        this._updateLabel(property);
        if (property == '_output') {
            if (muted)
                this.setIcon('audio-volume-muted');
@@ -210,7 +206,17 @@ Indicator.prototype = {

    _volumeChanged: function(object, param_spec, property) {
        this[property+'Slider'].setValue(this[property].volume / VOLUME_MAX);
+        this._updateLabel(property);
        if (property == '_output' && !this._output.is_muted)
            this.setIcon(this._volumeToIcon(this._output.volume));
+    },
+
+    _updateLabel: function(property) {
+        let label;
+        if (this[property].is_muted)
+            label = (property == '_output' ? _("Volume: Muted") : _("Microphone: Muted"));
+        else
+            label = (property == '_output' ? _("Volume: %3.0f%%") : _("Microphone: %3.0f%%")).format(this[property].volume / VOLUME_MAX * 100);
+        this[property+'Switch'].label.text = label;
    }
 };
--- a/js/ui/statusMenu.js
+++ b/js/ui/statusMenu.js
@@ -111,11 +111,11 @@ StatusMenuButton.prototype = {
        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);

-        item = new PopupMenu.PopupMenuItem(_("My Account"));
+        item = new PopupMenu.PopupMenuItem(_("My Account..."));
        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
        this.menu.addMenuItem(item);

-        item = new PopupMenu.PopupMenuItem(_("System Settings"));
+        item = new PopupMenu.PopupMenuItem(_("System Settings..."));
        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
        this.menu.addMenuItem(item);

@@ -138,7 +138,7 @@ StatusMenuButton.prototype = {
        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);

-        item = new PopupMenu.PopupMenuItem(_("Suspend..."));
+        item = new PopupMenu.PopupMenuItem(_("Suspend"));
        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
        this.menu.addMenuItem(item);

@@ -153,7 +153,7 @@ StatusMenuButton.prototype = {

    _onMyAccountActivate: function() {
        Main.overview.hide();
-        this._spawn(['gnome-control-center', 'user-accounts']);
+        this._spawn(['gnome-about-me']);
    },

    _onPreferencesActivate: function() {
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -3,7 +3,6 @@
 const DBus = imports.dbus;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 const St = imports.gi.St;
 const Gettext = imports.gettext.domain('gnome-shell');
@@ -17,7 +16,6 @@ let contactManager;
 let channelDispatcher;

 // See Notification.appendMessage
-const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute
 const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes
 const SCROLLBACK_RECENT_LENGTH = 20;
 const SCROLLBACK_IDLE_LENGTH = 5;
@@ -471,11 +469,15 @@ Source.prototype = {
                }));
        }

+        this._notification = undefined;
+        this._sentMessages = [];
+
        // Since we only create sources when receiving a message, this
        // is a plausible default
        this._presence = Telepathy.ConnectionPresenceType.AVAILABLE;

        this._channelText = new Telepathy.ChannelText(DBus.session, connName, channelPath);
+        this._sentId = this._channelText.connect('Sent', Lang.bind(this, this._messageSent));
        this._receivedId = this._channelText.connect('Received', Lang.bind(this, this._messageReceived));

        this._channelText.ListPendingMessagesRemote(false, Lang.bind(this, this._gotPendingMessages));
@@ -519,6 +521,7 @@ Source.prototype = {
    _channelClosed: function() {
        this._channel.disconnect(this._closedId);
        this._channelText.disconnect(this._receivedId);
+        this._channelText.disconnect(this._sentId);
        this.destroy();
    },

@@ -526,17 +529,30 @@ Source.prototype = {
        if (!Main.messageTray.contains(this))
            Main.messageTray.add(this);

-        if (!this._notification)
+        if (!this._notification) {
            this._notification = new Notification(this);
+            for (let i = 0; i < this._sentMessages.length; i ++)
+                this._notification.appendMessage(this._sentMessages[i], false, true);
+            this._sentMessages = [];
+        }
    },

    _messageReceived: function(channel, id, timestamp, sender,
                               type, flags, text) {
        this._ensureNotification();
-        this._notification.appendMessage(text, timestamp);
+        this._notification.appendMessage(text, false, false);
        this.notify(this._notification);
    },

+    _messageSent: function(channel, timestamp, type, text) {
+        if (this._notification) {
+            this._notification.appendMessage(text, false, true);
+            this.notify(this._notification);
+        } else {
+            this._sentMessages.push(text);
+        }
+    },
+
    respond: function(text) {
        this._channelText.SendRemote(Telepathy.ChannelTextMessageType.NORMAL, text);
    },
@@ -567,7 +583,7 @@ Source.prototype = {
            msg += ' <i>(' + GLib.markup_escape_text(message, -1) + ')</i>';

        this._ensureNotification();
-        this._notification.appendPresence(msg, notify);
+        this._notification.appendMessage(msg, true, false);
        if (notify)
            this.notify(this._notification);
    }
@@ -588,40 +604,23 @@ Notification.prototype = {
        this.setActionArea(this._responseEntry);

        this._history = [];
-        this._timestampTimeoutId = 0;
    },

-    appendMessage: function(text, timestamp) {
-        this.update(this.source.title, text, { customContent: true });
-        this._append(text, 'chat-received', timestamp);
+    appendMessage: function(text, asTitle, sent) {
+        if (asTitle)
+            this.update(text, null, { customContent: true });
+        else
+            this.update(this.source.title, text, { customContent: true });
+        this._append(text, sent ? 'chat-sent' : 'chat-received');
    },

-    _append: function(text, style, timestamp) {
-        let currentTime = (Date.now() / 1000);
-        if (!timestamp)
-            timestamp = currentTime;
-        let lastMessageTime = -1;
-        if (this._history.length > 0)
-            lastMessageTime = this._history[0].time;
-
-        // Reset the old message timeout
-        if (this._timestampTimeoutId)
-            Mainloop.source_remove(this._timestampTimeoutId);
-
+    _append: function(text, style) {
        let body = this.addBody(text);
        body.add_style_class_name(style);
        this.scrollTo(St.Side.BOTTOM);

-        this._history.unshift({ actor: body, time: timestamp, realMessage: true });
-
-        if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME)
-            this._appendTimestamp();
-        else
-            // Schedule a new timestamp in SCROLLBACK_IMMEDIATE_TIME
-            // from the timestamp of the message.
-            this._timestampTimeoutId = Mainloop.timeout_add_seconds(
-                SCROLLBACK_IMMEDIATE_TIME - (currentTime - timestamp),
-                Lang.bind(this, this._appendTimestamp));
+        let now = new Date().getTime() / 1000;
+        this._history.unshift({ actor: body, time: now });

        if (this._history.length > 1) {
            // Keep the scrollback from growing too long. If the most
@@ -630,43 +629,17 @@ Notification.prototype = {
            // SCROLLBACK_RECENT_LENGTH previous messages. Otherwise
            // we'll keep SCROLLBACK_IDLE_LENGTH messages.

-            let maxLength = (lastMessageTime < currentTime - SCROLLBACK_RECENT_TIME) ?
+            let lastMessageTime = this._history[1].time;
+            let maxLength = (lastMessageTime < now - SCROLLBACK_RECENT_TIME) ?
                SCROLLBACK_IDLE_LENGTH : SCROLLBACK_RECENT_LENGTH;
-            let filteredHistory = this._history.filter(function(item) { return item.realMessage });
-            if (filteredHistory.length > maxLength) {
-                let lastMessageToKeep = filteredHistory[maxLength];
-                let expired = this._history.splice(this._history.indexOf(lastMessageToKeep));
+            if (this._history.length > maxLength) {
+                let expired = this._history.splice(maxLength);
                for (let i = 0; i < expired.length; i++)
                    expired[i].actor.destroy();
            }
        }
    },

-    _appendTimestamp: function() {
-        let lastMessageTime = this._history[0].time;
-        let lastMessageDate = new Date(lastMessageTime * 1000);
-
-        /* Translators: this is a time format string followed by a date.
-           If applicable, replace %X with a strftime format valid for your
-           locale, without seconds. */
-        let timeLabel = this.addBody(lastMessageDate.toLocaleFormat(_("Sent at %X on %A")), false, { expand: true, x_fill: false, x_align: St.Align.END });
-        timeLabel.add_style_class_name('chat-meta-message');
-        this._history.unshift({ actor: timeLabel, time: lastMessageTime, realMessage: false });
-
-        this._timestampTimeoutId = 0;
-        return false;
-    },
-
-    appendPresence: function(text, asTitle) {
-        if (asTitle)
-            this.update(text, null, { customContent: true });
-        else
-            this.update(this.source.title, null, { customContent: true });
-        let label = this.addBody(text);
-        label.add_style_class_name('chat-meta-message');
-        this._history.unshift({ actor: label, time: (Date.now() / 1000), realMessage: false});
-    },
-
    grabFocus: function(lockTray) {
        // Need to call the base class function first so that
        // it saves where the key focus was before.
@@ -680,7 +653,6 @@ Notification.prototype = {
            return;

        this._responseEntry.set_text('');
-        this._append(text, 'chat-sent');
        this.source.respond(text);
    }
 };
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -132,10 +132,7 @@ WindowClone.prototype = {
        if (this.inDrag || this._zooming)
            // We'll fix up the stack after the drag/zooming
            return;
-        if (this._stackAbove == null)
-            this.actor.lower_bottom();
-        else
-            this.actor.raise(this._stackAbove);
+        this.actor.raise(this._stackAbove);
    },

    destroy: function () {
@@ -242,13 +239,11 @@ WindowClone.prototype = {
        this.emit('zoom-end');

        this.actor.reparent(this._origParent);
-        if (this._stackAbove == null)
-            this.actor.lower_bottom();
        // If the workspace has been destroyed while we were reparented to
        // the stage, _stackAbove will be unparented and we can't raise our
        // actor above it - as we are bound to be destroyed anyway in that
        // case, we can skip that step
-        else if (this._stackAbove.get_parent())
+        if (this._stackAbove && this._stackAbove.get_parent())
            this.actor.raise(this._stackAbove);

        [this.actor.x, this.actor.y]             = this._zoomLocalOrig.getPosition();
@@ -280,13 +275,8 @@ WindowClone.prototype = {
        // We may not have a parent if DnD completed successfully, in
        // which case our clone will shortly be destroyed and replaced
        // with a new one on the target workspace.
-        if (this.actor.get_parent() != null) {
-            if (this._stackAbove == null)
-                this.actor.lower_bottom();
-            else
-                this.actor.raise(this._stackAbove);
-        }
-
+        if (this.actor.get_parent() != null)
+            this.actor.raise(this._stackAbove);

        this.emit('drag-end');
    }
@@ -469,10 +459,12 @@ WindowOverlay.prototype = {

    _idleToggleCloseButton: function() {
        this._idleToggleCloseId = 0;
-        if (!this._windowClone.actor.has_pointer &&
-            !this.closeButton.has_pointer)
+        let [x, y, mask] = global.get_pointer();
+        let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE,
+                                                  x, y);
+        if (actor != this._windowClone.actor && actor != this.closeButton) {
            this.closeButton.hide();
-
+        }
        return false;
    },

@@ -1007,6 +999,8 @@ Workspace.prototype = {
    },

    syncStacking: function(stackIndices) {
+        let desktopClone = this._windows[0];
+
        let visibleClones = this._getVisibleClones();
        visibleClones.sort(function (a, b) { return stackIndices[a.metaWindow.get_stable_sequence()] - stackIndices[b.metaWindow.get_stable_sequence()]; });

@@ -1014,7 +1008,7 @@ Workspace.prototype = {
            let clone = visibleClones[i];
            let metaWindow = clone.metaWindow;
            if (i == 0) {
-                clone.setStackAbove(null);
+                clone.setStackAbove(desktopClone.actor);
            } else {
                let previousClone = visibleClones[i - 1];
                clone.setStackAbove(previousClone.actor);
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -14,6 +14,7 @@ const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;
+const Search = imports.ui.search;

 const WORKSPACE_SWITCH_TIME = 0.25;
 // Note that mutter has a compile-time limit of 36
@@ -34,7 +35,7 @@ function WorkspacesView(width, height, x, y, workspaces) {

 WorkspacesView.prototype = {
    _init: function(width, height, x, y, workspaces) {
-        this.actor = new St.Group({ style_class: 'workspaces-view' });
+        this.actor = new St.Group({ style_class: 'workspaces single' });
        this.actor.set_clip(x, y, width, height);

        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
@@ -802,15 +803,13 @@ WorkspaceIndicatorPanel.prototype = {
        this._workspaces = null;
    },

-    // Allocate the box centered to the available area like StBin would do,
-    // except that the full height is used even if the box is not actually
-    // shown. This is a workaround, as the size of the workspace area is
-    // determined once when entering the overview, so if it would take up
-    // the indicator space in that case, it would overlap it later when
-    // additional workspaces were added.
    _allocate: function(actor, box, flags) {
        let children = this._box.get_children();

+        // Don't display a single indicator
+        if (children.length == 1)
+            return;
+
        let availWidth = box.x2 - box.x1;
        let availHeight = box.y2 - box.y1;
        let [minWidth, natWidth] = this._box.get_preferred_width(-1);
@@ -840,12 +839,6 @@ WorkspaceIndicatorPanel.prototype = {
    updateWorkspaces: function(workspaces) {
        this._workspaces = workspaces;

-        // Do not display a single indicator
-        if (this._workspaces.length == 1)
-            this.actor.set_skip_paint(this._box, true);
-        else
-            this.actor.set_skip_paint(this._box, false);
-
        this._box.remove_all();
        for (let i = 0; i < this._workspaces.length; i++) {
            let actor = new St.Button({ style_class: 'workspace-indicator',
@@ -944,45 +937,18 @@ WorkspaceControlsContainer.prototype = {
        this._controls.connect('notify::hover',
                               Lang.bind(this, this._onHoverChanged));

-        this._itemDragBeginId = 0;
-        this._itemDragEndId = 0;
-        this._windowDragBeginId = 0;
-        this._windowDragEndId = 0;
-    },
-
-    show: function() {
-        if (this._itemDragBeginId == 0)
-            this._itemDragBeginId = Main.overview.connect('item-drag-begin',
-                                                          Lang.bind(this, this.popOut));
-        if (this._itemDragEndId == 0)
-            this._itemDragEndId = Main.overview.connect('item-drag-end',
-                                                        Lang.bind(this, this.popIn));
-        if (this._windowDragBeginId == 0)
-            this._windowDragBeginId = Main.overview.connect('window-drag-begin',
-                                                            Lang.bind(this, this.popOut));
-        if (this._windowDragEndId == 0)
-            this._windowDragEndId = Main.overview.connect('window-drag-end',
-                                                          Lang.bind(this, this.popIn));
-        this._controls.x = this._poppedInX();
-    },
-
-    hide: function() {
-        if (this._itemDragBeginId > 0) {
-            Main.overview.disconnect(this._itemDragBeginId);
-            this._itemDragBeginId = 0;
-        }
-        if (this._itemEndBeginId > 0) {
-            Main.overview.disconnect(this._itemDragEndId);
-            this._itemDragEndId = 0;
-        }
-        if (this._windowDragBeginId > 0) {
-            Main.overview.disconnect(this._windowDragBeginId);
-            this._windowDragBeginId = 0;
-        }
-        if (this._windowDragEndId > 0) {
-            Main.overview.disconnect(this._windowDragEndId);
-            this._windowDragEndId = 0;
-        }
+        let workId = Main.initializeDeferredWork(this.actor,
+            Lang.bind(this, function() {
+                Main.overview.connect('item-drag-begin',
+                                      Lang.bind(this, this.popOut));
+                Main.overview.connect('item-drag-end',
+                                      Lang.bind(this, this.popIn));
+                Main.overview.connect('window-drag-begin',
+                                      Lang.bind(this, this.popOut));
+                Main.overview.connect('window-drag-end',
+                                      Lang.bind(this, this.popIn));
+                this._controls.x = this._poppedInX();
+            }));
    },

    _getPreferredWidth: function(actor, forHeight, alloc) {
@@ -991,19 +957,12 @@ WorkspaceControlsContainer.prototype = {
        alloc.natural_size = natWidth;
    },

-    // Always request the full width ...
    _getPreferredHeight: function(actor, forWidth, alloc) {
        let [minHeight, natHeight] = this._controls.get_preferred_height(-1);
        alloc.min_size = minHeight;
        alloc.natural_size = natHeight;
    },

-    // ... even when the controls are popped in, to keep the width constant.
-    // This is necessary as the workspace size is determined once before
-    // entering the overview, when the controls are popped in - if the width
-    // varied, the workspaces would be given too much width, and the controls
-    // would be overlapped by the workspaces when popped out, rendering them
-    // useless.
    _allocate: function(actor, box, flags) {
        let childBox = new Clutter.ActorBox();
        childBox.x1 = this._controls.x;
@@ -1093,9 +1052,7 @@ WorkspacesDisplay.prototype = {
        this._nWorkspacesNotifyId = 0;
    },

-   show: function() {
-        this._controlsContainer.show();
-
+    show: function() {
        this._workspaces = [];
        for (let i = 0; i < global.screen.n_workspaces; i++) {
            let metaWorkspace = global.screen.get_workspace_by_index(i);
@@ -1142,8 +1099,6 @@ WorkspacesDisplay.prototype = {
    },

    hide: function() {
-        this._controlsContainer.hide();
-
        if (this._nWorkspacesNotifyId > 0)
            global.screen.disconnect(this._nWorkspacesNotifyId);
        this.workspacesView.destroy();
@@ -1198,3 +1153,77 @@ WorkspacesDisplay.prototype = {
    }
 };
 Signals.addSignalMethods(WorkspacesDisplay.prototype);
+
+
+function WindowSearchProvider() {
+    this._init();
+}
+
+WindowSearchProvider.prototype = {
+    __proto__: Search.SearchProvider.prototype,
+
+    _init: function() {
+        Search.SearchProvider.prototype._init.call(this, _("WINDOWS"));
+        this._tracker = Shell.WindowTracker.get_default();
+    },
+
+    _matchWindow: function(window, terms) {
+        let title = window.get_title().toLowerCase();
+        let mtype = Search.MatchType.NONE;
+        for (let i = 0; i < terms.length; i ++) {
+            let idx = title.indexOf(terms[i]);
+
+            if (idx < 0)
+                return Search.MatchType.NONE;
+            if (idx == 0)
+                return Search.MatchType.PREFIX;
+        }
+        return Search.MatchType.SUBSTRING;
+    },
+
+    _search: function(items, terms) {
+        let prefixMatches = [];
+        let substringMatches = [];
+        for (let i = 0; i < items.length; i ++) {
+            let item = items[i];
+            let match = this._matchWindow(item, terms);
+
+            if (match == Search.MatchType.PREFIX)
+                prefixMatches.push(item);
+            else if (match == Search.MatchType.SUBSTRING)
+                substringMatches.push(item);
+        }
+        return prefixMatches.concat(substringMatches);
+    },
+
+    getInitialResultSet: function(terms) {
+        let windows = global.get_window_actors();
+        windows = windows.map(function(w) { return w.metaWindow });
+        windows = windows.filter(this._tracker.is_window_interesting);
+
+        return this._search(windows, terms);
+    },
+
+    getSubsearchResultSet: function(previousResults, terms) {
+        return this._search(previousResults, terms);
+    },
+
+    // FIXME: resultId is the metaWindow because there's no obvious lookup ID
+    getResultMeta: function(resultId) {
+        if (!resultId)
+            return null;
+        let app = this._tracker.get_window_app(resultId);
+        return { 'id': resultId,
+                 'name': resultId.get_title(),
+                 'icon': app.create_icon_texture(Search.RESULT_ICON_SIZE) };
+    },
+
+    activateResult: function(resultId) {
+        Main.activateWindow(resultId);
+    },
+
+    expandSearch: function(resultId) {
+        if (Main.overview && Main.overview.viewSelector)
+            Main.overview.viewSelector._switchDefaultTab();
+    }
+};
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,7 +20,5 @@ js/ui/windowAttentionHandler.js
 js/ui/workspacesView.js
 src/gvc/gvc-mixer-control.c
 src/gdmuser/gdm-user.c
-src/shell-app-system.c
 src/shell-global.c
-src/shell-util.c
-
+src/shell-uri-util.c
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 17:32+0100\n"
-"PO-Revision-Date: 2010-11-29 17:33+0100\n"
+"POT-Creation-Date: 2010-11-03 00:26+0100\n"
+"PO-Revision-Date: 2010-11-03 00:28+0100\n"
 "Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
 "Language-Team: Galician <gnome-gl-list@gnome.org>\n"
 "Language: gl\n"
@@ -104,6 +104,10 @@ msgid "List of desktop file IDs for favorite applications"
 msgstr "Mostra os ID de ficheiros desktop para os aplicativos preferidos"

 #: ../data/org.gnome.shell.gschema.xml.in.h:13
+msgid "Overview workspace view mode"
+msgstr "Modo de visualización do espazo de traballo de vista previa"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
 "used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -124,19 +128,19 @@ msgstr ""
 "está a un valor baleiro, usarase a tubería predeterminada. Actualmente é "
 "«videorate ! theoraenc ! oggmux» e grava en Ogg Theora."

-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show date in clock"
 msgstr "Mostrar a data no reloxo"

-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 msgid "Show the week date in the calendar"
 msgstr "Mostrar a data da semana no calendario"

-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid "Show time with seconds"
 msgstr "Mostrar a hora con segundos"

-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
@@ -144,7 +148,7 @@ msgstr ""
 "Os aplicativos que corresponden a estes identificadores mostraranse na área "
 "de preferidos."

-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -154,7 +158,7 @@ msgstr ""
 "baseado na data actual e usa esta extensión. Debería cambiar ao grabar nun "
 "formato de contedor diferente."

-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -162,11 +166,19 @@ msgstr ""
 "A taxa de marcos do screencast resultante grabado polo grabador de "
 "screencasts de GNOME Shell en marcos-por-segundo."

-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "A tubería de gstreamer usada para codificar o screencast"

-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
+msgid ""
+"The selected workspace view mode in the overview. Supported values are "
+"\"single\" and \"grid\"."
+msgstr ""
+"O modo de visualización do espazo de traballo seleccionado na vista previa. "
+"Os valores admitidos son \"single\" e \"grid\"."
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid ""
 "The shell normally monitors active applications in order to present the most "
 "used ones (e.g. in launchers). While this data will be kept private, you may "
@@ -178,7 +190,7 @@ msgstr ""
 "privados, vostede pode desactivar isto por motivos de privacidade. Teña en "
 "conta que facendo isto non eliminará os datos gardados."

-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:24
 msgid ""
 "This key specifies the format used by the panel clock when the format key is "
 "set to \"custom\". You can use conversion specifiers understood by strftime"
@@ -190,7 +202,7 @@ msgstr ""
 "de conversión que entende strftime() para obter un formato de hora "
 "especificado. Vexa o manual de strftime() para obter máis información."

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:25
 msgid ""
 "This key specifies the hour format used by the panel clock. Possible values "
 "are \"12-hour\", \"24-hour\", \"unix\" and \"custom\". If set to \"unix\", "
@@ -207,11 +219,11 @@ msgstr ""
 "está estabelecido a «unix» ou «custom», as chaves show_date e show_seconds "
 "ignoraranse."

-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:26
 msgid "Uuids of extensions to disable"
 msgstr "Os Uuid das extensións a desactivar"

-#: ../data/org.gnome.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.h:27
 msgid "Whether to collect stats about applications usage"
 msgstr "Indica se recoller estatísticas sobre o uso dos aplicativos"

@@ -397,41 +409,62 @@ msgstr "Formato _12 horas"
 msgid "_24 hour format"
 msgstr "Formato _24 horas"

-#: ../js/ui/appDisplay.js:215
+#. **** Applications ****
+#: ../js/ui/appDisplay.js:316 ../js/ui/dash.js:778
 msgid "APPLICATIONS"
 msgstr "APLICATIVOS"

-#: ../js/ui/appDisplay.js:245
+#: ../js/ui/appDisplay.js:348
 msgid "PREFERENCES"
 msgstr "PREFERENCIAS"

-#: ../js/ui/appDisplay.js:538
+#: ../js/ui/appDisplay.js:647
 msgid "New Window"
 msgstr "Xanela nova"

-#: ../js/ui/appDisplay.js:542
+#: ../js/ui/appDisplay.js:651
 msgid "Remove from Favorites"
 msgstr "Eliminar dos favoritos"

-#: ../js/ui/appDisplay.js:543
+#: ../js/ui/appDisplay.js:652
 msgid "Add to Favorites"
 msgstr "Engadir aos favoritos"

-#: ../js/ui/appFavorites.js:91
+#: ../js/ui/appDisplay.js:829
+msgid "Drag here to add favorites"
+msgstr "Arrastre aquí para engadir aos favoritos"
+
+#: ../js/ui/appFavorites.js:88
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s foi engadido aos seus favoritos."

-#: ../js/ui/appFavorites.js:122
+#: ../js/ui/appFavorites.js:107
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s foi eliminado dos seus favoritos."

-#: ../js/ui/dash.js:27
-msgid "Remove"
-msgstr "Eliminar"
+#: ../js/ui/dash.js:142
+msgid "Find"
+msgstr "Buscar"

-#: ../js/ui/docDisplay.js:494
+#: ../js/ui/dash.js:473
+msgid "Searching..."
+msgstr "Buscando..."
+
+#: ../js/ui/dash.js:487
+msgid "No matching results."
+msgstr "Non hai resultados que coincidan."
+
+#. **** Places ****
+#. Translators: This is in the sense of locations for documents,
+#. network locations, etc.
+#: ../js/ui/dash.js:797 ../js/ui/placeDisplay.js:554
+msgid "PLACES & DEVICES"
+msgstr "LUGARES E DISPOSITIVOS"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:804 ../js/ui/docDisplay.js:494
 msgid "RECENT ITEMS"
 msgstr "ELEMENTOS RECENTES"

@@ -465,63 +498,63 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Páxina web"

-#: ../js/ui/overview.js:112
+#: ../js/ui/overview.js:160
 msgid "Undo"
 msgstr "Desfacer"

 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:470
+#: ../js/ui/panel.js:469
 #, c-format
 msgid "Quit %s"
 msgstr "Saír de %s"

-#: ../js/ui/panel.js:495
+#: ../js/ui/panel.js:494
 msgid "Preferences"
 msgstr "Preferencias"

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

-#: ../js/ui/panel.js:582
+#: ../js/ui/panel.js:581
 msgid "%a %b %e, %R"
 msgstr "%a %e de %b, %R"

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

-#: ../js/ui/panel.js:587
+#: ../js/ui/panel.js:586
 msgid "%a %R"
 msgstr "%a %R"

 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:594
+#: ../js/ui/panel.js:593
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %e de %b, %H:%M:%S"

-#: ../js/ui/panel.js:595
+#: ../js/ui/panel.js:594
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %e de %b, %H:%M"

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

-#: ../js/ui/panel.js:600
+#: ../js/ui/panel.js:599
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:745
+#: ../js/ui/panel.js:744
 msgid "Activities"
 msgstr "Actividades"

@@ -538,10 +571,6 @@ msgstr "Reintentar"
 msgid "Connect to..."
 msgstr "Conectar con..."

-#: ../js/ui/placeDisplay.js:558
-msgid "PLACES & DEVICES"
-msgstr "LUGARES E DISPOSITIVOS"
-
 #. Translators: this MUST be either "toggle-switch-us"
 #. (for toggle switches containing the English words
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
@@ -568,31 +597,39 @@ msgstr "Dispoñíbel"
 msgid "Busy"
 msgstr "Ocupado"

-#: ../js/ui/statusMenu.js:114
-msgid "My Account"
-msgstr "A miña conta"
+#: ../js/ui/statusMenu.js:111
+msgid "Invisible"
+msgstr "Invisíbel"

-#: ../js/ui/statusMenu.js:118
-msgid "System Settings"
-msgstr "Configuracións do sistema"
+#: ../js/ui/statusMenu.js:119
+msgid "My Account..."
+msgstr "A miña conta..."

-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:123
+msgid "System Settings..."
+msgstr "Configuracións do sistema..."
+
+#: ../js/ui/statusMenu.js:130
 msgid "Lock Screen"
 msgstr "Bloquear pantalla"

-#: ../js/ui/statusMenu.js:129
+#: ../js/ui/statusMenu.js:134
 msgid "Switch User"
 msgstr "Cambiar de usuario"

-#: ../js/ui/statusMenu.js:134
+#: ../js/ui/statusMenu.js:139
 msgid "Log Out..."
 msgstr "Saír da sesión..."

-#: ../js/ui/statusMenu.js:141
-msgid "Suspend..."
-msgstr "Suspender..."
+#: ../js/ui/statusMenu.js:146
+msgid "Suspend"
+msgstr "Suspender"

-#: ../js/ui/statusMenu.js:145
+#: ../js/ui/statusMenu.js:150
+msgid "Restart..."
+msgstr "Reiniciar..."
+
+#: ../js/ui/statusMenu.js:154
 msgid "Shut Down..."
 msgstr "Apagar..."

@@ -632,18 +669,14 @@ msgstr "Configuracións de acceso universal"
 msgid "High Contrast"
 msgstr "Alto contraste"

-#: ../js/ui/status/accessibility.js:205
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Texto máis grande"

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

-#: ../js/ui/viewSelector.js:26
-msgid "Search your computer"
-msgstr "Buscar no seu computador"
-
 #: ../js/ui/windowAttentionHandler.js:43
 #, c-format
 msgid "%s has finished starting"
@@ -654,14 +687,14 @@ msgstr "%s rematou de iniarse"
 msgid "'%s' is ready"
 msgstr "«%s» está preparado"

-#: ../js/ui/workspacesView.js:244
+#: ../js/ui/workspacesView.js:229
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr ""
 "Non é posíbel engadir unha área de traballo nova porque chegouse ao límite "
 "de áreas de traballo."

-#: ../js/ui/workspacesView.js:260
+#: ../js/ui/workspacesView.js:246
 msgid "Can't remove the first workspace."
 msgstr "Non é posíbel quitar a primeira área de traballo."

@@ -687,53 +720,49 @@ msgstr[1] "%u entradas"
 msgid "System Sounds"
 msgstr "Sons do sistema"

-#: ../src/shell-app-system.c:1012
-msgid "Unknown"
-msgstr "Descoñecido"
-
-#: ../src/shell-global.c:1163
+#: ../src/shell-global.c:1219
 msgid "Less than a minute ago"
 msgstr "Hai menos dun minuto"

-#: ../src/shell-global.c:1167
+#: ../src/shell-global.c:1223
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hai %d minuto"
 msgstr[1] "hai %d minutos"

-#: ../src/shell-global.c:1172
+#: ../src/shell-global.c:1228
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hai %d hora"
 msgstr[1] "hai %d horas"

-#: ../src/shell-global.c:1177
+#: ../src/shell-global.c:1233
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hai %d día"
 msgstr[1] "hai %d días"

-#: ../src/shell-global.c:1182
+#: ../src/shell-global.c:1238
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "hai %d semana"
 msgstr[1] "hai %d semanas"

-#: ../src/shell-util.c:89
+#: ../src/shell-uri-util.c:89
 msgid "Home Folder"
 msgstr "Cartafol persoal"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-util.c:104
+#: ../src/shell-uri-util.c:104
 msgid "File System"
 msgstr "Sistema de ficheiros"

-#: ../src/shell-util.c:250
+#: ../src/shell-uri-util.c:250
 msgid "Search"
 msgstr "Buscar"

@@ -742,39 +771,11 @@ msgstr "Buscar"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-util.c:300
+#: ../src/shell-uri-util.c:300
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Overview workspace view mode"
-#~ msgstr "Modo de visualización do espazo de traballo de vista previa"
-
-#~ msgid ""
-#~ "The selected workspace view mode in the overview. Supported values are "
-#~ "\"single\" and \"grid\"."
-#~ msgstr ""
-#~ "O modo de visualización do espazo de traballo seleccionado na vista "
-#~ "previa. Os valores admitidos son \"single\" e \"grid\"."
-
-#~ msgid "Drag here to add favorites"
-#~ msgstr "Arrastre aquí para engadir aos favoritos"
-
-#~ msgid "Find"
-#~ msgstr "Buscar"
-
-#~ msgid "Searching..."
-#~ msgstr "Buscando..."
-
-#~ msgid "No matching results."
-#~ msgstr "Non hai resultados que coincidan."
-
-#~ msgid "Invisible"
-#~ msgstr "Invisíbel"
-
-#~ msgid "Restart..."
-#~ msgstr "Reiniciar..."
-
 #~ msgid "System Preferences..."
 #~ msgstr "Preferencias do sistema..."

--- a/po/nb.po
+++ b/po/nb.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 2.91.x\n"
+"Project-Id-Version: gnome-shell 2.31.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-20 14:39+0100\n"
-"PO-Revision-Date: 2010-11-20 14:40+0100\n"
+"POT-Creation-Date: 2010-10-28 17:35+0200\n"
+"PO-Revision-Date: 2010-10-28 17:38+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -344,19 +344,19 @@ msgstr "PROGRAMMER"
 msgid "PREFERENCES"
 msgstr "BRUKERVALG"

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

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

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

-#: ../js/ui/appDisplay.js:829
+#: ../js/ui/appDisplay.js:830
 msgid "Drag here to add favorites"
 msgstr "Dra hit for å legge til favoritter"

@@ -385,7 +385,7 @@ msgstr "Ingen treff."
 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:797 ../js/ui/placeDisplay.js:558
+#: ../js/ui/dash.js:797 ../js/ui/placeDisplay.js:554
 msgid "PLACES & DEVICES"
 msgstr "STEDER & ENHETER"

@@ -429,58 +429,58 @@ msgid "Undo"
 msgstr "Angre"

 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:470
+#: ../js/ui/panel.js:469
 #, c-format
 msgid "Quit %s"
 msgstr "Avslutt %s"

-#: ../js/ui/panel.js:495
+#: ../js/ui/panel.js:494
 msgid "Preferences"
 msgstr "Brukervalg"

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

-#: ../js/ui/panel.js:582
+#: ../js/ui/panel.js:581
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"

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

-#: ../js/ui/panel.js:587
+#: ../js/ui/panel.js:586
 msgid "%a %R"
 msgstr "%a %R"

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

-#: ../js/ui/panel.js:595
+#: ../js/ui/panel.js:594
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %e %b, %l.%M %p"

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

-#: ../js/ui/panel.js:600
+#: ../js/ui/panel.js:599
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:745
+#: ../js/ui/panel.js:744
 msgid "Activities"
 msgstr "Aktiviteter"

@@ -523,31 +523,39 @@ msgstr "Tilgjengelig"
 msgid "Busy"
 msgstr "Opptatt"

-#: ../js/ui/statusMenu.js:114
+#: ../js/ui/statusMenu.js:111
+msgid "Invisible"
+msgstr "Usynlig"
+
+#: ../js/ui/statusMenu.js:119
 msgid "My Account..."
 msgstr "Min konto..."

-#: ../js/ui/statusMenu.js:118
-msgid "System Settings..."
-msgstr "Systeminnstillinger..."
+#: ../js/ui/statusMenu.js:123
+msgid "System Preferences..."
+msgstr "Brukervalg for systemet..."

-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:130
 msgid "Lock Screen"
 msgstr "Lås skjerm"

-#: ../js/ui/statusMenu.js:129
+#: ../js/ui/statusMenu.js:134
 msgid "Switch User"
 msgstr "Bytt bruker"

-#: ../js/ui/statusMenu.js:134
+#: ../js/ui/statusMenu.js:139
 msgid "Log Out..."
 msgstr "Logg ut..."

-#: ../js/ui/statusMenu.js:141
+#: ../js/ui/statusMenu.js:146
 msgid "Suspend"
 msgstr "Hvilemodus"

-#: ../js/ui/statusMenu.js:145
+#: ../js/ui/statusMenu.js:150
+msgid "Restart..."
+msgstr "Start på nytt..."
+
+#: ../js/ui/statusMenu.js:154
 msgid "Shut Down..."
 msgstr "Avslutt..."

@@ -587,11 +595,11 @@ msgstr "Innstillinger for tilgjengelighet"
 msgid "High Contrast"
 msgstr "Høy kontrast"

-#: ../js/ui/status/accessibility.js:205
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Stor tekst"

-#: ../js/ui/status/accessibility.js:224
+#: ../js/ui/status/accessibility.js:223
 msgid "Zoom"
 msgstr "Zoom"

@@ -638,53 +646,49 @@ msgstr[1] "%u innganger"
 msgid "System Sounds"
 msgstr "Systemlyder"

-#: ../src/shell-app-system.c:1012
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: ../src/shell-global.c:1158
+#: ../src/shell-global.c:1204
 msgid "Less than a minute ago"
 msgstr "Mindre enn ett minutt siden"

-#: ../src/shell-global.c:1162
+#: ../src/shell-global.c:1208
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutt siden"
 msgstr[1] "%d minutter siden"

-#: ../src/shell-global.c:1167
+#: ../src/shell-global.c:1213
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"

-#: ../src/shell-global.c:1172
+#: ../src/shell-global.c:1218
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dager siden"

-#: ../src/shell-global.c:1177
+#: ../src/shell-global.c:1223
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uke siden"
 msgstr[1] "%d uker siden"

-#: ../src/shell-util.c:89
+#: ../src/shell-uri-util.c:89
 msgid "Home Folder"
 msgstr "Hjemmemappe"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-util.c:104
+#: ../src/shell-uri-util.c:104
 msgid "File System"
 msgstr "Filsystem"

-#: ../src/shell-util.c:250
+#: ../src/shell-uri-util.c:250
 msgid "Search"
 msgstr "Søk"

@@ -693,7 +697,7 @@ msgstr "Søk"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-util.c:300
+#: ../src/shell-uri-util.c:300
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2010-11-20 13:40+0000\n"
-"PO-Revision-Date: 2010-11-23 10:04+0700\n"
+"POT-Creation-Date: 2010-06-13 23:04+0000\n"
+"PO-Revision-Date: 2010-06-14 20:22+0700\n"
 "Last-Translator: Sira Nokyoongtong <gumaraa@gmail.com>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
-msgstr "เชลล์ GNOME"
+msgstr ""

 #: ../data/gnome-shell.desktop.in.in.h:2
 msgid "Window management and application launching"
-msgstr "การจัดการหน้าต่างและการเรียกใช้โปรแกรม"
+msgstr ""

 #: ../data/gnome-shell-clock-preferences.desktop.in.in.h:1
 msgid "Clock"
@@ -33,294 +33,6 @@ msgstr "นาฬิกา"
 msgid "Customize the panel clock"
 msgstr "ปรับแต่งนาฬิกาบนพาเนล"

-#: ../data/org.gnome.shell.gschema.xml.in.h:1
-msgid ""
-"Allows access to internal debugging and monitoring tools using the Alt-F2 "
-"dialog."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:2
-msgid "Custom format of the clock"
-msgstr "รูปแบบนาฬิกากำหนดเอง"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:3
-msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:4
-msgid "File extension used for storing the screencast"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:5
-msgid "Framerate used for recording screencasts."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:6
-msgid ""
-"GNOME Shell extensions have a uuid property; this key lists extensions which "
-"should not be loaded."
-msgstr ""
-"ส่วนขยายต่างๆ ของเชลล์ GNOME จะมี uuid ประจำตัว ค่านี้จะเก็บรายชื่อของส่วนขยายที่จะไม่เรียกใช้"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:7
-msgid "History for command (Alt-F2) dialog"
-msgstr "ประวัติคำสั่งของกล่องโต้ตอบเรียกโปรแกรม (Alt-F2)"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:8
-msgid "Hour format"
-msgstr "รูปแบบชั่วโมง"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:9
-msgid ""
-"If true and format is either \"12-hour\" or \"24-hour\", display date in the "
-"clock, in addition to time."
-msgstr ""
-"ถ้าเลือก และรูปแบบเวลาเป็น \"12-hour\" หรือ \"24-hour\" "
-"ก็จะแสดงวันที่ในนาฬิกาควบคู่กับเวลาด้วย"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:10
-msgid ""
-"If true and format is either \"12-hour\" or \"24-hour\", display seconds in "
-"time."
-msgstr ""
-"ถ้าเลือก และรูปแบบเวลาเป็น \"12-hour\" หรือ \"24-hour\" ก็จะแสดงวินาทีในเวลาด้วย"
-
-# See http://en.wikipedia.org/wiki/ISO_week_date
-#: ../data/org.gnome.shell.gschema.xml.in.h:11
-msgid "If true, display the ISO week date in the calendar."
-msgstr "ถ้าเลือก จะแสดงวันที่แบบสัปดาห์ของ ISO ในปฏิทิน"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:12
-msgid "List of desktop file IDs for favorite applications"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
-msgid "Overview workspace view mode"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:14
-msgid ""
-"Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
-"used for gst-launch. The pipeline should have an unconnected sink pad where "
-"the recorded video is recorded. It will normally have a unconnected source "
-"pad; output from that pad will be written into the output file. However the "
-"pipeline can also take care of its own output - this might be used to send "
-"the output to an icecast server via shout2send or similar. When unset or set "
-"to an empty value, the default pipeline will be used. This is currently "
-"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
-msgid "Show date in clock"
-msgstr "แสดงวันที่ในนาฬิกา"
-
-# See http://en.wikipedia.org/wiki/ISO_week_date
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
-msgid "Show the week date in the calendar"
-msgstr "แสดงวันที่แบบสัปดาห์ในปฏิทิน"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
-msgid "Show time with seconds"
-msgstr "แสดงเวลาพร้อมวินาที"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
-msgid ""
-"The applications corresponding to these identifiers will be displayed in the "
-"favorites area."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
-msgid ""
-"The filename for recorded screencasts will be a unique filename based on the "
-"current date, and use this extension. It should be changed when recording to "
-"a different container format."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
-msgid ""
-"The framerate of the resulting screencast recordered by GNOME Shell's "
-"screencast recorder in frames-per-second."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
-msgid "The gstreamer pipeline used to encode the screencast"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:22
-msgid ""
-"The selected workspace view mode in the overview. Supported values are "
-"\"single\" and \"grid\"."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:23
-msgid ""
-"The shell normally monitors active applications in order to present the most "
-"used ones (e.g. in launchers). While this data will be kept private, you may "
-"want to disable this for privacy reasons. Please note that doing so won't "
-"remove already saved data."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:24
-msgid ""
-"This key specifies the format used by the panel clock when the format key is "
-"set to \"custom\". You can use conversion specifiers understood by strftime"
-"() to obtain a specific format. See the strftime() manual for more "
-"information."
-msgstr ""
-"ค่านี้กำหนดรูปแบบของเวลาในแอพเพล็ตนาฬิกาเมื่อกำหนดรูปแบบเป็น \"custom\" "
-"คุณสามารถใช้รหัสการแปลงของ strftime() เพื่อระบุรูปแบบที่ต้องการได้ "
-"ดูข้อมูลเพิ่มเติมได้จากคู่มือของ strftime()"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:25
-msgid ""
-"This key specifies the hour format used by the panel clock. Possible values "
-"are \"12-hour\", \"24-hour\", \"unix\" and \"custom\". If set to \"unix\", "
-"the clock will display time in seconds since Epoch, i.e. 1970-01-01. If set "
-"to \"custom\", the clock will display time according to the format specified "
-"in the custom_format key. Note that if set to either \"unix\" or \"custom\", "
-"the show_date and show_seconds keys are ignored."
-msgstr ""
-"ค่านี้กำหนดรูปแบบชั่วโมงที่จะใช้ในแอพเพล็ตนาฬิกา ค่าที่เป็นไปได้คือ\"12-hour\", \"24-hour\", "
-"\"unix\" และ \"custom\" ถ้ากำหนดเป็น \"unix\" นาฬิกาจะแสดงเวลาเป็นวินาทีนับจาก 1970-"
-"01-01 ถ้ากำหนดเป็น \"custom\" นาฬิกาจะแสดงตามรูปแบบที่กำหนดใน custom_format "
-"สังเกตว่าถ้ากำหนดเป็น \"unix\" หรือ \"custom\" ค่า show_date และ show_seconds "
-"ก็จะไม่มีผล"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:26
-msgid "Uuids of extensions to disable"
-msgstr "uuid ของส่วนขยายที่จะปิดใช้"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:27
-msgid "Whether to collect stats about applications usage"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
-msgid "Clip the crosshairs at the center"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:2
-msgid "Color of the crosshairs"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:3
-msgid ""
-"Determines the length of the vertical and horizontal lines that make up the "
-"crosshairs."
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:4
-msgid ""
-"Determines the position of the magnified mouse image within the magnified "
-"view and how it reacts to system mouse movement. The values are - none: no "
-"mouse tracking; - centered: the mouse image is displayed at the center of "
-"the zoom region (which also represents the point under the system mouse) and "
-"the magnified contents are scrolled as the system mouse moves; - "
-"proportional: the position of the magnified mouse in the zoom region is "
-"proportionally the same as the position of the system mouse on screen; - "
-"push: when the magnified mouse intersects a boundary of the zoom region, the "
-"contents are scrolled into view."
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:5
-msgid ""
-"Determines the transparency of the crosshairs, from fully opaque to fully "
-"transparent."
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:6
-msgid ""
-"Determines whether the crosshairs intersect the magnified mouse sprite, or "
-"are clipped such that the ends of the horizontal and vertical lines surround "
-"the mouse image."
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:7
-msgid "Enable lens mode"
-msgstr "เปิดใช้โหมดแว่นขยาย"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:8
-msgid ""
-"Enables/disables display of crosshairs centered on the magnified mouse "
-"sprite."
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:9
-msgid ""
-"For centered mouse tracking, when the system pointer is at or near the edge "
-"of the screen, the magnified contents continue to scroll such that the "
-"screen edge moves into the magnified view."
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:10
-msgid "Length of the crosshairs"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:11
-msgid "Magnification factor"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:12
-msgid "Mouse Tracking Mode"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:13
-msgid "Opacity of the crosshairs"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:14
-msgid "Screen position"
-msgstr "ตำแหน่งของหน้าจอ"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:15
-msgid "Scroll magnified contents beyond the edges of the desktop"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:16
-msgid "Show or hide crosshairs"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:17
-msgid "Show or hide the magnifier"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:18
-msgid "Show or hide the magnifier and all of its zoom regions."
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:19
-msgid ""
-"The color of the the vertical and horizontal lines that make up the "
-"crosshairs."
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:20
-msgid ""
-"The magnified view either fills the entire screen, or occupies the top-half, "
-"bottom-half, left-half, or right-half of the screen."
-msgstr ""
-"ช่องแสดงภาพขยายอาจจะใหญ่เต็มจอภาพ (full-screen) หรืออาจจะกินที่แค่ครึ่งบน (top-half) "
-"ครึ่งล่าง (bottom-half) ครึ่งซ้าย (left-half) หรือครึ่งขวา (right-half)"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:21
-msgid ""
-"The power of the magnification. A value of 1.0 means no magnification. A "
-"value of 2.0 doubles the size."
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:22
-msgid "Thickness of the crosshairs"
-msgstr ""
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:23
-msgid ""
-"Whether the magnified view should be centered over the location of the "
-"system mouse and move with it."
-msgstr "กำหนดว่าจะให้ภาพขยายหน้าจอวางตำแหน่งกึ่งกลางที่เมาส์และเคลื่อนย้ายไปตามเมาส์หรือไม่"
-
-#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:24
-msgid "Width of the vertical and horizontal lines that make up the crosshairs."
-msgstr ""
-
 #: ../data/clock-preferences.ui.h:1
 msgid "Clock Format"
 msgstr "รูปแบบนาฬิกา"
@@ -350,31 +62,31 @@ msgid "_24 hour format"
 msgstr "แบบ _24 ขั่วโมง"

 #. **** Applications ****
-#: ../js/ui/appDisplay.js:316 ../js/ui/dash.js:778
+#: ../js/ui/appDisplay.js:388 ../js/ui/dash.js:872
 msgid "APPLICATIONS"
 msgstr "โปรแกรม"

-#: ../js/ui/appDisplay.js:348
+#: ../js/ui/appDisplay.js:420
 msgid "PREFERENCES"
 msgstr "ปรับแต่ง"

-#: ../js/ui/appDisplay.js:647
+#: ../js/ui/appDisplay.js:726
 msgid "New Window"
 msgstr "หน้าต่างใหม่"

-#: ../js/ui/appDisplay.js:651
+#: ../js/ui/appDisplay.js:730
 msgid "Remove from Favorites"
 msgstr "ลบออกจากรายการโปรด"

-#: ../js/ui/appDisplay.js:652
+#: ../js/ui/appDisplay.js:731
 msgid "Add to Favorites"
 msgstr "เพิ่มเข้าในรายการโปรด"

-#: ../js/ui/appDisplay.js:829
+#: ../js/ui/appDisplay.js:1038
 msgid "Drag here to add favorites"
 msgstr "ลากมาที่นี่เพื่อเพิ่มเป็นรายการโปรด"

-#: ../js/ui/appFavorites.js:88
+#: ../js/ui/appFavorites.js:89
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s ถูกเพิ่มเข้าในรายการโปรดของคุณแล้ว"
@@ -384,313 +96,233 @@ msgstr "%s ถูกเพิ่มเข้าในรายการโปร
 msgid "%s has been removed from your favorites."
 msgstr "%s ถูกลบออกจากรายการโปรดของคุณแล้ว"

-#: ../js/ui/dash.js:142
+#: ../js/ui/dash.js:204
 msgid "Find"
 msgstr "หา"

-#: ../js/ui/dash.js:473
+#: ../js/ui/dash.js:527
 msgid "Searching..."
 msgstr "กำลังค้นหา..."

-#: ../js/ui/dash.js:487
+#: ../js/ui/dash.js:541
 msgid "No matching results."
 msgstr "ไม่มีผลลัพธ์ที่ตรงกัน"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:797 ../js/ui/placeDisplay.js:558
+#: ../js/ui/dash.js:891 ../js/ui/placeDisplay.js:551
 msgid "PLACES & DEVICES"
-msgstr "ที่หลักๆ และอุปกรณ์"
+msgstr ""

 #. **** Documents ****
-#: ../js/ui/dash.js:804 ../js/ui/docDisplay.js:494
+#: ../js/ui/dash.js:898 ../js/ui/docDisplay.js:497
 msgid "RECENT ITEMS"
-msgstr "รายการล่าสุด"
+msgstr ""

-#: ../js/ui/lookingGlass.js:552
+#: ../js/ui/lookingGlass.js:475
 msgid "No extensions installed"
 msgstr "ไม่มีส่วนขยายติดตั้งอยู่"

-#: ../js/ui/lookingGlass.js:589
+#: ../js/ui/lookingGlass.js:512
 msgid "Enabled"
-msgstr "เปิดใช้งาน"
+msgstr ""

-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:591 ../src/gvc/gvc-mixer-control.c:1087
+#: ../js/ui/lookingGlass.js:514
 msgid "Disabled"
-msgstr "ปิดใช้"
+msgstr ""

-#: ../js/ui/lookingGlass.js:593
+#: ../js/ui/lookingGlass.js:516
 msgid "Error"
 msgstr "ผิดพลาด"

-#: ../js/ui/lookingGlass.js:595
+#: ../js/ui/lookingGlass.js:518
 msgid "Out of date"
-msgstr "ตกรุ่น"
+msgstr ""

-#: ../js/ui/lookingGlass.js:620
+#: ../js/ui/lookingGlass.js:543
 msgid "View Source"
-msgstr "ดูซอร์ส"
+msgstr ""

-#: ../js/ui/lookingGlass.js:626
+#: ../js/ui/lookingGlass.js:549
 msgid "Web Page"
 msgstr "หน้าเว็บ"

-#: ../js/ui/overview.js:160
+#: ../js/ui/overview.js:165
 msgid "Undo"
 msgstr "เรียกคืน"

-#. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:470
+#: ../js/ui/panel.js:334
 #, c-format
 msgid "Quit %s"
 msgstr "ออกจาก %s"

-#: ../js/ui/panel.js:495
+#: ../js/ui/panel.js:354
 msgid "Preferences"
 msgstr "ปรับแต่ง"

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

-#: ../js/ui/panel.js:582
+#: ../js/ui/panel.js:442
 msgid "%a %b %e, %R"
-msgstr "%a %d %b, %R"
+msgstr ""

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

-#: ../js/ui/panel.js:587
+#: ../js/ui/panel.js:447
 msgid "%a %R"
-msgstr "%a %R"
+msgstr ""

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

-#: ../js/ui/panel.js:595
+#: ../js/ui/panel.js:455
 msgid "%a %b %e, %l:%M %p"
-msgstr "%a %d %b, %l:%M %p"
+msgstr ""

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

-#: ../js/ui/panel.js:600
+#: ../js/ui/panel.js:460
 msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+msgstr ""

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:745
+#: ../js/ui/panel.js:562
 msgid "Activities"
 msgstr "กิจกรรม"

-#: ../js/ui/placeDisplay.js:111
+#: ../js/ui/placeDisplay.js:108
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "เลิกเมานท์ '%s' ไม่สำเร็จ"

-#: ../js/ui/placeDisplay.js:114
+#: ../js/ui/placeDisplay.js:111
 msgid "Retry"
 msgstr "ลองใหม่"

-#: ../js/ui/placeDisplay.js:159
+#: ../js/ui/placeDisplay.js:156
 msgid "Connect to..."
 msgstr "เชื่อมต่อไปยัง..."

-#. Translators: this MUST be either "toggle-switch-us"
-#. (for toggle switches containing the English words
-#. "ON" and "OFF") or "toggle-switch-intl" (for toggle
-#. switches containing "◯" and "|"). Other values will
-#. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:33
-msgid "toggle-switch-us"
-msgstr ""
-
-#: ../js/ui/runDialog.js:233
+#: ../js/ui/runDialog.js:235
 msgid "Please enter a command:"
 msgstr "โปรดป้อนคำสั่ง:"

-#: ../js/ui/runDialog.js:378
+#: ../js/ui/runDialog.js:380
 #, c-format
 msgid "Execution of '%s' failed:"
-msgstr "คำสั่ง '%s' ทำงานล้มเหลว:"
+msgstr ""

-#: ../js/ui/statusMenu.js:101
+#: ../js/ui/statusMenu.js:91
 msgid "Available"
-msgstr "อยู่"
+msgstr ""
+
+#: ../js/ui/statusMenu.js:95
+msgid "Busy"
+msgstr ""
+
+#: ../js/ui/statusMenu.js:99
+msgid "Invisible"
+msgstr ""

 #: ../js/ui/statusMenu.js:106
-msgid "Busy"
-msgstr "ไม่ว่าง"
+msgid "Account Information..."
+msgstr "ข้อมูลบัญชี..."

-#: ../js/ui/statusMenu.js:114
-msgid "My Account..."
-msgstr "บัญชีของฉัน..."
+#: ../js/ui/statusMenu.js:110
+msgid "System Preferences..."
+msgstr "ปรับแต่งระบบ..."

-#: ../js/ui/statusMenu.js:118
-msgid "System Settings..."
-msgstr "ตั้งค่าระบบ..."
-
-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:117
 msgid "Lock Screen"
 msgstr "ล็อคหน้าจอ"

-#: ../js/ui/statusMenu.js:129
+#: ../js/ui/statusMenu.js:121
 msgid "Switch User"
 msgstr "สลับผู้ใช้"

-#: ../js/ui/statusMenu.js:134
+#: ../js/ui/statusMenu.js:126
 msgid "Log Out..."
 msgstr "ออกจากระบบ..."

-#: ../js/ui/statusMenu.js:141
-msgid "Suspend"
-msgstr "พักเครื่อง"
-
-#: ../js/ui/statusMenu.js:145
+#: ../js/ui/statusMenu.js:130
 msgid "Shut Down..."
 msgstr "ปิดเครื่อง..."

-#: ../js/ui/status/accessibility.js:88
-msgid "Screen Reader"
-msgstr "โปรแกรมอ่านหน้าจอ"
-
-#: ../js/ui/status/accessibility.js:91
-msgid "Screen Keyboard"
-msgstr "แป้นพิมพ์บนหน้าจอ"
-
-#: ../js/ui/status/accessibility.js:94
-msgid "Visual Alerts"
-msgstr "แจ้งเหตุด้วยภาพ"
-
-#: ../js/ui/status/accessibility.js:97
-msgid "Sticky Keys"
-msgstr "ค้างปุ่มกด"
-
-#: ../js/ui/status/accessibility.js:100
-msgid "Slow Keys"
-msgstr "พิมพ์แบบช้า"
-
-#: ../js/ui/status/accessibility.js:103
-msgid "Bounce Keys"
-msgstr "ป้องกันการกดแป้นรัว"
-
-#: ../js/ui/status/accessibility.js:106
-msgid "Mouse Keys"
-msgstr "บังคับเมาส์ด้วยแป้น"
-
-#: ../js/ui/status/accessibility.js:110
-msgid "Universal Access Settings"
-msgstr "ตั้งค่าสิ่งอำนวยความสะดวก"
-
-#: ../js/ui/status/accessibility.js:163
-msgid "High Contrast"
-msgstr "สีตัดกัน"
-
-#: ../js/ui/status/accessibility.js:205
-msgid "Large Text"
-msgstr "อักษรขนาดใหญ่"
-
-#: ../js/ui/status/accessibility.js:224
-msgid "Zoom"
-msgstr "ซูม"
-
-#: ../js/ui/windowAttentionHandler.js:43
+#: ../js/ui/windowAttentionHandler.js:47
 #, c-format
 msgid "%s has finished starting"
-msgstr "%s เปิดเสร็จแล้ว"
+msgstr ""

-#: ../js/ui/windowAttentionHandler.js:45
+#: ../js/ui/windowAttentionHandler.js:49
 #, c-format
 msgid "'%s' is ready"
 msgstr "'%s' พร้อมแล้ว"

-#: ../js/ui/workspacesView.js:229
+#: ../js/ui/workspacesView.js:237
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr ""

-#: ../js/ui/workspacesView.js:246
+#: ../js/ui/workspacesView.js:254
 msgid "Can't remove the first workspace."
 msgstr "ไม่สามารถลบพื้นที่ทำงานแรกได้"

-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1094
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] ""
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1104
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] ""
-
-#: ../src/gvc/gvc-mixer-control.c:1402
-msgid "System Sounds"
-msgstr "เสียงของระบบ"
-
-#: ../src/shell-app-system.c:1012
-msgid "Unknown"
-msgstr ""
-
-#: ../src/shell-global.c:1158
+#: ../src/shell-global.c:1025
 msgid "Less than a minute ago"
 msgstr "ไม่ถึงหนึ่งนาทีก่อน"

-#: ../src/shell-global.c:1162
+#: ../src/shell-global.c:1029
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d นาทีก่อน"

-#: ../src/shell-global.c:1167
+#: ../src/shell-global.c:1034
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ชั่วโมงก่อน"

-#: ../src/shell-global.c:1172
+#: ../src/shell-global.c:1039
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d วันก่อน"

-#: ../src/shell-global.c:1177
+#: ../src/shell-global.c:1044
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d สัปดาห์ก่อน"

-#: ../src/shell-util.c:89
+#: ../src/shell-uri-util.c:89
 msgid "Home Folder"
 msgstr "โฟลเดอร์บ้าน"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-util.c:104
+#: ../src/shell-uri-util.c:104
 msgid "File System"
 msgstr "ระบบแฟ้ม"

-#: ../src/shell-util.c:250
+#: ../src/shell-uri-util.c:250
 msgid "Search"
 msgstr "ค้นหา"

@@ -699,10 +331,7 @@ msgstr "ค้นหา"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-util.c:300
+#: ../src/shell-uri-util.c:300
 #, c-format
 msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "Account Information..."
-#~ msgstr "ข้อมูลบัญชี..."
+msgstr ""
--- a/po/ug.po
+++ b/po/ug.po
@@ -1,18 +1,17 @@
-# Uyghur translation for gnome-shell.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Gheyret Kenji<gheyret@yahoo.com>,2010.
-# Sahran <sahran.ug@gmail.com>, 2010.
-# Zeper <zeper@msn.com>, 2010.
-# 
+# Uyghur translation for gnome-shell.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Gheyret Kenji<gheyret@yahoo.com>,2010.
+# Sahran <sahran.ug@gmail.com>, 2010.
+# Zeper <zeper@msn.com>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2010-11-25 14:32+0000\n"
-"PO-Revision-Date: 2010-11-25 14:28+0600\n"
-"Last-Translator: Sahran <sahran@live.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=general\n"
+"POT-Creation-Date: 2010-11-11 00:43+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Gheyret Kenji<gheyret@yahoo.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +20,7 @@ msgstr ""

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
-msgstr "GNOME Shell"
+msgstr "GNOME چاپان"

 #: ../data/gnome-shell.desktop.in.in.h:2
 msgid "Window management and application launching"
@@ -33,7 +32,7 @@ msgstr "سائەت"

 #: ../data/gnome-shell-clock-preferences.desktop.in.in.h:2
 msgid "Customize the panel clock"
-msgstr "تاختا سائەتنى ئۆزلەشتۈرىدۇ"
+msgstr "ئىختىيارىچە تاختا سائەت"

 #: ../data/org.gnome.shell.gschema.xml.in.h:1
 msgid ""
@@ -43,32 +42,25 @@ msgstr "ئىچكى سازلاش ۋە كۆزىتىش قورالىنى زىيار

 #: ../data/org.gnome.shell.gschema.xml.in.h:2
 msgid "Custom format of the clock"
-msgstr "سائەتنىڭ ئىختىيارىي فورماتى"
+msgstr "ئىختىيارىي سائەت فورماتى"

 #: ../data/org.gnome.shell.gschema.xml.in.h:3
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr ""
-"ئىچكى قورال قوزغىتىلسا ئىجادكارلار ۋە سىنىغۇچىلارنىڭ Alt-F2 ئارقىلىق "
-"كىرىشىگە قۇلايلىق"
+msgstr "ئىچكى قورال قوزغىتىلسا ئىجادكارلار ۋە سىنىغۇچىلارنىڭ Alt-F2 ئارقىلىق كىرىشىگە قۇلايلىق"

 #: ../data/org.gnome.shell.gschema.xml.in.h:4
 msgid "File extension used for storing the screencast"
-msgstr ""
-"ئېكران كەسمىسى (screencasts) ساقلاشتا ئىشلىتىلىدىغان ھۆججەتنىڭ كېڭەيتىلگەن "
-"ئاتى "
+msgstr "ھۆججەت كېڭەيتىلگەن ئاتى ئېكران كەسمىسى (screencasts) ساقلاشقا ئىشلىتىلىدۇ"

 #: ../data/org.gnome.shell.gschema.xml.in.h:5
 msgid "Framerate used for recording screencasts."
-msgstr ""
-"ئېكران كەسمىسى (screencasts) خاتىرىلەشتە ئىشلىتىلىدىغان كاندۇك تېزلىكى."
+msgstr "كاندۇك نىسبىتى ئېكران كەسمىسى (screencasts) خاتىرىلەشكە ئىشلىتىلىدۇ"

 #: ../data/org.gnome.shell.gschema.xml.in.h:6
 msgid ""
 "GNOME Shell extensions have a uuid property; this key lists extensions which "
 "should not be loaded."
-msgstr ""
-"GNOME چاپان (Shell)كېڭەيتىلمىسىنىڭ uuid خاسلىقى بار؛ بۇ كۇنۇپكا "
-"يۈكلەنمەيدىغان كېڭەيتىلمىلەر تىزىملىكىنى كۆرسىتىدۇ."
+msgstr "GNOME چاپان (Shell)كېڭەيتىلمىسىنىڭ uuid خاسلىقى بار؛ بۇ كۇنۇپكا يۈكلەنمەيدىغان كېڭەيتىلمىلەر تىزىملىكىنى كۆرسىتىدۇ."

 #: ../data/org.gnome.shell.gschema.xml.in.h:7
 msgid "History for command (Alt-F2) dialog"
@@ -82,17 +74,13 @@ msgstr "سائەت فورماتى"
 msgid ""
 "If true and format is either \"12-hour\" or \"24-hour\", display date in the "
 "clock, in addition to time."
-msgstr ""
-"ئەگەر راست (true) بولسا سائەتتە ۋاقىت فورماتىنى «12 سائەت» ياكى «24 سائەت» "
-"كۆرسەتكەندىن سىرت چېسلانىمۇ كۆرسىتىدۇ."
+msgstr "ئەگەر راست (true) بولسا سائەتتە ۋاقىت فورماتىنى «12 سائەت» ياكى «24 سائەت» كۆرسەتكەندىن سىرت چېسلانىمۇ كۆرسىتىدۇ."

 #: ../data/org.gnome.shell.gschema.xml.in.h:10
 msgid ""
 "If true and format is either \"12-hour\" or \"24-hour\", display seconds in "
 "time."
-msgstr ""
-"ئەگەر راست (true) بولسا سائەتتە ۋاقىت فورماتىنى «12 سائەت» ياكى «24 سائەت» "
-"كۆرسەتكەندىن سىرت سېكۇنتنىمۇ كۆرسىتىدۇ. "
+msgstr "ئەگەر راست (true) بولسا سائەتتە ۋاقىت فورماتىنى «12 سائەت» ياكى «24 سائەت» كۆرسەتكەندىن سىرت سېكۇنتنىمۇ كۆرسىتىدۇ."

 #: ../data/org.gnome.shell.gschema.xml.in.h:11
 msgid "If true, display the ISO week date in the calendar."
@@ -100,11 +88,11 @@ msgstr "ئەگەر راست(true) بولسا يىلنامىدىكى ISO ھەپت

 #: ../data/org.gnome.shell.gschema.xml.in.h:12
 msgid "List of desktop file IDs for favorite applications"
-msgstr "ئامراق قوللىنىشچان پروگراممىلارنىڭ ئۈستەل ئۈستى ھۆججەت ID تىزىملىكى"
+msgstr "ئامراق پروگراممىلارنىڭ ئۈستەل ئۈستى ھۆججەت ID تىزىملىكى"

 #: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Overview workspace view mode"
-msgstr "خىزمەت رايون كۆرۈنۈش ھالىتى ھەققىدە قىسقىچە بايان"
+msgstr "قىسقىچە بايان خىزمەت رايون كۆرۈنۈش ھالىتى"

 #: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid ""
@@ -117,16 +105,6 @@ msgid ""
 "to an empty value, the default pipeline will be used. This is currently "
 "'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
 msgstr ""
-"ئۈن ئېلىشنى كودلاشتا ئىشلىتىلىدىغان GStreamer ئاقما لىنىيىنى تەڭشەيدۇ. ئۇ "
-"gst-launch گرامماتىكىسىغا بوي سۇنىدۇ. بۇ ئاقما لىنىيىدە ئۇلانمىغان sink pad "
-"بولۇشى لازىم، خاتىرىلىنىدىغان سىن مۇشۇ جايدا خاتىرىلىنىدۇ. بۇ لىنىيىدە "
-"ئادەتتە يەنە بىر ئۇلانمىغان مەنبە pad بولىدۇ؛ بۇ pad چىقارغان ئۇچۇرلار "
-"ھۆججەتكە يېزىلىدۇ. ئەمما ئاقما لىنىيە ئۆزىنىڭ چىقىرىشىنى بىر تەرەپ "
-"قىلالايدۇ، بۇنداق بولغاندا shout2send ئارقىلىق ياكى شۇنىڭغا ئوخشاش ئۇسۇلدا "
-"چىقىرىشنى icecast مۇلازىمېتىرىغا يوللايدۇ. ئاقما لىنىيە تەڭشەلمىگەن ياكى بوش "
-"قىممەتكە تەڭشەلگەندە كۆڭۈلدىكى ئاقما لىنىيە قوزغىتىلىدۇ. ئۇنىڭ نۆۋەتتىكى "
-"قىممىتى 'videorate ! theoraenc ! oggmux' بولۇپ، فورماتى Ogg شەكلىدە "
-"خاتىرىلىنىدۇ."

 #: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show date in clock"
@@ -134,7 +112,7 @@ msgstr "سائەت ئىچىدە چېسلا كۆرسەت"

 #: ../data/org.gnome.shell.gschema.xml.in.h:16
 msgid "Show the week date in the calendar"
-msgstr "يىلنامىدە ھەپتىنى كۆرسىتىدۇ"
+msgstr "يىلنامىدە ھەپتە كۆرسەت"

 #: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid "Show time with seconds"
@@ -151,30 +129,23 @@ msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
 "a different container format."
-msgstr ""
-"خاتىرىلەنگەن ئېكراننىڭ ھۆججەت ئاتى نۆۋەتتىكى چېسلا ئاساسىدا بىردىنبىر بولۇپ "
-"بۇ كېڭەيتىلگەن ئاتىنى ئىشلىتىدۇ. ئۇ ئۆزگەرسە ئوخشاش بولمىغان قاچا فورماتىدا "
-"خاتىرىلەيدۇ."
+msgstr "خاتىرىلەنگەن ئېكراننىڭ ھۆججەت ئاتى نۆۋەتتىكى چېسلا ئاساسىدا بىردىنبىر بولۇپ بۇ كېڭەيتىلگەن ئاتىنى ئىشلىتىدۇ. ئۇ ئۆزگەرسە ئوخشاش بولمىغان قاچا فورماتىدا خاتىرىلەيدۇ."

 #: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
-msgstr ""
-"GNOME Shell ئېكران خاتىرىلىگۈچ ھەر سېكۇنتتا خاتىرىلەيدىغان ئېكران كەسمىسى "
-"كاندۇك سۈرىتى(ھەر سېكۇنتتىكى كاندۇك سانى)."
+msgstr "GNOME Shell ئېكران خاتىرىلىگۈچ ھەر سېكۇنتتا خاتىرىلەيدىغان ئېكران كەسمىسى كاندۇك نىسبىتى"

 #: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "The gstreamer pipeline used to encode the screencast"
-msgstr "ئېكران كەسمىسىنى كودلاشتا ئىشلىتىلىدىغان gstreamer ئاقما لىنىيىسى"
+msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid ""
 "The selected workspace view mode in the overview. Supported values are "
 "\"single\" and \"grid\"."
-msgstr ""
-"قىسقىچە باياندىكى تاللانغان خىزمەت رايونىنىڭ كۆرۈنۈش ھالىتى. ئىشلىتىشكە "
-"بولىدىغان قىممەتلەر «يەككە» ۋە «سېتكا»"
+msgstr "تاللانغان قىسقىچە مەزمۇن خىزمەت رايونى كۆرۈنۈشىدە قوللايدىغان قىممەت «يەككە» ۋە «سېتكا»"

 #: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid ""
@@ -182,11 +153,7 @@ msgid ""
 "used ones (e.g. in launchers). While this data will be kept private, you may "
 "want to disable this for privacy reasons. Please note that doing so won't "
 "remove already saved data."
-msgstr ""
-"چاپان (shell) ئادەتتىكى ئەھۋالدا كۆپ ئىشلىتىلىدىغان ئاكتىپ پروگراممىلار"
-"(مەسىلەن، ئىجرا قىلىنىۋاتقان)نى كۆزىتىدۇ. گەرچە بۇ سانلىق مەلۇماتلار مەخپىي "
-"ساقلانسىمۇ، شەخسىي سىر سەۋەبىدىن بۇنى چەكلىشىڭىز مۇمكىن. دىققەت بۇنداق "
-"قىلغاندا ئاللىبۇرۇن ساقلانغان سانلىق مەلۇماتلار چىقىرىۋېتىلمەيدۇ."
+msgstr "چاپان (shell) ئادەتتىكى ئەھۋالدا كۆپ ئىشلىتىلىدىغان ئاكتىپ پروگراممىلار(مەسىلەن، ئىجرا قىلىنىۋاتقان)نى كۆزىتىدۇ. گەرچە بۇ سانلىق مەلۇماتلار مەخپىي ساقلانسىمۇ، شەخسىي سىر سەۋەبىدىن بۇنى چەكلىشىڭىز مۇمكىن. دىققەت بۇنداق قىلغاندا ئاللىبۇرۇن ساقلانغان سانلىق مەلۇماتلار چىقىرىۋېتىلمەيدۇ."

 #: ../data/org.gnome.shell.gschema.xml.in.h:24
 msgid ""
@@ -194,11 +161,7 @@ msgid ""
 "set to \"custom\". You can use conversion specifiers understood by strftime"
 "() to obtain a specific format. See the strftime() manual for more "
 "information."
-msgstr ""
-"format (فورمات) كۇنۇپكىسى \"custom\" (ئىختىيارى) قىلىپ تەڭشەلسە بۇ كۇنۇپكا "
-"تاختا سائەت ئىشلىتىدىغان فورماتنى بەلگىلەيدۇ. سىز strftime()نىڭ فورمات "
-"بەلگىسىنى ئىشلىتىپ بەلگىلەنگەن فورماتقا ئېرىشەلەيسىز. تەپسىلاتىنى strftime() "
-"نىڭ قوللانمىسىدىن كۆرۈڭ."
+msgstr "format (فورمات) كۇنۇپكىسى \"custom\" (ئىختىيارى) قىلىپ تەڭشەلسە بۇ كۇنۇپكا تاختا سائەت ئىشلىتىدىغان فورماتنى بەلگىلەيدۇ. سىز strftime()نىڭ فورمات بەلگىسىنى ئىشلىتىپ بەلگىلەنگەن فورماتقا ئېرىشەلەيسىز. تەپسىلاتىنى strftime() نىڭ قوللانمىسىدىن كۆرۈڭ."

 #: ../data/org.gnome.shell.gschema.xml.in.h:25
 msgid ""
@@ -208,18 +171,11 @@ msgid ""
 "to \"custom\", the clock will display time according to the format specified "
 "in the custom_format key. Note that if set to either \"unix\" or \"custom\", "
 "the show_date and show_seconds keys are ignored."
-msgstr ""
-"بۇ كۇنۇپكا تاختا سائەت ئىشلەتكەن سائەت فورماتىنى بەلگىلىگەن. ئىشلەتكىلى "
-"بولىدىغان قىممىتى \"12-hour\" يەنى (12 سائەت)، \"24-hour\" يەنى (24 سائەت)،  "
-"\"unix\" ۋە \"custom\" (ئىختىيارى). ئەگەر \"unix\" قىلىپ تەڭشەلسە سائەت "
-"ئۆزلۈكىدىن يېڭى ئېرا (يەنى، 1970-01-01) دىن ئۆتكەن سېكۇنتنى ئاساس قىلىدۇ. "
-"ئەگەر \"custom\" قىلىپ تەڭشەلسە سائەت custom_format كۇنۇپكا قىممىتىگە "
-"ئاساسەن ۋاقىتنى كۆرسىتىدۇ. ئەگەر  \"unix\" ياكى \"custom\" قىلىپ تەڭشەلسە "
-"show_date ۋە show_seconds قىممىتىگە پەرۋا قىلمايدۇ"
+msgstr "بۇ كۇنۇپكا تاختا سائەت ئىشلەتكەن سائەت فورماتىنى بەلگىلىگەن. ئىشلەتكىلى بولىدىغان قىممىتى \"12-hour\" يەنى (12 سائەت)، \"24-hour\" يەنى (24 سائەت)،  \"unix\" ۋە \"custom\" (ئىختىيارى). ئەگەر \"unix\" قىلىپ تەڭشەلسە سائەت ئۆزلۈكىدىن يېڭى ئېرا (يەنى، 1970-01-01) دىن ئۆتكەن سېكۇنتنى ئاساس قىلىدۇ. ئەگەر \"custom\" قىلىپ تەڭشەلسە سائەت custom_format كۇنۇپكا قىممىتىگە ئاساسەن ۋاقىتنى كۆرسىتىدۇ. ئەگەر  \"unix\" ياكى \"custom\" قىلىپ تەڭشەلسە show_date ۋە show_seconds قىممىتىگە پەرۋا قىلمايدۇ"

 #: ../data/org.gnome.shell.gschema.xml.in.h:26
 msgid "Uuids of extensions to disable"
-msgstr "چەكلىنىدىغان كېڭەيتىلمىنىڭ Uuid سى"
+msgstr "كېڭەيتىلمىنىڭ Uuid چەكلەندى"

 #: ../data/org.gnome.shell.gschema.xml.in.h:27
 msgid "Whether to collect stats about applications usage"
@@ -227,18 +183,17 @@ msgstr "پروگراممىنىڭ ئىشلىتىلىشى ھەققىدىكى ست

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
 msgid "Clip the crosshairs at the center"
-msgstr "نىشانلىغۇچنى ئوتتۇرىغا توغرىلا"
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:2
 msgid "Color of the crosshairs"
-msgstr "نىشانلىغۇچنىڭ رەڭگى"
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:3
 msgid ""
 "Determines the length of the vertical and horizontal lines that make up the "
 "crosshairs."
 msgstr ""
-"نىشانلىغۇچنى ھاسىل قىلىدىغان توغرا ۋە بوي سىزىقنىڭ ئۇزۇنلۇقى بەلگىلىنىدۇ."

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:4
 msgid ""
@@ -257,7 +212,7 @@ msgstr ""
 msgid ""
 "Determines the transparency of the crosshairs, from fully opaque to fully "
 "transparent."
-msgstr "نىشانلىغۇچنىڭ سۈزۈكلۈكى تولۇق سۈزۈكتىن تولۇق تۇتۇققىچە بەلگىلىنىدۇ."
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:6
 msgid ""
@@ -268,7 +223,7 @@ msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:7
 msgid "Enable lens mode"
-msgstr "لېنزا ھالىتىنى قوزغات"
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:8
 msgid ""
@@ -285,19 +240,19 @@ msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:10
 msgid "Length of the crosshairs"
-msgstr "نىشانلىغۇچنىڭ ئېگىزلىكى"
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:11
 msgid "Magnification factor"
-msgstr "چوڭايتىش-كىچىكلىتىش نىسبىتى"
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:12
 msgid "Mouse Tracking Mode"
-msgstr "چاشقىنەك ئىزلاش ھالىتى"
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:13
 msgid "Opacity of the crosshairs"
-msgstr "نىشانلىغۇچنىڭ سۈزۈكلۈكى"
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:14
 msgid "Screen position"
@@ -309,21 +264,21 @@ msgstr "دومىلىما چوڭايتقۇچ ئۈستەل ئۈستى گىرۋەك

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:16
 msgid "Show or hide crosshairs"
-msgstr "نىشانلىغۇچنى كۆرسەت ياكى يوشۇر"
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:17
 msgid "Show or hide the magnifier"
-msgstr "لوپا ئەينەكنى كۆرسەت ياكى يوشۇر"
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:18
 msgid "Show or hide the magnifier and all of its zoom regions."
-msgstr "لوپا ئەينەك ۋە ئۇنىڭ ھەممە چوڭايتىش دائىرىسىنى كۆرسەت ياكى يوشۇرىدۇ."
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:19
 msgid ""
 "The color of the the vertical and horizontal lines that make up the "
 "crosshairs."
-msgstr "نىشانلىغۇچنى ھاسىل قىلىدىغان توغرا ۋە بوي سىزىقنىڭ رەڭگى."
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:20
 msgid ""
@@ -335,11 +290,11 @@ msgstr ""
 msgid ""
 "The power of the magnification. A value of 1.0 means no magnification. A "
 "value of 2.0 doubles the size."
-msgstr "چوڭايتىش كۈچى. 1.0 چوڭايتمايدۇ، 2.0 چوڭلۇقىنى ھەسسىلەيدۇ دېگەن مەنىدە."
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:22
 msgid "Thickness of the crosshairs"
-msgstr "نىشانلىغۇچنىڭ قېلىنلىقى"
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:23
 msgid ""
@@ -349,7 +304,7 @@ msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:24
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
-msgstr "نىشانلىغۇچنى ھاسىل قىلىدىغان توغرا ۋە بوي سىزىقنىڭ كەڭلىكى."
+msgstr ""

 #: ../data/clock-preferences.ui.h:1
 msgid "Clock Format"
@@ -361,11 +316,11 @@ msgstr "سائەت مايىللىقى"

 #: ../data/clock-preferences.ui.h:3
 msgid "Panel Display"
-msgstr "تاختا كۆرسىتىش"
+msgstr "تاختا كۆرسەت"

 #: ../data/clock-preferences.ui.h:4
 msgid "Show seco_nds"
-msgstr "سېكۇنتنى كۆرسەت(_N)"
+msgstr "سېكۇنت كۆرسەت(_N)"

 #: ../data/clock-preferences.ui.h:5
 msgid "Show the _date"
@@ -402,12 +357,12 @@ msgstr "يىغقۇچقا قوش"

 #: ../js/ui/appDisplay.js:829
 msgid "Drag here to add favorites"
-msgstr "بۇ جايغا سۆرەپ يىغقۇچقا قوش"
+msgstr "بۇ جايغا سۆرەپ قىسقۇچقا قوش"

 #: ../js/ui/appFavorites.js:88
 #, c-format
 msgid "%s has been added to your favorites."
-msgstr "%s يىغقۇچىڭىزغا قوشۇلدى."
+msgstr "%s يىغقۇچىڭىزغا قوشۇلىدۇ."

 #: ../js/ui/appFavorites.js:107
 #, c-format
@@ -420,7 +375,7 @@ msgstr "ئىزدە"

 #: ../js/ui/dash.js:473
 msgid "Searching..."
-msgstr "ئىزدەۋاتىدۇ..."
+msgstr "ئىزدەۋاتىدۇ…"

 #: ../js/ui/dash.js:487
 msgid "No matching results."
@@ -429,7 +384,7 @@ msgstr "ماس كېلىدىغان نەتىجە يوق."
 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:797 ../js/ui/placeDisplay.js:558
+#: ../js/ui/dash.js:797 ../js/ui/placeDisplay.js:554
 msgid "PLACES & DEVICES"
 msgstr "ئورۇن ۋە ئۈسكۈنىلەر"

@@ -466,72 +421,72 @@ msgstr "مەنبەنى كۆرسەت"

 #: ../js/ui/lookingGlass.js:626
 msgid "Web Page"
-msgstr "توربەت"
+msgstr "تور بەت"

 #: ../js/ui/overview.js:160
 msgid "Undo"
 msgstr "يېنىۋال"

 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:470
+#: ../js/ui/panel.js:469
 #, c-format
 msgid "Quit %s"
 msgstr "%s چېكىن"

-#: ../js/ui/panel.js:495
+#: ../js/ui/panel.js:494
 msgid "Preferences"
 msgstr "مايىللىق"

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

-#: ../js/ui/panel.js:582
+#: ../js/ui/panel.js:581
 msgid "%a %b %e, %R"
 msgstr "%a %b %e، %R"

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

-#: ../js/ui/panel.js:587
+#: ../js/ui/panel.js:586
 msgid "%a %R"
 msgstr "%a %R"

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

-#: ../js/ui/panel.js:595
+#: ../js/ui/panel.js:594
 msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e، %l:%M %p"
+msgstr "%a %b %e, %l:%M %p"

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

-#: ../js/ui/panel.js:600
+#: ../js/ui/panel.js:599
 msgid "%a %l:%M %p"
 msgstr "%p%l:%M (%a)"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:745
+#: ../js/ui/panel.js:744
 msgid "Activities"
-msgstr "پائالىيەتلەر"
+msgstr "ھەرىكەتچان"

 #: ../js/ui/placeDisplay.js:111
 #, c-format
 msgid "Failed to unmount '%s'"
-msgstr "«%s» نى ئېگەرسىزلەش مەغلۇپ بولدى"
+msgstr "%s نىڭ ئېگەرنى يېشىش مەغلۇپ بولدى."

 #: ../js/ui/placeDisplay.js:114
 msgid "Retry"
@@ -539,7 +494,7 @@ msgstr "قايتا سىنا"

 #: ../js/ui/placeDisplay.js:159
 msgid "Connect to..."
-msgstr "باغلىنىش…"
+msgstr "باغلانماق..."

 #. Translators: this MUST be either "toggle-switch-us"
 #. (for toggle switches containing the English words
@@ -548,7 +503,7 @@ msgstr "باغلىنىش…"
 #. simply result in invisible toggle switches.
 #: ../js/ui/popupMenu.js:33
 msgid "toggle-switch-us"
-msgstr "toggle-switch-us"
+msgstr ""

 #: ../js/ui/runDialog.js:233
 msgid "Please enter a command:"
@@ -557,47 +512,49 @@ msgstr "بۇيرۇق كىرگۈزۈڭ:"
 #: ../js/ui/runDialog.js:378
 #, c-format
 msgid "Execution of '%s' failed:"
-msgstr "«%s» ئىجرا قىلىش مەغلۇپ بولدى:"
+msgstr "'%s' ئىجرا قىلالمىدى:"

 #: ../js/ui/statusMenu.js:101
 msgid "Available"
-msgstr "بار"
+msgstr "ئىشلىتىلىشچان"

 #: ../js/ui/statusMenu.js:106
 msgid "Busy"
 msgstr "ئالدىراش"

-#: ../js/ui/statusMenu.js:114
-#, fuzzy
-#| msgid "My Account..."
-msgid "My Account"
-msgstr "ھېساباتىم…"
+#: ../js/ui/statusMenu.js:111
+msgid "Invisible"
+msgstr "يوشۇرۇن"

-#: ../js/ui/statusMenu.js:118
-#, fuzzy
-#| msgid "System Settings..."
-msgid "System Settings"
-msgstr "سىستېما تەڭشەكلىرى..."
+#: ../js/ui/statusMenu.js:119
+msgid "My Account..."
+msgstr ""

-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:123
+msgid "System Settings..."
+msgstr "سىستېما تەڭشەكلىرى"
+
+#: ../js/ui/statusMenu.js:130
 msgid "Lock Screen"
-msgstr "ئېكراننى قۇلۇپلاش"
-
-#: ../js/ui/statusMenu.js:129
-msgid "Switch User"
-msgstr "ئىشلەتكۈچى ئالماشتۇرۇش"
+msgstr "ئېكراننى قۇلۇپلا"

 #: ../js/ui/statusMenu.js:134
+msgid "Switch User"
+msgstr "ئىشلەتكۈچى ئالماشتۇر"
+
+#: ../js/ui/statusMenu.js:139
 msgid "Log Out..."
-msgstr "تىزىمدىن چىقىش…"
+msgstr "تىزىمدىن چىق…"

-#: ../js/ui/statusMenu.js:141
-#, fuzzy
-#| msgid "Suspend"
-msgid "Suspend..."
-msgstr "توڭلات"
+#: ../js/ui/statusMenu.js:146
+msgid "Suspend"
+msgstr "ۋاقىتلىق توختىتىش"

-#: ../js/ui/statusMenu.js:145
+#: ../js/ui/statusMenu.js:150
+msgid "Restart..."
+msgstr ""
+
+#: ../js/ui/statusMenu.js:154
 msgid "Shut Down..."
 msgstr "تاقا…"

@@ -615,33 +572,33 @@ msgstr "كۆرۈنمە ئاگاھلاندۇرۇش"

 #: ../js/ui/status/accessibility.js:97
 msgid "Sticky Keys"
-msgstr "Sticky Keys"
+msgstr "چاپلاش كۇنۇپكىسى"

 #: ../js/ui/status/accessibility.js:100
 msgid "Slow Keys"
-msgstr "Slow Keys"
+msgstr "ئاستا كۇنۇپكا"

 #: ../js/ui/status/accessibility.js:103
 msgid "Bounce Keys"
-msgstr "Bounce Keys"
+msgstr "قاڭقىش كۇنۇپكىسى"

 #: ../js/ui/status/accessibility.js:106
 msgid "Mouse Keys"
-msgstr "Mouse Keys"
+msgstr "چاشقىنەك كۇنۇپكا"

 #: ../js/ui/status/accessibility.js:110
 msgid "Universal Access Settings"
-msgstr "ئۇنىۋېرسال زىيارەت تەڭشىكى"
+msgstr "ھەممىباب زىيارەت تەڭشىكى"

 #: ../js/ui/status/accessibility.js:163
 msgid "High Contrast"
 msgstr "يۇقىرى ئاق-قارىلىقى"

-#: ../js/ui/status/accessibility.js:205
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "چوڭ تېكىست"

-#: ../js/ui/status/accessibility.js:224
+#: ../js/ui/status/accessibility.js:223
 msgid "Zoom"
 msgstr "كېڭەيت تارايت"

@@ -653,7 +610,7 @@ msgstr "%s باشلاشنى تاماملىدى"
 #: ../js/ui/windowAttentionHandler.js:45
 #, c-format
 msgid "'%s' is ready"
-msgstr "«%s» تەييار"
+msgstr "'%s' تەييار بولدى"

 #: ../js/ui/workspacesView.js:229
 msgid ""
@@ -662,7 +619,7 @@ msgstr "يېڭى خىزمەت رايونى قوشالمايدۇ چۈنكى ئە

 #: ../js/ui/workspacesView.js:246
 msgid "Can't remove the first workspace."
-msgstr "بىرىنچى خىزمەت رايونىنى چىقىرىۋەتكىلى بولمايدۇ."
+msgstr "بىرىنچى خىزمەت رايونىنى چىقىرىۋېتەلمەيدۇ."

 #. translators:
 #. * The number of sound outputs on a particular device
@@ -670,7 +627,7 @@ msgstr "بىرىنچى خىزمەت رايونىنى چىقىرىۋەتكىلى
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
-msgstr[0] "%u چىقىرىلما"
+msgstr[0] "%u چىقار"

 #. translators:
 #. * The number of sound inputs on a particular device
@@ -678,55 +635,51 @@ msgstr[0] "%u چىقىرىلما"
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
-msgstr[0] "%u كىرگۈزۈلمە"
+msgstr[0] "%u كىرگۈز"

 #: ../src/gvc/gvc-mixer-control.c:1402
 msgid "System Sounds"
 msgstr "سىستېما ئاۋازى"

-#: ../src/shell-app-system.c:1012
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#: ../src/shell-global.c:1163
+#: ../src/shell-global.c:1219
 msgid "Less than a minute ago"
 msgstr "بىر مىنۇتتىنمۇ ئىلگىرى"

-#: ../src/shell-global.c:1167
+#: ../src/shell-global.c:1223
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d مىنۇت ئىلگىرى"

-#: ../src/shell-global.c:1172
+#: ../src/shell-global.c:1228
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d سائەت ئىلگىرى"

-#: ../src/shell-global.c:1177
+#: ../src/shell-global.c:1233
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d كۈن ئىلگىرى"

-#: ../src/shell-global.c:1182
+#: ../src/shell-global.c:1238
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d ھەپتە ئىلگىرى"

-#: ../src/shell-util.c:89
+#: ../src/shell-uri-util.c:89
 msgid "Home Folder"
-msgstr "ماكان مۇندەرىجە"
+msgstr "باش مۇندەرىجە"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-util.c:104
+#: ../src/shell-uri-util.c:104
 msgid "File System"
 msgstr "ھۆججەت سىستېمىسى"

-#: ../src/shell-util.c:250
+#: ../src/shell-uri-util.c:250
 msgid "Search"
 msgstr "ئىزدە"

@@ -735,10 +688,7 @@ msgstr "ئىزدە"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-util.c:300
+#: ../src/shell-uri-util.c:300
 #, c-format
 msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s "
-
-#~ msgid "Invisible"
-#~ msgstr "يوشۇرۇن"
+msgstr "%1$s: %2$s"
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,8 @@ bin_SCRIPTS = gnome-shell gnome-shell-clock-preferences
 gnome-shell: gnome-shell.in
 	$(AM_V_GEN) sed -e "s|@MUTTER_BIN_DIR[@]|$(MUTTER_BIN_DIR)|" \
 	    -e "s|@datadir[@]|$(datadir)|" \
+	    -e "s|@GJS_JS_DIR[@]|$(GJS_JS_DIR)|" \
+	    -e "s|@GJS_JS_NATIVE_DIR[@]|$(GJS_JS_NATIVE_DIR)|" \
 	    -e "s|@libexecdir[@]|$(libexecdir)|" \
 	    -e "s|@libdir[@]|$(libdir)|" \
 	    -e "s|@pkgdatadir[@]|$(pkgdatadir)|" \
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -220,7 +220,7 @@ def start_shell(perf_output=None):

    # Set up environment
    env = dict(os.environ)
-    env.update({'GNOME_SHELL_JS'      : js_dir,
+    env.update({'GNOME_SHELL_JS'      : '@GJS_JS_DIR@:@GJS_JS_NATIVE_DIR@:' + js_dir,
                'PATH'                : '@MUTTER_BIN_DIR@:' + os.environ.get('PATH', ''),
                'XDG_CONFIG_DIRS'     : '@sysconfdir@/xdg:' + (os.environ.get('XDG_CONFIG_DIRS') or '/etc/xdg'),
                'XDG_DATA_DIRS'       : '@datadir@:' + (os.environ.get('XDG_DATA_DIRS') or '/usr/local/share:/usr/share'),
--- a/src/shell-generic-container.c
+++ b/src/shell-generic-container.c
@@ -245,34 +245,6 @@ shell_generic_container_finalize (GObject *object)
  G_OBJECT_CLASS (shell_generic_container_parent_class)->finalize (object);
 }

-/* Based on implementation from clutter-group.c */
-static gboolean
-shell_generic_container_get_paint_volume (ClutterActor *actor,
-                                          ClutterPaintVolume *volume)
-{
-  GList *l, *children;
-
-  children = st_container_get_children_list (ST_CONTAINER (actor));
-
-  CLUTTER_ACTOR_CLASS (shell_generic_container_parent_class)->get_paint_volume (actor, volume);
-
-  for (l = children; l != NULL; l = l->next)
-    {
-      ClutterActor *child = l->data;
-      const ClutterPaintVolume *child_volume;
-
-      /* This gets the paint volume of the child transformed into the
-       * group's coordinate space... */
-      child_volume = clutter_actor_get_transformed_paint_volume (child, actor);
-      if (!child_volume)
-        return FALSE;
-
-      clutter_paint_volume_union (volume, child_volume);
-    }
-
-  return TRUE;
-}
-
 static void
 shell_generic_container_class_init (ShellGenericContainerClass *klass)
 {
@@ -285,7 +257,6 @@ shell_generic_container_class_init (ShellGenericContainerClass *klass)
  actor_class->get_preferred_width = shell_generic_container_get_preferred_width;
  actor_class->get_preferred_height = shell_generic_container_get_preferred_height;
  actor_class->allocate = shell_generic_container_allocate;
-  actor_class->get_paint_volume = shell_generic_container_get_paint_volume;
  actor_class->paint = shell_generic_container_paint;
  actor_class->pick = shell_generic_container_pick;

--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -497,9 +497,6 @@ shell_global_set_cursor (ShellGlobal *global,
    case SHELL_CURSOR_DND_UNSUPPORTED_TARGET:
      name = "dnd-none";
      break;
-    case SHELL_CURSOR_POINTING_HAND:
-      name = "hand";
-      break;
    default:
      g_return_if_reached ();
    }
@@ -519,8 +516,6 @@ shell_global_set_cursor (ShellGlobal *global,
        case SHELL_CURSOR_DND_COPY:
          cursor_type = GDK_PLUS;
          break;
-        case SHELL_CURSOR_POINTING_HAND:
-          cursor_type = GDK_HAND2;
        case SHELL_CURSOR_DND_UNSUPPORTED_TARGET:
          cursor_type = GDK_X_CURSOR;
          break;
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -38,8 +38,7 @@ typedef enum {
  SHELL_CURSOR_DND_IN_DRAG,
  SHELL_CURSOR_DND_UNSUPPORTED_TARGET,
  SHELL_CURSOR_DND_MOVE,
-  SHELL_CURSOR_DND_COPY,
-  SHELL_CURSOR_POINTING_HAND
+  SHELL_CURSOR_DND_COPY
 } ShellCursor;

 void shell_global_set_cursor (ShellGlobal *global,
--- a/src/st/st-box-layout.c
+++ b/src/st/st-box-layout.c
@@ -876,39 +876,29 @@ st_box_layout_apply_transform (ClutterActor *a,
  cogl_matrix_translate (m, (int) -x, (int) -y, 0);
 }

-/* If we are translated, then we need to translate back before chaining
- * up or the background and borders will be drawn in the wrong place */
-static void
-get_border_paint_offsets (StBoxLayout *self,
-                          double      *x,
-                          double      *y)
-{
-  StBoxLayoutPrivate *priv = self->priv;
-
-  if (priv->hadjustment)
-    *x = st_adjustment_get_value (priv->hadjustment);
-  else
-    *x = 0;
-
-  if (priv->vadjustment)
-    *y = st_adjustment_get_value (priv->vadjustment);
-  else
-    *y = 0;
-}
-

 static void
 st_box_layout_paint (ClutterActor *actor)
 {
-  StBoxLayout *self = ST_BOX_LAYOUT (actor);
-  StBoxLayoutPrivate *priv = self->priv;
+  StBoxLayoutPrivate *priv = ST_BOX_LAYOUT (actor)->priv;
  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (actor));
  GList *l, *children;
  gdouble x, y;
  ClutterActorBox allocation_box;
  ClutterActorBox content_box;

-  get_border_paint_offsets (self, &x, &y);
+  if (priv->hadjustment)
+    x = st_adjustment_get_value (priv->hadjustment);
+  else
+    x = 0;
+
+  if (priv->vadjustment)
+    y = st_adjustment_get_value (priv->vadjustment);
+  else
+    y = 0;
+
+  /* If we are translated, then we need to translate back before chaining
+   * up or the background and borders will be drawn in the wrong place */
  if (x != 0 || y != 0)
    {
      cogl_push_matrix ();
@@ -960,15 +950,23 @@ static void
 st_box_layout_pick (ClutterActor       *actor,
                    const ClutterColor *color)
 {
-  StBoxLayout *self = ST_BOX_LAYOUT (actor);
-  StBoxLayoutPrivate *priv = self->priv;
+  StBoxLayoutPrivate *priv = ST_BOX_LAYOUT (actor)->priv;
  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (actor));
  GList *l, *children;
  gdouble x, y;
  ClutterActorBox allocation_box;
  ClutterActorBox content_box;

-  get_border_paint_offsets (self, &x, &y);
+  if (priv->hadjustment)
+    x = st_adjustment_get_value (priv->hadjustment);
+  else
+    x = 0;
+
+  if (priv->vadjustment)
+    y = st_adjustment_get_value (priv->vadjustment);
+  else
+    y = 0;
+
  if (x != 0 || y != 0)
    {
      cogl_push_matrix ();
@@ -1013,34 +1011,6 @@ st_box_layout_pick (ClutterActor       *actor,
    cogl_clip_pop ();
 }

-static gboolean
-st_box_layout_get_paint_volume (ClutterActor       *actor,
-                                ClutterPaintVolume *volume)
-{
-  StBoxLayout *self = ST_BOX_LAYOUT (actor);
-  gdouble x, y;
-
-  CLUTTER_ACTOR_CLASS (st_box_layout_parent_class)->get_paint_volume (actor, volume);
-
-  /* When scrolled, st_box_layout_apply_transform() includes the scroll offset
-   * and affects paint volumes. This is right for our children, but our paint volume
-   * is determined by our allocation and borders and doesn't scroll, so we need
-   * to reverse-compensate here, the same as we do when painting.
-   */
-  get_border_paint_offsets (self, &x, &y);
-  if (x != 0 || y != 0)
-    {
-      ClutterVertex origin;
-
-      clutter_paint_volume_get_origin (volume, &origin);
-      origin.x += x;
-      origin.y += y;
-      clutter_paint_volume_set_origin (volume, &origin);
-    }
-
-  return TRUE;
-}
-
 static void
 st_box_layout_style_changed (StWidget *self)
 {
@@ -1077,7 +1047,6 @@ st_box_layout_class_init (StBoxLayoutClass *klass)
  actor_class->apply_transform = st_box_layout_apply_transform;

  actor_class->paint = st_box_layout_paint;
-  actor_class->get_paint_volume = st_box_layout_get_paint_volume;
  actor_class->pick = st_box_layout_pick;

  widget_class->style_changed = st_box_layout_style_changed;
--- a/src/st/st-group.c
+++ b/src/st/st-group.c
@@ -3,7 +3,6 @@
 * st-group.c: A fixed layout container based on ClutterGroup
 *
 * Copyright 2010 Florian Müllner
- * Copyright 2010 Intel Corporation
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU Lesser General Public License,
@@ -231,33 +230,7 @@ st_group_hide_all (ClutterActor *actor)
                             NULL);
 }

-/* Based on implementation from clutter-group.c */
-static gboolean
-st_group_get_paint_volume (ClutterActor *actor,
-                            ClutterPaintVolume *volume)
-{
-  GList *l, *children;

-  children = st_container_get_children_list (ST_CONTAINER (actor));
-
-  CLUTTER_ACTOR_CLASS (st_group_parent_class)->get_paint_volume (actor, volume);
-
-  for (l = children; l != NULL; l = l->next)
-    {
-      ClutterActor *child = l->data;
-      const ClutterPaintVolume *child_volume;
-
-      /* This gets the paint volume of the child transformed into the
-       * group's coordinate space... */
-      child_volume = clutter_actor_get_transformed_paint_volume (child, actor);
-      if (!child_volume)
-        return FALSE;
-
-      clutter_paint_volume_union (volume, child_volume);
-    }
-
-  return TRUE;
-}


 static void
@@ -269,7 +242,6 @@ st_group_class_init (StGroupClass *klass)
  actor_class->get_preferred_height = st_group_get_preferred_height;
  actor_class->allocate = st_group_allocate;
  actor_class->paint = st_group_paint;
-  actor_class->get_paint_volume = st_group_get_paint_volume;
  actor_class->pick = st_group_pick;
  actor_class->show_all = st_group_show_all;
  actor_class->hide_all = st_group_hide_all;
--- a/src/st/st-icon.c
+++ b/src/st/st-icon.c
@@ -56,10 +56,6 @@ struct _StIconPrivate
  gint          prop_icon_size;  /* icon size set as property */
  gint          theme_icon_size; /* icon size from theme node */
  gint          icon_size;       /* icon size we are using */
-
-  CoglHandle    shadow_material;
-  float         shadow_width;
-  float         shadow_height;
 };

 static void st_icon_update               (StIcon *icon);
@@ -149,12 +145,6 @@ st_icon_dispose (GObject *gobject)
      priv->gicon = NULL;
    }

-  if (priv->shadow_material)
-    {
-      cogl_handle_unref (priv->shadow_material);
-      priv->shadow_material = COGL_INVALID_HANDLE;
-    }
-
  G_OBJECT_CLASS (st_icon_parent_class)->dispose (gobject);
 }

@@ -237,30 +227,7 @@ st_icon_paint (ClutterActor *actor)
  CLUTTER_ACTOR_CLASS (st_icon_parent_class)->paint (actor);

  if (priv->icon_texture)
-    {
-      if (priv->shadow_material)
-        {
-          StThemeNode *node = st_widget_get_theme_node (ST_WIDGET (actor));
-          StShadow *shadow_spec = st_theme_node_get_shadow (node);
-          ClutterActorBox allocation;
-          float width, height;
-
-          clutter_actor_get_allocation_box (priv->icon_texture, &allocation);
-          clutter_actor_box_get_size (&allocation, &width, &height);
-
-          allocation.x1 = (width - priv->shadow_width) / 2;
-          allocation.y1 = (height - priv->shadow_height) / 2;
-          allocation.x2 = allocation.x1 + priv->shadow_width;
-          allocation.y2 = allocation.y1 + priv->shadow_height;
-
-          _st_paint_shadow_with_opacity (shadow_spec,
-                                         priv->shadow_material,
-                                         &allocation,
-                                         clutter_actor_get_paint_opacity (priv->icon_texture));
-        }
-
-      clutter_actor_paint (priv->icon_texture);
-    }
+    clutter_actor_paint (priv->icon_texture);
 }

 static void
@@ -359,45 +326,6 @@ st_icon_init (StIcon *self)
  self->priv->icon_size = DEFAULT_ICON_SIZE;
  self->priv->prop_icon_size = -1;
  self->priv->icon_type = DEFAULT_ICON_TYPE;
-
-  self->priv->icon_texture = COGL_INVALID_HANDLE;
-  self->priv->shadow_width = -1;
-  self->priv->shadow_height = -1;
-}
-
-static void
-st_icon_update_shadow_material (StIcon *icon)
-{
-  StIconPrivate *priv = icon->priv;
-  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (icon));
-  StShadow *shadow_spec = st_theme_node_get_shadow (theme_node);
-
-  if (priv->shadow_material)
-    {
-      cogl_handle_unref (priv->shadow_material);
-      priv->shadow_material = COGL_INVALID_HANDLE;
-    }
-
-  if (shadow_spec)
-   {
-     CoglHandle material;
-     gint width, height;
-
-     clutter_texture_get_base_size (CLUTTER_TEXTURE (priv->icon_texture),
-                                    &width, &height);
-     material = _st_create_shadow_material_from_actor (shadow_spec,
-                                                       priv->icon_texture);
-     priv->shadow_material = material;
-     priv->shadow_width = width;
-     priv->shadow_height = height;
-   }
-}
-
-static void
-on_pixbuf_changed (ClutterTexture *texture,
-                   StIcon         *icon)
-{
-  st_icon_update_shadow_material (icon);
 }

 static void
@@ -438,14 +366,7 @@ st_icon_update (StIcon *icon)
                                                            priv->icon_size);
    }
  if (priv->icon_texture)
-    {
-      st_icon_update_shadow_material (icon);
-      clutter_actor_set_parent (priv->icon_texture, CLUTTER_ACTOR (icon));
-
-      /* "pixbuf-change" is actually a misnomer for "texture-changed" */
-      g_signal_connect (priv->icon_texture, "pixbuf-change",
-                        G_CALLBACK (on_pixbuf_changed), icon);
-    }
+    clutter_actor_set_parent (priv->icon_texture, CLUTTER_ACTOR (icon));
 }

 static gboolean
--- a/src/st/st-im-text.c
+++ b/src/st/st-im-text.c
@@ -181,13 +181,6 @@ st_im_text_paint (ClutterActor *actor)
    update_im_cursor_location (self);
 }

-static gboolean
-st_im_text_get_paint_volume (ClutterActor       *self,
-                             ClutterPaintVolume *volume)
-{
-  return clutter_paint_volume_set_from_allocation (volume, self);
-}
-
 /* Returns a new reference to window */
 static GdkWindow *
 window_for_actor (ClutterActor *actor)
@@ -447,7 +440,6 @@ st_im_text_class_init (StIMTextClass *klass)
  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;

--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@@ -718,7 +718,7 @@ get_length_from_term (StThemeNode *node,
  if (term->type != TERM_NUMBER)
    {
      g_warning ("Ignoring length property that isn't a number");
-      return VALUE_NOT_FOUND;
+      return FALSE;
    }

  num = term->content.num;
@@ -859,7 +859,7 @@ get_length_from_term_int (StThemeNode *node,
  GetFromTermResult result;

  result = get_length_from_term (node, term, use_parent_font, &value);
-  if (result == VALUE_FOUND)
+  if (result != VALUE_NOT_FOUND)
    *length = (int) (0.5 + value);
  return result;
 }
@@ -1053,7 +1053,7 @@ do_border_property (StThemeNode   *node,
  StSide side = (StSide)-1;
  ClutterColor color;
  gboolean color_set = FALSE;
-  int width = 0; /* suppress warning */
+  int width;
  gboolean width_set = FALSE;
  int j;

@@ -1098,8 +1098,7 @@ do_border_property (StThemeNode   *node,
              const char *ident = term->content.str->stryng->str;
              if (strcmp (ident, "none") == 0 || strcmp (ident, "hidden") == 0)
                {
-                  width = 0;
-                  width_set = TRUE;
+                  width = 0.;
                  continue;
                }
              else if (strcmp (ident, "solid") == 0)
@@ -1186,7 +1185,7 @@ do_outline_property (StThemeNode   *node,
  const char *property_name = decl->property->stryng->str + 7; /* Skip 'outline' */
  ClutterColor color;
  gboolean color_set = FALSE;
-  int width = 0; /* suppress warning */
+  int width;
  gboolean width_set = FALSE;

  if (strcmp (property_name, "") == 0)
@@ -1203,8 +1202,7 @@ do_outline_property (StThemeNode   *node,
              const char *ident = term->content.str->stryng->str;
              if (strcmp (ident, "none") == 0 || strcmp (ident, "hidden") == 0)
                {
-                  width = 0;
-                  width_set = TRUE;
+                  width = 0.;
                  continue;
                }
              else if (strcmp (ident, "solid") == 0)
@@ -2236,19 +2234,17 @@ font_variant_from_term (CRTerm       *term,
 const PangoFontDescription *
 st_theme_node_get_font (StThemeNode *node)
 {
-  /* Initialized despite _set flags to suppress compiler warnings */
-  PangoStyle font_style = PANGO_STYLE_NORMAL;
+  PangoStyle font_style;
  gboolean font_style_set = FALSE;
-  PangoVariant variant = PANGO_VARIANT_NORMAL;
+  PangoVariant variant;
  gboolean variant_set = FALSE;
-  PangoWeight weight = PANGO_WEIGHT_NORMAL;
-  gboolean weight_absolute = TRUE;
+  PangoWeight weight;
+  gboolean weight_absolute;
  gboolean weight_set = FALSE;
-  double size = 0.;
-  gboolean size_set = FALSE;
-
-  char *family = NULL;
  double parent_size;
+  double size = 0.; /* Suppress warning */
+  gboolean size_set = FALSE;
+  char *family = NULL;
  int i;

  if (node->font_desc)
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -7,7 +7,6 @@
 * Copyright 2009, 2010 Red Hat, Inc.
 * Copyright 2009 Abderrahim Kitouni
 * Copyright 2009, 2010 Florian Müllner
- * Copyright 2010 Adel Gadllah
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU Lesser General Public License,
@@ -669,31 +668,6 @@ st_widget_hide (ClutterActor *actor)
  CLUTTER_ACTOR_CLASS (st_widget_parent_class)->hide (actor);
 }

-static gboolean
-st_widget_get_paint_volume (ClutterActor *self, ClutterPaintVolume *volume)
-{
-  ClutterActorBox paint_box, alloc_box;
-  StThemeNode *theme_node;
-  ClutterVertex origin;
-
-  /* Setting the paint volume does not make sense when we don't have any allocation */
-  if (!clutter_actor_has_allocation (self))
-    return FALSE;
-
-  theme_node = st_widget_get_theme_node (ST_WIDGET(self));
-  clutter_actor_get_allocation_box (self, &alloc_box);
-  st_theme_node_get_paint_box (theme_node, &alloc_box, &paint_box);
-
-  origin.x = paint_box.x1 - alloc_box.x1;
-  origin.y = paint_box.y1 - alloc_box.y1;
-  origin.z = 0.0f;
-
-  clutter_paint_volume_set_origin (volume, &origin);
-  clutter_paint_volume_set_width (volume, paint_box.x2 - paint_box.x1);
-  clutter_paint_volume_set_height (volume, paint_box.y2 - paint_box.y1);
-
-  return TRUE;
-}


 static void
@@ -714,7 +688,6 @@ st_widget_class_init (StWidgetClass *klass)
  actor_class->get_preferred_height = st_widget_get_preferred_height;
  actor_class->allocate = st_widget_allocate;
  actor_class->paint = st_widget_paint;
-  actor_class->get_paint_volume = st_widget_get_paint_volume;
  actor_class->parent_set = st_widget_parent_set;
  actor_class->map = st_widget_map;
  actor_class->unmap = st_widget_unmap;
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,6 +24,8 @@ EXTRA_DIST += $(TEST_MISC)

 run-test.sh: run-test.sh.in
 	$(AM_V_GEN) sed \
+	    -e "s|@GJS_JS_DIR[@]|$(GJS_JS_DIR)|" \
+	    -e "s|@GJS_JS_NATIVE_DIR[@]|$(GJS_JS_NATIVE_DIR)|" \
 	    -e "s|@MUTTER_LIB_DIR[@]|$(MUTTER_LIB_DIR)|" \
 	    -e "s|@srcdir[@]|$(srcdir)|" \
 	    $< > $@ && chmod a+x $@
--- a/tests/run-test.sh.in
+++ b/tests/run-test.sh.in
@@ -31,13 +31,17 @@ srcdir=$builddir/@srcdir@
 srcdir=`cd $srcdir && pwd`

 GI_TYPELIB_PATH="@MUTTER_LIB_DIR@/mutter:$builddir/../src"
-GJS_PATH="$srcdir:$srcdir/../js"
 GJS_DEBUG_OUTPUT=stderr
 $verbose || GJS_DEBUG_TOPICS="JS ERROR;JS LOG"
 GNOME_SHELL_TESTSDIR="$srcdir/"

-export GI_TYPELIB_PATH GJS_PATH GJS_DEBUG_OUTPUT GJS_DEBUG_TOPICS GNOME_SHELL_JS GNOME_SHELL_TESTSDIR LD_PRELOAD
+export GI_TYPELIB_PATH GJS_DEBUG_OUTPUT GJS_DEBUG_TOPICS GNOME_SHELL_JS GNOME_SHELL_TESTSDIR LD_PRELOAD
+
+run_js_test_args=
+for i in $srcdir $srcdir/../js @GJS_JS_DIR@ @GJS_JS_NATIVE_DIR@ ; do
+    run_js_test_args="$run_js_test_args -I $i"
+done

 for test in $tests ; do
-    $debug $builddir/../src/run-js-test $test || exit $?
+    $debug $builddir/../src/run-js-test $run_js_test_args $test || exit $?
 done
--- a/tools/build/gnome-shell-build-setup.sh
+++ b/tools/build/gnome-shell-build-setup.sh
@@ -62,7 +62,7 @@ fi
 # libxklavier, libxml2, ORBit2, pam, python, readline,
 # spidermonkey ({mozilla,firefox,xulrunner}-js), startup-notification,
 # xdamage, icon-naming-utils, upower, libtool-ltdl, libvorbis,
-# libgcrypt, libtasn1, libgnome-keyring
+# libgcrypt, libtasn1
 #
 # Non-devel packages needed by gnome-shell and its deps:
 # glxinfo, gstreamer-plugins-base, gstreamer-plugins-good,
@@ -82,7 +82,7 @@ if test "x$system" = xUbuntu -o "x$system" = xDebian -o "x$system" = xLinuxMint
    mesa-common-dev mesa-utils libpam-dev python-dev python-gconf python-gobject
    xulrunner-dev xserver-xephyr gnome-terminal libcroco3-dev
    libgstreamer0.10-dev gstreamer0.10-plugins-base gstreamer0.10-plugins-good
-    libltdl-dev libvorbis-dev libxklavier-dev libgnome-keyring-dev libupower-glib-dev
+    libltdl-dev libvorbis-dev libxklavier-dev
    "

  if apt-cache show autopoint > /dev/null 2> /dev/null; then
@@ -120,7 +120,6 @@ if test "x$system" = xFedora ; then
    startup-notification-devel xorg-x11-server-Xephyr gnome-terminal zenity
    icon-naming-utils upower-devel libtool-ltdl-devel libvorbis-devel
    libxklavier-devel libgcrypt-devel libtasn1-devel libtasn1-tools
-    libgnome-keyring-devel
    "

  if expr $version \>= 14 > /dev/null ; then
--- a/tools/build/gnome-shell.modules
+++ b/tools/build/gnome-shell.modules
@@ -191,6 +191,35 @@
    </dependencies>
  </autotools>

+  <autotools id="gnome-keyring">
+    <branch repo="git.gnome.org" module="gnome-keyring"/>
+    <dependencies>
+       <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libnotify">
+    <branch repo="git.gnome.org" module="libnotify"/>
+    <dependencies>
+      <dep package="gtk3"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgnomekbd">
+    <branch repo="git.gnome.org" module="libgnomekbd"/>
+    <dependencies>
+      <dep package="gtk3"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-settings-daemon">
+    <branch repo="git.gnome.org" module="gnome-settings-daemon"/>
+    <dependencies>
+      <dep package="libnotify"/>
+      <dep package="gnome-desktop-3"/>
+    </dependencies>
+  </autotools>
+
  <autotools id="gnome-control-center">
    <branch repo="git.gnome.org" module="gnome-control-center"/>
    <dependencies>
@@ -209,6 +238,7 @@
        <dep package="gconf"/>
        <dep package="cairo"/>
        <dep package="libnotify"/>
+        <dep package="gnome-keyring"/>
        <dep package="libcanberra"/>
 	<dep package="gnome-control-center"/>
    </dependencies>
Author	SHA1	Message	Date
Jasper St. Pierre	9efa271888	Implement Sent signals for Telepathy. This will allow us to update our notifications when someone uses a different Telepathy client to send messages. https://bugzilla.gnome.org/show_bug.cgi?id=635991	2010-11-28 10:28:51 -05:00
Jasper St. Pierre	9ed3ce9006	Add a search provider for the session's current windows. https://bugzilla.gnome.org/show_bug.cgi?id=635989	2010-11-28 10:26:09 -05:00
Florian Müllner	b400fc2837	workspace-indicators: Add hover indication Scale up indicators on hover to hint at their clickability. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:13 +01:00
Florian Müllner	a66af6fbac	overview: Update animation Update the animation on entering/leaving the overview to only zoom the window previews and fade other elements. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:13 +01:00
Florian Müllner	1bbc138ed2	dash: Improve DND to dash and allow reordering Show a positional indicator where a new favorite will be added and make the favorites re-orderable. Also allow the removal of favorites using drag-and-drop according to the mockups. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:13 +01:00
Florian Müllner	868d4756e4	workspaces: Change handling of window-drag signals Delegate the emission of the window-drag-begin/window-drag-end signals to overview functions, as done already for other items. This will enable objects to react to those signals without having access to the workspace objects / the workspaces view. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:13 +01:00
Florian Müllner	dfa3be59dc	search-display: Change the default display to use iconGrid Current mockups display all search results as icons as used by application results, so change the default result display to use iconGrid/BaseIcon. Remove the custom application results display, as it is no longer needed. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:13 +01:00
Florian Müllner	62677336a5	overview: Add ViewSelector to the overview Add the view selector and adjust the positioning of elements in the overview. Unlike the old dash, the view selector is made public to indicate that extensions may add additional views or search providers. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:06 +01:00
Florian Müllner	264a82cbfc	workspaces: Rework workspace controls for the view selector As workspaces will appear as a particular view in the view selector, merge WorkspacesControls and WorkspacesManager to control workspaces and related controls, so that a single actor can be added to the selector instead of positioning the elements from the overview. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:06 +01:00
Florian Müllner	f8cfd9f903	workspaces-view: Swap workspace ordering for RTL locales Make the first workspace the right-most one in RTL locales, as one would expect. Update all dragging/scrolling functions to behave correctly. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:06 +01:00
Florian Müllner	13f8cd3bcf	workspaces-view: Remove MosaicView The new layout does no longer support view switching, so merge GenericWorkspacesView and SingleView, and remove MosaicView. Also rename or remove workspace properties and functions which are now unused. The grid will have a comeback with the new DND behavior. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:06 +01:00
Florian Müllner	e1f336374b	app-display: Slight cleanup and style update Being no longer an independent menu pane, both the toggle() and close() functions are no longer needed, and the view's structure can be simplified a bit. Also update the style to fit into the view selector. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:06 +01:00
Florian Müllner	0ba1387d19	Fake workspaces tab https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:06 +01:00
Florian Müllner	8832ce3a2b	view-selector: Add keyboard shortcut for view switching As the view selector is a tabbed interface, use the default keyboard shortcut of Ctrl-PageUp/PageDown of GtkNotebook for switching between views. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:06 +01:00
Florian Müllner	91d7a022a9	view-selector: Move search logic into SearchTab The view selector should only deal with view switching, so move the logic to deal with search (find-as-you-type, cancelling a search, navigating/activating results) into the SearchTab. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:11:03 +01:00
Florian Müllner	95d15725fc	Use the old dash code to implement the view selector The view selector is a tabbed interface with a search entry. Starting a search switches focus to the results' tab, ending a search moves the focus back to the previously selected tab. Activating a normal tab while a search is active cancels the search. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 05:10:21 +01:00
Florian Müllner	bb2b7d83af	search-display: Move SearchResults to a separate file With the new layout, search results will be displayed in an independent view like window previews, applications and possible future additions; it does not make much sense keeping it with the switching logic, so move the code to its own file. Also remove the dash-prefix from the relevant style classes. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 00:13:51 +01:00
Florian Müllner	0abac6f67d	dash: Move padding into the icon for Fittsability With this change, the icons' reactive area extends to the screen edge, making them good targets according to Fitts' law. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 00:13:51 +01:00
Florian Müllner	e00398e2ac	dash: Reimplement the dash based on AppWell code The new dash implementation is a single-column vertical sidebar, whose items are scaled dynamically to fit the available height. If the height is still exceeded after scaling down to a minimum item size, excess items are cut off. The now unused old dash implementation is renamed to OldDash, as its code will be used as a base for the new view selector element. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 00:13:51 +01:00
Florian Müllner	0f19492545	linear-view: Remove NewWorkspaceArea As the button to add workspaces will move to the same position as the new workspace drop area in drag mode, the latter is redundant and can be removed. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 00:13:51 +01:00
Florian Müllner	9d46a6ceea	linear-view: Remove shadows when zoomed out Overlaying inactive workspaces with a gradient to fade out the actors does no longer work when re-using the normal desktop background. If we keep the current DND behavior, we probably want to implement a real fade effect - for now, just remove the visually disruptive shadows. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 00:13:51 +01:00
Florian Müllner	6432de95cc	overview: Do not zoom the desktop background While scaling the desktop background with the window previews represents workspaces quite intuitively, the approach is not without problems. As window previews in the overview behave quite differently to "real" windows, the representation of workspaces as miniature versions of "real" workspaces is flawed. The scaling also makes the transitions to and from the overview much more visually expensive, without adding much benefit. Leaving the background in place provides more visual stability to the transitions and emphasizes the distinctive behavior of elements in the overview. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-19 00:13:46 +01:00
Florian Müllner	738fc375c0	overview: Replace InfoBar with message tray notifications The layout of recent mockups occupies the space previously reserved for the info bar with the view selector. As the bar's purpose is mainly to provide the user with feedback, it makes sense to use the existing message tray facility instead of moving the bar elsewhere. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-18 20:35:55 +01:00
Florian Müllner	4e9a530a64	linear-view: Remove the scrollbar The scrollbar is the main culprit for cluttered controls in the linear view - all its functionality is already provided by the workspace indicators, so it is save to remove the scrollbar in order to clean up the interface. https://bugzilla.gnome.org/show_bug.cgi?id=634948	2010-11-18 20:35:55 +01:00