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
172 changed files with 8953 additions and 24612 deletions
--- a/.gitignore
+++ b/.gitignore
@ -18,12 +18,13 @@ config
 configure
 data/gnome-shell.desktop
 data/gnome-shell.desktop.in
+data/gnome-shell-clock-preferences.desktop
+data/gnome-shell-clock-preferences.desktop.in
 data/gschemas.compiled
 data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
 data/org.gnome.accessibility.magnifier.gschema.xml
 data/org.gnome.accessibility.magnifier.gschema.valid
-js/misc/config.js
 intltool-extract.in
 intltool-merge.in
 intltool-update.in
@ -44,13 +45,12 @@ src/Makefile
 src/Makefile.in
 src/gnomeshell-taskpanel
 src/gnome-shell
+src/gnome-shell-clock-preferences
 src/run-js-test
 src/test-recorder
 src/test-recorder.ogg
 src/test-theme
 src/st.h
-src/stamp-st.h
-src/stamp-st.h.tmp
 stamp-h1
 tests/run-test.sh
 xmldocs.make
--- a/configure.ac
+++ b/configure.ac
@ -1,14 +1,11 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[2.91.5],[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])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])

-AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"])
-AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"])
-
 AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip foreign])
 AM_MAINTAINER_MODE

@ -60,20 +57,16 @@ fi

 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)

-CLUTTER_MIN_VERSION=1.5.15
-GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=0.7.8
-MUTTER_MIN_VERSION=2.91.4
-GTK_MIN_VERSION=2.91.7
+CLUTTER_MIN_VERSION=1.3.14
+GOBJECT_INTROSPECTION_MIN_VERSION=0.6.11
+GJS_MIN_VERSION=0.7
+MUTTER_MIN_VERSION=2.91.0
+GTK_MIN_VERSION=2.91.0
 GIO_MIN_VERSION=2.25.9
-LIBECAL_REQUIRED=1.6.0
-LIBEDATASERVER_REQUIRED=1.2.0
-LIBEDATASERVERUI_REQUIRED=1.2.0
-

 # Collect more than 20 libraries for a prize!
 PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION
-                                 gio-unix-2.0 dbus-glib-1 libxml-2.0
+                                 gio-unix-2.0 dbus-glib-1
                                 gtk+-3.0 >= $GTK_MIN_VERSION
                                 mutter-plugins >= $MUTTER_MIN_VERSION
                                 gjs-internals-1.0 >= $GJS_MIN_VERSION
@ -85,10 +78,6 @@ PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION
                                 gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
 				 libcanberra)

-GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
-AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
-AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
-
 saved_CFLAGS=$CFLAGS
 saved_LIBS=$LIBS
 CFLAGS=$MUTTER_PLUGIN_CFLAGS
@ -98,29 +87,14 @@ AC_CHECK_FUNCS(JS_NewGlobalObject sn_startup_sequence_get_application_id)
 CFLAGS=$saved_CFLAGS
 LIBS=$saved_LIBS

+PKG_CHECK_MODULES(TIDY, clutter-1.0)
 PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 gnome-desktop-3.0 >= 2.90.0)
 PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+
 PKG_CHECK_MODULES(JS_TEST, clutter-x11-1.0 gjs-1.0 gobject-introspection-1.0 gtk+-3.0)

-AC_MSG_CHECKING([for bluetooth support])
-PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0],
-        [BLUETOOTH_DIR=`$PKG_CONFIG --variable=libdir gnome-bluetooth-1.0`/gnome-bluetooth
-	 BLUETOOTH_LIBS="-L'$BLUETOOTH_DIR' -lgnome-bluetooth-applet"
-	 AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
-	 AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
-	 AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
-	 AC_SUBST([HAVE_BLUETOOTH],[1])
-	 AC_MSG_RESULT([yes])],
-	[AC_DEFINE([HAVE_BLUETOOTH],[0])
-	 AC_SUBST([HAVE_BLUETOOTH],[0])
-	 AC_MSG_RESULT([no])])
-
-PKG_CHECK_MODULES(LIBECAL, libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-1.2 >= $LIBEDATASERVERUI_REQUIRED)
-AC_SUBST(LIBECAL_CFLAGS)
-AC_SUBST(LIBECAL_LIBS)
-
 MUTTER_BIN_DIR=`$PKG_CONFIG --variable=exec_prefix mutter-plugins`/bin
 # FIXME: metacity-plugins.pc should point directly to its .gir file
 MUTTER_LIB_DIR=`$PKG_CONFIG --variable=libdir mutter-plugins`
@ -129,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)
@ -179,11 +157,18 @@ changequote([,])dnl
 AC_PATH_PROG(mutter, [mutter])
 AC_SUBST(mutter)

+AC_MSG_CHECKING([if mutter was compiled with GTK+-3.0])
+if $PKG_CONFIG --libs libmutter-private | grep gtk-x11-3 >/dev/null; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([GNOME Shell requires Mutter to be compiled against GTK+-3.0])
+fi
+
 AC_CONFIG_FILES([
  Makefile
  data/Makefile
  js/Makefile
-  js/misc/config.js
  src/Makefile
  tests/Makefile
  po/Makefile.in
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -1,5 +1,5 @@
 desktopdir=$(datadir)/applications
-desktop_DATA = gnome-shell.desktop
+desktop_DATA = gnome-shell.desktop gnome-shell-clock-preferences.desktop

 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
@ -12,10 +12,7 @@ desktop_DATA = gnome-shell.desktop
 %.desktop:%.desktop.in
 	$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@

-searchprovidersdir = $(pkgdatadir)/search_providers
-dist_searchproviders_DATA =				\
-	search_providers/google.xml				\
-	search_providers/wikipedia.xml
+dist_pkgdata_DATA = clock-preferences.ui

 imagesdir = $(pkgdatadir)/images
 dist_images_DATA =				\
@ -25,13 +22,11 @@ dist_images_DATA =				\
 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
 	theme/add-workspace.svg			\
-	theme/calendar-arrow-left.svg		\
-	theme/calendar-arrow-right.svg		\
 	theme/close-window.svg			\
 	theme/close.svg				\
 	theme/corner-ripple.png			\
 	theme/dash-placeholder.svg		\
-	theme/filter-selected.svg		\
+	theme/dialog-error.svg			\
 	theme/gnome-shell.css			\
 	theme/mosaic-view-active.svg		\
 	theme/mosaic-view.svg			\
@ -92,6 +87,7 @@ install-data-local:

 EXTRA_DIST =						\
 	gnome-shell.desktop.in.in			\
+	gnome-shell-clock-preferences.desktop.in.in	\
 	$(menu_DATA)					\
 	$(gconfschema_DATA)				\
 	$(shaders_DATA)					\
@ -100,6 +96,7 @@ EXTRA_DIST =						\

 CLEANFILES =						\
 	gnome-shell.desktop.in				\
+	gnome-shell-clock-preferences.desktop.in	\
 	$(desktop_DATA)					\
 	$(gsettings_SCHEMAS)				\
 	gschemas.compiled
--- a/data/clock-preferences.ui
+++ b/data/clock-preferences.ui
@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+<interface domain="gnome-shell">
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkDialog" id="prefs-dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Clock Preferences</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">18</property>
+            <child>
+              <object class="GtkFrame" id="frame1">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment1">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <property name="right_padding">6</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkRadioButton" id="12hr_radio">
+                            <property name="label" translatable="yes">_12 hour format</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="24hr_radio">
+                            <property name="label" translatable="yes">_24 hour format</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">12hr_radio</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label_format">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Clock Format</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="frame2">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox2">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkCheckButton" id="date_check">
+                            <property name="label" translatable="yes">Show the _date</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="seconds_check">
+                            <property name="label" translatable="yes">Show seco_nds</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label_display">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Panel Display</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">6</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="prefs_close_button">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">prefs_close_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
--- a/data/gnome-shell-clock-preferences.desktop.in.in
+++ b/data/gnome-shell-clock-preferences.desktop.in.in
@ -0,0 +1,15 @@
+[Desktop Entry]
+_Name=Clock
+_Comment=Customize the panel clock
+Exec=@bindir@/gnome-shell-clock-preferences
+Icon=gnome-panel-clock
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;DesktopSettings;
+OnlyShowIn=GNOME;
+X-GNOME-ShellOnly=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-shell
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
--- a/data/gnome-shell.desktop.in.in
+++ b/data/gnome-shell.desktop.in.in
@ -7,7 +7,7 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;Core;
+Categories=GNOME;GTK;Utility;Core;
 OnlyShowIn=GNOME;
 NoDisplay=true
 X-GNOME-Autostart-Phase=WindowManager
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@ -44,20 +44,19 @@
      </schema>

      <schema>
-        <key>/schemas/desktop/gnome/shell/windows/edge_tiling</key>
-        <applyto>/desktop/gnome/shell/windows/edge_tiling</applyto>
+        <key>/schemas/desktop/gnome/shell/windows/side_by_side_tiling</key>
+        <applyto>/desktop/gnome/shell/windows/side_by_side_tiling</applyto>
        <owner>gnome-shell</owner>
        <type>bool</type>
        <default>true</default>
        <locale name="C">
-          <short>enable edge tiling when dropping windows on screen edges</short>
+          <short>enable side-by-side tiling when dropping windows on screen edges</short>
          <long>
-             If enabled, dropping windows on vertical screen edges maximizes them
+             If enabled, dropping windows on screen edges maximizes them
             vertically and resizes them horizontally to cover half of the
-             available area. Dropping windows on the top screen edge maximizes them
-             completely.
+             available area.

-             This key overrides /apps/metacity/general/edge_tiling when
+             This key overrides /apps/metacity/general/side_by_side_tiling when
             running GNOME Shell.
          </long>
        </locale>
--- a/data/gs-applications.menu
+++ b/data/gs-applications.menu
@ -1,30 +1,12 @@
 <Menu>
-	<DefaultLayout>
-		<Menuname>Accessories</Menuname>
-		<Menuname>Games</Menuname>
-		<Menuname>Graphics</Menuname>
-		<Menuname>Internet</Menuname>
-		<Menuname>Multimedia</Menuname>
-		<Menuname>Office</Menuname>
-		<Menuname>Other</Menuname>
-	</DefaultLayout>
-
+    <DefaultLayout>
+        <Menuname>Apps</Menuname>
+        <Menuname>Games</Menuname>
+        <Menuname>Tools</Menuname>
+    </DefaultLayout>
 	<Name>Applications</Name>
 	<AppDir>/usr/local/share/applications</AppDir>
 	<DefaultAppDirs/>
-
-	<Menu>
-		<Name>Accessories</Name>
-		<Include>
-			<And>
-				<Category>Utility</Category>
-				<Not>
-					<Category>System</Category>
-				</Not>
-			</And>
-		</Include>
-	</Menu>
-
 	<Menu>
 		<Name>Games</Name>
 		<Include>
@ -33,50 +15,28 @@
 			</And>
 		</Include>
 	</Menu>
-
 	<Menu>
-		<Name>Graphics</Name>
+		<Name>Tools</Name>
 		<Include>
+			<Category>Development</Category>
 			<And>
-				<Category>Graphics</Category>
+				<Category>System</Category>
+				<Not>
+					<Category>Settings</Category>
+				</Not>
 			</And>
+			<Category>Utility</Category>
 		</Include>
 	</Menu>
-
 	<Menu>
-		<Name>Internet</Name>
-		<Include>
-			<And>
-				<Category>Network</Category>
-				<Not><Category>Settings</Category></Not>
-			</And>
-		</Include>
-	</Menu>
-
-	<Menu>
-		<Name>Multimedia</Name>
-		<Include>
-			<And>
-				<Category>AudioVideo</Category>
-				<Not><Category>Settings</Category></Not>
-			</And>
-		</Include>
-	</Menu>
-
-	<Menu>
-		<Name>Office</Name>
-		<Include>
-			<And>
-				<Category>Office</Category>
-			</And>
-		</Include>
-	</Menu>
-
-	<Menu>
-		<Name>Other</Name>
+		<Name>Apps</Name>
 		<OnlyUnallocated/>
 		<Include>
 			<And>
+				<Or>
+					<Category>Documentation</Category>
+					<Not><Category>Core</Category></Not>
+				</Or>
 				<Not><Category>Settings</Category></Not>
 				<Not><Category>Screensaver</Category></Not>
 			</And>
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@ -30,17 +30,13 @@
      </_description>
    </key>
    <key name="favorite-apps" type="as">
-      <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default>
+      <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'openoffice.org-writer.desktop' ]</default>
      <_summary>List of desktop file IDs for favorite applications</_summary>
      <_description>
        The applications corresponding to these identifiers
        will be displayed in the favorites area.
      </_description>
    </key>
-    <key name="disabled-open-search-providers" type="as">
-      <default>[]</default>
-      <_summary>disabled OpenSearch providers</_summary>
-    </key>
    <key name="command-history" type="as">
      <default>[]</default>
      <_summary>History for command (Alt-F2) dialog</_summary>
@ -63,18 +59,51 @@

  <schema id="org.gnome.shell.clock" path="/apps/gnome-shell/clock/"
          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="format" type="s">
+      <default l10n="messages" context="hour_format">
+      <!-- TRANSLATORS: This is the default hour format, choose ONLY '12-hour' or '24-hour'. -->
+        "12-hour"
+      </default>
+      <_summary>Hour format</_summary>
+      <_description>
+        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.
+      </_description>
+      <choices>
+        <choice value="12-hour"/>
+        <choice value="24-hour"/>
+        <choice value="unix"/>
+        <choice value="custom"/>
+      </choices>
+    </key>
+    <key name="custom-format" type="s">
+      <default>''</default>
+      <_summary>Custom format of the clock</_summary>
+      <_description>
+        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.
+      </_description>
+    </key>
    <key name="show-seconds" type="b">
      <default>false</default>
      <_summary>Show time with seconds</_summary>
      <_description>
-        If true, display seconds in time.
+        If true and format is either "12-hour" or "24-hour", display seconds in time.
      </_description>
    </key>
    <key name="show-date" type="b">
      <default>false</default>
      <_summary>Show date in clock</_summary>
      <_description>
-        If true, display date in the clock, in addition to time.
+        If true and format is either "12-hour" or "24-hour",
+        display date in the clock, in addition to time.
      </_description>
    </key>
  </schema>
@ -101,13 +130,11 @@
        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 ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux'
-        and records to WEBM using the VP8 codec. %T is used as a placeholder
-        for a guess at the optimal thread count on the system.
+        'videorate ! theoraenc ! oggmux' and records to Ogg Theora.
      </_description>
    </key>
    <key name="file-extension" type="s">
-      <default>'webm'</default>
+      <default>'ogv'</default>
      <_summary>File extension used for storing the screencast</_summary>
      <_description>
        The filename for recorded screencasts will be a unique filename
--- a/data/search_providers/google.xml
+++ b/data/search_providers/google.xml
@ -1,7 +0,0 @@
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-<ShortName>Google</ShortName>
-<Description>Google Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
-<Url type="text/html" method="GET" template="http://www.google.com/search?q={searchTerms}"/>
-</OpenSearchDescription>
--- a/data/search_providers/wikipedia.xml
+++ b/data/search_providers/wikipedia.xml
@ -1,44 +0,0 @@
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-<ShortName>Wikipedia</ShortName>
-<Description>Wikipedia, the free encyclopedia</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image>
-<Url type="text/html" method="GET" template="http://{language}.wikipedia.org/wiki/Special:Search?search={searchTerms}"/>
-<!-- The criterion for being below is being listed with more than 100,000
-articles on http://meta.wikimedia.org/wiki/List_of_Wikipedias -->
-<Language>ar</Language>
-<Language>bg</Language>
-<Language>ca</Language>
-<Language>cs</Language>
-<Language>da</Language>
-<Language>de</Language>
-<Language>en</Language>
-<Language>eo</Language>
-<Language>es</Language>
-<Language>fa</Language>
-<Language>fi</Language>
-<Language>fr</Language>
-<Language>he</Language>
-<Language>hu</Language>
-<Language>id</Language>
-<Language>it</Language>
-<Language>ja</Language>
-<Language>ko</Language>
-<Language>lt</Language>
-<Language>nl</Language>
-<Language>no</Language>
-<Language>pl</Language>
-<Language>pt</Language>
-<Language>ro</Language>
-<Language>ru</Language>
-<Language>sk</Language>
-<Language>sl</Language>
-<Language>sr</Language>
-<Language>sv</Language>
-<Language>tr</Language>
-<Language>uk</Language>
-<Language>vi</Language>
-<Language>vo</Language>
-<Language>war</Language>
-<Language>zh</Language>
-</OpenSearchDescription>
--- a/data/theme/calendar-arrow-left.svg
+++ b/data/theme/calendar-arrow-left.svg
@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48+devel r9942 custom"
-   sodipodi:docname="New document 4">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="8.984481"
-     inkscape:cy="5.6224906"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="930"
-     inkscape:window-height="681"
-     inkscape:window-x="1892"
-     inkscape:window-y="272"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid17403"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.43015847;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="path18028"
-       sodipodi:sides="3"
-       sodipodi:cx="84.5"
-       sodipodi:cy="337.5"
-       sodipodi:r1="5"
-       sodipodi:r2="2.5"
-       sodipodi:arg1="0.52359878"
-       sodipodi:arg2="1.5707963"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 88.830127,340 80.169873,340 84.5,332.5 z"
-       transform="matrix(0,1.3621708,0.99186247,0,-325.48222,929.32667)" />
-  </g>
-</svg>
--- a/data/theme/calendar-arrow-right.svg
+++ b/data/theme/calendar-arrow-right.svg
@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48+devel r9942 custom"
-   sodipodi:docname="arrow-left.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="7.7366092"
-     inkscape:cy="6.4536271"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="930"
-     inkscape:window-height="681"
-     inkscape:window-x="1892"
-     inkscape:window-y="272"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid17403"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.43015847;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="path18028"
-       sodipodi:sides="3"
-       sodipodi:cx="84.5"
-       sodipodi:cy="337.5"
-       sodipodi:r1="5"
-       sodipodi:r2="2.5"
-       sodipodi:arg1="0.52359878"
-       sodipodi:arg2="1.5707963"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 88.830127,340 80.169873,340 84.5,332.5 z"
-       transform="matrix(0,1.3621708,-0.99186247,0,342.48324,929.32667)" />
-  </g>
-</svg>
--- a/data/theme/dialog-error.svg
+++ b/data/theme/dialog-error.svg
@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg4908"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="dialog-error.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/gnome-icon-theme/scalable/actions/process-stop.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   version="1.0">
+  <defs
+     id="defs4910">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective25" />
+    <radialGradient
+       gradientTransform="matrix(1.349881,0,0,1.349881,-3.498814,-1.810859)"
+       gradientUnits="userSpaceOnUse"
+       r="9.7183542"
+       fy="4.9892726"
+       fx="9.6893959"
+       cy="4.9892726"
+       cx="9.6893959"
+       id="radialGradient5177"
+       xlink:href="#linearGradient5171"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(2.417917,0,0,2.417917,-14.17917,-4.903184)"
+       gradientUnits="userSpaceOnUse"
+       r="9.7785711"
+       fy="3.458019"
+       fx="10"
+       cy="3.458019"
+       cx="10"
+       id="radialGradient5157"
+       xlink:href="#linearGradient5151"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.928125,0,0,0.3143011,0.7718789,12.358015)"
+       r="9.0598059"
+       fy="18.022524"
+       fx="10.739184"
+       cy="18.022524"
+       cx="10.739184"
+       id="radialGradient5145"
+       xlink:href="#linearGradient5139"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5139"
+       inkscape:collect="always">
+      <stop
+         id="stop5141"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop5143"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5151"
+       inkscape:collect="always">
+      <stop
+         id="stop5153"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop5155"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5171">
+      <stop
+         id="stop5173"
+         offset="0"
+         style="stop-color:#fe3a00;stop-opacity:1" />
+      <stop
+         id="stop5175"
+         offset="1"
+         style="stop-color:#c00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="24.442987"
+     inkscape:cy="10.142308"
+     inkscape:current-layer="g7001"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1674"
+     inkscape:window-height="970"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     width="48px"
+     height="48px"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4913">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Stop Process</dc:title>
+        <dc:date>December 2006</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Andreas Nilsson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>stop</rdf:li>
+            <rdf:li>halt</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-24)">
+    <g
+       inkscape:label="Layer 1"
+       id="g7001"
+       transform="matrix(1.4566048,0,0,1.4455352,0.4112881,1.2324709)">
+      <path
+         transform="matrix(0.91468137,0,0,0.70055266,-1.8812476,17.474032)"
+         d="m 19.79899,18.022524 a 9.0598059,3.0935922 0 1 1 -18.1196115,0 9.0598059,3.0935922 0 1 1 18.1196115,0 z"
+         sodipodi:ry="3.0935922"
+         sodipodi:rx="9.0598059"
+         sodipodi:cy="18.022524"
+         sodipodi:cx="10.739184"
+         id="path5137"
+         style="color:#000000;fill:url(#radialGradient5145);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.87347736,0,0,0.83068052,-0.79308842,15.602788)"
+         d="m 19.25,9.625 a 9.25,9.25 0 1 1 -18.5,0 9.25,9.25 0 1 1 18.5,0 z"
+         sodipodi:ry="9.25"
+         sodipodi:rx="9.25"
+         sodipodi:cy="9.625"
+         sodipodi:cx="10"
+         id="path4262"
+         style="color:#000000;fill:url(#radialGradient5177);fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:0.47435912;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.35393258;color:#000000;fill:none;stroke:url(#radialGradient5157);stroke-width:0.49999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         id="path5149"
+         sodipodi:cx="10"
+         sodipodi:cy="9.625"
+         sodipodi:rx="9.25"
+         sodipodi:ry="9.25"
+         d="m 19.25,9.625 a 9.25,9.25 0 1 1 -18.5,0 9.25,9.25 0 1 1 18.5,0 z"
+         transform="matrix(0.82868359,0,0,0.78808147,-0.34515141,16.012803)" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5159"
+         d="m 4.834121,20.642783 6.215127,5.91061"
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.21219134;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.21219146;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="M 11.04925,20.622826 4.8159529,26.553393"
+         id="path5161"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+</svg>
--- a/data/theme/filter-selected.svg
+++ b/data/theme/filter-selected.svg
@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="10"
-   height="20"
-   id="svg10003"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="filter-selected.svg">
-  <defs
-     id="defs10005">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective10011" />
-    <inkscape:perspective
-       id="perspective9998"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="10.181818"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="994"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata10008">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-44)">
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/app-picker.png"
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
-       id="rect34320"
-       d="m -0.18726572,54.181804 10.55634072,10.55636 10e-6,-21.11269 z"
-       style="opacity:0.21000001;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -17,10 +17,6 @@
 * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 */

-stage {
-    font-family: cantarell, sans-serif;
-}
-
 .shell-link {
    color: #0000ff;
    text-decoration: underline;
@ -52,6 +48,21 @@ StScrollView StScrollBar
  min-height: 16px;
 }

+StScrollView > .top-shadow
+{
+    background-gradient-direction: vertical;
+    background-gradient-start: #111111;
+    background-gradient-end: rgba(17, 17, 17, 0);
+    height: 30px;
+}
+
+StScrollView > .bottom-shadow
+{
+    background-gradient-direction: vertical;
+    background-gradient-start: rgba(17, 17, 17, 0);
+    background-gradient-end: #111111;
+    height: 30px;
+}

 StScrollBar StBin#trough {
    background-color: #080808;
@ -105,14 +116,10 @@ StTooltip StLabel {

 .popup-menu {
    color: #ffffff;
-    font-size: 14px;
+    font-size: 16px;
    min-width: 200px;
 }

-.popup-sub-menu {
-    background-color: #606060;
-}
-
 /* The remaining popup-menu sizing is all done in ems, so that if you
 * override .popup-menu.font-size, everything else will scale with it.
 */
@ -142,7 +149,6 @@ StTooltip StLabel {

 .popup-slider-menu-item {
    height: 1em;
-    min-width: 15em;
    -slider-height: 0.3em;
    -slider-background-color: #333333;
    -slider-border-color: #5f5f5f;
@ -155,7 +161,7 @@ StTooltip StLabel {
 }

 .popup-menu-icon {
-    icon-size: 1.14em;
+    icon-size: 1em;
 }

 /* Switches (to be used in menus) */
@ -182,6 +188,7 @@ StTooltip StLabel {

 #panel {
    color: #ffffff;
+    font-size: 16px;
    background-color: black;
 }

@ -212,12 +219,12 @@ StTooltip StLabel {
    border-radius: 5px;
    border-radius-bottomleft: 0px;
    border-radius-bottomright: 0px;
-    font-size: 14px;
+    font: 16px sans-serif;
    font-weight: bold;
    transition-duration: 100;
 }

-.panel-button:active, .panel-button:checked, .panel-button:pressed, .panel-button:focus {
+.panel-button:active, .panel-button:checked, .panel-button:pressed {
    background-gradient-direction: vertical;
    background-gradient-start: #3c3c3c;
    background-gradient-end: #131313;
@ -245,7 +252,7 @@ StTooltip StLabel {
 }

 .system-status-icon {
-    icon-size: 1.14em;
+    icon-size: 1em;
 }

 /* Overview */
@ -255,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;
 }
@ -274,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;
@ -300,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-background-image-shadow: -2px 2px 6px rgba(0,0,0,0.5);
-    -shell-close-overlap: 16px;
-}
-
 /* Dash */

 #dash {
@ -329,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;
@ -341,15 +390,10 @@ StTooltip StLabel {

 #viewSelector {
    spacing: 16px;
-    font-size: 16px;
-}
-
-#viewSelectorTabBar {
-    padding: 16px;
 }

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

 #searchEntry {
@ -374,7 +418,7 @@ StTooltip StLabel {
    background-gradient-direction: vertical;
    color: rgb(64, 64, 64);
    font-weight: bold;
-    box-shadow: 0px 0px 6px 2px rgba(255,255,255,0.9);
+    -st-shadow: 0px 0px 6px 2px rgba(255,255,255,0.9);
    transition-duration: 0;
 }

@ -388,18 +432,10 @@ StTooltip StLabel {
    color: #888a85;
    font-weight: bold;
    padding: 0px 12px;
-    height: 24px;
-}
-
-.view-tab-title:hover {
-    color: #bbb;
 }

 .view-tab-title:selected {
-    color: #000000;
-    background-color: #c2c7cd;
-    border-radius: 4px;
-    height: 24px;
+    color: white;
 }

 .view-tab-boxpointer {
@ -448,56 +484,65 @@ StTooltip StLabel {
    spacing: 4px;
 }

-.search-providers-box {
+/* GenericDisplay */
+
+.generic-display-container {
    spacing: 4px;
 }

-.dash-search-button {
-    background-gradient-direction: vertical;
-    background-gradient-start: rgba(255, 255, 255, 0.2);
-    background-gradient-end: rgba(255, 255, 255, 0);
-/*    border: 1px solid #808080;*/
-    border-radius: 10px;
-    height: 32px;
-    width: 300px;
+.generic-display-item {
+    height: 50px;
+    border-radius: 4px;
+    color: #ffffff;
+    font-size: 14px;
+    spacing: 4px;
 }

-.dash-search-button:selected,
-.dash-search-button:hover {
-    background-gradient-direction: vertical;
-    background-gradient-start: rgba(255, 255, 255, 0.4);
-    background-gradient-end: rgba(255, 255, 255, 0.2);
+.generic-display-item:selected {
+    background-color: rgba(79,111,173,0.66);
 }

-.dash-search-button-label {
-    color: #cccccc;
-    font-size: 16px;
+.generic-display-item-text {
+    spacing: 4px;
+}
+
+.generic-display-item-description {
+    font-size: 12px;
+    color: #bababa;
+}
+
+.generic-display-details {
+    font-size: 14px;
+    color: #ffffff;
+}
+
+.generic-display-details-name {
+    font-weight: bold;
 }

 /* Apps */

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

 .all-app {
-    padding: 16px 25px 16px 16px;
-    spacing: 20px;
+    padding: 10px;
 }

-.app-filter {
-    font-size: 14px;
-    font-weight: bold;
-    height: 40px;
-    color: #aaa;
-    width: 200px;
+.app-section-divider-container {
+    padding-top: 10px;
+    padding-bottom: 10px;
 }

-.app-filter:selected {
-    color: #ffffff;
-    background-image: url("filter-selected.svg");
-    background-position: 190px 10px;
+.app-section-divider {
+    height: 2px;
+    background-image: url("separator-white.png");
 }

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

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

 .app-well-app > .overview-icon,
@ -551,6 +595,57 @@ StTooltip StLabel {
    font-size: 12px
 }

+/* Places */
+
+.places-section {
+    spacing-columns: 4px;
+    spacing-rows: 4px;
+}
+
+.places-item-box {
+    spacing: 2px;
+}
+
+.places-item {
+    border-radius: 4px;
+    padding: 2px;
+    border: 1px solid #181818;
+    padding-left: 4px;
+    padding-right: 4px;
+    transition-duration: 100;
+}
+
+.places-item:hover {
+    border: 1px solid #666666;
+    background-gradient-direction: vertical;
+    background-gradient-start: rgba(61,61,61,0.8);
+    background-gradient-end: rgba(24,24,24,0.2);
+    transition-duration: 100;
+}
+
+/* Recent items */
+
+.recent-docs-item-box {
+    spacing: 2px;
+}
+
+.recent-docs-item {
+    border-radius: 4px;
+    padding: 2px;
+    border: 1px solid #181818;
+    padding-left: 4px;
+    padding-right: 4px;
+    transition-duration: 100;
+}
+
+.recent-docs-item:hover {
+    border: 1px solid #666666;
+    background-gradient-direction: vertical;
+    background-gradient-start: rgba(61,61,61,0.8);
+    background-gradient-end: rgba(24,24,24,0.2);
+    transition-duration: 100;
+}
+
 /* LookingGlass */

 #LookingGlassDialog
@ -674,17 +769,6 @@ StTooltip StLabel {

 /* Calendar popup */

-#calendarArea {
-    /* this is the width of the entire popup */
-    width: 600px;
-}
-
-.calendar-vertical-separator {
-    -stipple-width: 1px;
-    -stipple-color: #505050;
-    width: 1.5em;
-}
-
 #calendarPopup {
    border-radius: 5px;
    background: rgba(0,0,0,0.9);
@ -697,159 +781,37 @@ StTooltip StLabel {
 }

 .calendar {
-    padding: .4em 1.75em;
-    spacing-rows: 0px;
-    spacing-columns: 0px;
+    spacing-rows: 5px;
+    spacing-columns: 3px;
 }

-.calendar-month-label {
-    color: #666666;
-    font-size: 10px;
+.calendar-change-month {
    padding: 2px;
 }

-.calendar-change-month-back {
-    width: 20px;
-    height: 20px;
-    background-image: url("calendar-arrow-left.svg");
-    border-radius: 4px;
-}
-.calendar-change-month-back:hover {
-    background-color: #999999;
-}
-.calendar-change-month-back:active {
-    background-color: #aaaaaa;
+.calendar-change-month:hover {
+    background: #314a6c;
+    border-radius: 5px;
 }

-.calendar-change-month-forward {
-    width: 20px;
-    height: 20px;
-    background-image: url("calendar-arrow-right.svg");
-    border-radius: 4px;
-}
-.calendar-change-month-forward:hover {
-    background-color: #999999;
-}
-.calendar-change-month-forward:active {
-    background-color: #aaaaaa;
+.calendar-change-month:active {
+    background: #213050;
+    border-radius: 5px;
 }

-.datemenu-date-label {
-    padding: .4em 1.75em;
-    font-size: 16px;
-    color: #ffffff;
-}
-
-.calendar-day-base {
-    font-size: 10px;
-    text-align: center;
-    width: 24px;
-    height: 24px;
-}
-
-.calendar-day-base:hover {
-    background: #777777;
-}
-
-.calendar-day-base:active {
-    background: #555555;
-}
-
-.calendar-day-heading {
-    color: #666666;
-}
-
-.calendar-week-number {
-    color: #666666;
-    font-weight: bold;
-}
-
-/* Hack used in lieu of border-collapse - see calendar.js */
 .calendar-day {
-    border: 1px solid #333333;
-    color: #cccccc;
-    border-top-width: 0;
-    border-left-width: 0;
-}
-.calendar-day-top {
-    border-top-width: 1px;
-}
-.calendar-day-left {
-    border-left-width: 1px;
-}
-
-.calendar-work-day {
-}
-
-.calendar-nonwork-day {
-    background-color: rgba(128, 128, 128, .1);
+    padding: 1px 2px;
 }

 .calendar-today {
-    color: #ffffff;
    font-weight: bold;
-    background-gradient-direction: vertical;
-    background-gradient-start: #3c3c3c;
-    background-gradient-end: #131313;
+    background: #ffffff;
+    color: black;
+    border-radius: 5px;
 }

 .calendar-other-month-day {
-    color: #333333;
-}
-
-.calendar-day-with-events {
-    font-weight: bold;
-}
-
-.events-header-vbox {
-    spacing: 10px;
-}
-
-.events-header {
-    height: 40px;
-}
-
-.events-header-hbox {
-    spacing: 8px;
-    padding: 0.3em;
-}
-
-.events-day-header {
-    font-size: 14px;
-    color: rgba(153, 153, 153, 1.0);
-}
-
-.events-day-dayname {
-    font-size: 12px;
-    color: rgba(153, 153, 153, 1.0);
-    text-align: left;
-}
-
-.events-day-time {
-    font-size: 12px;
-    font-weight: bold;
-    color: #fff;
-    text-align: right;
-}
-
-.events-day-task {
-    font-size: 12px;
-    color: rgba(153, 153, 153, 1.0);
-}
-
-.events-day-name-box {
-    width: 20px;
-}
-
-.events-time-box {
-    width: 70px;
-}
-
-.events-event-box {
-}
-
-.url-highlighter {
-    link-color: #ccccff;
+    color: #cccccc;
 }

 /* Message Tray */
@ -898,10 +860,6 @@ StTooltip StLabel {
    height: 1em;
 }

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

-.chat-meta-message {
-    padding-left: 4px;
-    border-radius: 4px;
-    font-size: 14px;
-    color: #bbbbbb;
-}
-
-#notification StEntry {
+.chat-response {
    padding: 4px;
    border-radius: 4px;
    border: 1px solid #565656;
@ -977,14 +928,15 @@ StTooltip StLabel {
    background-color: #404040;
    caret-color: #ffffff;
    caret-size: 1px;
+    height: 18px;
 }

-#notification StEntry:focus {
+.chat-response:focus {
    border: 1px solid #3a3a3a;
    color: #545454;
    background-color: #e8e8e8;
    caret-color: #545454;
-    box-shadow: 0px 0px 6px 2px rgba(255,255,255,0.9);
+    -st-shadow: 0px 0px 6px 2px rgba(255,255,255,0.9);
 }

 /* The spacing and padding on the summary is tricky; we want to keep
@ -1006,7 +958,6 @@ StTooltip StLabel {
 }

 .summary-source {
-    color: white;
 }

 .summary-source-button {
@ -1019,11 +970,16 @@ StTooltip StLabel {
 }

 .source-title {
-    font-size: 12px;
+    font: 12px sans-serif;
    font-weight: bold;
+    color: white;
    padding-left: 4px;
 }

+.calendar-calendarweek {
+    color: #666666;
+}
+
 /* App Switcher */
 #altTabPopup {
    padding: 8px;
@ -1036,7 +992,7 @@ StTooltip StLabel {
    border-radius: 24px;
    padding: 20px;

-    font-size: 12px;
+    font: 12px sans-serif;
    color: white;
 }

@ -1069,15 +1025,6 @@ StTooltip StLabel {
    border-radius: 8px;
 }

-.switcher-list .item-box:outlined {
-    padding: 6px;
-    border: 2px solid rgba(85,85,85,1.0);
-}
-
-.switcher-list .item-box:selected {
-    background: rgba(255,255,255,0.33);
-}
-
 .switcher-list .thumbnail-box {
    padding: 2px;
    spacing: 4px;
@ -1087,6 +1034,18 @@ StTooltip StLabel {
    width:  256px;
 }

+.switcher-list .outlined-item-box {
+    padding: 6px;
+    border: 2px solid rgba(85,85,85,1.0);
+    border-radius: 8px;
+}
+
+.switcher-list .selected-item-box {
+    padding: 8px;
+    border-radius: 8px;
+    background: rgba(255,255,255,0.33);
+}
+
 .switcher-list .separator {
    width: 1px;
    background: rgba(255,255,255,0.33);
@ -1151,146 +1110,41 @@ StTooltip StLabel {
    border-radius: 8px;
 }

-/* Modal Dialogs */
-.modal-dialog {
-    font-size: 12pt;
-    border-radius: 24px;
-    background-color: rgba(0.0, 0.0, 0.0, 0.9);
-    border: 2px solid #868686;
-    color: #ffffff;
-
-    padding-right: 42px;
-    padding-left: 42px;
-    padding-bottom: 30px;
-    padding-top: 30px;
-}
-
-.modal-dialog-button {
-    border: 1px solid #8b8b8b;
-    border-radius: 18px;
-    font-size: 14px;
-
-    margin-left: 10px;
-    margin-right: 10px;
-
-    padding-left: 32px;
-    padding-right: 32px;
-    padding-top: 8px;
-    padding-bottom: 8px;
-
-    background-gradient-direction: vertical;
-    background-gradient-start: #29323b;
-    background-gradient-end: #121a24;
-}
-
-.modal-dialog-button:active,
-.modal-dialog-button:pressed {
-    border-color: #a5a5a5;
-    background-gradient-start: #121a24;
-    background-gradient-end: #29323b;
-}
-
-.modal-dialog-button:focus {
-    border: 2px solid #a5a5a5;
-
-    padding-left: 31px;
-    padding-right: 31px;
-    padding-top: 7px;
-    padding-bottom: 7px;
-}
-
 /* Run Dialog */
 .run-dialog-label {
-    font-size: 12px;
+    font: 12px sans-serif;
    color: white;
 }

+.run-dialog-error-icon {
+    background-image: url("dialog-error.svg");
+    width: 36px;
+    height: 36px;
+}
+
 .run-dialog-error-label {
-    font-size: 12px;
+    font: 16px sans-serif;
    color: white;
 }

-.run-dialog-error-box {
-    padding-top: 15px;
-    spacing: 5px;
-}
-
 .run-dialog-entry {
-    font-size: 14px;
+    font: 14px sans-serif;
    font-weight: bold;
    width: 320px;
    color: white;
 }

 .run-dialog {
-    border-radius: 16px;
-
-    padding-right: 21px;
-    padding-left: 21px;
-    padding-bottom: 15px;
-    padding-top: 15px;
+    padding: 8px;
+    border: 1px solid rgba(128,128,128,0.40);
+    border-radius: 4px;
+    background: rgba(0,0,0,0.8);
 }

 .lightbox {
    background-color: rgba(0, 0, 0, 0.4);
 }

-/* End Session Dialog */
-.end-session-dialog-subject {
-    font-size: 12pt;
-    font-weight: bold;
-    color: #666666;
-    padding-top: 10px;
-    padding-left: 17px;
-    padding-bottom: 30px;
-}
-
-.end-session-dialog-description {
-    font-size: 10pt;
-    color: white;
-    padding-left: 17px;
-    padding-right: 40px;
-    width: 16em;
-}
-
-.end-session-dialog-logout-icon {
-    border: 2px solid #8b8b8b;
-    border-radius: 5px;
-    width: 32px;
-    height: 32px;
-}
-
-.end-session-dialog-shutdown-icon {
-    width: 32px;
-    height: 32px;
-}
-
-.end-session-dialog-app-list {
-    font-size: 10pt;
-    max-height: 200px;
-    padding-top: 42px;
-    padding-bottom: 42px;
-    padding-left: 17px;
-    padding-right: 32px;
-}
-
-.end-session-dialog-app-list-item {
-    padding-right: 1em;
-}
-
-.end-session-dialog-app-list-item-icon {
-    padding-right: 17px;
-}
-
-.end-session-dialog-app-list-item-name {
-    font-size: 10pt;
-}
-
-.end-session-dialog-app-list-item-description {
-    font-size: 8pt;
-    color: #444444;
-}
-
 /* Magnifier */

 .magnifier-zoom-region {
--- a/gnome-shell.doap
+++ b/gnome-shell.doap
@ -33,7 +33,7 @@
    <foaf:Person>
      <foaf:name>Colin Walters</foaf:name>
      <foaf:mbox rdf:resource="mailto:walters@verbum.org" />
-      <gnome:userid>walters</gnome:userid>
+      <gnome:userid>cwalters</gnome:userid>
    </foaf:Person>
  </maintainer>
  <maintainer>
--- a/js/Makefile.am
+++ b/js/Makefile.am
@ -2,29 +2,26 @@
 jsdir = $(pkgdatadir)/js

 nobase_dist_js_DATA = 	\
-	misc/config.js		\
 	misc/docInfo.js		\
 	misc/fileUtils.js	\
 	misc/format.js		\
 	misc/gnomeSession.js	\
 	misc/params.js		\
 	misc/telepathy.js	\
-	misc/util.js		\
 	perf/core.js		\
+	prefs/clockPreferences.js \
 	ui/altTab.js		\
 	ui/appDisplay.js	\
 	ui/appFavorites.js	\
 	ui/boxpointer.js	\
 	ui/calendar.js		\
 	ui/chrome.js		\
-	ui/ctrlAltTab.js	\
 	ui/dash.js		\
-	ui/dateMenu.js		\
 	ui/dnd.js		\
 	ui/docDisplay.js	\
-	ui/endSessionDialog.js	\
 	ui/environment.js	\
 	ui/extensionSystem.js	\
+	ui/genericDisplay.js	\
 	ui/iconGrid.js		\
 	ui/lightbox.js		\
 	ui/link.js		\
@ -33,7 +30,6 @@ nobase_dist_js_DATA = 	\
 	ui/magnifierDBus.js	\
 	ui/main.js		\
 	ui/messageTray.js	\
-	ui/modalDialog.js	\
 	ui/notificationDaemon.js \
 	ui/overview.js		\
 	ui/panel.js		\
@ -48,10 +44,8 @@ nobase_dist_js_DATA = 	\
 	ui/statusIconDispatcher.js	\
 	ui/statusMenu.js	\
 	ui/status/accessibility.js	\
-	ui/status/keyboard.js	\
 	ui/status/power.js	\
 	ui/status/volume.js	\
-	ui/status/bluetooth.js	\
 	ui/telepathyClient.js	\
 	ui/tweener.js		\
 	ui/viewSelector.js	\
@ -59,5 +53,4 @@ nobase_dist_js_DATA = 	\
 	ui/windowManager.js	\
 	ui/workspace.js		\
 	ui/workspacesView.js	\
-	ui/workspaceSwitcherPopup.js    \
-	ui/xdndHandler.js
+	ui/workspaceSwitcherPopup.js
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@ -1,10 +0,0 @@
-/* mode: js2; indent-tabs-mode: nil; tab-size: 4 */
-/* The name of this package (not localized) */
-const PACKAGE_NAME = '@PACKAGE_NAME@';
-/* The version of this package */
-const PACKAGE_VERSION = '@PACKAGE_VERSION@';
-/* The version of GJS we're linking to */
-const GJS_VERSION = '@GJS_VERSION@';
-/* 1 if gnome-bluetooth is available, 0 otherwise */
-const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-
--- a/js/misc/docInfo.js
+++ b/js/misc/docInfo.js
@ -60,7 +60,8 @@ function getDocManager() {
 }

 /**
- * DocManager wraps the DocSystem, primarily to expose DocInfo objects.
+ * DocManager wraps the DocSystem, primarily to expose DocInfo objects
+ * which conform to the GenericDisplay item API.
 */
 function DocManager() {
    this._init();
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@ -2,7 +2,6 @@

 const DBus = imports.dbus;
 const Lang = imports.lang;
-const Signals = imports.signals;

 const PresenceIface = {
    name: 'org.gnome.SessionManager.Presence',
@ -44,60 +43,3 @@ Presence.prototype = {
    }
 };
 DBus.proxifyPrototype(Presence.prototype, PresenceIface);
-
-// Note inhibitors are immutable objects, so they don't
-// change at runtime (changes always come in the form
-// of new inhibitors)
-const InhibitorIface = {
-    name: 'org.gnome.SessionManager.Inhibitor',
-    properties: [{ name: 'app_id',
-                   signature: 's',
-                   access: 'readonly' },
-                 { name: 'client_id',
-                   signature: 's',
-                   access: 'readonly' },
-                 { name: 'reason',
-                   signature: 's',
-                   access: 'readonly' },
-                 { name: 'flags',
-                   signature: 'u',
-                   access: 'readonly' },
-                 { name: 'toplevel_xid',
-                   signature: 'u',
-                   access: 'readonly' },
-                 { name: 'cookie',
-                   signature: 'u',
-                   access: 'readonly' }],
-};
-
-function Inhibitor(objectPath) {
-    this._init(objectPath);
-}
-
-Inhibitor.prototype = {
-    _init: function(objectPath) {
-        DBus.session.proxifyObject(this,
-                                   "org.gnome.SessionManager",
-                                   objectPath);
-        this.isLoaded = false;
-        this._loadingPropertiesCount = InhibitorIface.properties.length;
-        for (let i = 0; i < InhibitorIface.properties.length; i++) {
-            let propertyName = InhibitorIface.properties[i].name;
-            this.GetRemote(propertyName, Lang.bind(this,
-                function(value, exception) {
-                    if (exception)
-                        return;
-
-                    this[propertyName] = value;
-                    this._loadingPropertiesCount--;
-
-                    if (this._loadingPropertiesCount == 0) {
-                        this.isLoaded = true;
-                        this.emit("is-loaded");
-                    }
-                }));
-        }
-    },
-};
-DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface);
-Signals.addSignalMethods(Inhibitor.prototype);
--- a/js/misc/util.js
+++ b/js/misc/util.js
@ -1,180 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Gdk = imports.gi.Gdk;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Shell = imports.gi.Shell;
-
-const Main = imports.ui.main;
-const MessageTray = imports.ui.messageTray;
-
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-/* http://daringfireball.net/2010/07/improved_regex_for_matching_urls */
-const _urlRegexp = new RegExp('\\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;
-}
-
-// spawn:
-// @argv: an argv array
-//
-// Runs @argv in the background, handling any errors that occur
-// when trying to start the program.
-function spawn(argv) {
-    try {
-        trySpawn(argv);
-    } catch (err) {
-        _handleSpawnError(argv[0], err);
-    }
-}
-
-// spawnCommandLine:
-// @command_line: a command line
-//
-// Runs @command_line in the background, handling any errors that
-// occur when trying to parse or start the program.
-function spawnCommandLine(command_line) {
-    try {
-        let [success, argc, argv] = GLib.shell_parse_argv(command_line);
-        trySpawn(argv);
-    } catch (err) {
-        _handleSpawnError(command_line, err);
-    }
-}
-
-// spawnDesktop:
-// @id: a desktop file ID
-//
-// Spawns the desktop file identified by @id using startup notification,
-// etc, handling any errors that occur when trying to find or start
-// the program.
-function spawnDesktop(id) {
-    try {
-        trySpawnDesktop(id);
-    } catch (err) {
-        _handleSpawnError(id, err);
-    }
-}
-
-// trySpawn:
-// @argv: an argv array
-//
-// Runs @argv in the background. If launching @argv fails,
-// this will throw an error.
-function trySpawn(argv)
-{
-    try {
-        GLib.spawn_async(null, argv, null,
-                         GLib.SpawnFlags.SEARCH_PATH,
-                         null, null);
-    } catch (err) {
-        if (err.code == GLib.SpawnError.G_SPAWN_ERROR_NOENT) {
-            err.message = _("Command not found");
-        } else {
-            // The exception from gjs contains an error string like:
-            //   Error invoking GLib.spawn_command_line_async: Failed to
-            //   execute child process "foo" (No such file or directory)
-            // We are only interested in the part in the parentheses. (And
-            // we can't pattern match the text, since it gets localized.)
-            err.message = err.message.replace(/.*\((.+)\)/, '$1');
-        }
-
-        throw err;
-    }
-}
-
-// trySpawnCommandLine:
-// @command_line: a command line
-//
-// Runs @command_line in the background. If launching @command_line
-// fails, this will throw an error.
-function trySpawnCommandLine(command_line) {
-    let success, argc, argv;
-
-    try {
-        [success, argc, argv] = GLib.shell_parse_argv(command_line);
-    } catch (err) {
-        // Replace "Error invoking GLib.shell_parse_argv: " with
-        // something nicer
-        err.message = err.message.replace(/[^:]*: /, _("Could not parse command:") + "\n");
-        throw err;
-    }
-
-    trySpawn(argv);
-}
-
-// trySpawnDesktop:
-// @id: a desktop file ID
-//
-// Spawns the desktop file identified by @id using startup notification.
-// On error, throws an exception.
-function trySpawnDesktop(id) {
-    let app;
-
-    // shell_app_system_load_from_desktop_file() will end up returning
-    // a stupid error message if the desktop file doesn't exist, but
-    // that's the only case it returns an error for, so we just
-    // substitute our own error in instead
-    try {
-        app = Shell.AppSystem.get_default().load_from_desktop_file(id + '.desktop');
-    } catch (err) {
-        throw new Error(_("No such application"));
-    }
-
-    try {
-        app.launch();
-    } catch(err) {
-        // see trySpawn
-        err.message = err.message.replace(/.*\((.+)\)/, '$1');
-        throw err;
-    }
-}
-
-function _handleSpawnError(command, err) {
-    let title = _("Execution of '%s' failed:").format(command);
-
-    let source = new MessageTray.SystemNotificationSource();
-    Main.messageTray.add(source);
-    let notification = new MessageTray.Notification(source, title, err.message);
-    notification.setTransient(true);
-    source.notify(notification);
-}
-
-// killall:
-// @processName: a process name
-//
-// Kills @processName. If no process with the given name is found,
-// this will fail silently.
-function killall(processName) {
-    try {
-        // pkill is more portable than killall, but on Linux at least
-        // it won't match if you pass more than 15 characters of the
-        // process name... However, if you use the '-f' flag to match
-        // the entire command line, it will work, but we have to be
-        // careful in that case that we can match
-        // '/usr/bin/processName' but not 'gedit processName.c' or
-        // whatever...
-
-        let argv = ['pkill', '-f', '^([^ ]*/)?' + processName + '($| )'];
-        GLib.spawn_sync(null, argv, null, GLib.SpawnFlags.SEARCH_PATH, null, null);
-        // It might be useful to return success/failure, but we'd need
-        // a wrapper around WIFEXITED and WEXITSTATUS. Since none of
-        // the current callers care, we don't bother.
-    } catch (e) {
-        logError(e, 'Failed to kill ' + processName);
-    }
-}
--- a/js/prefs/clockPreferences.js
+++ b/js/prefs/clockPreferences.js
@ -0,0 +1,97 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+
+const Lang = imports.lang;
+const Signals = imports.signals;
+
+const Gettext = imports.gettext;
+
+const FORMAT_KEY       = 'format';
+const SHOW_DATE_KEY    = 'show-date';
+const SHOW_SECONDS_KEY = 'show-seconds';
+
+
+function ClockPreferences(uiFile) {
+    this._init(uiFile);
+};
+
+ClockPreferences.prototype = {
+    _init: function(uiFile) {
+        let builder = new Gtk.Builder();
+        builder.add_from_file(uiFile);
+
+        this._dialog = builder.get_object('prefs-dialog');
+        this._dialog.connect('response', Lang.bind(this, this._onResponse));
+
+        this._12hrRadio = builder.get_object('12hr_radio');
+        this._24hrRadio = builder.get_object('24hr_radio');
+        this._dateCheck = builder.get_object('date_check');
+        this._secondsCheck = builder.get_object('seconds_check');
+
+        delete builder;
+
+        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.clock' });
+        this._notifyId = this._settings.connect('changed',
+                                                Lang.bind(this,
+                                                          this._updateDialog));
+
+        this._12hrRadio.connect('toggled', Lang.bind(this,
+            function() {
+                let format = this._12hrRadio.active ? '12-hour' : '24-hour';
+                this._settings.set_string(FORMAT_KEY, format);
+            }));
+        this._dateCheck.connect('toggled', Lang.bind(this,
+            function() {
+                this._settings.set_boolean(SHOW_DATE_KEY,
+                                           this._dateCheck.active);
+            }));
+        this._secondsCheck.connect('toggled', Lang.bind(this,
+            function() {
+                this._settings.set_boolean(SHOW_SECONDS_KEY,
+                                           this._secondsCheck.active);
+            }));
+
+        this._updateDialog();
+    },
+
+    show: function() {
+        this._dialog.show_all();
+    },
+
+    _updateDialog: function() {
+        let format = this._settings.get_string(FORMAT_KEY);
+        this._12hrRadio.active = (format == "12-hour");
+        this._24hrRadio.active = (format == "24-hour");
+
+        this._dateCheck.active = this._settings.get_boolean(SHOW_DATE_KEY);
+        this._secondsCheck.active = this._settings.get_boolean(SHOW_SECONDS_KEY);
+    },
+
+    _onResponse: function() {
+        this._dialog.destroy();
+        this._settings.disconnect(this._notifyId);
+        this.emit('destroy');
+    }
+};
+Signals.addSignalMethods(ClockPreferences.prototype);
+
+function main(params) {
+    if ('progName' in params)
+        GLib.set_prgname(params['progName']);
+    if ('localeDir' in params)
+        Gettext.bindtextdomain('gnome-shell', params['localeDir']);
+
+    Gtk.init(null, null);
+
+    let clockPrefs = new ClockPreferences(params['uiFile']);
+    clockPrefs.connect('destroy',
+                       function() {
+                           Gtk.main_quit();
+                       });
+    clockPrefs.show();
+
+    Gtk.main();
+}
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -15,8 +15,6 @@ const POPUP_APPICON_SIZE = 96;
 const POPUP_SCROLL_TIME = 0.10; // seconds
 const POPUP_FADE_TIME = 0.1; // seconds

-const APP_ICON_HOVER_TIMEOUT = 750; // milliseconds
-
 const DISABLE_HOVER_TIMEOUT = 500; // milliseconds

 const THUMBNAIL_DEFAULT_SIZE = 256;
@ -36,8 +34,7 @@ function AltTabPopup() {
 AltTabPopup.prototype = {
    _init : function() {
        this.actor = new Shell.GenericContainer({ name: 'altTabPopup',
-                                                  reactive: true,
-                                                  visible: false });
+                                                    reactive: true });

        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
@ -52,8 +49,6 @@ AltTabPopup.prototype = {
        this._thumbnailTimeoutId = 0;
        this._motionTimeoutId = 0;

-        this.thumbnailsVisible = false;
-
        // Initially disable hover so we ignore the enter-event if
        // the switcher appears underneath the current pointer location
        this._disableHover();
@ -131,13 +126,13 @@ AltTabPopup.prototype = {
            return false;
        this._haveModal = true;

-        this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
-        this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
+        this._keyPressEventId = global.stage.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
+        this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));

        this.actor.connect('button-press-event', Lang.bind(this, this._clickedOutside));
        this.actor.connect('scroll-event', Lang.bind(this, this._onScroll));

-        this._appSwitcher = new AppSwitcher(apps, this);
+        this._appSwitcher = new AppSwitcher(apps);
        this.actor.add_actor(this._appSwitcher.actor);
        this._appSwitcher.connect('item-activated', Lang.bind(this, this._appActivated));
        this._appSwitcher.connect('item-entered', Lang.bind(this, this._appEntered));
@ -370,18 +365,15 @@ AltTabPopup.prototype = {
    },

    destroy : function() {
-        if (this.actor.visible) {
-            Tweener.addTween(this.actor,
-                             { opacity: 0,
-                               time: POPUP_FADE_TIME,
-                               transition: 'easeOutQuad',
-                               onComplete: Lang.bind(this,
-                                   function() {
-                                       this.actor.destroy();
-                                   })
-                             });
-        } else
-            this.actor.destroy();
+        Tweener.addTween(this.actor,
+                         { opacity: 0,
+                           time: POPUP_FADE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.actor.destroy();
+                               })
+                         });
    },

    _onDestroy : function() {
@ -391,6 +383,11 @@ AltTabPopup.prototype = {
        if (this._thumbnails)
            this._destroyThumbnails();

+        if (this._keyPressEventId)
+            global.stage.disconnect(this._keyPressEventId);
+        if (this._keyReleaseEventId)
+            global.stage.disconnect(this._keyReleaseEventId);
+
        if (this._motionTimeoutId != 0)
            Mainloop.source_remove(this._motionTimeoutId);
        if (this._thumbnailTimeoutId != 0)
@ -461,15 +458,11 @@ AltTabPopup.prototype = {
    },

    _destroyThumbnails : function() {
-        let thumbnailsActor = this._thumbnails.actor;
-        Tweener.addTween(thumbnailsActor,
+        Tweener.addTween(this._thumbnails.actor,
                         { opacity: 0,
                           time: THUMBNAIL_FADE_TIME,
                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                                                            thumbnailsActor.destroy();
-                                                            this.thumbnailsVisible = false;
-                                                        })
+                           onComplete: function() { this.destroy(); }
                         });
        this._thumbnails = null;
    },
@ -485,8 +478,7 @@ AltTabPopup.prototype = {
        Tweener.addTween(this._thumbnails.actor,
                         { opacity: 255,
                           time: THUMBNAIL_FADE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function () { this.thumbnailsVisible = true; })
+                           transition: 'easeOutQuad'
                         });
    }
 };
@ -600,20 +592,16 @@ SwitcherList.prototype = {
        this._list.add_actor(bbox);

        let n = this._items.length;
-        bbox.connect('clicked', Lang.bind(this, function() { this._onItemClicked(n); }));
-        bbox.connect('enter-event', Lang.bind(this, function() { this._onItemEnter(n); }));
+        bbox.connect('clicked', Lang.bind(this, function () {
+                                               this._itemActivated(n);
+                                          }));
+        bbox.connect('enter-event', Lang.bind(this, function () {
+                                                  this._itemEntered(n);
+                                              }));

        this._items.push(bbox);
    },

-    _onItemClicked: function (index) {
-        this._itemActivated(index);
-    },
-
-    _onItemEnter: function (index) {
-        this._itemEntered(index);
-    },
-
    addSeparator: function () {
        let box = new St.Bin({ style_class: 'separator' });
        this._separator = box;
@ -621,18 +609,16 @@ SwitcherList.prototype = {
    },

    highlight: function(index, justOutline) {
-        if (this._highlighted != -1) {
-            this._items[this._highlighted].remove_style_pseudo_class('outlined');
-            this._items[this._highlighted].remove_style_pseudo_class('selected');
-        }
+        if (this._highlighted != -1)
+            this._items[this._highlighted].style_class = 'item-box';

        this._highlighted = index;

        if (this._highlighted != -1) {
            if (justOutline)
-                this._items[this._highlighted].add_style_pseudo_class('outlined');
+                this._items[this._highlighted].style_class = 'outlined-item-box';
            else
-                this._items[this._highlighted].add_style_pseudo_class('selected');
+                this._items[this._highlighted].style_class = 'selected-item-box';
        }

        let monitor = global.get_primary_monitor();
@ -832,14 +818,14 @@ AppIcon.prototype = {
    }
 };

-function AppSwitcher(apps, altTabPopup) {
-    this._init(apps, altTabPopup);
+function AppSwitcher(apps) {
+    this._init(apps);
 }

 AppSwitcher.prototype = {
    __proto__ : SwitcherList.prototype,

-    _init : function(apps, altTabPopup) {
+    _init : function(apps) {
        SwitcherList.prototype._init.call(this, true);

        // Construct the AppIcons, sort by time, add to the popup
@ -871,8 +857,6 @@ AppSwitcher.prototype = {

        this._curApp = -1;
        this._iconSize = 0;
-        this._altTabPopup = altTabPopup;
-        this._mouseTimeOutId = 0;
    },

    _getPreferredHeight: function (actor, forWidth, alloc) {
@ -880,19 +864,17 @@ AppSwitcher.prototype = {
        while(this._items.length > 1 && this._items[j].style_class != 'item-box') {
                j++;
        }
-        let themeNode = this._items[j].get_theme_node();
-        let iconPadding = themeNode.get_horizontal_padding();
-        let iconBorder = themeNode.get_border_width(St.Side.LEFT) + themeNode.get_border_width(St.Side.RIGHT);
+        let iconPadding = this._items[j].get_theme_node().get_horizontal_padding();
        let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
-        let iconSpacing = iconNaturalHeight + iconPadding + iconBorder;
+        let iconSpacing = iconNaturalHeight + iconPadding;
        let totalSpacing = this._list.spacing * (this._items.length - 1);
        if (this._separator)
           totalSpacing += this._separator.width + this._list.spacing;

        // We just assume the whole screen here due to weirdness happing with the passed width
-        let primary = global.get_primary_monitor();
+        let focus = global.get_focus_monitor();
        let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
-        let availWidth = primary.width - parentPadding - this.actor.get_theme_node().get_horizontal_padding();
+        let availWidth = focus.width - parentPadding - this.actor.get_theme_node().get_horizontal_padding();
        let height = 0;

        for(let i =  0; i < iconSizes.length; i++) {
@ -937,29 +919,6 @@ AppSwitcher.prototype = {
        }
    },

-    // We override SwitcherList's _onItemEnter method to delay
-    // activation when the thumbnail list is open
-    _onItemEnter: function (index) {
-        if (this._mouseTimeOutId != 0)
-            Mainloop.source_remove(this._mouseTimeOutId);
-        if (this._altTabPopup.thumbnailsVisible) {
-            this._mouseTimeOutId = Mainloop.timeout_add(APP_ICON_HOVER_TIMEOUT,
-                                                        Lang.bind(this, function () {
-                                                                            this._enterItem(index);
-                                                                            this._mouseTimeOutId = 0;
-                                                                            return false;
-                                                        }));
-        } else
-           this._itemEntered(index);
-    },
-
-    _enterItem: function(index) {
-        let [x, y, mask] = global.get_pointer();
-        let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y);
-        if (this._items[index].contains(pickedActor))
-            this._itemEntered(index);
-    },
-
    // We override SwitcherList's highlight() method to also deal with
    // the AppSwitcher->ThumbnailList arrows. Apps with only 1 window
    // will hide their arrows by default, but show them when their
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -29,29 +29,10 @@ function AlphabeticalView() {

 AlphabeticalView.prototype = {
    _init: function() {
-        this._grid = new IconGrid.IconGrid({ xAlign: St.Align.START });
+        this.actor = new St.BoxLayout({ vertical: true });
+        this._grid = new IconGrid.IconGrid();
        this._appSystem = Shell.AppSystem.get_default();
-
-        this._filterApp = null;
-
-        let box = new St.BoxLayout({ vertical: true });
-        box.add(this._grid.actor, { y_align: St.Align.START, expand: true });
-
-        this.actor = new St.ScrollView({ x_fill: true,
-                                         y_fill: false,
-                                         y_align: St.Align.START,
-                                         vfade: true });
-        this.actor.add_actor(box);
-        this.actor.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        this.actor.connect('notify::mapped', Lang.bind(this,
-            function() {
-                if (!this.actor.mapped)
-                    return;
-
-                let adjustment = this.actor.vscroll.adjustment;
-                let direction = Overview.SwipeScrollDirection.VERTICAL;
-                Main.overview.setScrollAdjustment(adjustment, direction);
-            }));
+        this.actor.add(this._grid.actor, { y_align: St.Align.START, expand: true });
    },

    _removeAll: function() {
@ -59,24 +40,20 @@ AlphabeticalView.prototype = {
        this._apps = [];
    },

-    _addApp: function(appInfo) {
-        let appIcon = new AppWellIcon(this._appSystem.get_app(appInfo.get_id()));
+    _addApp: function(app) {
+        let appIcon = new AppWellIcon(this._appSystem.get_app(app.get_id()));
+        appIcon.connect('launching', Lang.bind(this, function() {
+            this.emit('launching');
+        }));
+        appIcon._draggable.connect('drag-begin', Lang.bind(this, function() {
+            this.emit('drag-begin');
+        }));

        this._grid.addItem(appIcon.actor);

-        appIcon._appInfo = appInfo;
-        if (this._filterApp && !this._filterApp(appInfo))
-            appIcon.actor.hide();
-
        this._apps.push(appIcon);
    },

-    setFilter: function(filter) {
-        this._filterApp = filter;
-        for (let i = 0; i < this._apps.length; i++)
-            this._apps[i].actor.visible = filter(this._apps[i]._appInfo);
-    },
-
    refresh: function(apps) {
        let ids = [];
        for (let i in apps)
@ -93,6 +70,8 @@ AlphabeticalView.prototype = {
    }
 };

+Signals.addSignalMethods(AlphabeticalView.prototype);
+
 function ViewByCategories() {
    this._init();
 }
@ -100,79 +79,59 @@ function ViewByCategories() {
 ViewByCategories.prototype = {
    _init: function() {
        this._appSystem = Shell.AppSystem.get_default();
-        this.actor = new St.BoxLayout({ style_class: 'all-app' });
+        this.actor = new St.BoxLayout({ vertical: true });
        this.actor._delegate = this;
-
-        this._view = new AlphabeticalView();
-
-        this._filters = new St.BoxLayout({ vertical: true });
-        this.actor.add(this._view.actor, { expand: true, x_fill: true, y_fill: true });
-        this.actor.add(this._filters, { expand: false, y_fill: false, y_align: St.Align.START });
-
        this._sections = [];
    },

-    _selectCategory: function(num) {
-        if (num != -1)
-            this._allFilter.remove_style_pseudo_class('selected');
-        else
-            this._allFilter.add_style_pseudo_class('selected');
-
-        this._view.setFilter(Lang.bind(this, function(app) {
-            if (num == -1)
-                return true;
-            return this._sections[num].name == app.get_section();
-        }));
-
-        for (let i = 0; i < this._sections.length; i++) {
-            if (i == num)
-                this._sections[i].filterActor.add_style_pseudo_class('selected');
-            else
-                this._sections[i].filterActor.remove_style_pseudo_class('selected');
-        }
-    },
-
-    _addFilter: function(name, num) {
-        let button = new St.Button({ label: name,
-                                     style_class: 'app-filter',
-                                     x_align: St.Align.START });
-        this._filters.add(button, { expand: true, x_fill: true, y_fill: false });
-        button.connect('clicked', Lang.bind(this, function() {
-            this._selectCategory(num);
-        }));
-
-        if (num != -1)
-            this._sections[num] = { filterActor: button,
-                                    name: name };
-        else
-            this._allFilter = button;
-    },
-
-    _removeAll: function() {
-        this._sections = [];
-        this._filters.destroy_children();
-    },
-
-    refresh: function(apps) {
+    _updateSections: function(apps) {
        this._removeAll();

        let sections = this._appSystem.get_sections();
-        this._apps = apps;
-        this._view.refresh(apps);
-
-        /* Translators: Filter to display all applications */
-        this._addFilter(_("All"), -1);
-
        if (!sections)
            return;
+        for (let i = 0; i < sections.length; i++) {
+            if (i) {
+                let actor = new St.Bin({ style_class: 'app-section-divider' });
+                let divider = new St.Bin({ style_class: 'app-section-divider-container',
+                                           child: actor,
+                                           x_fill: true });

-        for (let i = 0; i < sections.length; i++)
-            this._addFilter(sections[i], i);
+                this.actor.add(divider, { y_fill: false, expand: true });
+            }
+            let _apps = apps.filter(function(app) {
+                return app.get_section() == sections[i];
+            });
+            this._sections[i] = { view: new AlphabeticalView(),
+                                  apps: _apps,
+                                  name: sections[i] };
+            this._sections[i].view.connect('launching', Lang.bind(this, function() {
+                this.emit('launching');
+            }));
+            this._sections[i].view.connect('drag-begin', Lang.bind(this, function() {
+                this.emit('drag-begin');
+            }));
+            this.actor.add(this._sections[i].view.actor, { y_align: St.Align.START, expand: true });
+        }
+    },

-        this._selectCategory(-1);
+    _removeAll: function() {
+        this.actor.destroy_children();
+        this._sections.forEach(function (section) { section.view.disconnectAll(); });
+
+        this._sections = [];
+    },
+
+    refresh: function(apps) {
+        this._updateSections(apps);
+        for (let i = 0; i < this._sections.length; i++) {
+            this._sections[i].view.refresh(this._sections[i].apps);
+        }
    }
 };

+Signals.addSignalMethods(ViewByCategories.prototype);
+
 /* This class represents a display containing a collection of application items.
 * The applications are sorted based on their name.
 */
@ -187,8 +146,17 @@ AllAppDisplay.prototype = {
            Main.queueDeferredWork(this._workId);
        }));

+        this._scrollView = new St.ScrollView({ x_fill: true,
+                                               y_fill: false,
+                                               vshadows: true });
+        this.actor = new St.Bin({ style_class: 'all-app',
+                                  y_align: St.Align.START,
+                                  child: this._scrollView });
+
        this._appView = new ViewByCategories();
-        this.actor = new St.Bin({ child: this._appView.actor, x_fill: true, y_fill: true });
+        this._scrollView.add_actor(this._appView.actor);
+
+        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);

        this._workId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._redisplay));
    },
@ -201,6 +169,8 @@ AllAppDisplay.prototype = {
        this._appView.refresh(apps);
    }
 };
+Signals.addSignalMethods(AllAppDisplay.prototype);
+

 function BaseAppSearchProvider() {
    this._init();
@ -290,21 +260,21 @@ PrefsSearchProvider.prototype = {
    }
 };

-function AppIcon(app, params) {
-    this._init(app, params);
+function AppIcon(app) {
+    this._init(app);
 }

 AppIcon.prototype = {
    __proto__:  IconGrid.BaseIcon.prototype,

-    _init : function(app, params) {
+    _init : function(app) {
        this.app = app;

        let label = this.app.get_name();

        IconGrid.BaseIcon.prototype._init.call(this,
                                               label,
-                                               params);
+                                               { setSizeManually: true });
    },

    createIcon: function(iconSize) {
@ -312,12 +282,12 @@ AppIcon.prototype = {
    }
 };

-function AppWellIcon(app, iconParams) {
-    this._init(app, iconParams);
+function AppWellIcon(app) {
+    this._init(app);
 }

 AppWellIcon.prototype = {
-    _init : function(app, iconParams) {
+    _init : function(app) {
        this.app = app;
        this.actor = new St.Clickable({ style_class: 'app-well-app',
                                         reactive: true,
@ -325,7 +295,7 @@ AppWellIcon.prototype = {
                                         y_fill: true });
        this.actor._delegate = this;

-        this.icon = new AppIcon(app, iconParams);
+        this.icon = new AppIcon(app);
        this.actor.set_child(this.icon.actor);

        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
@ -521,11 +491,7 @@ AppIconMenu.prototype = {
    __proto__: PopupMenu.PopupMenu.prototype,

    _init: function(source) {
-        let side = St.Side.LEFT;
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
-            side = St.Side.RIGHT;
-
-        PopupMenu.PopupMenu.prototype._init.call(this, source.actor, St.Align.MIDDLE, side, 0);
+        PopupMenu.PopupMenu.prototype._init.call(this, source.actor, St.Align.MIDDLE, St.Side.LEFT, 0);

        this._source = source;

--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@ -11,7 +11,7 @@ const POPUP_ANIMATION_TIME = 0.15;

 /**
 * BoxPointer:
- * @side: side to draw the arrow on
+ * @side: A St.Side type; currently only St.Side.TOP is implemented
 * @binProperties: Properties to set on contained bin
 *
 * An actor which displays a triangle "arrow" pointing to a given
@ -42,7 +42,7 @@ BoxPointer.prototype = {
        this.bin.raise(this._border);
    },

-    show: function(animate, onComplete) {
+    animateAppear: function(onComplete) {
        let x = this.actor.x;
        let y = this.actor.y;
        let themeNode = this.actor.get_theme_node();
@ -51,21 +51,19 @@ BoxPointer.prototype = {
        this.actor.opacity = 0;
        this.actor.show();

-        if (animate) {
-            switch (this._arrowSide) {
-                case St.Side.TOP:
-                    this.actor.y -= rise;
-                    break;
-                case St.Side.BOTTOM:
-                    this.actor.y += rise;
-                    break;
-                case St.Side.LEFT:
-                    this.actor.x -= rise;
-                    break;
-                case St.Side.RIGHT:
-                    this.actor.x += rise;
-                    break;
-            }
+        switch (this._arrowSide) {
+            case St.Side.TOP:
+                this.actor.y -= rise;
+                break;
+            case St.Side.BOTTOM:
+                this.actor.y += rise;
+                break;
+            case St.Side.LEFT:
+                this.actor.x -= rise;
+                break;
+            case St.Side.RIGHT:
+                this.actor.x += rise;
+                break;
        }

        Tweener.addTween(this.actor, { opacity: 255,
@ -76,7 +74,7 @@ BoxPointer.prototype = {
                                       time: POPUP_ANIMATION_TIME });
    },

-    hide: function(animate, onComplete) {
+    animateDisappear: function(onComplete) {
        let x = this.actor.x;
        let y = this.actor.y;
        let originalX = this.actor.x;
@ -84,21 +82,19 @@ BoxPointer.prototype = {
        let themeNode = this.actor.get_theme_node();
        let rise = themeNode.get_length('-arrow-rise');

-        if (animate) {
-            switch (this._arrowSide) {
-                case St.Side.TOP:
-                    y += rise;
-                    break;
-                case St.Side.BOTTOM:
-                    y -= rise;
-                    break;
-                case St.Side.LEFT:
-                    x += rise;
-                    break;
-                case St.Side.RIGHT:
-                    x -= rise;
-                    break;
-            }
+        switch (this._arrowSide) {
+            case St.Side.TOP:
+                y += rise;
+                break;
+            case St.Side.BOTTOM:
+                y -= rise;
+                break;
+            case St.Side.LEFT:
+                x += rise;
+                break;
+            case St.Side.RIGHT:
+                x -= rise;
+                break;
        }

        Tweener.addTween(this.actor, { opacity: 0,
@ -276,9 +272,7 @@ BoxPointer.prototype = {
        // edge by the same distance as the main part of the box is
        // separated from its sourceActor
        let primary = global.get_primary_monitor();
-        let themeNode = this.actor.get_theme_node();
-        let arrowRise = themeNode.get_length('-arrow-rise');
-        let borderRadius = themeNode.get_length('-arrow-border-radius');
+        let arrowRise = this.actor.get_theme_node().get_length('-arrow-rise');

        let resX, resY;

@ -304,13 +298,13 @@ BoxPointer.prototype = {
        case St.Side.BOTTOM:
            switch (alignment) {
            case St.Align.START:
-                resX = sourceX - 2 * borderRadius;
+                resX = sourceX;
                break;
            case St.Align.MIDDLE:
                resX = sourceX - Math.floor((natWidth - sourceWidth) / 2);
                break;
            case St.Align.END:
-                resX = sourceX - (natWidth - sourceWidth) + 2 * borderRadius;
+                resX = sourceX - (natWidth - sourceWidth);
                break;
            }

@ -324,13 +318,13 @@ BoxPointer.prototype = {
        case St.Side.RIGHT:
            switch (alignment) {
            case St.Align.START:
-                resY = sourceY - 2 * borderRadius;
+                resY = sourceY;
                break;
            case St.Align.MIDDLE:
                resY = sourceY - Math.floor((natHeight - sourceHeight) / 2);
                break;
            case St.Align.END:
-                resY = sourceY - (natHeight - sourceHeight) + 2 * borderRadius;
+                resY = sourceY - (natHeight - sourceHeight);
                break;
            }

--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -4,78 +4,19 @@ const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const St = imports.gi.St;
-const Signals = imports.signals;
 const Pango = imports.gi.Pango;
-const Gettext_gtk30 = imports.gettext.domain('gtk30');
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-const Mainloop = imports.mainloop;
-const Shell = imports.gi.Shell;
+const Gettext_gtk20 = imports.gettext.domain('gtk20');

 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 const WEEKDATE_HEADER_WIDTH_DIGITS = 3;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';

-// in org.gnome.desktop.interface
-const CLOCK_FORMAT_KEY        = 'clock-format';
-
 function _sameDay(dateA, dateB) {
    return (dateA.getDate() == dateB.getDate() &&
            dateA.getMonth() == dateB.getMonth() &&
            dateA.getYear() == dateB.getYear());
 }

-function _sameYear(dateA, dateB) {
-    return (dateA.getYear() == dateB.getYear());
-}
-
-/* TODO: maybe needs config - right now we assume that Saturday and
- * Sunday are non-work days (not true in e.g. Israel, it's Sunday and
- * Monday there)
- */
-function _isWorkDay(date) {
-    return date.getDay() != 0 && date.getDay() != 6;
-}
-
-function _getBeginningOfDay(date) {
-    let ret = new Date(date.getTime());
-    ret.setHours(0);
-    ret.setMinutes(0);
-    ret.setSeconds(0);
-    ret.setMilliseconds(0);
-    return ret;
-}
-
-function _getEndOfDay(date) {
-    let ret = new Date(date.getTime());
-    ret.setHours(23);
-    ret.setMinutes(59);
-    ret.setSeconds(59);
-    ret.setMilliseconds(999);
-    return ret;
-}
-
-function _formatEventTime(event, clockFormat) {
-    let ret;
-    if (event.allDay) {
-        /* Translators: Shown in calendar event list for all day events */
-        ret = _("All Day");
-    } else {
-        switch (clockFormat) {
-        case '24h':
-            ret = event.date.toLocaleFormat('%H:%M');
-            break;
-
-        default:
-            /* explicit fall-through */
-        case '12h':
-            ret = event.date.toLocaleFormat('%l:%M %p');
-            break;
-        }
-    }
-    return ret;
-}
-
 function _getCalendarWeekForDate(date) {
    // Based on the algorithms found here:
    // http://en.wikipedia.org/wiki/Talk:ISO_week_date
@ -102,259 +43,12 @@ function _getDigitWidth(actor){
    return width;
 }

-function _getCalendarDayAbbreviation(dayNumber) {
-    let abbreviations = [
-        /* Translators: Calendar grid abbreviation for Sunday.
-         *
-         * NOTE: These abbreviations are always shown together and in
-         * order, e.g. "S M T W T F S".
-         */
-        _("S"),
-        /* Translators: Calendar grid abbreviation for Monday */
-        _("M"),
-        /* Translators: Calendar grid abbreviation for Tuesday */
-        _("T"),
-        /* Translators: Calendar grid abbreviation for Wednesday */
-        _("W"),
-        /* Translators: Calendar grid abbreviation for Thursday */
-        _("T"),
-        /* Translators: Calendar grid abbreviation for Friday */
-        _("F"),
-        /* Translators: Calendar grid abbreviation for Saturday */
-        _("S")
-    ];
-    return abbreviations[dayNumber];
-}
-
-function _getEventDayAbbreviation(dayNumber) {
-    let abbreviations = [
-        /* Translators: Event list abbreviation for Sunday.
-         *
-         * NOTE: These abbreviations are normally not shown together
-         * so they need to be unique (e.g. Tuesday and Thursday cannot
-         * both be 'T').
-         */
-        _("Su"),
-        /* Translators: Event list abbreviation for Monday */
-        _("M"),
-        /* Translators: Event list abbreviation for Tuesday */
-        _("T"),
-        /* Translators: Event list abbreviation for Wednesday */
-        _("W"),
-        /* Translators: Event list abbreviation for Thursday */
-        _("Th"),
-        /* Translators: Event list abbreviation for Friday */
-        _("F"),
-        /* Translators: Event list abbreviation for Saturday */
-        _("S")
-    ];
-    return abbreviations[dayNumber];
-}
-
-// Abstraction for an appointment/event in a calendar
-
-function CalendarEvent(date, summary, allDay) {
-    this._init(date, summary, allDay);
-}
-
-CalendarEvent.prototype = {
-    _init: function(date, summary, allDay) {
-        this.date = date;
-        this.summary = summary;
-        this.allDay = allDay;
-    }
-};
-
-// Interface for appointments/events - e.g. the contents of a calendar
-//
-
-// First, an implementation with no events
-function EmptyEventSource() {
+function Calendar() {
    this._init();
 }

-EmptyEventSource.prototype = {
-    _init: function() {
-    },
-
-    requestRange: function(begin, end) {
-    },
-
-    getEvents: function(begin, end) {
-        let result = [];
-        return result;
-    },
-
-    hasEvents: function(day) {
-        return false;
-    }
-};
-Signals.addSignalMethods(EmptyEventSource.prototype);
-
-// Second, wrap native Evolution event source
-function EvolutionEventSource() {
-    this._init();
-}
-
-EvolutionEventSource.prototype = {
-    _init: function() {
-        this._native = new Shell.EvolutionEventSource();
-        this._native.connect('changed', Lang.bind(this, function() {
-            this.emit('changed');
-        }));
-    },
-
-    requestRange: function(begin, end) {
-        this._native.request_range(begin.getTime(), end.getTime());
-    },
-
-    getEvents: function(begin, end) {
-        let result = [];
-        let nativeEvents = this._native.get_events(begin.getTime(), end.getTime());
-        for (let n = 0; n < nativeEvents.length; n++) {
-            let nativeEvent = nativeEvents[n];
-            result.push(new CalendarEvent(new Date(nativeEvent.msec_begin), nativeEvent.summary, nativeEvent.all_day));
-        }
-        return result;
-    },
-
-    hasEvents: function(day) {
-        let dayBegin = _getBeginningOfDay(day);
-        let dayEnd = _getEndOfDay(day);
-
-        let events = this.getEvents(dayBegin, dayEnd);
-
-        if (events.length == 0)
-            return false;
-
-        return true;
-    }
-};
-Signals.addSignalMethods(EvolutionEventSource.prototype);
-
-// Finally, an implementation with fake events
-function FakeEventSource() {
-    this._init();
-}
-
-FakeEventSource.prototype = {
-    _init: function() {
-
-        this._fakeEvents = [];
-
-        // Generate fake events
-        //
-        let midnightToday = _getBeginningOfDay(new Date());
-        let summary = '';
-
-        // '10-oclock pow-wow' is an event occuring IN THE PAST every four days at 10am
-        for (let n = 0; n < 10; n++) {
-            let t = new Date(midnightToday.getTime() - n * 4 * 86400 * 1000);
-            t.setHours(10);
-            summary = '10-oclock pow-wow (n=' + n + ')';
-            this._fakeEvents.push(new CalendarEvent(t, summary, false));
-        }
-
-        // '11-oclock thing' is an event occuring every three days at 11am
-        for (let n = 0; n < 10; n++) {
-            let t = new Date(midnightToday.getTime() + n * 3 * 86400 * 1000);
-            t.setHours(11);
-            summary = '11-oclock thing (n=' + n + ')';
-            this._fakeEvents.push(new CalendarEvent(t, summary, false));
-        }
-
-        // 'Weekly Meeting' is an event occuring every seven days at 1:45pm (two days displaced)
-        for (let n = 0; n < 5; n++) {
-            let t = new Date(midnightToday.getTime() + (n * 7 + 2) * 86400 * 1000);
-            t.setHours(13);
-            t.setMinutes(45);
-            summary = 'Weekly Meeting (n=' + n + ')';
-            this._fakeEvents.push(new CalendarEvent(t, summary, false));
-        }
-
-        // 'Fun All Day' is an all-day event occuring every fortnight (three days displayed)
-        for (let n = 0; n < 10; n++) {
-            let t = new Date(midnightToday.getTime() + (n * 14 + 3) * 86400 * 1000);
-            summary = 'Fun All Day (n=' + n + ')';
-            this._fakeEvents.push(new CalendarEvent(t, summary, true));
-        }
-
-        // 'Get Married' is an event that actually reflects reality (Dec 4, 2010) :-)
-        this._fakeEvents.push(new CalendarEvent(new Date(2010, 11, 4, 16, 0), 'Get Married', false));
-
-        // ditto for 'NE Patriots vs NY Jets'
-        this._fakeEvents.push(new CalendarEvent(new Date(2010, 11, 6, 20, 30), 'NE Patriots vs NY Jets', false));
-
-        // An event for tomorrow @6:30pm that is added/removed every five
-        // seconds (to check that the ::changed signal works)
-        let transientEventDate = new Date(midnightToday.getTime() + 86400 * 1000);
-        transientEventDate.setHours(18);
-        transientEventDate.setMinutes(30);
-        transientEventDate.setSeconds(0);
-        Mainloop.timeout_add(5000, Lang.bind(this, this._updateTransientEvent));
-        this._includeTransientEvent = false;
-        this._transientEvent = new CalendarEvent(transientEventDate, 'A Transient Event', false);
-        this._transientEventCounter = 1;
-    },
-
-    _updateTransientEvent: function() {
-        this._includeTransientEvent = !this._includeTransientEvent;
-        this._transientEventCounter = this._transientEventCounter + 1;
-        this._transientEvent.summary = 'A Transient Event (' + this._transientEventCounter + ')';
-        this.emit('changed');
-        Mainloop.timeout_add(5000, Lang.bind(this, this._updateTransientEvent));
-    },
-
-    requestRange: function(begin, end) {
-    },
-
-    getEvents: function(begin, end) {
-        let result = [];
-        //log('begin:' + begin);
-        //log('end:  ' + end);
-        for(let n = 0; n < this._fakeEvents.length; n++) {
-            let event = this._fakeEvents[n];
-            if (event.date >= begin && event.date <= end) {
-                result.push(event);
-            }
-            //log('when:' + event.date + ' summary:' + event.summary);
-        }
-        if (this._includeTransientEvent && this._transientEvent.date >= begin && this._transientEvent.date <= end)
-            result.push(this._transientEvent);
-        result.sort(function(event1, event2) {
-            return event1.date.getTime() - event2.date.getTime();
-        });
-        return result;
-    },
-
-    hasEvents: function(day) {
-        let dayBegin = _getBeginningOfDay(day);
-        let dayEnd = _getEndOfDay(day);
-
-        let events = this.getEvents(dayBegin, dayEnd);
-
-        if (events.length == 0)
-            return false;
-
-        return true;
-    }
-
-};
-Signals.addSignalMethods(FakeEventSource.prototype);
-
-// Calendar:
-// @eventSource: is an object implementing the EventSource API, e.g. the
-// requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
-function Calendar(eventSource) {
-    this._init(eventSource);
-}
-
 Calendar.prototype = {
-    _init: function(eventSource) {
-        this._eventSource = eventSource;
-
-        this._eventSource.connect('changed', Lang.bind(this, this._update));
-
+    _init: function() {
        // FIXME: This is actually the fallback method for GTK+ for the week start;
        // GTK+ by preference uses nl_langinfo (NL_TIME_FIRST_WEEKDAY). We probably
        // should add a C function so we can do the full handling.
@ -366,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));
        }
@ -377,8 +71,7 @@ Calendar.prototype = {
        }

        // Find the ordering for month/year in the calendar heading
-        this._headerFormatWithoutYear = '%B';
-        switch (Gettext_gtk30.gettext('calendar:MY')) {
+        switch (Gettext_gtk20.gettext('calendar:MY')) {
        case 'calendar:MY':
            this._headerFormat = '%B %Y';
            break;
@ -392,7 +85,7 @@ Calendar.prototype = {
        }

        // Start off with the current date
-        this._selectedDate = new Date();
+        this.date = new Date();

        this.actor = new St.Table({ homogeneous: false,
                                    style_class: 'calendar',
@ -407,10 +100,9 @@ Calendar.prototype = {

    // Sets the calendar to show a specific date
    setDate: function(date) {
-        if (!_sameDay(date, this._selectedDate)) {
-            this._selectedDate = date;
+        if (!_sameDay(date, this.date)) {
+            this.date = date;
            this._update();
-            this.emit('selected-date-changed', new Date(this._selectedDate));
        }
    },

@ -424,36 +116,45 @@ Calendar.prototype = {
                       { row: 0, col: 0, col_span: offsetCols + 7 });

        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChange));
+        let [backlabel, forwardlabel] = ['&lt;', '&gt;'];
+        if (St.Widget.get_default_direction () == St.TextDirection.RTL) {
+            [backlabel, forwardlabel] = [forwardlabel, backlabel];
+        }

-        let back = new St.Button({ style_class: 'calendar-change-month-back' });
+        let back = new St.Button({ label: backlabel, style_class: 'calendar-change-month'  });
        this._topBox.add(back);
-        back.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
+        back.connect('clicked', Lang.bind(this, this._prevMonth));

-        this._monthLabel = new St.Label({style_class: 'calendar-month-label'});
-        this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
+        this._dateLabel = new St.Label();
+        this._topBox.add(this._dateLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });

-        let forward = new St.Button({ style_class: 'calendar-change-month-forward' });
+        let forward = new St.Button({ label: forwardlabel, style_class: 'calendar-change-month' });
        this._topBox.add(forward);
-        forward.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));
+        forward.connect('clicked', Lang.bind(this, this._nextMonth));

-        // Add weekday labels...
-        //
        // We need to figure out the abbreviated localized names for the days of the week;
        // we do this by just getting the next 7 days starting from right now and then putting
        // them in the right cell in the table. It doesn't matter if we add them in order
-        let iter = new Date(this._selectedDate);
+        let iter = new Date(this.date);
        iter.setSeconds(0); // Leap second protection. Hah!
        iter.setHours(12);
+
+        if (this._useWeekdate) {
+            this._weekdateHeader = new St.Label();
+            this.actor.add(this._weekdateHeader,
+                              { row: 1,
+                                col: 0,
+                                x_fill: false, x_align: St.Align.MIDDLE });
+            this._setWeekdateHeaderWidth();
+        } else {
+            this._weekdateHeader = null;
+        }
+
        for (let i = 0; i < 7; i++) {
-            // Could use iter.toLocaleFormat('%a') but that normally gives three characters
-            // and we want, ideally, a single character for e.g. S M T W T F S
-            let customDayAbbrev = _getCalendarDayAbbreviation(iter.getDay());
-            let label = new St.Label({ style_class: 'calendar-day-base calendar-day-heading',
-                                       text: customDayAbbrev });
-            this.actor.add(label,
+            this.actor.add(new St.Label({ text: iter.toLocaleFormat('%a') }),
                           { row: 1,
                             col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: St.Align.MIDDLE });
+                             x_fill: false, x_align: St.Align.END });
            iter.setTime(iter.getTime() + MSECS_IN_DAY);
        }

@ -477,35 +178,33 @@ Calendar.prototype = {
        switch (event.get_scroll_direction()) {
        case Clutter.ScrollDirection.UP:
        case Clutter.ScrollDirection.LEFT:
-            this._onPrevMonthButtonClicked();
+            this._prevMonth();
            break;
        case Clutter.ScrollDirection.DOWN:
        case Clutter.ScrollDirection.RIGHT:
-            this._onNextMonthButtonClicked();
+            this._nextMonth();
            break;
        }
    },

-    _onPrevMonthButtonClicked: function() {
-        let newDate = new Date(this._selectedDate);
-        if (newDate.getMonth() == 0) {
-            newDate.setMonth(11);
-            newDate.setFullYear(newDate.getFullYear() - 1);
+    _prevMonth: function() {
+        if (this.date.getMonth() == 0) {
+            this.date.setMonth(11);
+            this.date.setFullYear(this.date.getFullYear() - 1);
        } else {
-            newDate.setMonth(newDate.getMonth() - 1);
+            this.date.setMonth(this.date.getMonth() - 1);
        }
-        this.setDate(newDate);
+        this._update();
   },

-    _onNextMonthButtonClicked: function() {
-        let newDate = new Date(this._selectedDate);
-        if (newDate.getMonth() == 11) {
-            newDate.setMonth(0);
-            newDate.setFullYear(newDate.getFullYear() + 1);
+    _nextMonth: function() {
+        if (this.date.getMonth() == 11) {
+            this.date.setMonth(0);
+            this.date.setFullYear(this.date.getFullYear() + 1);
        } else {
-            newDate.setMonth(newDate.getMonth() + 1);
+            this.date.setMonth(this.date.getMonth() + 1);
        }
-        this.setDate(newDate);
+        this._update();
    },

    _onSettingsChange: function() {
@ -515,12 +214,7 @@ Calendar.prototype = {
    },

    _update: function() {
-        let now = new Date();
-
-        if (_sameYear(this._selectedDate, now))
-            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormatWithoutYear);
-        else
-            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormat);
+        this._dateLabel.text = this.date.toLocaleFormat(this._headerFormat);

        // Remove everything but the topBox and the weekday labels
        let children = this.actor.get_children();
@ -528,201 +222,45 @@ Calendar.prototype = {
            children[i].destroy();

        // Start at the beginning of the week before the start of the month
-        let beginDate = new Date(this._selectedDate);
-        beginDate.setDate(1);
-        beginDate.setSeconds(0);
-        beginDate.setHours(12);
-        let daysToWeekStart = (7 + beginDate.getDay() - this._weekStart) % 7;
-        beginDate.setTime(beginDate.getTime() - daysToWeekStart * MSECS_IN_DAY);
+        let iter = new Date(this.date);
+        iter.setDate(1);
+        iter.setSeconds(0);
+        iter.setHours(12);
+        let daysToWeekStart = (7 + iter.getDay() - this._weekStart) % 7;
+        iter.setTime(iter.getTime() - daysToWeekStart * MSECS_IN_DAY);
+
+        let now = new Date();

-        let iter = new Date(beginDate);
        let row = 2;
        while (true) {
-            let button = new St.Button({ label: iter.getDate().toString() });
-
-            let iterStr = iter.toUTCString();
-            button.connect('clicked', Lang.bind(this, function() {
-                let newlySelectedDate = new Date(iterStr);
-                this.setDate(newlySelectedDate);
-            }));
-
-            let hasEvents = this._eventSource.hasEvents(iter);
-            let styleClass = 'calendar-day-base calendar-day';
-            if (_isWorkDay(iter))
-                styleClass += ' calendar-work-day'
-            else
-                styleClass += ' calendar-nonwork-day'
-
-            // Hack used in lieu of border-collapse - see gnome-shell.css
-            if (row == 2)
-                styleClass = 'calendar-day-top ' + styleClass;
-            if (iter.getDay() == 0)
-                styleClass = 'calendar-day-left ' + styleClass;
-
+            let label = new St.Label({ text: iter.getDate().toString() });
            if (_sameDay(now, iter))
-                styleClass += ' calendar-today';
-            else if (iter.getMonth() != this._selectedDate.getMonth())
-                styleClass += ' calendar-other-month-day';
-
-            if (_sameDay(this._selectedDate, iter))
-                button.add_style_pseudo_class('active');
-
-            if (hasEvents)
-                styleClass += ' calendar-day-with-events'
-
-            button.style_class = styleClass;
+                label.style_class = 'calendar-day calendar-today';
+            else if (iter.getMonth() != this.date.getMonth())
+                label.style_class = 'calendar-day calendar-other-month-day';
+            else
+                label.style_class = 'calendar-day';

            let offsetCols = this._useWeekdate ? 1 : 0;
-            this.actor.add(button,
-                           { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7 });
+            this.actor.add(label,
+                           { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7,
+                             x_fill: false, x_align: St.Align.END });

            if (this._useWeekdate && iter.getDay() == 4) {
                let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
-                                           style_class: 'calendar-day-base calendar-week-number'});
+                                           style_class: 'calendar-day calendar-calendarweek'});
                this.actor.add(label,
-                               { row: row, col: 0, y_align: St.Align.MIDDLE });
+                              { row: row, col: 0,
+		                        x_fill: false, x_align: St.Align.MIDDLE });
            }

            iter.setTime(iter.getTime() + MSECS_IN_DAY);
            if (iter.getDay() == this._weekStart) {
                // We stop on the first "first day of the week" after the month we are displaying
-                if (iter.getMonth() > this._selectedDate.getMonth() || iter.getYear() > this._selectedDate.getYear())
+                if (iter.getMonth() > this.date.getMonth() || iter.getYear() > this.date.getYear())
                    break;
                row++;
            }
        }
-        // Signal to the event source that we are interested in events
-        // only from this date range
-        this._eventSource.requestRange(beginDate, iter);
-    }
-};
-
-Signals.addSignalMethods(Calendar.prototype);
-
-function EventsList(eventSource) {
-    this._init(eventSource);
-}
-
-EventsList.prototype = {
-    _init: function(eventSource) {
-        this.actor = new St.BoxLayout({ vertical: true, style_class: 'events-header-vbox'});
-        this._date = new Date();
-        this._eventSource = eventSource;
-        this._eventSource.connect('changed', Lang.bind(this, this._update));
-        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
-        this._desktopSettings.connect('changed', Lang.bind(this, this._update));
-        this._update();
-    },
-
-    _addEvent: function(dayNameBox, timeBox, eventTitleBox, includeDayName, day, time, desc) {
-        if (includeDayName) {
-            dayNameBox.add(new St.Label( { style_class: 'events-day-dayname',
-                                           text: day } ),
-                           { x_fill: true } );
-        }
-        timeBox.add(new St.Label( { style_class: 'events-day-time',
-                                    text: time} ),
-                    { x_fill: true } );
-        eventTitleBox.add(new St.Label( { style_class: 'events-day-task',
-                                          text: desc} ));
-    },
-
-    _addPeriod: function(header, begin, end, includeDayName, showNothingScheduled) {
-        let events = this._eventSource.getEvents(begin, end);
-
-        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);;
-
-        if (events.length == 0 && !showNothingScheduled)
-            return;
-
-        let vbox = new St.BoxLayout( {vertical: true} );
-        this.actor.add(vbox);
-
-        vbox.add(new St.Label({ style_class: 'events-day-header', text: header }));
-        let box = new St.BoxLayout({style_class: 'events-header-hbox'});
-        let dayNameBox = new St.BoxLayout({ vertical: true, style_class: 'events-day-name-box' });
-        let timeBox = new St.BoxLayout({ vertical: true, style_class: 'events-time-box' });
-        let eventTitleBox = new St.BoxLayout({ vertical: true, style_class: 'events-event-box' });
-        box.add(dayNameBox, {x_fill: false});
-        box.add(timeBox, {x_fill: false});
-        box.add(eventTitleBox, {expand: true});
-        vbox.add(box);
-
-        for (let n = 0; n < events.length; n++) {
-            let event = events[n];
-            let dayString = _getEventDayAbbreviation(event.date.getDay());
-            let timeString = _formatEventTime(event, clockFormat);
-            let summaryString = event.summary;
-            this._addEvent(dayNameBox, timeBox, eventTitleBox, includeDayName, dayString, timeString, summaryString);
-        }
-
-        if (events.length == 0 && showNothingScheduled) {
-            let now = new Date();
-            /* Translators: Text to show if there are no events */
-            let nothingEvent = new CalendarEvent(now, _("Nothing Scheduled"), true);
-            let timeString = _formatEventTime(nothingEvent, clockFormat);
-            this._addEvent(dayNameBox, timeBox, eventTitleBox, false, "", timeString, nothingEvent.summary);
-        }
-    },
-
-    _showOtherDay: function(day) {
-        this.actor.destroy_children();
-
-        let dayBegin = _getBeginningOfDay(day);
-        let dayEnd = _getEndOfDay(day);
-
-        let dayString;
-        let now = new Date();
-        if (_sameYear(day, now))
-            dayString = day.toLocaleFormat('%A, %B %d');
-        else
-            dayString = day.toLocaleFormat('%A, %B %d, %Y');
-        this._addPeriod(dayString, dayBegin, dayEnd, false, true);
-    },
-
-    _showToday: function() {
-        this.actor.destroy_children();
-
-        let now = new Date();
-        let dayBegin = _getBeginningOfDay(now);
-        let dayEnd = _getEndOfDay(now);
-        this._addPeriod(_("Today"), dayBegin, dayEnd, false, true);
-
-        let tomorrowBegin = new Date(dayBegin.getTime() + 86400 * 1000);
-        let tomorrowEnd = new Date(dayEnd.getTime() + 86400 * 1000);
-        this._addPeriod(_("Tomorrow"), tomorrowBegin, tomorrowEnd, false, true);
-
-        if (dayEnd.getDay() <= 4) {
-            /* if now is Sunday through Thursday show "This week" and include events up until
-             * and including Saturday
-             */
-            let thisWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
-            let thisWeekEnd = new Date(dayEnd.getTime() + (6 - dayEnd.getDay()) * 86400 * 1000);
-            this._addPeriod(_("This week"), thisWeekBegin, thisWeekEnd, true, false);
-        } else {
-            /* otherwise it's a Friday or Saturday... show "Next week" and include events up
-             * until and including *next* Saturday
-             */
-            let nextWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
-            let nextWeekEnd = new Date(dayEnd.getTime() + (13 - dayEnd.getDay()) * 86400 * 1000);
-            this._addPeriod(_("Next week"), nextWeekBegin, nextWeekEnd, true, false);
-        }
-    },
-
-    // Sets the event list to show events from a specific date
-    setDate: function(date) {
-        if (!_sameDay(date, this._date)) {
-            this._date = date;
-            this._update();
-        }
-    },
-
-    _update: function() {
-        let today = new Date();
-        if (_sameDay (this._date, today)) {
-            this._showToday();
-        } else {
-            this._showOtherDay(this._date);
-        }
    }
 };
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@ -1,254 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Gdk = imports.gi.Gdk;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-
-const AltTab = imports.ui.altTab;
-const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-
-const POPUP_APPICON_SIZE = 96;
-const POPUP_FADE_TIME = 0.1; // seconds
-
-function CtrlAltTabManager() {
-    this._init();
-}
-
-CtrlAltTabManager.prototype = {
-    _init: function() {
-        this._items = [];
-        this._focusManager = St.FocusManager.get_for_stage(global.stage);
-        Main.wm.setKeybindingHandler('switch_panels', Lang.bind(this,
-            function (shellwm, binding, window, backwards) {
-                this.popup(backwards);
-            }));
-    },
-
-    addGroup: function(root, name, icon) {
-        this._items.push({ root: root, name: name, iconName: icon });
-        root.connect('destroy', Lang.bind(this, function() { this.removeGroup(root); }));
-        this._focusManager.add_group(root);
-    },
-
-    removeGroup: function(root) {
-        this._focusManager.remove_group(root);
-        for (let i = 0; i < this._items.length; i++) {
-            if (this._items[i].root == root) {
-                this._items.splice(i, 1);
-                return;
-            }
-        }
-    },
-
-    focusGroup: function(root) {
-        if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
-            global.stage_input_mode == Shell.StageInputMode.NORMAL)
-            global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
-        root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-    },
-
-    popup: function(backwards) {
-        // Start with the set of focus groups that are currently mapped
-        let items = this._items.filter(function (item) { return item.root.mapped; });
-
-        // And add the windows metacity would show in its Ctrl-Alt-Tab list
-        let screen = global.screen;
-        let display = screen.get_display();
-        let windows = display.get_tab_list(Meta.TabList.DOCKS, screen, screen.get_active_workspace ());
-        let windowTracker = Shell.WindowTracker.get_default();
-        let textureCache = St.TextureCache.get_default();
-        for (let i = 0; i < windows.length; i++) {
-            let icon;
-            let app = windowTracker.get_window_app(windows[i]);
-            if (app)
-                icon = app.create_icon_texture(POPUP_APPICON_SIZE);
-            else
-                icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
-            items.push({ window: windows[i],
-                         name: windows[i].title,
-                         iconActor: icon });
-        }
-
-        if (!items.length)
-            return;
-
-        new CtrlAltTabPopup().show(items, backwards);
-    }
-};
-
-function mod(a, b) {
-    return (a + b) % b;
-}
-
-function CtrlAltTabPopup() {
-    this._init();
-}
-
-CtrlAltTabPopup.prototype = {
-    _init : function() {
-        let primary = global.get_primary_monitor();
-        this.actor = new St.BoxLayout({ name: 'ctrlAltTabPopup',
-                                        reactive: true,
-                                        x: primary.x + primary.width / 2,
-                                        y: primary.y + primary.height / 2,
-                                        anchor_gravity: Clutter.Gravity.CENTER });
-
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this._haveModal = false;
-        this._selection = 0;
-
-        Main.uiGroup.add_actor(this.actor);
-    },
-
-    show : function(items, startBackwards) {
-        if (!Main.pushModal(this.actor))
-            return false;
-        this._haveModal = true;
-
-        this._keyPressEventId = this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
-        this._keyReleaseEventId = this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
-
-        this._items = items;
-        this._switcher = new CtrlAltTabSwitcher(items);
-        this.actor.add_actor(this._switcher.actor);
-
-        if (startBackwards)
-            this._selection = this._items.length - 1;
-        this._select(this._selection);
-
-        let [x, y, mods] = global.get_pointer();
-        if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
-            this._finish();
-            return false;
-        }
-
-        this.actor.opacity = 0;
-        this.actor.show();
-        Tweener.addTween(this.actor,
-                         { opacity: 255,
-                           time: POPUP_FADE_TIME,
-                           transition: 'easeOutQuad'
-                         });
-
-        return true;
-    },
-
-    _next : function() {
-        return mod(this._selection + 1, this._items.length);
-    },
-
-    _previous : function() {
-        return mod(this._selection - 1, this._items.length);
-    },
-
-    _keyPressEvent : function(actor, event) {
-        let keysym = event.get_key_symbol();
-        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
-        if (shift && keysym == Clutter.KEY_Tab)
-            keysym = Clutter.ISO_Left_Tab;
-
-        if (keysym == Clutter.KEY_Escape)
-            this.destroy();
-        else if (keysym == Clutter.KEY_Tab)
-            this._select(this._next());
-        else if (keysym == Clutter.KEY_ISO_Left_Tab)
-            this._select(this._previous());
-        else if (keysym == Clutter.KEY_Left)
-            this._select(this._previous());
-        else if (keysym == Clutter.KEY_Right)
-            this._select(this._next());
-
-        return true;
-    },
-
-    _keyReleaseEvent : function(actor, event) {
-        let [x, y, mods] = global.get_pointer();
-        let state = mods & Clutter.ModifierType.MOD1_MASK;
-
-        if (state == 0)
-            this._finish();
-
-        return true;
-    },
-
-    _finish : function() {
-        this.destroy();
-
-        let item = this._items[this._selection];
-        if (item.root)
-            Main.ctrlAltTabManager.focusGroup(item.root);
-        else
-            Main.activateWindow(item.window);
-    },
-
-    _popModal: function() {
-        if (this._haveModal) {
-            Main.popModal(this.actor);
-            this._haveModal = false;
-        }
-    },
-
-    destroy : function() {
-        this._popModal();
-        Tweener.addTween(this.actor,
-                         { opacity: 0,
-                           time: POPUP_FADE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this,
-                               function() {
-                                   this.actor.destroy();
-                               })
-                         });
-    },
-
-    _onDestroy : function() {
-        if (this._keyPressEventId)
-            this.actor.disconnect(this._keyPressEventId);
-        if (this._keyReleaseEventId)
-            this.actor.disconnect(this._keyReleaseEventId);
-    },
-
-    _select : function(num) {
-        this._selection = num;
-        this._switcher.highlight(num);
-    }
-};
-
-function CtrlAltTabSwitcher(items) {
-    this._init(items);
-}
-
-CtrlAltTabSwitcher.prototype = {
-    __proto__ : AltTab.SwitcherList.prototype,
-
-    _init : function(items) {
-        AltTab.SwitcherList.prototype._init.call(this, true);
-
-        for (let i = 0; i < items.length; i++)
-            this._addIcon(items[i]);
-    },
-
-    _addIcon : function(item) {
-        let box = new St.BoxLayout({ style_class: 'alt-tab-app',
-                                     vertical: true });
-
-        let icon = item.iconActor;
-        if (!icon) {
-            icon = new St.Icon({ icon_name: item.iconName,
-                                 icon_type: St.IconType.SYMBOLIC,
-                                 icon_size: POPUP_APPICON_SIZE });
-        }
-        box.add(icon, { x_fill: false, y_fill: false } );
-
-        let text = new St.Label({ text: item.name });
-        box.add(text, { x_fill: false });
-
-        this.addItem(box);
-    }
-};
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -78,6 +78,9 @@ function Dash() {

 Dash.prototype = {
    _init : function() {
+        this._placeholderText = null;
+        this._menus = [];
+        this._menuDisplays = [];
        this._maxHeight = -1;
        this._iconSize = 48;

@ -191,8 +194,7 @@ Dash.prototype = {
    },

    _addApp: function(app) {
-        let display = new AppDisplay.AppWellIcon(app,
-                                                 { setSizeManually: true });
+        let display = new AppDisplay.AppWellIcon(app);
        display._draggable.connect('drag-begin',
                                   Lang.bind(this, function() {
                                       display.actor.opacity = 50;
@ -214,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];
@ -226,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();
@ -272,11 +276,7 @@ Dash.prototype = {
        if (app == null || app.is_transient())
            return DND.DragMotionResult.NO_DROP;

-        let favorites = AppFavorites.getAppFavorites().getFavorites();
-        let numFavorites = favorites.length;
-
-        let favPos = favorites.indexOf(app);
-
+        let numFavorites = AppFavorites.getAppFavorites().getFavorites().length;
        let numChildren = this._box.get_children().length;
        let boxHeight = this._box.height;

@ -294,16 +294,15 @@ Dash.prototype = {
            this._dragPlaceholderPos = pos;
            if (this._dragPlaceholder)
                this._dragPlaceholder.destroy();
-
-            // Don't allow positioning before or after self
-            if (favPos != -1 && (pos == favPos || pos == favPos + 1))
-                return DND.DragMotionResult.CONTINUE;
-
            this._dragPlaceholder = new St.Bin({ style_class: 'dash-placeholder' });
            this._box.insert_actor(this._dragPlaceholder, pos);
        }

-        let srcIsFavorite = (favPos != -1);
+        let id = app.get_id();
+
+        let favorites = AppFavorites.getAppFavorites().getFavoriteMap();
+
+        let srcIsFavorite = (id in favorites);

        if (srcIsFavorite)
            return DND.DragMotionResult.MOVE_DROP;
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@ -1,212 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Cairo = imports.cairo;
-const Clutter = imports.gi.Clutter;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const Util = imports.misc.util;
-const Main = imports.ui.main;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-const Calendar = imports.ui.calendar;
-
-// in org.gnome.desktop.interface
-const CLOCK_FORMAT_KEY        = 'clock-format';
-
-// in org.gnome.shell.clock
-const CLOCK_SHOW_DATE_KEY     = 'show-date';
-const CLOCK_SHOW_SECONDS_KEY  = 'show-seconds';
-
-function _onVertSepRepaint (area)
-{
-    let cr = area.get_context();
-    let themeNode = area.get_theme_node();
-    let [width, height] = area.get_surface_size();
-    let stippleColor = new Clutter.Color();
-    let stippleWidth = themeNode.get_length('-stipple-width');
-    let x = Math.floor(width/2) + 0.5;
-    themeNode.lookup_color('-stipple-color', false, stippleColor);
-    cr.moveTo(x, 0);
-    cr.lineTo(x, height);
-    Clutter.cairo_set_source_color(cr, stippleColor);
-    cr.setDash([1, 3], 1); // Hard-code for now
-    cr.setLineWidth(stippleWidth);
-    cr.stroke();
-};
-
-function DateMenuButton() {
-    this._init();
-}
-
-DateMenuButton.prototype = {
-    __proto__: PanelMenu.Button.prototype,
-
-    _init: function() {
-        let item;
-        let hbox;
-        let vbox;
-
-        //this._eventSource = new Calendar.EmptyEventSource();
-        //this._eventSource = new Calendar.FakeEventSource();
-        this._eventSource = new Calendar.EvolutionEventSource();
-
-        PanelMenu.Button.prototype._init.call(this, St.Align.START);
-
-        this._clock = new St.Label();
-        this.actor.set_child(this._clock);
-
-        hbox = new St.BoxLayout({name: 'calendarArea'});
-        this.menu.addActor(hbox);
-
-        // Fill up the first column
-
-        vbox = new St.BoxLayout({vertical: true});
-        hbox.add(vbox);
-
-        // Date
-        this._date = new St.Label();
-        this._date.style_class = 'datemenu-date-label';
-        vbox.add(this._date);
-
-        this._eventList = new Calendar.EventsList(this._eventSource);
-
-        // Calendar
-        this._calendar = new Calendar.Calendar(this._eventSource);
-        this._calendar.connect('selected-date-changed',
-                               Lang.bind(this, function(calendar, date) {
-                                   this._eventList.setDate(date);
-                               }));
-        vbox.add(this._calendar.actor);
-
-        item = new PopupMenu.PopupSeparatorMenuItem();
-        item.setColumnWidths(1);
-        vbox.add(item.actor, {y_align: St.Align.END, expand: true, y_fill: false});
-        item = new PopupMenu.PopupMenuItem(_("Date and Time Settings"));
-        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-        vbox.add(item.actor);
-
-        // Add vertical separator
-
-        item = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
-                                    pseudo_class: 'highlighted' });
-        item.connect('repaint', Lang.bind(this, _onVertSepRepaint));
-        hbox.add(item);
-
-        // Fill up the second column
-        //
-        vbox = new St.BoxLayout({vertical: true});
-        hbox.add(vbox);
-
-        // Event list
-        vbox.add(this._eventList.actor);
-
-        item = new PopupMenu.PopupMenuItem(_("Open Calendar"));
-        item.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
-        vbox.add(item.actor, {y_align: St.Align.END, expand: true, y_fill: false});
-
-        // Whenever the menu is opened, select today
-        this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
-            if (isOpen) {
-                let now = new Date();
-                this._calendar.setDate(now);
-                // No need to update this._eventList as ::selected-date-changed
-                // signal will fire
-            }
-        }));
-
-        // Done with hbox for calendar and event list
-
-        // Track changes to clock settings
-        this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
-        this._clockSettings = new Gio.Settings({ schema: 'org.gnome.shell.clock' });
-        this._desktopSettings.connect('changed', Lang.bind(this, this._updateClockAndDate));
-        this._clockSettings.connect('changed', Lang.bind(this, this._updateClockAndDate));
-
-        // Start the clock
-        this._updateClockAndDate();
-    },
-
-    _updateClockAndDate: function() {
-        let format = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
-        let showDate = this._clockSettings.get_boolean(CLOCK_SHOW_DATE_KEY);
-        let showSeconds = this._clockSettings.get_boolean(CLOCK_SHOW_SECONDS_KEY);
-
-        let clockFormat;
-        let dateFormat;
-
-        switch (format) {
-            case '24h':
-                if (showDate)
-	            /* Translators: This is the time format with date used
-                       in 24-hour mode. */
-                    clockFormat = showSeconds ? _("%a %b %e, %R:%S")
-                                              : _("%a %b %e, %R");
-                else
-	            /* Translators: This is the time format without date used
-                       in 24-hour mode. */
-                    clockFormat = showSeconds ? _("%a %R:%S")
-                                              : _("%a %R");
-                break;
-            case '12h':
-            default:
-                if (showDate)
-	            /* Translators: This is a time format with date used
-                       for AM/PM. */
-                    clockFormat = showSeconds ? _("%a %b %e, %l:%M:%S %p")
-                                              : _("%a %b %e, %l:%M %p");
-                else
-	            /* Translators: This is a time format without date used
-                       for AM/PM. */
-                    clockFormat = showSeconds ? _("%a %l:%M:%S %p")
-                                              : _("%a %l:%M %p");
-                break;
-        }
-
-        let displayDate = new Date();
-        let msecRemaining;
-        if (showSeconds) {
-            msecRemaining = 1000 - displayDate.getMilliseconds();
-            if (msecRemaining < 50) {
-                displayDate.setSeconds(displayDate.getSeconds() + 1);
-                msecRemaining += 1000;
-            }
-        } else {
-            msecRemaining = 60000 - (1000 * displayDate.getSeconds() +
-                                     displayDate.getMilliseconds());
-            if (msecRemaining < 500) {
-                displayDate.setMinutes(displayDate.getMinutes() + 1);
-                msecRemaining += 60000;
-            }
-        }
-
-        this._clock.set_text(displayDate.toLocaleFormat(clockFormat));
-
-        /* Translators: This is the date format to use when the calendar popup is
-         * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-         */
-        dateFormat = _("%A %B %e, %Y");
-        this._date.set_text(displayDate.toLocaleFormat(dateFormat));
-
-        Mainloop.timeout_add(msecRemaining, Lang.bind(this, this._updateClockAndDate));
-        return false;
-    },
-
-    _onPreferencesActivate: function() {
-        this.menu.close();
-        Util.spawnDesktop('gnome-datetime-panel');
-    },
-
-    _onOpenCalendarActivate: function() {
-        this.menu.close();
-        // TODO: pass '-c calendar' (to force the calendar at startup)
-        // TODO: pass the selected day
-        Util.spawnDesktop('evolution');
-    },
-};
--- 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/docDisplay.js
+++ b/js/ui/docDisplay.js
@ -1,11 +1,487 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const St = imports.gi.St;
+const Mainloop = imports.mainloop;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

 const DocInfo = imports.misc.docInfo;
+const DND = imports.ui.dnd;
+const GenericDisplay = imports.ui.genericDisplay;
+const Main = imports.ui.main;
 const Search = imports.ui.search;

+const MAX_DASH_DOCS = 50;
+const DASH_DOCS_ICON_SIZE = 16;
+
+const DEFAULT_SPACING = 4;
+
+/* This class represents a single display item containing information about a document.
+ * We take the current number of seconds in the constructor to avoid looking up the current
+ * time for every item when they are created in a batch.
+ *
+ * docInfo - DocInfo object containing information about the document
+ * currentSeconds - current number of seconds since the epoch
+ */
+function DocDisplayItem(docInfo, currentSecs) {
+    this._init(docInfo, currentSecs);
+}
+
+DocDisplayItem.prototype = {
+    __proto__:  GenericDisplay.GenericDisplayItem.prototype,
+
+    _init : function(docInfo, currentSecs) {
+        GenericDisplay.GenericDisplayItem.prototype._init.call(this);
+        this._docInfo = docInfo;
+
+        this._setItemInfo(docInfo.name, '');
+
+        this._timeoutTime = -1;
+        this._resetTimeDisplay(currentSecs);
+    },
+
+    //// Public methods ////
+
+    getUpdateTimeoutTime: function() {
+        return this._timeoutTime;
+    },
+
+    // Update any relative-time based displays for this item.
+    redisplay: function(currentSecs) {
+        this._resetTimeDisplay(currentSecs);
+    },
+
+    //// Public method overrides ////
+
+    // Opens a document represented by this display item.
+    launch : function() {
+        this._docInfo.launch();
+    },
+
+    //// Protected method overrides ////
+
+    // Returns an icon for the item.
+    _createIcon : function() {
+        return this._docInfo.createIcon(GenericDisplay.ITEM_DISPLAY_ICON_SIZE);
+    },
+
+    // Returns a preview icon for the item.
+    _createPreviewIcon : function() {
+        return this._docInfo.createIcon(GenericDisplay.PREVIEW_ICON_SIZE);
+    },
+
+    // Creates and returns a large preview icon, but only if this._docInfo is an image file
+    // and we were able to generate a pixbuf from it successfully.
+    _createLargePreviewIcon : function() {
+        if (this._docInfo.mimeType == null || this._docInfo.mimeType.indexOf('image/') != 0)
+            return null;
+
+        try {
+            return St.TextureCache.get_default().load_uri_sync(St.TextureCachePolicy.NONE,
+                                                               this._docInfo.uri, -1, -1);
+        } catch (e) {
+            // An exception will be raised when the image format isn't know
+            /* FIXME: http://bugzilla.gnome.org/show_bug.cgi?id=591480: should
+             *        only ignore GDK_PIXBUF_ERROR_UNKNOWN_TYPE. */
+            return null;
+        }
+    },
+
+    //// Drag and Drop ////
+
+    shellWorkspaceLaunch: function() {
+        this.launch();
+    },
+
+    //// Private Methods ////
+
+    // Updates the last visited time displayed in the description text for the item.
+    _resetTimeDisplay: function(currentSecs) {
+        let lastSecs = this._docInfo.timestamp;
+        let timeDelta = currentSecs - lastSecs;
+        let [text, nextUpdate] = global.format_time_relative_pretty(timeDelta);
+        this._timeoutTime = currentSecs + nextUpdate;
+        this._setDescriptionText(text);
+    }
+};
+
+/* This class represents a display containing a collection of document items.
+ * The documents are sorted by how recently they were last visited.
+ */
+function DocDisplay() {
+    this._init();
+}
+
+DocDisplay.prototype = {
+    __proto__:  GenericDisplay.GenericDisplay.prototype,
+
+    _init : function() {
+        GenericDisplay.GenericDisplay.prototype._init.call(this);
+        // We keep a single timeout callback for updating last visited times
+        // for all the items in the display. This avoids creating individual
+        // callbacks for each item in the display. So proper time updates
+        // for individual items and item details depend on the item being
+        // associated with one of the displays.
+        this._updateTimeoutTargetTime = -1;
+        this._updateTimeoutId = 0;
+
+        this._docManager = DocInfo.getDocManager();
+        this._docsStale = true;
+        this._docManager.connect('changed', Lang.bind(this, function(mgr, userData) {
+            this._docsStale = true;
+            // Changes in local recent files should not happen when we are in the Overview mode,
+            // but redisplaying right away is cool when we use Zephyr.
+            // Also, we might be displaying remote documents, like Google Docs, in the future
+            // which might be edited by someone else.
+            this._redisplay(GenericDisplay.RedisplayFlags.NONE);
+        }));
+
+        this.connect('destroy', Lang.bind(this, function (o) {
+            if (this._updateTimeoutId > 0)
+                Mainloop.source_remove(this._updateTimeoutId);
+        }));
+    },
+
+    //// Protected method overrides ////
+
+    // Gets the list of recent items from the recent items manager.
+    _refreshCache : function() {
+        if (!this._docsStale)
+            return true;
+        this._allItems = {};
+        Lang.copyProperties(this._docManager.getInfosByUri(), this._allItems);
+        this._docsStale = false;
+        return false;
+    },
+
+    // Sets the list of the displayed items based on how recently they were last visited.
+    _setDefaultList : function() {
+        // It seems to be an implementation detail of the Mozilla JavaScript that object
+        // properties are returned during the iteration in the same order in which they were
+        // defined, but it is not a guarantee according to this 
+        // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Statements/for...in
+        // While this._allItems associative array seems to always be ordered by last added,
+        // as the results of this._recentManager.get_items() based on which it is constructed are,
+        // we should do the sorting manually because we want the order to be based on last visited.
+        //
+        // This function is called each time the search string is set back to '' or we display
+        // the Overview, so we are doing the sorting over the same items multiple times if the list
+        // of recent items didn't change. We could store an additional array of doc ids and sort
+        // them once when they are returned by this._recentManager.get_items() to avoid having to do 
+        // this sorting each time, but the sorting seems to be very fast anyway, so there is no need
+        // to introduce an additional class variable.
+        this._matchedItems = {};
+        this._matchedItemKeys = [];
+        let docIdsToRemove = [];
+        for (docId in this._allItems) {
+            this._matchedItems[docId] = 1;
+            this._matchedItemKeys.push(docId);
+        }
+
+        for (docId in docIdsToRemove) {
+            delete this._allItems[docId];
+        }
+
+        this._matchedItemKeys.sort(Lang.bind(this, this._compareItems));
+    },
+
+    // Compares items associated with the item ids based on how recently the items
+    // were last visited.
+    // Returns an integer value indicating the result of the comparison.
+   _compareItems : function(itemIdA, itemIdB) {
+        let docA = this._allItems[itemIdA];
+        let docB = this._allItems[itemIdB];
+
+        return docB.timestamp - docA.timestamp;
+    },
+
+    // Checks if the item info can be a match for the search string by checking
+    // the name of the document. Item info is expected to be GtkRecentInfo.
+    // Returns a boolean flag indicating if itemInfo is a match.
+    _isInfoMatching : function(itemInfo, search) {
+        if (!itemInfo.exists())
+            return false;
+ 
+        if (search == null || search == '')
+            return true;
+
+        let name = itemInfo.name.toLowerCase();
+        if (name.indexOf(search) >= 0)
+            return true;
+        // TODO: we can also check doc URIs, so that
+        // if you search for a directory name, we display recent files from it
+        return false;
+    },
+
+    // Creates a DocDisplayItem based on itemInfo, which is expected to be a DocInfo object.
+    _createDisplayItem: function(itemInfo) {
+        let currentSecs = new Date().getTime() / 1000;
+        let docDisplayItem = new DocDisplayItem(itemInfo, currentSecs);
+        this._updateTimeoutCallback(docDisplayItem, currentSecs);
+        return docDisplayItem;
+    },
+
+    //// Private Methods ////
+
+    // A callback function that redisplays the items, updating their descriptions,
+    // and sets up a new timeout callback.
+    _docTimeout: function () {
+        let currentSecs = new Date().getTime() / 1000;
+        this._updateTimeoutId = 0;
+        this._updateTimeoutTargetTime = -1;
+        for (let docId in this._displayedItems) {
+            let docDisplayItem = this._displayedItems[docId];
+            docDisplayItem.redisplay(currentSecs);          
+            this._updateTimeoutCallback(docDisplayItem, currentSecs);
+        }
+        return false;
+    },
+
+    // Updates the timeout callback if the timeout time for the docDisplayItem 
+    // is earlier than the target time for the current timeout callback.
+    _updateTimeoutCallback: function (docDisplayItem, currentSecs) {
+        let timeoutTime = docDisplayItem.getUpdateTimeoutTime();
+        if (this._updateTimeoutTargetTime < 0 || timeoutTime < this._updateTimeoutTargetTime) {
+            if (this._updateTimeoutId > 0)
+                Mainloop.source_remove(this._updateTimeoutId);
+            this._updateTimeoutId = Mainloop.timeout_add_seconds(timeoutTime - currentSecs, Lang.bind(this, this._docTimeout));
+            this._updateTimeoutTargetTime = timeoutTime;
+        }
+    }
+};
+
+Signals.addSignalMethods(DocDisplay.prototype);
+
+function DashDocDisplayItem(docInfo) {
+    this._init(docInfo);
+}
+
+DashDocDisplayItem.prototype = {
+    _init: function(docInfo) {
+        this._info = docInfo;
+        this._icon = docInfo.createIcon(DASH_DOCS_ICON_SIZE);
+
+        this.actor = new St.Clickable({ style_class: 'recent-docs-item',
+                                        reactive: true,
+                                        x_align: St.Align.START });
+
+        let box = new St.BoxLayout({ style_class: 'recent-docs-item-box' });
+        this.actor.set_child(box);
+
+        box.add(this._icon);
+
+        let text = new St.Label({ text: docInfo.name });
+        box.add(text);
+
+        this.actor.connect('clicked', Lang.bind(this, function () {
+            docInfo.launch();
+            Main.overview.hide();
+        }));
+
+        this.actor._delegate = this;
+        let draggable = DND.makeDraggable(this.actor);
+        draggable.connect('drag-begin',
+                          Lang.bind(this, function() {
+                              Main.overview.beginItemDrag(this);
+                          }));
+        draggable.connect('drag-end',
+                          Lang.bind(this, function() {
+                              Main.overview.endItemDrag(this);
+                          }));
+    },
+
+    getUri: function() {
+        return this._info.uri;
+    },
+
+    getDragActorSource: function() {
+        return this._icon;
+    },
+
+    getDragActor: function(stageX, stageY) {
+        this.dragActor = this._info.createIcon(DASH_DOCS_ICON_SIZE);
+        return this.dragActor;
+    },
+
+    //// Drag and drop functions ////
+
+    shellWorkspaceLaunch: function () {
+        this._info.launch();
+    }
+};
+
+/**
+ * Class used to display two column recent documents in the dash
+ */
+function DashDocDisplay() {
+    this._init();
+}
+
+DashDocDisplay.prototype = {
+    _init: function() {
+        this.actor = new Shell.GenericContainer();
+        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this.actor.connect('allocate', Lang.bind(this, this._allocate));
+        this._workId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._redisplay));
+
+        this._actorsByUri = {};
+
+        this._docManager = DocInfo.getDocManager();
+        this._docManager.connect('changed', Lang.bind(this, this._onDocsChanged));
+        this._pendingDocsChange = true;
+        this._checkDocExistence = false;
+    },
+
+    _getPreferredWidth: function(actor, forHeight, alloc) {
+        let children = actor.get_children();
+
+        // We use two columns maximum.  Just take the min and natural size of the
+        // first two items, even though strictly speaking it's not correct; we'd
+        // need to calculate how many items we could fit for the height, then
+        // take the biggest preferred width for each column.
+        // In practice the dash gets a fixed width anyways.
+
+        // If we have one child, add its minimum and natural size
+        if (children.length > 0) {
+            let [minSize, naturalSize] = children[0].get_preferred_width(forHeight);
+            alloc.min_size += minSize;
+            alloc.natural_size += naturalSize;
+        }
+        // If we have two, add its size, plus DEFAULT_SPACING
+        if (children.length > 1) {
+            let [minSize, naturalSize] = children[1].get_preferred_width(forHeight);
+            alloc.min_size += DEFAULT_SPACING + minSize;
+            alloc.natural_size += DEFAULT_SPACING + naturalSize;
+        }
+    },
+
+    _getPreferredHeight: function(actor, forWidth, alloc) {
+        let children = actor.get_children();
+
+        // The width of an item is our allocated width, minus spacing, divided in half.
+        this._itemWidth = Math.floor((forWidth - DEFAULT_SPACING) / 2);
+
+        let maxNatural = 0;
+        for (let i = 0; i < children.length; i++) {
+            let child = children[i];
+            let [minSize, naturalSize] = child.get_preferred_height(this._itemWidth);
+            maxNatural = Math.max(maxNatural, naturalSize);
+        }
+
+        this._itemHeight = maxNatural;
+
+        let firstColumnChildren = Math.ceil(children.length / 2);
+        alloc.natural_size = (firstColumnChildren * maxNatural +
+                              (firstColumnChildren - 1) * DEFAULT_SPACING);
+    },
+
+    _allocate: function(actor, box, flags) {
+        let width = box.x2 - box.x1;
+        let height = box.y2 - box.y1;
+
+        // Make sure this._itemWidth/Height have been computed, even
+        // if the parent actor didn't check our size before allocating.
+        // (Not clear if that is required or not as a Clutter
+        // invariant; this is safe and cheap because of caching.)
+        actor.get_preferred_height(width);
+
+        let children = actor.get_children();
+
+        let x = 0;
+        let y = 0;
+        let columnIndex = 0;
+        let i = 0;
+        // Loop over the children, going vertically down first.  When we run
+        // out of vertical space (our y variable is bigger than box.y2), switch
+        // to the second column.
+        while (i < children.length) {
+            let child = children[i];
+
+            if (y + this._itemHeight > box.y2) {
+                // Is this the second column, or we're in
+                // the first column and can't even fit one
+                // item?  In that case, break.
+                if (columnIndex == 1 || i == 0) {
+                    break;
+                }
+                // Set x to the halfway point.
+                columnIndex += 1;
+                x = x + this._itemWidth + DEFAULT_SPACING;
+                // And y is back to the top.
+                y = 0;
+                // Retry this same item, now that we're in the second column.
+                // By looping back to the top here, we re-test the size
+                // again for the second column.
+                continue;
+            }
+
+            let childBox = new Clutter.ActorBox();
+            childBox.x1 = x;
+            childBox.y1 = y;
+            childBox.x2 = childBox.x1 + this._itemWidth;
+            childBox.y2 = y + this._itemHeight;
+
+            y = childBox.y2 + DEFAULT_SPACING;
+
+            child.allocate(childBox, flags);
+            this.actor.set_skip_paint(child, false);
+
+            i++;
+        }
+
+        if (this._checkDocExistence) {
+            // Now we know how many docs we are displaying, queue a check to see if any of them
+            // have been deleted. If they are deleted, then we'll get a 'changed' signal; since
+            // we'll now be displaying items we weren't previously, we'll check again to see
+            // if they were deleted, and so forth and so on.
+            // TODO: We should change this to ask for as many as we can fit in the given space:
+            // https://bugzilla.gnome.org/show_bug.cgi?id=603522#c23
+            this._docManager.queueExistenceCheck(i);
+            this._checkDocExistence = false;
+        }
+
+        for (; i < children.length; i++)
+            this.actor.set_skip_paint(children[i], true);
+    },
+
+    _onDocsChanged: function() {
+        this._checkDocExistence = true;
+        Main.queueDeferredWork(this._workId);
+    },
+
+    _redisplay: function() {
+        // Should be kept alive by the _actorsByUri
+        this.actor.remove_all();
+        let docs = this._docManager.getTimestampOrderedInfos();
+        for (let i = 0; i < docs.length && i < MAX_DASH_DOCS; i++) {
+            let doc = docs[i];
+            let display = this._actorsByUri[doc.uri];
+            if (display) {
+                this.actor.add_actor(display.actor);
+            } else {
+                let display = new DashDocDisplayItem(doc);
+                this.actor.add_actor(display.actor);
+                this._actorsByUri[doc.uri] = display;
+            }
+        }
+        // Any unparented actors must have been deleted
+        for (let uri in this._actorsByUri) {
+            let display = this._actorsByUri[uri];
+            if (display.actor.get_parent() == null) {
+                display.actor.destroy();
+                delete this._actorsByUri[uri];
+            }
+        }
+        this.emit('changed');
+    }
+};
+
+Signals.addSignalMethods(DashDocDisplay.prototype);

 function DocSearchProvider() {
    this._init();
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -1,504 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
- * Copyright 2010 Red Hat, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-const DBus = imports.dbus;
-const Lang = imports.lang;
-const Signals = imports.signals;
-
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const Clutter = imports.gi.Clutter;
-const Gdm = imports.gi.Gdm;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-
-const GnomeSession = imports.misc.gnomeSession
-const Lightbox = imports.ui.lightbox;
-const Main = imports.ui.main;
-const ModalDialog = imports.ui.modalDialog;
-const Tweener = imports.ui.tweener;
-
-let _endSessionDialog = null;
-
-const _ITEM_ICON_SIZE = 48;
-const _DIALOG_ICON_SIZE = 32;
-
-const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
-
-const EndSessionDialogIface = {
-    name: 'org.gnome.SessionManager.EndSessionDialog',
-    methods: [{ name: 'Open',
-                inSignature: 'uuuao',
-                outSignature: ''
-              }
-             ],
-    signals: [{ name: 'Canceled',
-                outSignature: '',
-              }],
-    properties: []
-};
-
-const logoutDialogContent = {
-    subjectWithUser: _("Log Out %s"),
-    subject: _("Log Out"),
-    inhibitedDescription: _("Click Log Out to quit these applications and log out of the system."),
-    uninhibitedDescriptionWithUser: _("%s will be logged out automatically in %d seconds."),
-    uninhibitedDescription: _("You will be logged out automatically in %d seconds."),
-    endDescription: _("Logging out of the system."),
-    confirmButtonText: _("Log Out"),
-    iconStyleClass: 'end-session-dialog-logout-icon'
-};
-
-const shutdownDialogContent = {
-    subject: _("Shut Down"),
-    inhibitedDescription: _("Click Shut Down to quit these applications and shut down the system."),
-    uninhibitedDescription: _("The system will shut down automatically in %d seconds."),
-    endDescription: _("Shutting down the system."),
-    confirmButtonText: _("Shut Down"),
-    iconName: 'system-shutdown',
-    iconStyleClass: 'end-session-dialog-shutdown-icon'
-};
-
-const restartDialogContent = {
-    subject: _("Restart"),
-    inhibitedDescription: _("Click Restart to quit these applications and restart the system."),
-    uninhibitedDescription: _("The system will restart automatically in %d seconds."),
-    endDescription: _("Restarting the system."),
-    confirmButtonText: _("Restart"),
-    iconName: 'system-shutdown',
-    iconStyleClass: 'end-session-dialog-shutdown-icon'
-};
-
-const DialogContent = {
-    0 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT */: logoutDialogContent,
-    1 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN */: shutdownDialogContent,
-    2 /* GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART */: restartDialogContent
-};
-
-function findAppFromInhibitor(inhibitor) {
-    let desktopFile = inhibitor.app_id;
-
-    if (!GLib.str_has_suffix(desktopFile, '.desktop'))
-      desktopFile += '.desktop';
-
-    let candidateDesktopFiles = [];
-
-    candidateDesktopFiles.push(desktopFile);
-    candidateDesktopFiles.push('gnome-' + desktopFile);
-
-    let appSystem = Shell.AppSystem.get_default();
-    let app = null;
-    for (let i = 0; i < candidateDesktopFiles.length; i++) {
-        try {
-            app = appSystem.get_app(candidateDesktopFiles[i]);
-
-            if (app)
-                break;
-        } catch(e) {
-            // ignore errors
-        }
-    }
-
-    return app;
-}
-
-function ListItem(app, reason) {
-    this._init(app, reason);
-}
-
-ListItem.prototype = {
-    _init: function(app, reason) {
-        this._app = app;
-        this._reason = reason;
-
-        if (this._reason == null)
-          this._reason = '';
-
-        let layout = new St.BoxLayout({ vertical: false});
-
-        this.actor = new St.Clickable({ style_class: 'end-session-dialog-app-list-item',
-                                        can_focus:   true,
-                                        child:       layout,
-                                        reactive:    true,
-                                        x_align:     St.Align.START,
-                                        x_fill:      true });
-
-        this._icon = this._app.create_icon_texture(_ITEM_ICON_SIZE);
-
-        let iconBin = new St.Bin({ style_class: 'end-session-dialog-app-list-item-icon',
-                                   child:       this._icon });
-        layout.add(iconBin);
-
-        let textLayout = new St.BoxLayout({ style_class: 'end-session-dialog-app-list-item-text-box',
-                                            vertical:    true });
-        layout.add(textLayout);
-
-        this._nameLabel = new St.Label({ text:        this._app.get_name(),
-                                         style_class: 'end-session-dialog-app-list-item-name' });
-        textLayout.add(this._nameLabel,
-                       { expand: false,
-                         x_fill: true });
-
-        this._descriptionLabel = new St.Label({ text:        this._reason,
-                                                style_class: 'end-session-dialog-app-list-item-description' });
-        textLayout.add(this._descriptionLabel,
-                       { expand: true,
-                         x_fill: true });
-
-        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
-    },
-
-    _onClicked: function() {
-        this.emit('activate');
-        this._app.activate();
-    }
-};
-Signals.addSignalMethods(ListItem.prototype);
-
-// The logout timer only shows updates every 10 seconds
-// until the last 10 seconds, then it shows updates every
-// second.  This function takes a given time and returns
-// what we should show to the user for that time.
-function _roundSecondsToInterval(totalSeconds, secondsLeft, interval) {
-    let time;
-
-    time = Math.ceil(secondsLeft);
-
-    // Final count down is in decrements of 1
-    if (time <= interval)
-        return time;
-
-    // Round up higher than last displayable time interval
-    time += interval - 1;
-
-    // Then round down to that time interval
-    if (time > totalSeconds)
-        time = Math.ceil(totalSeconds);
-    else
-        time -= time % interval;
-
-    return time;
-}
-
-function _setLabelText(label, text) {
-    if (text) {
-        label.set_text(text);
-        label.show();
-    } else {
-        label.set_text('');
-        label.hide();
-    }
-}
-
-function EndSessionDialog() {
-    if (_endSessionDialog == null) {
-        this._init();
-        DBus.session.exportObject('/org/gnome/SessionManager/EndSessionDialog',
-                                  this);
-        _endSessionDialog = this;
-    }
-
-    return _endSessionDialog;
-}
-
-function init() {
-    // This always returns the same singleton object
-    // By instantiating it initially, we register the
-    // bus object, etc.
-    let dialog = new EndSessionDialog();
-}
-
-EndSessionDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
-
-    _init: function() {
-        ModalDialog.ModalDialog.prototype._init.call(this);
-
-        this._user = Gdm.UserManager.ref_default().get_user(GLib.get_user_name());
-
-        this._secondsLeft = 0;
-        this._totalSecondsToStayOpen = 0;
-        this._inhibitors = [];
-
-        this.connect('destroy',
-                     Lang.bind(this, this._onDestroy));
-        this.connect('opened',
-                     Lang.bind(this, this._onOpened));
-
-        this._userLoadedId = this._user.connect('notify::is_loaded',
-                                                Lang.bind(this, this._updateContent));
-
-        this._userChangedId = this._user.connect('changed',
-                                                 Lang.bind(this, this._updateContent));
-
-        let mainContentLayout = new St.BoxLayout({ vertical: false });
-        this.contentLayout.add(mainContentLayout,
-                               { x_fill: true,
-                                 y_fill: false });
-
-        this._iconBin = new St.Bin();
-        mainContentLayout.add(this._iconBin,
-                              { x_fill:  true,
-                                y_fill:  false,
-                                x_align: St.Align.END,
-                                y_align: St.Align.START });
-
-        let messageLayout = new St.BoxLayout({ vertical: true });
-        mainContentLayout.add(messageLayout,
-                              { y_align: St.Align.START });
-
-        this._subjectLabel = new St.Label({ style_class: 'end-session-dialog-subject' });
-
-        messageLayout.add(this._subjectLabel,
-                          { y_fill:  false,
-                            y_align: St.Align.START });
-
-        this._descriptionLabel = new St.Label({ style_class: 'end-session-dialog-description' });
-        this._descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._descriptionLabel.clutter_text.line_wrap = true;
-
-        messageLayout.add(this._descriptionLabel,
-                          { y_fill:  true,
-                            y_align: St.Align.START });
-
-        let scrollView = new St.ScrollView({ style_class: 'end-session-dialog-app-list'});
-        scrollView.set_policy(Gtk.PolicyType.NEVER,
-                              Gtk.PolicyType.AUTOMATIC);
-        this.contentLayout.add(scrollView,
-                               { x_fill: true,
-                                 y_fill: true });
-        this._applicationList = new St.BoxLayout({ vertical: true });
-        scrollView.add_actor(this._applicationList,
-                             { x_fill:  true,
-                               y_fill:  true,
-                               x_align: St.Align.START,
-                               y_align: St.Align.MIDDLE });
-    },
-
-    _onDestroy: function() {
-        this._user.disconnect(this._userLoadedId);
-        this._user.disconnect(this._userChangedId);
-    },
-
-    _setIconFromFile: function(iconFile, styleClass) {
-        if (styleClass)
-            this._iconBin.set_style_class_name(styleClass);
-        this._iconBin.set_style(null);
-
-        this._iconBin.child = null;
-        if (iconFile) {
-            this._iconBin.show();
-            this._iconBin.set_style('background-image: url("' + iconFile + '");');
-        } else {
-            this._iconBin.hide();
-        }
-    },
-
-    _setIconFromName: function(iconName, styleClass) {
-        if (styleClass)
-            this._iconBin.set_style_class_name(styleClass);
-        this._iconBin.set_style(null);
-
-        if (iconName != null) {
-            let textureCache = St.TextureCache.get_default();
-            let icon = textureCache.load_icon_name(this._iconBin.get_theme_node(),
-                                                   iconName,
-                                                   St.IconType.SYMBOLIC,
-                                                   _DIALOG_ICON_SIZE);
-
-            this._iconBin.child = icon;
-            this._iconBin.show();
-        } else {
-            this._iconBin.child = null;
-            this._iconBin.hide();
-        }
-    },
-
-    _updateContent: function() {
-        if (this.state != ModalDialog.State.OPENING &&
-            this.state != ModalDialog.State.OPENED)
-            return;
-
-        let dialogContent = DialogContent[this._type];
-
-        let subject = dialogContent.subject;
-        let description;
-
-        if (this._user.is_loaded && !dialogContent.iconName) {
-            let iconFile = this._user.get_icon_file();
-
-            this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
-        } else if (dialogContent.iconName) {
-            this._setIconFromName(dialogContent.iconName,
-                                  dialogContent.iconStyleClass);
-        }
-
-        if (this._inhibitors.length > 0) {
-            this._stopTimer();
-            description = dialogContent.inhibitedDescription;
-        } else if (this._secondsLeft > 0 && this._inhibitors.length == 0) {
-            let displayTime = _roundSecondsToInterval(this._totalSecondsToStayOpen,
-                                                      this._secondsLeft,
-                                                      10);
-
-            if (this._user.is_loaded) {
-                let realName = this._user.get_real_name();
-
-                if (realName != null) {
-                    if (dialogContent.subjectWithUser)
-                        subject = dialogContent.subjectWithUser.format(realName);
-
-                    if (dialogContent.uninhibitedDescriptionWithUser)
-                        description = dialogContent.uninhibitedDescriptionWithUser.format(realName, displayTime);
-                    else
-                        description = dialogContent.uninhibitedDescription.format(displayTime);
-                }
-            }
-
-            if (!description)
-                description = dialogContent.uninhibitedDescription.format(displayTime);
-        } else {
-            description = dialogContent.endDescription;
-        }
-
-        _setLabelText(this._subjectLabel, subject);
-        _setLabelText(this._descriptionLabel, description);
-    },
-
-    _updateButtons: function() {
-        if (this.state != ModalDialog.State.OPENING &&
-            this.state != ModalDialog.State.OPENED)
-            return;
-
-        let dialogContent = DialogContent[this._type];
-        let confirmButtonText = _("Confirm");
-
-        if (dialogContent.confirmButtonText)
-            confirmButtonText = dialogContent.confirmButtonText;
-
-        this.setButtons([{ label: _("Cancel"),
-                           action: Lang.bind(this, this.cancel),
-                           key:    Clutter.Escape
-                         },
-                         { label:  confirmButtonText,
-                           action: Lang.bind(this, this._confirm)
-                         }]);
-    },
-
-    cancel: function() {
-        this._stopTimer();
-        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
-                                 'org.gnome.SessionManager.EndSessionDialog',
-                                 'Canceled', '', []);
-        this.close(global.get_current_time());
-    },
-
-    _confirm: function() {
-        this._fadeOutDialog();
-        this._stopTimer();
-        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
-                                 'org.gnome.SessionManager.EndSessionDialog',
-                                 'Confirmed', '', []);
-    },
-
-    _onOpened: function() {
-        if (this._inhibitors.length == 0)
-            this._startTimer();
-    },
-
-    _startTimer: function() {
-        this._secondsLeft = this._totalSecondsToStayOpen;
-        Tweener.addTween(this,
-                         { _secondsLeft: 0,
-                           time: this._secondsLeft,
-                           transition: 'linear',
-                           onUpdate: Lang.bind(this, this._updateContent),
-                           onComplete: Lang.bind(this, this._confirm),
-                         });
-    },
-
-    _stopTimer: function() {
-        Tweener.removeTweens(this);
-        this._secondsLeft = 0;
-    },
-
-    _onInhibitorLoaded: function(inhibitor) {
-        if (this._inhibitors.indexOf(inhibitor) < 0) {
-            // Stale inhibitor
-            return;
-        }
-
-        let app = findAppFromInhibitor(inhibitor);
-
-        if (app) {
-            let item = new ListItem(app, inhibitor.reason);
-            item.connect('activate',
-                         Lang.bind(this, function() {
-                             this.close(global.get_current_time());
-                         }));
-            this._applicationList.add(item.actor, { x_fill: true });
-            this._stopTimer();
-        } else {
-            // inhibiting app is a service, not an application
-            this._inhibitors.splice(this._inhibitors.indexOf(inhibitor), 1);
-        }
-
-        this._updateContent();
-    },
-
-    OpenAsync: function(type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths, callback) {
-        this._totalSecondsToStayOpen = totalSecondsToStayOpen;
-        this._inhibitors = [];
-        this._applicationList.remove_all();
-        this._type = type;
-
-        if (!(this._type in DialogContent))
-            throw new DBus.DBusError('org.gnome.Shell.ModalDialog.TypeError',
-                                     "Unknown dialog type requested");
-
-        for (let i = 0; i < inhibitorObjectPaths.length; i++) {
-            let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i]);
-
-            inhibitor.connect('is-loaded',
-                              Lang.bind(this, function() {
-                                  this._onInhibitorLoaded(inhibitor);
-                              }));
-            this._inhibitors.push(inhibitor);
-        }
-
-        if (!this.open(timestamp))
-            throw new DBus.DBusError('org.gnome.Shell.ModalDialog.GrabError',
-                                     "Cannot grab pointer and keyboard");
-
-        this._updateButtons();
-        this._updateContent();
-
-        let signalId = this.connect('opened',
-                                    Lang.bind(this, function() {
-                                        callback();
-                                        this.disconnect(signalId);
-                                    }));
-    }
-};
-DBus.conformExport(EndSessionDialog.prototype, EndSessionDialogIface);
--- 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);
    }

@ -88,6 +88,8 @@ function init() {

    _blockMethod('Clutter.Event.get_state', 'Shell.get_event_state',
                 'gjs\'s handling of Clutter.ModifierType is broken. See bug 597292.');
+    _blockMethod('Gdk.Display.get_device_state', 'global.get_pointer',
+                 'gjs\'s handling of Gdk.ModifierType is broken. See bug 597292.');
    _blockMethod('Gdk.Window.get_device_position', 'global.get_pointer',
                 'gjs\'s handling of Gdk.ModifierType is broken. See bug 597292.');

--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -4,8 +4,6 @@ const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const St = imports.gi.St;

-const Config = imports.misc.config;
-
 const ExtensionState = {
    ENABLED: 1,
    DISABLED: 2,
@ -27,36 +25,6 @@ var disabledExtensions;
 // GFile for user extensions
 var userExtensionsDir = null;

-/**
- * versionCheck:
- * @required: an array of versions we're compatible with
- * @current: the version we have
- *
- * Check if a component is compatible for an extension.
- * @required is an array, and at least one version must match.
- * @current must be in the format <major>.<minor>.<point>.<micro>
- * <micro> is always ignored
- * <point> is ignored if <minor> is even (so you can target the
- * whole stable release)
- * <minor> and <major> must match
- * Each target version must be at least <major> and <minor>
- */
-function versionCheck(required, current) {
-    let currentArray = current.split('.');
-    let major = currentArray[0];
-    let minor = currentArray[1];
-    let point = currentArray[2];
-    for (let i = 0; i < required.length; i++) {
-        let requiredArray = required[i].split('.');
-        if (requiredArray[0] == major &&
-            requiredArray[1] == minor &&
-            (requiredArray[2] == point ||
-             (requiredArray[2] == undefined && parseInt(minor) % 2 == 0)))
-            return true;
-    }
-    return false;
-}
-
 function loadExtension(dir, enabled, type) {
    let info;
    let baseErrorString = 'While loading extension from "' + dir.get_parse_name() + '": ';
@ -75,8 +43,8 @@ function loadExtension(dir, enabled, type) {
        global.logError(baseErrorString + 'Failed to parse metadata.json: ' + e);
        return;
    }
-    let requiredProperties = ['uuid', 'name', 'description', 'shell-version'];
-    for (let i = 0; i < requiredProperties.length; i++) {
+    let requiredProperties = ['uuid', 'name', 'description'];
+    for (let i = 0; i < requiredProperties; i++) {
        let prop = requiredProperties[i];
        if (!meta[prop]) {
            global.logError(baseErrorString + 'missing "' + prop + '" property in metadata.json');
@ -100,12 +68,6 @@ function loadExtension(dir, enabled, type) {
        return;
    }

-    if (!versionCheck(meta['shell-version'], Config.PACKAGE_VERSION) ||
-        (meta['js-version'] && !versionCheck(meta['js-version'], Config.GJS_VERSION))) {
-        global.logError(baseErrorString + 'extension is not compatible with current GNOME Shell and/or GJS version');
-        return;
-    }
-
    extensionMeta[meta.uuid] = meta;
    extensionMeta[meta.uuid].type = type;
    extensionMeta[meta.uuid].path = dir.get_path();
--- a/js/ui/genericDisplay.js
+++ b/js/ui/genericDisplay.js
@ -0,0 +1,693 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Signals = imports.signals;
+const St = imports.gi.St;
+
+const DND = imports.ui.dnd;
+const Main = imports.ui.main;
+
+const RedisplayFlags = { NONE: 0,
+                         FULL: 1 << 1,
+                         SUBSEARCH: 1 << 2,
+                         IMMEDIATE: 1 << 3 };
+
+// Used by subclasses
+const ITEM_DISPLAY_ICON_SIZE = 48;
+const PREVIEW_ICON_SIZE = 96;
+
+/* This is a virtual class that represents a single display item containing
+ * a name, a description, and an icon. It allows selecting an item and represents
+ * it by highlighting it with a different background color than the default.
+ */
+function GenericDisplayItem() {
+    this._init();
+}
+
+GenericDisplayItem.prototype = {
+    _init: function() {
+        this.actor = new St.BoxLayout({ style_class: 'generic-display-item',
+                                         reactive: true });
+
+        this.actor._delegate = this;
+        this.actor.connect('button-release-event',
+                           Lang.bind(this,
+                                     function() {
+                                         // Activates the item by launching it
+                                         this.emit('activate');
+                                         return true;  
+                                     }));
+
+        let draggable = DND.makeDraggable(this.actor);
+        draggable.connect('drag-begin',
+                          Lang.bind(this, function() {
+                              Main.overview.beginItemDrag(this);
+                          }));
+        draggable.connect('drag-end',
+                          Lang.bind(this, function() {
+                              Main.overview.endItemDrag(this);
+                          }));
+
+        this._iconBin = new St.Bin();
+        this.actor.add(this._iconBin);
+
+        this._infoText = new St.BoxLayout({ style_class: 'generic-display-item-text',
+                                             vertical: true });
+        this.actor.add(this._infoText, { expand: true, y_fill: false });
+
+        this._name = null;
+        this._description = null;
+        this._icon = null;
+
+        this._initialLoadComplete = false;
+
+        // An array of details description actors that we create over time for the item.
+        // It is used for updating the description text inside the details actor when
+        // the description text for the item is updated.
+        this._detailsDescriptions = [];
+    },
+
+    //// Draggable object interface ////
+
+    // Returns a cloned texture of the item's icon to represent the item as it 
+    // is being dragged. 
+    getDragActor: function(stageX, stageY) {
+        return this._createIcon();
+    },
+
+    // Returns the item icon, a separate copy of which is used to
+    // represent the item as it is being dragged. This is used to
+    // determine a snap-back location for the drag icon if it does
+    // not get accepted by any drop target.
+    getDragActorSource: function() {
+        return this._icon;
+    },
+
+    //// Public methods ////
+
+    // Highlights the item by setting a different background color than the default 
+    // if isSelected is true, removes the highlighting otherwise.
+    markSelected: function(isSelected) {
+        if (isSelected)
+            this.actor.add_style_pseudo_class('selected');
+        else
+            this.actor.remove_style_pseudo_class('selected');
+    },
+
+    /*
+     * Returns an actor containing item details. In the future details can have more information than what
+     * the preview pop-up has and be item-type specific.
+     */
+    createDetailsActor: function() {
+
+        let details = new St.BoxLayout({ style_class: 'generic-display-container',
+                                         vertical: true });
+
+        let mainDetails = new St.BoxLayout({ style_class: 'generic-display-container' });
+
+        // Inner box with name and description
+        let textDetails = new St.BoxLayout({ style_class: 'generic-display-details',
+                                             vertical: true });
+        let detailsName = new St.Label({ style_class: 'generic-display-details-name',
+                                          text: this._name.text });
+        textDetails.add(detailsName);
+
+        let detailsDescription = new St.Label({ text: this._description.text });
+        textDetails.add(detailsDescription);
+
+        this._detailsDescriptions.push(detailsDescription);
+
+        mainDetails.add(textDetails, { expand: true });
+
+        let previewIcon = this._createPreviewIcon();
+        let largePreviewIcon = this._createLargePreviewIcon();
+
+        if (previewIcon != null && largePreviewIcon == null) {
+            mainDetails.insert_actor(previewIcon, 0);
+        }
+
+        details.add(mainDetails);
+
+        if (largePreviewIcon != null) {
+            details.add(largePreviewIcon);
+        }
+   
+        return details;
+    },
+
+    // Destroys the item.
+    destroy: function() {
+        this.actor.destroy();
+    },
+
+    //// Pure virtual public methods ////
+
+    // Performes an action associated with launching this item, such as opening a file or an application.
+    launch: function() {
+        throw new Error('Not implemented');
+    },
+
+    //// Protected methods ////
+
+    /*
+     * Creates the graphical elements for the item based on the item information.
+     *
+     * nameText - name of the item
+     * descriptionText - short description of the item
+     */
+    _setItemInfo: function(nameText, descriptionText) {
+        if (this._name != null) {
+            // this also removes this._name from the parent container,
+            // so we don't need to call this.actor.remove_actor(this._name) directly
+            this._name.destroy();
+            this._name = null;
+        } 
+        if (this._description != null) {
+            this._description.destroy();
+            this._description = null;
+        } 
+        if (this._icon != null) {
+            // though we get the icon from elsewhere, we assume its ownership here,
+            // and therefore should be responsible for distroying it
+            this._icon.destroy();
+            this._icon = null;
+        }
+
+        this._icon = this._createIcon();
+        this._iconBin.set_child(this._icon);
+
+        this._name = new St.Label({ style_class: 'generic-display-item-name',
+                                     text: nameText });
+        this._infoText.add(this._name);
+
+        this._description = new St.Label({ style_class: 'generic-display-item-description',
+                                            text: descriptionText ? descriptionText : '' });
+        this._infoText.add(this._description);
+    },
+
+    // Sets the description text for the item, including the description text
+    // in the details actors that have been created for the item.
+    _setDescriptionText: function(text) {
+        this._description.text = text;
+        for (let i = 0; i < this._detailsDescriptions.length; i++) {
+            let detailsDescription = this._detailsDescriptions[i];
+            if (detailsDescription != null) {
+                detailsDescription.text = text;
+            }
+        }
+    },
+
+    //// Virtual protected methods ////
+
+    // Creates and returns a large preview icon, but only if we have a detailed image.
+    _createLargePreviewIcon : function() {
+        return null;
+    },
+
+    //// Pure virtual protected methods ////
+
+    // Returns an icon for the item.
+    _createIcon: function() {
+        throw new Error('Not implemented');
+    },
+
+    // Returns a preview icon for the item.
+    _createPreviewIcon: function() {
+        throw new Error('Not implemented');
+    }
+
+    //// Private methods ////
+};
+
+Signals.addSignalMethods(GenericDisplayItem.prototype);
+
+/* This is a virtual class that represents a display containing a collection of items
+ * that can be filtered with a search string.
+ */
+function GenericDisplay() {
+    this._init();
+}
+
+GenericDisplay.prototype = {
+    _init : function() {
+        this._search = '';
+        this._expanded = false;
+
+        this.actor = new St.ScrollView({ x_fill: true,
+                                         y_fill: false,
+                                         vshadows: true });
+        this._list = new St.BoxLayout({ style_class: 'generic-display-container',
+                                         vertical: true });
+        this.actor.add_actor(this._list);
+        this.actor.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+
+        this._pendingRedisplay = RedisplayFlags.NONE;
+        this.actor.connect('notify::mapped', Lang.bind(this, this._onMappedNotify));
+
+        // map<itemId, Object> where Object represents the item info
+        this._allItems = {};
+        // set<itemId>
+        this._matchedItems = {};
+        // sorted array of items matched by search
+        this._matchedItemKeys = [];
+        // map<itemId, GenericDisplayItem>
+        this._displayedItems = {};
+        this._openDetailIndex = -1;
+        this._selectedIndex = -1;
+    },
+
+    //// Public methods ////
+
+    // Sets the search string and displays the matching items.
+    setSearch: function(text) {
+        let lowertext = text.toLowerCase();
+        if (lowertext == this._search) {
+            return;
+        }
+        let flags = RedisplayFlags.IMMEDIATE;
+        if (this._search != '') {
+            // Because we combine search terms with OR, we have to be sure that no new term
+            // was introduced before deciding that the new search results will be a subset of
+            // the existing search results.
+            if (lowertext.indexOf(this._search) == 0 &&
+                lowertext.split(/\s+/).length == this._search.split(/\s+/).length) {
+                flags |= RedisplayFlags.SUBSEARCH;
+            }
+        }
+        this._search = lowertext;
+        this._redisplay(flags);
+    },
+
+    // Launches the item that is currently selected, closing the Overview
+    activateSelected: function() {
+        if (this._selectedIndex != -1) {
+            let selected = this._findDisplayedByIndex(this._selectedIndex);
+            selected.launch();
+            this.unsetSelected();
+            Main.overview.hide();
+        }
+    },
+
+    // Moves the selection one up. If the selection was already on the top item, it's moved
+    // to the bottom one. Returns true if the selection actually moved up, false if it wrapped 
+    // around to the bottom.
+    selectUp: function() {
+        let count = this._getVisibleCount();
+        let selectedUp = true;
+        let prev = this._selectedIndex - 1;
+        if (this._selectedIndex <= 0) {
+            prev = count - 1;
+            selectedUp = false; 
+        }
+        this._selectIndex(prev);
+        return selectedUp;
+    },
+
+    // Moves the selection one down. If the selection was already on the bottom item, it's moved
+    // to the top one. Returns true if the selection actually moved down, false if it wrapped 
+    // around to the top.
+    selectDown: function() {
+        let count = this._getVisibleCount();
+        let selectedDown = true;
+        let next = this._selectedIndex + 1;
+        if (this._selectedIndex == count - 1) {
+            next = 0;
+            selectedDown = false;
+        }
+        this._selectIndex(next);
+        return selectedDown;
+    },
+
+    // Selects the first item among the displayed items.
+    selectFirstItem: function() {
+        if (this.hasItems())
+            this._selectIndex(0);
+    },
+
+    // Selects the last item among the displayed items.
+    selectLastItem: function() {
+        let count = this._getVisibleCount();
+        if (this.hasItems())
+            this._selectIndex(count - 1);
+    },
+
+    // Returns true if the display has some item selected.
+    hasSelected: function() {
+        return this._selectedIndex != -1;
+    },
+
+    // Removes selection if some display item is selected.
+    unsetSelected: function() {
+        this._selectIndex(-1);
+    },
+
+    // Returns true if the display has any displayed items.
+    hasItems: function() {
+        // TODO: figure out why this._list.displayedCount is returning a
+        // positive number when this._mathedItems.length is 0
+        // This can be triggered if a search string is entered for which there are no matches.
+        // log('this._mathedItems.length: ' + this._matchedItems.length + ' this._list.displayedCount ' + this._list.displayedCount);
+        return this._matchedItemKeys.length > 0;
+    },
+
+    getMatchedItemsCount: function() {
+        return this._matchedItemKeys.length;
+    },
+
+    // Load the initial state
+    load: function() {
+        this._redisplay(RedisplayFlags.FULL);
+    },
+
+    // Should be called when the display is closed
+    resetState: function() {
+        this._filterReset();
+        this._openDetailIndex = -1;
+        this.actor.get_vscroll_bar().get_adjustment().value = 0;
+    },
+
+    // Returns an actor which acts as a sidebar; this is used for
+    // the applications category view
+    getNavigationArea: function () {
+        return null;
+    },
+
+    createDetailsForIndex: function(index) {
+        let item = this._findDisplayedByIndex(index);
+        return item.createDetailsActor();
+    },
+
+    //// Protected methods ////
+
+    _recreateDisplayItems: function() {
+        this._removeAllDisplayItems();
+        this._setDefaultList();
+        for (let itemId in this._allItems) {
+            this._addDisplayItem(itemId);
+        }
+    },
+
+    // Creates a display item based on the information associated with itemId
+    // and adds it to the list of displayed items, but does not yet display it.
+    _addDisplayItem : function(itemId) {
+        if (this._displayedItems.hasOwnProperty(itemId)) {
+            log('Tried adding a display item for ' + itemId + ', but an item with this item id is already among displayed items.');
+            return;
+        }
+
+        let itemInfo = this._allItems[itemId];
+        let displayItem = this._createDisplayItem(itemInfo);
+
+        displayItem.connect('activate',
+                            Lang.bind(this,
+                                      function() {
+                                          // update the selection
+                                          this._selectIndex(this._list.get_children().indexOf(displayItem.actor));
+                                          this.activateSelected();
+                                      }));
+
+        displayItem.connect('show-details',
+                            Lang.bind(this,
+                                      function() {
+                                          let index = this._list.get_children().indexOf(displayItem.actor);
+                                          /* Close the details pane if already open */
+                                          if (index == this._openDetailIndex) {
+                                              this._openDetailIndex = -1;
+                                              this.emit('show-details', -1);
+                                          } else {
+                                              this._openDetailIndex = index;
+                                              this.emit('show-details', index);
+                                          }
+                                      }));
+        this._displayedItems[itemId] = displayItem;
+    },
+
+    // Removes an item identifed by the itemId from the displayed items.
+    _removeDisplayItem: function(itemId) {
+        let children = this._list.get_children();
+        let count = children.length;
+        let displayItem = this._displayedItems[itemId];
+        let displayItemIndex = children.indexOf(displayItem.actor);
+
+        if (this.hasSelected() && count == 1) {
+            this.unsetSelected();
+        } else if (this.hasSelected() && displayItemIndex < this._selectedIndex) {
+            this.selectUp();
+        }
+
+        displayItem.destroy();
+
+        delete this._displayedItems[itemId];
+    },
+
+    // Removes all displayed items.
+    _removeAllDisplayItems: function() {
+        this.unsetSelected();
+        for (itemId in this._displayedItems)
+            this._removeDisplayItem(itemId);
+     },
+
+    // Return true if there's an active search or other constraint
+    // on the list
+    _filterActive: function() {
+        return this._search != '';
+    },
+
+    // Called when we are resetting state
+    _filterReset: function() {
+        this.unsetSelected();
+    },
+
+    _compareSearchMatch: function(a, b) {
+        let countA = this._matchedItems[a];
+        let countB = this._matchedItems[b];
+        if (countA > countB)
+            return -1;
+        else if (countA < countB)
+            return 1;
+        else
+            return this._compareItems(a, b);
+    },
+
+    _setMatches: function(matches) {
+        this._matchedItems = matches;
+        this._matchedItemKeys = [];
+        for (let itemId in this._matchedItems) {
+            this._matchedItemKeys.push(itemId);
+        }
+        this._matchedItemKeys.sort(Lang.bind(this, this._compareSearchMatch));
+    },
+
+    /**
+     * _redisplaySubSearch:
+     * A somewhat more optimized function called when we know
+     * that we're going to be displaying a subset of the items
+     * we already had, in the same order.  In that case, we can
+     * just hide the actors that shouldn't be shown.
+     */
+    _redisplaySubSearch: function() {
+        let matches = this._getSearchMatchedItems(true);
+
+        // Just hide all from the old set,
+        // we'll show the ones we want below
+        for (let itemId in this._displayedItems) {
+            let item = this._displayedItems[itemId];
+            item.actor.hide();
+        }
+
+        this._setMatches(matches);
+
+        for (let itemId in matches) {
+            let item = this._displayedItems[itemId];
+            item.actor.show();
+        }
+        this._list.queue_relayout();
+    },
+
+    _redisplayReordering: function() {
+        if (!this._filterActive()) {
+            this._setDefaultList();
+        } else {
+            this._setMatches(this._getSearchMatchedItems(false));
+        }
+        this._list.remove_all();
+        for (let i = 0; i < this._matchedItemKeys.length; i++) {
+            let itemId = this._matchedItemKeys[i];
+            let item = this._displayedItems[itemId];
+            item.actor.show();
+            this._list.add_actor(item.actor);
+       }
+    },
+
+    /*
+     * Updates the displayed items, applying the search string if one exists.
+     * @flags: Flags controlling redisplay behavior as follows:
+     *  SUBSEARCH - Indicates that the current _search is a superstring of the previous
+     *  one, which implies we only need to re-search through previous results.
+     *  FULL - Indicates that we need recreate all displayed items.
+     *  IMMEDIATE - Do the full redisplay even if we're not mapped.  This is useful
+     *  if you want to get the number of matched items and show/hide a section based on
+     *  that number.
+     */
+    _redisplay: function(flags) {
+        let immediate = (flags & RedisplayFlags.IMMEDIATE) != 0;
+        if (!immediate && !this.actor.mapped) {
+            this._pendingRedisplay |= flags;
+            return;
+        }
+
+        let isSubSearch = (flags & RedisplayFlags.SUBSEARCH) != 0;
+        let fullReload = (flags & RedisplayFlags.FULL) != 0;
+
+        let hadSelected = this.hasSelected();
+        this.unsetSelected();
+
+        if (!this._initialLoadComplete)
+            fullReload = true;
+
+        if (!this._refreshCache())
+            fullReload = true;
+
+        if (fullReload) {
+            this._recreateDisplayItems();
+            this._initialLoadComplete = true;
+        }
+
+        if (isSubSearch) {
+            this._redisplaySubSearch();
+        } else {
+            this._redisplayReordering();
+        }
+
+        if (hadSelected) {
+            this._selectedIndex = -1;
+            this.selectFirstItem();
+        }
+
+        this.emit('redisplayed');
+    },
+
+    //// Pure virtual protected methods ////
+
+    // Performs the steps needed to have the latest information about the items.
+    // Implementation should return %true if we are up to date, and %false
+    // if a full reload occurred.
+    _refreshCache: function() {
+        throw new Error('Not implemented');
+    },
+
+    // Sets the list of the displayed items based on the default sorting order.
+    // The default sorting order is specific to each implementing class.
+    _setDefaultList: function() {
+        throw new Error('Not implemented');
+    },
+
+    // Compares items associated with the item ids based on the order in which the
+    // items should be displayed.
+    // Intended to be used as a compareFunction for array.sort().
+    // Returns an integer value indicating the result of the comparison.
+    _compareItems: function(itemIdA, itemIdB) {
+        throw new Error('Not implemented');
+    },
+
+    // Checks if the item info can be a match for the search string. 
+    // Returns a boolean flag indicating if that's the case.
+    _isInfoMatching: function(itemInfo, search) {
+        throw new Error('Not implemented');
+    },
+
+    // Creates a display item based on itemInfo.
+    _createDisplayItem: function(itemInfo) {
+        throw new Error('Not implemented');
+    },
+
+    //// Private methods ////
+
+    _getItemSearchScore: function(itemId, terms) {
+        let item = this._allItems[itemId];
+        let score = 0;
+        for (let i = 0; i < terms.length; i++) {
+            let term = terms[i];
+            if (this._isInfoMatching(item, term)) {
+                score++;
+            }
+        }
+        return score;
+    },
+
+    _getSearchMatchedItems: function(isSubSearch) {
+        // Break the search up into terms, and search for each
+        // individual term.  Keep track of the number of terms
+        // each item matched.
+        let terms = this._search.split(/\s+/);
+        let matchScores = {};
+
+        if (isSubSearch) {
+            for (let i = 0; i < this._matchedItemKeys.length; i++) {
+                let itemId = this._matchedItemKeys[i];
+                let score = this._getItemSearchScore(itemId, terms);
+                if (score > 0)
+                    matchScores[itemId] = score;
+            }
+        } else {
+            for (let itemId in this._displayedItems) {
+                let score = this._getItemSearchScore(itemId, terms);
+                if (score > 0)
+                    matchScores[itemId] = score;
+            }
+        }
+        return matchScores;
+    },
+
+    // Returns a display item based on its index in the ordering of the
+    // display children.
+    _findDisplayedByIndex: function(index) {
+        let actor = this._list.get_children()[index];
+        return this._findDisplayedByActor(actor);
+    },
+
+    // Returns a display item based on the actor that represents it in 
+    // the display.
+    _findDisplayedByActor: function(actor) {
+        for (itemId in this._displayedItems) {
+            let item = this._displayedItems[itemId];
+            if (item.actor == actor) {
+                return item;
+            }
+        }
+        return null;
+    },
+
+    // Selects (e.g. highlights) a display item at the provided index,
+    // updates this.selectedItemDetails actor, and emits 'selected' signal.
+    _selectIndex: function(index) {
+        // Cleanup from the previous item
+        if (this.hasSelected()) {
+            this._findDisplayedByIndex(this._selectedIndex).markSelected(false);
+        }
+
+        this._selectedIndex = index;
+        if (index < 0)
+            return;
+
+        // Mark the new item as selected and create its details pane
+        let item = this._findDisplayedByIndex(index);
+        item.markSelected(true);
+        this.emit('selected');
+    },
+
+    _getVisibleCount: function() {
+        return this._list.get_n_children();
+    },
+
+    _onMappedNotify: function () {
+        let mapped = this.actor.mapped;
+        if (mapped && this._pendingRedisplay > RedisplayFlags.NONE)
+            this._redisplay(this._pendingRedisplay);
+
+        this._pendingRedisplay = RedisplayFlags.NONE;
+    }
+};
+
+Signals.addSignalMethods(GenericDisplay.prototype);
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@ -165,16 +165,8 @@ IconGrid.prototype = {
        alloc.natural_size = nColumns * this._item_size + totalSpacing;
    },

-    _getVisibleChildren: function() {
-        let children = this._grid.get_children();
-        children = children.filter(function(actor) {
-            return actor.visible;
-        });
-        return children;
-    },
-
    _getPreferredHeight: function (grid, forWidth, alloc) {
-        let children = this._getVisibleChildren();
+        let children = this._grid.get_children();
        let [nColumns, usedWidth] = this._computeLayout(forWidth);
        let nRows;
        if (nColumns > 0)
@ -190,7 +182,7 @@ IconGrid.prototype = {
    },

    _allocate: function (grid, box, flags) {
-        let children = this._getVisibleChildren();
+        let children = this._grid.get_children();
        let availWidth = box.x2 - box.x1;
        let availHeight = box.y2 - box.y1;

--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -398,9 +398,6 @@ Inspector.prototype = {
    },

    _allocate: function(actor, box, flags) {
-        if (!this._eventHandler)
-            return;
-
        let primary = global.get_primary_monitor();

        let [minWidth, minHeight, natWidth, natHeight] =
@ -418,7 +415,6 @@ Inspector.prototype = {
        Clutter.ungrab_pointer(this._eventHandler);
        Clutter.ungrab_keyboard(this._eventHandler);
        this._eventHandler.destroy();
-        this._eventHandler = null;
        this.emit('closed');
    },

@ -667,11 +663,11 @@ LookingGlass.prototype = {
                                        style_class: 'lg-dialog',
                                        vertical: true,
                                        visible: false });
-        this.actor.connect('key-press-event', Lang.bind(this, this._globalKeyPressEvent));

-        this._interfaceSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
-        this._interfaceSettings.connect('changed::monospace-font-name',
-                                        Lang.bind(this, this._updateFont));
+        let gconf = GConf.Client.get_default();
+        gconf.add_dir('/desktop/gnome/interface', GConf.ClientPreloadType.PRELOAD_NONE);
+        gconf.notify_add('/desktop/gnome/interface/monospace_font_name',
+                         Lang.bind(this, this._updateFont));
        this._updateFont();

        Main.uiGroup.add_actor(this.actor);
@ -782,7 +778,8 @@ LookingGlass.prototype = {
    },

    _updateFont: function() {
-        let fontName = this._interfaceSettings.get_string('monospace-font-name');
+        let gconf = GConf.Client.get_default();
+        let fontName = gconf.get_string('/desktop/gnome/interface/monospace_font_name');
        // This is mishandled by the scanner - should by Pango.FontDescription_from_string(fontName);
        // https://bugzilla.gnome.org/show_bug.cgi?id=595889
        let fontDesc = Pango.font_description_from_string(fontName);
@ -928,15 +925,20 @@ LookingGlass.prototype = {
        if (this._open)
            return;

-        if (!Main.pushModal(this._entry))
+        if (!Main.pushModal(this.actor))
            return;

+        this._keyPressEventId = global.stage.connect('key-press-event',
+            Lang.bind(this, this._globalKeyPressEvent));
+
        this.actor.show();
        this.actor.lower(Main.chrome.actor);
        this._open = true;

        Tweener.removeTweens(this.actor);

+        global.stage.set_key_focus(this._entry);
+
        // We inverse compensate for the slow-down so you can change the factor
        // through LookingGlass without long waits.
        Tweener.addTween(this.actor, { time: 0.5 / St.get_slow_down_factor(),
@ -949,6 +951,9 @@ LookingGlass.prototype = {
        if (!this._open)
            return;

+        if (this._keyPressEventId)
+            global.stage.disconnect(this._keyPressEventId);
+
        this._objInspector.actor.hide();

        this._historyNavIndex = -1;
@ -961,7 +966,7 @@ LookingGlass.prototype = {
            this._borderPaintTarget = null;
        }

-        Main.popModal(this._entry);
+        Main.popModal(this.actor);

        Tweener.addTween(this.actor, { time: 0.5 / St.get_slow_down_factor(),
                                       transition: 'easeOutQuad',
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@ -10,7 +10,6 @@ const Signals = imports.signals;

 const Main = imports.ui.main;
 const MagnifierDBus = imports.ui.magnifierDBus;
-const Params = imports.misc.params;

 // Keep enums in sync with GSettings schemas
 const MouseTrackingMode = {
@ -66,14 +65,11 @@ Magnifier.prototype = {

        // Create the first ZoomRegion and initialize it according to the
        // magnification settings.
-
-        let mask;
-        [this.xMouse, this.yMouse, mask] = global.get_pointer();
-
+        let [xMouse, yMouse, mask] = global.get_pointer();
        let aZoomRegion = new ZoomRegion(this, this._cursorRoot);
        this._zoomRegions.push(aZoomRegion);
        let showAtLaunch = this._settingsInit(aZoomRegion);
-        aZoomRegion.scrollContentsTo(this.xMouse, this.yMouse);
+        aZoomRegion.scrollContentsTo(xMouse, yMouse);

        xfixesCursor.connect('cursor-change', Lang.bind(this, this._updateMouseSprite));
        this._xfixesCursor = xfixesCursor;
@ -141,10 +137,12 @@ Magnifier.prototype = {
     * Turn on mouse tracking, if not already doing so.
     */
    startTrackingMouse: function() {
+        // initialize previous mouse coord to undefined.
+        let prevCoord = { x: NaN, y: NaN };
        if (!this._mouseTrackingId)
            this._mouseTrackingId = Mainloop.timeout_add(
                MOUSE_POLL_FREQUENCY,
-                Lang.bind(this, this.scrollToMousePos)
+                Lang.bind(this, this.scrollToMousePos, prevCoord)
            );
    },

@ -171,15 +169,14 @@ Magnifier.prototype = {
     * scrollToMousePos:
     * Position all zoom regions' ROI relative to the current location of the
     * system pointer.
+     * @prevCoord:  The previous mouse coordinates.  Used to stop scrolling if
+     *              the new position is the same as the last one (optional).
     * @return      true.
     */
-    scrollToMousePos: function() {
+    scrollToMousePos: function(prevCoord) {
        let [xMouse, yMouse, mask] = global.get_pointer();

-        if (xMouse != this.xMouse || yMouse != this.yMouse) {
-            this.xMouse = xMouse;
-            this.yMouse = yMouse;
-
+        if (!prevCoord || prevCoord.x != xMouse || prevCoord.y != yMouse) {
            let sysMouseOverAny = false;
            this._zoomRegions.forEach(function(zoomRegion, index, array) {
                if (zoomRegion.scrollToMousePos())
@ -189,6 +186,11 @@ Magnifier.prototype = {
                this.hideSystemCursor();
            else
                this.showSystemCursor();
+
+            if (prevCoord) {
+                prevCoord.x = xMouse;
+                prevCoord.y = yMouse;
+            }
        }
        return true;
    },
@ -210,14 +212,9 @@ Magnifier.prototype = {
     */
    createZoomRegion: function(xMagFactor, yMagFactor, roi, viewPort) {
        let zoomRegion = new ZoomRegion(this, this._cursorRoot);
+        zoomRegion.setMagFactor(xMagFactor, yMagFactor);
        zoomRegion.setViewPort(viewPort);
-
-        // We ignore the redundant width/height on the ROI
-        let fixedROI = new Object(roi);
-        fixedROI.width = viewPort.width / xMagFactor;
-        fixedROI.height = viewPort.height / yMagFactor;
-        zoomRegion.setROI(fixedROI);
-
+        zoomRegion.setROI(roi);
        zoomRegion.addCrosshairs(this._crossHairs);
        return zoomRegion;
    },
@ -250,9 +247,22 @@ Magnifier.prototype = {
     * Remove all the zoom regions from this Magnfier's ZoomRegion list.
     */
    clearAllZoomRegions: function() {
-        for (let i = 0; i < this._zoomRegions.length; i++)
+        // First ZoomRegion is special since its magnified mouse and crosshairs
+        // are the original -- all the others are Clutter.Clone's.  Deal with
+        // all but first zoom region.
+        for (let i = 1; i < this._zoomRegions.length; i++) {
            this._zoomRegions[i].setActive(false);
+            this._zoomRegions[i].removeFromStage();
+        }
+        this._zoomRegions[0].setActive(false);

+        // Detach the (original) magnified mouse and cross hair for later reuse
+        // before removing ZoomRegion from the stage.
+        this._cursorRoot.get_parent().remove_actor(this._cursorRoot);
+        if (this._crossHairs)
+            this._crossHairs.removeFromParent();
+
+        this._zoomRegions[0].removeFromStage();
        this._zoomRegions.length = 0;
        this.stopTrackingMouse();
        this.showSystemCursor();
@ -557,35 +567,44 @@ Magnifier.prototype = {
 };
 Signals.addSignalMethods(Magnifier.prototype);

-function ZoomRegion(magnifier, mouseSourceActor) {
-    this._init(magnifier, mouseSourceActor);
+function ZoomRegion(magnifier, mouseRoot) {
+    this._init(magnifier, mouseRoot);
 }

 ZoomRegion.prototype = {
-    _init: function(magnifier, mouseSourceActor) {
+    _init: function(magnifier, mouseRoot) {
        this._magnifier = magnifier;

-        this._mouseTrackingMode = MouseTrackingMode.NONE;
-        this._clampScrollingAtEdges = false;
-        this._lensMode = false;
-        this._screenPosition = ScreenPosition.FULL_SCREEN;
+        // The root actor for the zoom region
+        this._magView = new St.Bin({ style_class: 'magnifier-zoom-region', x_fill: true, y_fill: true });
+        global.stage.add_actor(this._magView);
+        this._magView.hide();

-        this._magView = null;
-        this._uiGroupClone = null;
-        this._mouseSourceActor = mouseSourceActor;
-        this._mouseActor  = null;
+        // Append a Clutter.Group to clip the contents of the magnified view.
+        this._mainGroup = new Clutter.Group({ clip_to_allocation: true });
+        this._magView.set_child(this._mainGroup);
+
+        // Add a background for when the magnified uiGroup is scrolled
+        // out of view (don't want to see desktop showing through).
+        let background = new Clutter.Rectangle({ color: Main.DEFAULT_BACKGROUND_COLOR });
+        this._mainGroup.add_actor(background);
+
+        // Clone the group that contains all of UI on the screen.  This is the
+        // chrome, the windows, etc.
+        this._uiGroupClone = new Clutter.Clone({ source: Main.uiGroup });
+        this._mainGroup.add_actor(this._uiGroupClone);
+        Main.uiGroup.set_size(global.screen_width, global.screen_height);
+        background.set_size(global.screen_width, global.screen_height);
+        this._uiGroupClone.set_size(global.screen_width, global.screen_height);
+
+        // Add either the given mouseRoot to the ZoomRegion, or a clone of
+        // it.
+        if (mouseRoot.get_parent() != null)
+            this._mouseRoot = new Clutter.Clone({ source: mouseRoot });
+        else
+            this._mouseRoot = mouseRoot;
+        this._mainGroup.add_actor(this._mouseRoot);
        this._crossHairs = null;
-        this._crossHairsActor = null;
-
-        this._viewPortX = 0;
-        this._viewPortY = 0;
-        this._viewPortWidth = global.screen_width;
-        this._viewPortWidth = global.screen_height;
-        this._xCenter = this._viewPortWidth / 2;
-        this._yCenter = this._viewPortHeight / 2;
-        this._xMagFactor = 1;
-        this._yMagFactor = 1;
-        this._followingCursor = false;
    },

    /**
@ -593,16 +612,14 @@ ZoomRegion.prototype = {
     * @activate:   Boolean to show/hide the ZoomRegion.
     */
    setActive: function(activate) {
-        if (activate && !this.isActive()) {
-            this._createActors();
-            if (this._isMouseOverRegion())
+        if (activate) {
+            this._magView.show();
+            if (this.isMouseOverRegion())
                this._magnifier.hideSystemCursor();
-            this._updateMagViewGeometry();
-            this._updateCloneGeometry();
-            this._updateMousePosition();
-        } else if (!activate && this.isActive()) {
-            this._destroyActors();
+            this._updateMousePosition(false /* mouse didn't move */);
        }
+        else
+            this._magView.hide();
    },

    /**
@ -610,7 +627,18 @@ ZoomRegion.prototype = {
     * @return  Whether this ZoomRegion is active (boolean).
     */
    isActive: function() {
-        return this._magView != null;
+        return this._magView.visible;
+    },
+
+    /**
+     * removeFromStage:
+     * Remove the magnified view from the stage.
+     */
+    removeFromStage: function() {
+        global.stage.remove_actor(this._magView);
+        this._mouseRoot = null;
+        this._uiGroupClone = null;
+        this._magView = null;
    },

    /**
@ -622,9 +650,19 @@ ZoomRegion.prototype = {
     *                  of the magnified view.
     */
    setMagFactor: function(xMagFactor, yMagFactor) {
-        this._changeROI({ xMagFactor: xMagFactor,
-                          yMagFactor: yMagFactor,
-                          redoCursorTracking: this._followingCursor });
+        if (xMagFactor > 0 && yMagFactor > 0) {
+            // Changing the mag factor moves the pixels along the axes of
+            // magnification.  Set the view back to the point that was at the centre
+            // of the region of interest.
+            let [x, y, width, height] = this.getROI();
+            let xCentre = x + width / 2;
+            let yCentre = y + height / 2;
+            this._uiGroupClone.set_scale(xMagFactor, yMagFactor);
+            this._mouseRoot.set_scale(xMagFactor, yMagFactor);
+            this._calcRightBottomStops();
+            this._scrollToPosition(xCentre, yCentre);
+            this._updateMousePosition(false /* mouse didn't move */);
+        }
    },

    /**
@ -635,7 +673,7 @@ ZoomRegion.prototype = {
     *          in size, and so on.
     */
    getMagFactor: function() {
-        return [this._xMagFactor, this._yMagFactor];
+        return this._uiGroupClone.get_scale();
    },

    /**
@ -658,12 +696,29 @@ ZoomRegion.prototype = {
    /**
     * setViewPort
     * Sets the position and size of the ZoomRegion on screen.
-     * @viewPort:   Object defining the position and size of the view port.
-     *              It has members x, y, width, height.  The values are in
+     * @viewPort:   Object defining the position and size of the view port.  It
+     *              has the form { x, y, width, height }.  The values are in
     *              stage coordinate space.
     */
    setViewPort: function(viewPort) {
-        this._setViewPort(viewPort);
+        let [xRoi, yRoi, wRoi, hRoi] = this.getROI();
+
+        // Remove border if the view port is the entire screen.  Otherwise,
+        // ensure that the border is there.
+        if (viewPort.x == 0 && viewPort.y == 0 && viewPort.width == global.screen_width && viewPort.height == global.screen_height)
+            this._magView.add_style_class_name('full-screen');
+        else
+            this._magView.remove_style_class_name('full-screen');
+
+        this.setSize(viewPort.width, viewPort.height);
+        this.setPosition(viewPort.x, viewPort.y);
+        if (this._crossHairs)
+            this._crossHairs.reCenter();
+
+        this.scrollContentsTo(xRoi + wRoi / 2, yRoi + hRoi / 2);
+        if (this.isMouseOverRegion())
+            this._magnifier.hideSystemCursor();
+
        this._screenPosition = ScreenPosition.NONE;
    },

@ -671,18 +726,88 @@ ZoomRegion.prototype = {
     * setROI
     * Sets the "region of interest" that the ZoomRegion is magnifying.
     * @roi:    Object that defines the region of the screen to magnify.  It
-     *          has members x, y, width, height.  The values are in
+     *          has the form { x, y, width, height }.  The values are in
     *          screen (unmagnified) coordinate space.
     */
    setROI: function(roi) {
-        if (roi.width <= 0 || roi.height <= 0)
-            return;
+        let xRoiCenter = roi.x + roi.width  / 2;
+        let yRoiCenter = roi.y + roi.height / 2;
+        this.scrollContentsTo(xRoiCenter, yRoiCenter);
+    },

-        this._followingCursor = false;
-        this._changeROI({ xMagFactor: this._viewPortWidth / roi.width,
-                          yMagFactor: this._viewPortHeight / roi.height,
-                          xCenter: roi.x + roi.width  / 2,
-                          yCenter: roi.y + roi.height / 2 });
+    /**
+     * setSize:
+     * @width:    The width to set the magnified view to.
+     * @height:   The height to set the magnified view to.
+     */
+    setSize: function(width, height) {
+        this._magView.set_size(width, height);
+        this._calcRightBottomStops();
+    },
+
+    /**
+     * getSize:
+     * @return  an array, [width, height], that specifies the size of the
+     *          magnified view.
+     */
+    getSize: function() {
+        return this._magView.get_size();
+    },
+
+    /**
+     * setPosition:
+     * Position the magnified view at the given coordinates.
+     * @x:    The x-coord of the new position.
+     * @y:    The y-coord of the new position.
+     */
+    setPosition: function(x, y) {
+        let [width, height] = this._magView.get_size();
+        if (this._clampScrollingAtEdges) {
+            // Restrict positioning so view doesn't go beyond any edge of the
+            // screen.
+            if (x < 0)
+                x = 0;
+            if (x + width > global.screen_width)
+                x = global.screen_width - width;
+            if (y < 0)
+                y = 0;
+            if (y + height > global.screen_height)
+                y = global.screen_height - height;
+        }
+        this._magView.set_position(x, y);
+    },
+
+    /**
+     * getPosition:
+     * @return  an array, [x, y], that gives the position of the
+     *          magnified view on screen.
+     */
+    getPosition: function() {
+        return this._magView.get_position();
+    },
+
+    /**
+     * getCenter:
+     * @return  an array, [x, y], that is half the width and height of the
+     *          magnified view (the center of the magnified view).
+     */
+    getCenter: function() {
+        let [width, height] = this._magView.get_size();
+        return [width / 2, height / 2];
+    },
+
+    /**
+     * isFullScreenMode:
+     * Does the magnified view occupy the whole screen?
+     */
+    isFullScreenMode: function() {
+        let [x, y] = this._magView.get_position();
+        if (x != 0 || y != 0)
+            return false;
+        [width, height] = this._magView.get_size();
+        if (width != global.screen_width || height != global.screen_height)
+            return false;
+        return true;
    },

    /**
@ -694,23 +819,24 @@ ZoomRegion.prototype = {
     *          rectangle of what is shown in the magnified view.
     */
    getROI: function() {
-        let roiWidth = this._viewPortWidth / this._xMagFactor;
-        let roiHeight = this._viewPortHeight / this._yMagFactor;
-
-        return [this._xCenter - roiWidth / 2,
-                this._yCenter - roiHeight / 2,
-                roiWidth, roiHeight];
+        let [xMagnified, yMagnified] = this._uiGroupClone.get_position();
+        let [xMagFactor, yMagFactor] = this.getMagFactor();
+        let [width, height] = this.getSize();
+        let x = (0 - xMagnified) / xMagFactor;
+        let y = (0 - yMagnified) / yMagFactor;
+        return [x, y, width / xMagFactor, height / yMagFactor];
    },

    /**
     * setLensMode:
-     * Turn lens mode on/off.  In full screen mode, lens mode does nothing since
+     * Turn lens mode on/off.  In full screen mode, lens mode is alway off since
     * a lens the size of the screen is pointless.
     * @lensMode:   A boolean to set the sense of lens mode.
     */
    setLensMode: function(lensMode) {
-        this._lensMode = lensMode;
-        if (!this._lensMode)
+        let fullScreen = this.isFullScreenMode();
+        this._lensMode = (lensMode && !fullScreen);
+        if (!this._lensMode && !fullScreen)
            this.setScreenPosition (this._screenPosition);
    },

@ -731,8 +857,6 @@ ZoomRegion.prototype = {
     */
    setClampScrollingAtEdges: function(clamp) {
        this._clampScrollingAtEdges = clamp;
-        if (clamp)
-            this._changeROI();
    },

    /**
@ -745,7 +869,7 @@ ZoomRegion.prototype = {
        viewPort.y = 0;
        viewPort.width = global.screen_width;
        viewPort.height = global.screen_height/2;
-        this._setViewPort(viewPort);
+        this.setViewPort(viewPort);
        this._screenPosition = ScreenPosition.TOP_HALF;
    },

@ -759,7 +883,7 @@ ZoomRegion.prototype = {
        viewPort.y = global.screen_height/2;
        viewPort.width = global.screen_width;
        viewPort.height = global.screen_height/2;
-        this._setViewPort(viewPort);
+        this.setViewPort(viewPort);
        this._screenPosition = ScreenPosition.BOTTOM_HALF;
    },

@ -773,7 +897,7 @@ ZoomRegion.prototype = {
        viewPort.y = 0;
        viewPort.width = global.screen_width/2;
        viewPort.height = global.screen_height;
-        this._setViewPort(viewPort);
+        this.setViewPort(viewPort);
        this._screenPosition = ScreenPosition.LEFT_HALF;
    },

@ -787,24 +911,62 @@ ZoomRegion.prototype = {
        viewPort.y = 0;
        viewPort.width = global.screen_width/2;
        viewPort.height = global.screen_height;
-        this._setViewPort(viewPort);
+        this.setViewPort(viewPort);
        this._screenPosition = ScreenPosition.RIGHT_HALF;
    },

+    /**
+     * getScreenPosition:
+     * Tell the outside world what the current mode is -- magnifiying the
+     * top half, bottom half, etc.
+     * @return:  the current mode.
+     */
+    getScreenPosition: function() {
+        return this._screenPosition;
+    },
+
+    /**
+     * scrollToMousePos:
+     * Set the region of interest based on the position of the system pointer.
+     * @return:     Whether the system mouse pointer is over the magnified view.
+     */
+    scrollToMousePos: function() {
+        let [xMouse, yMouse, mask] = global.get_pointer();
+
+        if (this._mouseTrackingMode == MouseTrackingMode.PROPORTIONAL) {
+            this._setROIProportional(xMouse, yMouse);
+        }
+        else if (this._mouseTrackingMode == MouseTrackingMode.PUSH) {
+            this._setROIPush(xMouse, yMouse);
+        }
+        else if (this._mouseTrackingMode == MouseTrackingMode.CENTERED) {
+            this._setROICentered(xMouse, yMouse);
+        }
+        this._updateMousePosition(true);
+
+        // Determine whether the system mouse pointer is over this zoom region.
+        return this.isMouseOverRegion(xMouse, yMouse);
+    },
+
    /**
     * setFullScreenMode:
     * Set the ZoomRegion to full-screen mode.
     * Note:  disallows lens mode.
     */
    setFullScreenMode: function() {
-        let viewPort = {};
-        viewPort.x = 0;
-        viewPort.y = 0;
-        viewPort.width = global.screen_width;
-        viewPort.height = global.screen_height;
-        this.setViewPort(viewPort);
+        if (!this.isFullScreenMode()) {
+            let viewPort = {};
+            viewPort.x = 0;
+            viewPort.y = 0;
+            viewPort.width = global.screen_width;
+            viewPort.height = global.screen_height;
+            this.setViewPort(viewPort);
+            this.setLensMode(false);
+            if (this.isActive())
+                this._magnifier.hideSystemCursor();

-        this._screenPosition = ScreenPosition.FULL_SCREEN;
+            this._screenPosition = ScreenPosition.FULL_SCREEN;
+        }
    },

    /**
@ -835,241 +997,111 @@ ZoomRegion.prototype = {
        }
    },

-    /**
-     * getScreenPosition:
-     * Tell the outside world what the current mode is -- magnifiying the
-     * top half, bottom half, etc.
-     * @return:  the current mode.
-     */
-    getScreenPosition: function() {
-        return this._screenPosition;
-    },
-
-    /**
-     * scrollToMousePos:
-     * Set the region of interest based on the position of the system pointer.
-     * @return:     Whether the system mouse pointer is over the magnified view.
-     */
-    scrollToMousePos: function() {
-        this._followingCursor = true;
-        if (this._mouseTrackingMode != MouseTrackingMode.NONE)
-            this._changeROI({ redoCursorTracking: true });
-        else
-            this._updateMousePosition();
-
-        // Determine whether the system mouse pointer is over this zoom region.
-        return this._isMouseOverRegion();
-    },
-
    /**
     * scrollContentsTo:
     * Shift the contents of the magnified view such it is centered on the given
-     * coordinate.
+     * coordinate.  Also, update the position of the magnified mouse image after
+     * the shift.
     * @x:      The x-coord of the point to center on.
     * @y:      The y-coord of the point to center on.
     */
    scrollContentsTo: function(x, y) {
-        this._followingCursor = false;
-        this._changeROI({ xCenter: x,
-                          yCenter: y });
+        this._scrollToPosition(x, y);
+        this._updateMousePosition(false /* mouse didn't move */);
    },

    /**
-     * addCrosshairs:
-     * Add crosshairs centered on the magnified mouse.
-     * @crossHairs: Crosshairs instance
+     * isMouseOverRegion:
+     * Return whether the system mouse sprite is over this ZoomRegion.  If the
+     * mouse's position is not given, then it is fetched.
+     * @xMouse:     The system mouse's x-coord.  Optional.
+     * @yMouse:     The system mouse's y-coord.  Optional.
+     * @return:     Boolean:  true if the mouse is over the zoom region; false
+     *              otherwise.
     */
-    addCrosshairs: function(crossHairs) {
-        this._crossHairs = crossHairs;
-
-        // If the crossHairs is not already within a larger container, add it
-        // to this zoom region.  Otherwise, add a clone.
-        if (crossHairs && this.isActive()) {
-            this._crossHairsActor = crossHairs.addToZoomRegion(this, this._mouseActor);
-        }
-    },
-
-    //// Private methods ////
-
-    _createActors: function() {
-        // The root actor for the zoom region
-        this._magView = new St.Bin({ style_class: 'magnifier-zoom-region', x_fill: true, y_fill: true });
-        global.stage.add_actor(this._magView);
-
-        // hide the magnified region from CLUTTER_PICK_ALL
-        Shell.util_set_hidden_from_pick (this._magView, true);
-
-        // Append a Clutter.Group to clip the contents of the magnified view.
-        let mainGroup = new Clutter.Group({ clip_to_allocation: true });
-        this._magView.set_child(mainGroup);
-
-        // Add a background for when the magnified uiGroup is scrolled
-        // out of view (don't want to see desktop showing through).
-        let background = new Clutter.Rectangle({ color: Main.DEFAULT_BACKGROUND_COLOR });
-        mainGroup.add_actor(background);
-
-        // Clone the group that contains all of UI on the screen.  This is the
-        // chrome, the windows, etc.
-        this._uiGroupClone = new Clutter.Clone({ source: Main.uiGroup });
-        mainGroup.add_actor(this._uiGroupClone);
-        Main.uiGroup.set_size(global.screen_width, global.screen_height);
-        background.set_size(global.screen_width, global.screen_height);
-
-        // Add either the given mouseSourceActor to the ZoomRegion, or a clone of
-        // it.
-        if (this._mouseSourceActor.get_parent() != null)
-            this._mouseActor = new Clutter.Clone({ source: this._mouseSourceActor });
-        else
-            this._mouseActor = this._mouseSourceActor;
-        mainGroup.add_actor(this._mouseActor);
-
-        if (this._crossHairs)
-            this._crossHairsActor = this._crossHairs.addToZoomRegion(this, this._mouseActor);
-        else
-            this._crossHairsActor = null;
-    },
-
-    _destroyActors: function() {
-        if (this._mouseActor == this._mouseSourceActor)
-            this._mouseActor.get_parent().remove_actor (this._mouseActor);
-        if (this._crossHairs)
-            this._crossHairs.removeFromParent(this._crossHairsActor);
-
-        this._magView.destroy();
-        this._magView = null;
-        this._uiGroupClone = null;
-        this._mouseActor = null;
-        this._crossHairsActor = null;
-    },
-
-    _setViewPort: function(viewPort, fromROIUpdate) {
-        // Sets the position of the zoom region on the screen
-
-        let width = Math.round(Math.min(viewPort.width, global.screen_width));
-        let height = Math.round(Math.min(viewPort.height, global.screen_height));
-        let x = Math.max(viewPort.x, 0);
-        let y = Math.max(viewPort.y, 0);
-
-        x = Math.round(Math.min(x, global.screen_width - width));
-        y = Math.round(Math.min(y, global.screen_height - height));
-
-        this._viewPortX = x;
-        this._viewPortY = y;
-        this._viewPortWidth = width;
-        this._viewPortHeight = height;
-
-        this._updateMagViewGeometry();
-
-        if (!fromROIUpdate)
-            this._changeROI({ redoCursorTracking: this._followingCursor }); // will update mouse
-
-        if (this.isActive() && this._isMouseOverRegion())
-            this._magnifier.hideSystemCursor();
-    },
-
-    _changeROI: function(params) {
-        // Updates the area we are viewing; the magnification factors
-        // and center can be set explicitly, or we can recompute
-        // the position based on the mouse cursor position
-
-        params = Params.parse(params, { xMagFactor: this._xMagFactor,
-                                        yMagFactor: this._yMagFactor,
-                                        xCenter: this._xCenter,
-                                        yCenter: this._yCenter,
-                                        redoCursorTracking: false });
-
-        if (params.xMagFactor <= 0)
-            params.xMagFactor = this._xMagFactor;
-        if (params.yMagFactor <= 0)
-            params.yMagFactor = this._yMagFactor;
-
-        this._xMagFactor = params.xMagFactor;
-        this._yMagFactor = params.yMagFactor;
-
-        if (params.redoCursorTracking &&
-            this._mouseTrackingMode != MouseTrackingMode.NONE) {
-            // This depends on this.xMagFactor/yMagFactor already being updated
-            [params.xCenter, params.yCenter] = this._centerFromMousePosition();
-        }
-
-        if (this._clampScrollingAtEdges) {
-            let roiWidth = this._viewPortWidth / this._xMagFactor;
-            let roiHeight = this._viewPortHeight / this._yMagFactor;
-
-            params.xCenter = Math.min(params.xCenter, global.screen_width - roiWidth / 2);
-            params.xCenter = Math.max(params.xCenter, roiWidth / 2);
-            params.yCenter = Math.min(params.yCenter, global.screen_height - roiHeight / 2);
-            params.yCenter = Math.max(params.yCenter, roiHeight / 2);
-        }
-
-        this._xCenter = params.xCenter;
-        this._yCenter = params.yCenter;
-
-        // If in lens mode, move the magnified view such that it is centered
-        // over the actual mouse. However, in full screen mode, the "lens" is
-        // the size of the screen -- pointless to move such a large lens around.
-        if (this._lensMode && !this._isFullScreen())
-            this._setViewPort({ x: this._xCenter - this._viewPortWidth / 2,
-                                y: this._yCenter - this._viewPortHeight / 2,
-                                width: this._viewPortWidth,
-                                height: this._viewPortHeight }, true);
-
-        this._updateCloneGeometry();
-        this._updateMousePosition();
-    },
-
-    _isMouseOverRegion: function() {
-        // Return whether the system mouse sprite is over this ZoomRegion.  If the
-        // mouse's position is not given, then it is fetched.
+    isMouseOverRegion: function(xMouse, yMouse) {
        let mouseIsOver = false;
        if (this.isActive()) {
-            let xMouse = this._magnifier.xMouse;
-            let yMouse = this._magnifier.yMouse;
-
+            if (!xMouse || !yMouse) {
+                let [x, y, mask] = global.get_pointer();
+                xMouse = x;
+                yMouse = y;
+            }
+            let [x, y] = this.getPosition();
+            let [width, height] = this.getSize();
            mouseIsOver = (
-                xMouse >= this._viewPortX && xMouse < (this._viewPortX + this._viewPortWidth) &&
-                yMouse >= this._viewPortY && yMouse < (this._viewPortY + this._viewPortHeight)
+                xMouse >= x && xMouse < (x + width) &&
+                yMouse >= y && yMouse < (y + height)
            );
        }
        return mouseIsOver;
    },

-    _isFullScreen: function() {
-        // Does the magnified view occupy the whole screen? Note that this
-        // doesn't necessarily imply
-        // this._screenPosition = ScreenPosition.FULL_SCREEN;
-
-        if (this._viewPortX != 0 || this._viewPortY != 0)
-            return false;
-        if (this._viewPortWidth != global.screen_width ||
-            this._viewPortHeight != global.screen_height)
-            return false;
-        return true;
+    /**
+     * addCrosshairs:
+     * Add crosshairs centered on the magnified mouse.
+     * @crossHairs  Clutter.Group that contains the actors for the crosshairs.
+     */
+    addCrosshairs: function(crossHairs) {
+        // If the crossHairs is not already within a larger container, add it
+        // to this zoom region.  Otherwise, add a clone.
+        if (crossHairs) {
+            this._crosshairsActor = crossHairs.addToZoomRegion(this, this._mouseRoot);
+            this._crossHairs = crossHairs;
+        }
    },

-    _centerFromMousePosition: function() {
-        // Determines where the center should be given the current cursor
-        // position and mouse tracking mode
+    //// Private methods ////

-        let xMouse = this._magnifier.xMouse;
-        let yMouse = this._magnifier.yMouse;
+    _scrollToPosition: function(x, y) {
+        // Given the point (x, y) in non-magnified coordinates, scroll the
+        // magnified contenst such that the point is at the centre of the
+        // magnified view.
+        let [xMagFactor, yMagFactor] = this.getMagFactor();
+        let xMagnified = x * xMagFactor;
+        let yMagnified = y * yMagFactor;

-        if (this._mouseTrackingMode == MouseTrackingMode.PROPORTIONAL) {
-            return this._centerFromMouseProportional(xMouse, yMouse);
-        }
-        else if (this._mouseTrackingMode == MouseTrackingMode.PUSH) {
-            return this._centerFromMousePush(xMouse, yMouse);
-        }
-        else if (this._mouseTrackingMode == MouseTrackingMode.CENTERED) {
-            return this._centerFromMouseCentered(xMouse, yMouse);
-        }
+        let [xCenterMagView, yCenterMagView] = this.getCenter();
+        let newX = xCenterMagView - xMagnified;
+        let newY = yCenterMagView - yMagnified;

-        return null; // Should never be hit
+        if (this._clampScrollingAtEdges) {
+            if (newX > 0)
+                newX = 0;
+            else if (newX < this._rightStop)
+                newX = this._rightStop;
+            if (newY > 0)
+                newY = 0;
+            else if (newY < this._bottomStop)
+                newY = this._bottomStop;
+            this._uiGroupClone.set_position(newX, newY);
+        }
+        else
+            this._uiGroupClone.set_position(newX, newY);
+
+        // If in lens mode, move the magnified view such that it is centered
+        // over the actual mouse. However, in full screen mode, the "lens" is
+        // the size of the screen -- pointless to move such a large lens around.
+        if (this._lensMode && !this.isFullScreenMode())
+            this.setPosition(x - xCenterMagView, y - yCenterMagView);
    },

-    _centerFromMousePush: function(xMouse, yMouse) {
+    _calcRightBottomStops: function() {
+        // Calculate the location of the top-left corner of _uiGroupClone
+        // when its right and bottom edges are coincident with the right and
+        // bottom edges of the _magView.
+        let [contentWidth, contentHeight] = this._uiGroupClone.get_size();
+        let [viewWidth, viewHeight] = this.getSize();
+        let [xMagFactor, yMagFactor] = this.getMagFactor();
+        let rightStop = viewWidth - (contentWidth * xMagFactor);
+        let bottomStop = viewHeight - (contentHeight * yMagFactor);
+        this._rightStop = parseInt(rightStop.toFixed(1));
+        this._bottomStop = parseInt(bottomStop.toFixed(1));
+    },
+
+    _setROIPush: function(xMouse, yMouse) {
        let [xRoi, yRoi, widthRoi, heightRoi] = this.getROI();
-        let [cursorWidth, cursorHeight] = this._mouseSourceActor.get_size();
+        let [cursorWidth, cursorHeight] = this._mouseRoot.get_size();
        let xPos = xRoi + widthRoi / 2;
        let yPos = yRoi + heightRoi / 2;
        let xRoiRight = xRoi + widthRoi - cursorWidth;
@ -1085,79 +1117,58 @@ ZoomRegion.prototype = {
        else if (yMouse > yRoiBottom)
            yPos += (yMouse - yRoiBottom);

-        return [xPos, yPos];
+        this._scrollToPosition(xPos, yPos);
    },

-    _centerFromMouseProportional: function(xMouse, yMouse) {
+    _setROIProportional: function(xMouse, yMouse) {
        let [xRoi, yRoi, widthRoi, heightRoi] = this.getROI();
        let halfScreenWidth = global.screen_width / 2;
        let halfScreenHeight = global.screen_height / 2;
-        // We want to pad with a constant distance after zooming, so divide
-        // by the magnification factor.
-        let unscaledPadding = Math.min(this._viewPortWidth, this._viewPortHeight) / 5;
-        let xPadding = unscaledPadding / this._xMagFactor;
-        let yPadding = unscaledPadding / this._yMagFactor;
-        let xProportion = (xMouse - halfScreenWidth) / halfScreenWidth;   // -1 ... 1
-        let yProportion = (yMouse - halfScreenHeight) / halfScreenHeight; // -1 ... 1
-        let xPos = xMouse - xProportion * (widthRoi / 2 - xPadding);
-        let yPos = yMouse - yProportion * (heightRoi /2 - yPadding);
+        let xProportion = (halfScreenWidth - xMouse) / halfScreenWidth;
+        let yProportion = (halfScreenHeight - yMouse) / halfScreenHeight;
+        let xPos = xMouse + xProportion * widthRoi / 2;
+        let yPos = yMouse + yProportion * heightRoi / 2;

-        return [xPos, yPos];
+        this._scrollToPosition(xPos, yPos);
    },

-    _centerFromMouseCentered: function(xMouse, yMouse) {
-        return [xMouse, yMouse];
+    _setROICentered: function(xMouse, yMouse) {
+        this._scrollToPosition(xMouse, yMouse);
    },

-    _screenToViewPort: function(screenX, screenY) {
-        // Converts coordinates relative to the (unmagnified) screen to coordinates
-        // relative to the origin of this._magView
-        return [this._viewPortWidth / 2 + (screenX - this._xCenter) * this._xMagFactor,
-                this._viewPortHeight / 2 + (screenY - this._yCenter) * this._yMagFactor];
+    _updateMousePosition: function(mouseMoved) {
+        let [x, y] = this._uiGroupClone.get_position();
+        x = parseInt(x.toFixed(1));
+        y = parseInt(y.toFixed(1));
+        let [xCenterMagView, yCenterMagView] = this.getCenter();
+        let [xMouse, yMouse, mask] = global.get_pointer();
+        let [xMagFactor, yMagFactor] = this.getMagFactor();
+
+        let xMagMouse = xMouse * xMagFactor + x;
+        let yMagMouse = yMouse * yMagFactor + y;
+        if (mouseMoved) {
+            if (x == 0)
+                xMagMouse = xMouse * xMagFactor;
+            else if (x == this._rightStop)
+                xMagMouse = (xMouse * xMagFactor) + this._rightStop;
+            else if (this._mouseTrackingMode == MouseTrackingMode.CENTERED)
+                xMagMouse = xCenterMagView;
+
+            if (y == 0)
+                yMagMouse = yMouse * yMagFactor;
+            else if (y == this._bottomStop)
+                yMagMouse = (yMouse * yMagFactor) + this._bottomStop;
+            else if (this._mouseTrackingMode == MouseTrackingMode.CENTERED)
+                yMagMouse = yCenterMagView;
+        }
+        this._mouseRoot.set_position(xMagMouse, yMagMouse);
+        this._updateCrosshairsPosition(xMagMouse, yMagMouse);
    },

-    _updateMagViewGeometry: function() {
-        if (!this.isActive())
-            return;
-
-        if (this._isFullScreen())
-            this._magView.add_style_class_name('full-screen');
-        else
-            this._magView.remove_style_class_name('full-screen');
-
-        this._magView.set_size(this._viewPortWidth, this._viewPortHeight);
-        this._magView.set_position(this._viewPortX, this._viewPortY);
-    },
-
-    _updateCloneGeometry: function() {
-        if (!this.isActive())
-            return;
-
-        this._uiGroupClone.set_scale(this._xMagFactor, this._yMagFactor);
-        this._mouseActor.set_scale(this._xMagFactor, this._yMagFactor);
-
-        let [x, y] = this._screenToViewPort(0, 0);
-        this._uiGroupClone.set_position(x, y);
-
-        this._updateMousePosition();
-    },
-
-    _updateMousePosition: function() {
-        if (!this.isActive())
-            return;
-
-        let [xMagMouse, yMagMouse] = this._screenToViewPort(this._magnifier.xMouse,
-                                                            this._magnifier.yMouse);
-
-        xMagMouse = Math.round(xMagMouse);
-        yMagMouse = Math.round(yMagMouse);
-
-        this._mouseActor.set_position(xMagMouse, yMagMouse);
-
-        if (this._crossHairsActor) {
-            let [groupWidth, groupHeight] = this._crossHairsActor.get_size();
-            this._crossHairsActor.set_position(xMagMouse - groupWidth / 2,
-                                               yMagMouse - groupHeight / 2);
+    _updateCrosshairsPosition: function(x, y) {
+        if (this._crosshairsActor) {
+            let [groupWidth, groupHeight] = this._crosshairsActor.get_size();
+            this._crosshairsActor.set_position(x - groupWidth / 2, y - groupHeight / 2);
        }
    }
 };
@ -1232,15 +1243,10 @@ Crosshairs.prototype = {

    /**
     * removeFromParent:
-     * @childActor: the actor returned from addToZoomRegion
-     * Remove the crosshairs actor from its parent container, or destroy the
-     * child actor if it was just a clone of the crosshairs actor.
+     * Remove the crosshairs actor from its parent container.
     */
-    removeFromParent: function(childActor) {
-        if (childActor == this._actor)
-            childActor.get_parent().remove_actor(childActor);
-        else
-            childActor.destroy();
+    removeFromParent: function() {
+        this._actor.get_parent().remove_actor(this._actor);
    },

    /**
--- a/js/ui/magnifierDBus.js
+++ b/js/ui/magnifierDBus.js
@ -112,11 +112,6 @@ ShellMagnifier.prototype = {
     *                  [left, top, right, bottom].
     * @viewPort        Array of integers, [left, top, right, bottom] that defines
     *                  the position of the ZoomRegion on screen.
-     *
-     * FIXME: The arguments here are redundant, since the width and height of
-     *   the ROI are determined by the viewport and magnification factors.
-     *   We ignore the passed in width and height.
-     *
     * @return          The newly created ZoomRegion.
     */
    createZoomRegion: function(xMagFactor, yMagFactor, roi, viewPort) {
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -17,12 +17,8 @@ const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;

 const Chrome = imports.ui.chrome;
-const CtrlAltTab = imports.ui.ctrlAltTab;
-const EndSessionDialog = imports.ui.endSessionDialog;
 const Environment = imports.ui.environment;
 const ExtensionSystem = imports.ui.extensionSystem;
 const MessageTray = imports.ui.messageTray;
@ -38,9 +34,7 @@ const ShellDBus = imports.ui.shellDBus;
 const TelepathyClient = imports.ui.telepathyClient;
 const WindowManager = imports.ui.windowManager;
 const Magnifier = imports.ui.magnifier;
-const XdndHandler = imports.ui.xdndHandler;
 const StatusIconDispatcher = imports.ui.statusIconDispatcher;
-const Util = imports.misc.util;

 const DEFAULT_BACKGROUND_COLOR = new Clutter.Color();
 DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff);
@ -56,14 +50,12 @@ let messageTray = null;
 let notificationDaemon = null;
 let windowAttentionHandler = null;
 let telepathyClient = null;
-let ctrlAltTabManager = null;
 let recorder = null;
 let shellDBusService = null;
 let modalCount = 0;
 let modalActorFocusStack = [];
 let uiGroup = null;
 let magnifier = null;
-let xdndHandler = null;
 let statusIconDispatcher = null;
 let _errorLogStack = [];
 let _startDate;
@ -111,7 +103,10 @@ function start() {
    global.stage.color = DEFAULT_BACKGROUND_COLOR;
    global.stage.no_clear_hint = true;

-    loadTheme();
+    let themeContext = St.ThemeContext.get_for_stage (global.stage);
+    let stylesheetPath = global.datadir + '/theme/gnome-shell.css';
+    let theme = new St.Theme ({ application_stylesheet: stylesheetPath });
+    themeContext.set_theme (theme);

    let shellwm = global.window_manager;
    shellwm.takeover_keybinding('panel_main_menu');
@ -130,7 +125,6 @@ function start() {
    global.stage.add_actor(uiGroup);

    placesManager = new PlaceDisplay.PlacesManager();
-    xdndHandler = new XdndHandler.XdndHandler();
    overview = new Overview.Overview();
    chrome = new Chrome.Chrome();
    magnifier = new Magnifier.Magnifier();
@ -141,10 +135,6 @@ function start() {
    notificationDaemon = new NotificationDaemon.NotificationDaemon();
    windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
    telepathyClient = new TelepathyClient.Client();
-    panel.startStatusArea();
-
-    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
-    ctrlAltTabManager.addGroup(panel.actor, _("Panel"), 'gnome-panel');

    _startDate = new Date();

@ -172,10 +162,6 @@ function start() {
        }
    });

-    // Provide the bus object for gnome-session to
-    // initiate logouts.
-    EndSessionDialog.init();
-
    global.gdk_screen.connect('monitors-changed', _relayout);

    ExtensionSystem.init();
@ -204,18 +190,6 @@ function start() {
    }
 }

-/**
- * loadTheme:
- *
- * Reloads the theme CSS file from the default theme.
- */
-function loadTheme() {
-    let themeContext = St.ThemeContext.get_for_stage (global.stage);
-    let stylesheetPath = global.datadir + '/theme/gnome-shell.css';
-    let theme = new St.Theme ({ application_stylesheet: stylesheetPath });
-    themeContext.set_theme (theme);
-}
-
 /**
 * _log:
 * @category: string message type ('info', 'error')
@ -265,8 +239,10 @@ function _relayout() {

    // To avoid updating the position and size of the workspaces
    // in the overview, we just hide the overview. The positions
-    // will be updated when it is next shown.
+    // will be updated when it is next shown. We do the same for
+    // the calendar popdown.
    overview.hide();
+    panel.hideCalendar();
 }

 // metacity-clutter currently uses the same prefs as plain metacity,
@ -302,42 +278,47 @@ function _removeUnusedWorkspaces() {
 // are disabled with a global grab. (When there is a global grab, then
 // all key events will be delivered to the stage, so ::captured-event
 // on the stage can be used for global keybindings.)
+//
+// We expect to need to conditionally enable just a few keybindings
+// depending on circumstance; the main hackiness here is that we are
+// assuming that keybindings have their default values; really we
+// should be asking Mutter to resolve the key into an action and then
+// base our handling based on the action.
 function _globalKeyPressHandler(actor, event) {
    if (modalCount == 0)
        return false;
-    if (event.type() != Clutter.EventType.KEY_PRESS)
+    if (event.type() != Clutter.EventType.KEY_RELEASE)
        return false;

    let symbol = event.get_key_symbol();
    let keyCode = event.get_key_code();
    let modifierState = Shell.get_event_state(event);
+    // Check the overview key first, this isn't a Meta.KeyBindingAction yet
+    if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
+        // The super key is the default for triggering the overview, and should
+        // get us out of the overview when we are already in it.
+        if (overview.visible)
+            overview.hide();

+        return true;
+    }
+
+    // Whitelist some of the Metacity actions
    let display = global.screen.get_display();
+    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+
    // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
    let action = display.get_keybinding_action(keyCode, modifierState);
-
-    // The screenshot action should always be available (even if a
-    // modal dialog is present)
-    if (action == Meta.KeyBindingAction.COMMAND_SCREENSHOT) {
-        let gconf = GConf.Client.get_default();
-        let command = gconf.get_string('/apps/metacity/keybinding_commands/command_screenshot');
-        if (command != null && command != '')
-            Util.spawnCommandLine(command);
-        return true;
-    }
-
-    // Other bindings are only available when the overview is up and
-    // no modal dialog is present.
-    if (!overview.visible || modalCount > 1)
-        return false;
-
-    // This isn't a Meta.KeyBindingAction yet
-    if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
-        overview.hide();
-        return true;
-    }
-
    switch (action) {
+        case Meta.KeyBindingAction.COMMAND_SCREENSHOT:
+            let gconf = GConf.Client.get_default();
+            let command = gconf.get_string('/apps/metacity/keybinding_commands/command_screenshot');
+            if (command != null && command != '') {
+                let [ok, len, args] = GLib.shell_parse_argv(command);
+                let p = new Shell.Process({'args' : args});
+                p.run();
+            }
+            return true;
        case Meta.KeyBindingAction.WORKSPACE_LEFT:
            wm.actionMoveWorkspaceLeft();
            return true;
@ -348,12 +329,6 @@ function _globalKeyPressHandler(actor, event) {
        case Meta.KeyBindingAction.COMMAND_2:
            getRunDialog().open();
            return true;
-        case Meta.KeyBindingAction.PANEL_MAIN_MENU:
-            overview.hide();
-            return true;
-        case Meta.KeyBindingAction.SWITCH_PANELS:
-            ctrlAltTabManager.popup(modifierState & Clutter.ModifierType.SHIFT_MASK);
-            return true;
    }

    return false;
@ -372,30 +347,21 @@ function _findModal(actor) {
 /**
 * pushModal:
 * @actor: #ClutterActor which will be given keyboard focus
- * @timestamp: optional timestamp
 *
 * Ensure we are in a mode where all keyboard and mouse input goes to
- * the stage, and focus @actor. Multiple calls to this function act in
- * a stacking fashion; the effect will be undone when an equal number
- * of popModal() invocations have been made.
+ * the stage.  Multiple calls to this function act in a stacking fashion;
+ * the effect will be undone when an equal number of popModal() invocations
+ * have been made.
 *
- * Next, record the current Clutter keyboard focus on a stack. If the
- * modal stack returns to this actor, reset the focus to the actor
- * which was focused at the time pushModal() was invoked.
- *
- * @timestamp is optionally used to associate the call with a specific user
- * initiated event.  If not provided then the value of
- * global.get_current_time() is assumed.
+ * Next, record the current Clutter keyboard focus on a stack.  If the modal stack
+ * returns to this actor, reset the focus to the actor which was focused
+ * at the time pushModal() was invoked.
 *
 * Returns: true iff we successfully acquired a grab or already had one
 */
-function pushModal(actor, timestamp) {
-
-    if (timestamp == undefined)
-        timestamp = global.get_current_time();
-
+function pushModal(actor) {
    if (modalCount == 0) {
-        if (!global.begin_modal(timestamp)) {
+        if (!global.begin_modal(global.get_current_time())) {
            log('pushModal: invocation of begin_modal failed');
            return false;
        }
@ -419,28 +385,19 @@ function pushModal(actor, timestamp) {
    }
    modalActorFocusStack.push([actor, curFocus]);

-    global.stage.set_key_focus(actor);
+    global.stage.set_key_focus(null);
    return true;
 }

 /**
 * popModal:
 * @actor: #ClutterActor passed to original invocation of pushModal().
- * @timestamp: optional timestamp
 *
 * Reverse the effect of pushModal().  If this invocation is undoing
 * the topmost invocation, then the focus will be restored to the
 * previous focus at the time when pushModal() was invoked.
- *
- * @timestamp is optionally used to associate the call with a specific user
- * initiated event.  If not provided then the value of
- * global.get_current_time() is assumed.
 */
-function popModal(actor, timestamp) {
-
-    if (timestamp == undefined)
-        timestamp = global.get_current_time();
-
+function popModal(actor) {
    modalCount -= 1;
    let focusIndex = _findModal(actor);
    if (focusIndex >= 0) {
@ -458,8 +415,7 @@ function popModal(actor, timestamp) {
    if (modalCount > 0)
        return;

-    global.stage.set_key_focus(null);
-    global.end_modal(timestamp);
+    global.end_modal(global.get_current_time());
    global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
 }

--- 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,10 +14,6 @@ const Tweener = imports.ui.tweener;
 const Main = imports.ui.main;
 const BoxPointer = imports.ui.boxpointer;
 const Params = imports.misc.params;
-const Util = imports.misc.util;
-
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;

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

-// These reasons are useful when we destroy the notifications received through
-// the notification daemon. We use EXPIRED for transient notifications that the
-// user did not interact with, DISMISSED for all other notifications that were
-// destroyed as a result of a user action, and SOURCE_CLOSED for the notifications
-// that were requested to be destroyed by the associated source.
-const NotificationDestroyedReason = {
-    EXPIRED: 1,
-    DISMISSED: 2,
-    SOURCE_CLOSED: 3
-};
-
-// Message tray has its custom Urgency enumeration. LOW, NORMAL and CRITICAL
-// urgency values map to the corresponding values for the notifications received
-// through the notification daemon. HIGH urgency value is used for chats received
-// through the Telepathy client.
-const Urgency = {
-    LOW: 0,
-    NORMAL: 1,
-    HIGH: 2,
-    CRITICAL: 3
+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 _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 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
-                    Util.spawn(['gvfs-open', url]);
-                    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 = Util.findUrls(this.actor.clutter_text.text);
-        this._highlightUrls();
-    },
-
-    _highlightUrls: function() {
-        // text here contain markup
-        let urls = Util.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
@ -217,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
@ -232,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
@ -249,15 +98,11 @@ function Notification(source, title, banner, params) {
 Notification.prototype = {
    _init: function(source, title, banner, params) {
        this.source = source;
-        this.urgency = Urgency.NORMAL;
-        this.resident = false;
-        // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
-        this.isTransient = false;
+        this.urgent = false;
        this.expanded = false;
        this._useActionIcons = false;
        this._customContent = false;
        this._bannerBodyText = null;
-        this._bannerBodyMarkup = false;
        this._titleFitsInBannerMode = true;
        this._spacing = 0;

@ -269,6 +114,7 @@ Notification.prototype = {
        this._prevFocusedWindow = null;
        this._prevKeyFocusActor = null;

+        this._focusWindowChangedId = 0;
        this._focusActorChangedId = 0;
        this._stageInputModeChangedId = 0;
        this._capturedEventId = 0;
@ -283,7 +129,7 @@ Notification.prototype = {
            function (actor, event) {
                if (!this._actionArea ||
                    !this._actionArea.contains(event.get_source()))
-                    this._onClicked();
+                    this.emit('clicked');
            }));

        // The first line should have the title, followed by the
@ -302,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);
@ -330,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;
@ -363,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
@ -371,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
@ -383,7 +223,7 @@ Notification.prototype = {
            this._addBannerBody();

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

@ -391,13 +231,13 @@ 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',
                                                   vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,
                                                   hscrollbar_policy: Gtk.PolicyType.NEVER,
-                                                   vfade: true });
+                                                   vshadows: true });
            this.actor.add(this._scrollArea, { row: 1,
                                               col: 1 });
            this._contentArea = new St.BoxLayout({ name: 'notification-body',
@ -408,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);
        }
    },

@ -510,20 +354,12 @@ Notification.prototype = {
        }

        this._buttonBox.add(button);
-        button.connect('clicked', Lang.bind(this, this._onActionInvoked, id));
+        button.connect('clicked', Lang.bind(this, function() { this.emit('action-invoked', id); }));
        this._updated();
    },

-    setUrgency: function(urgency) {
-        this.urgency = urgency;
-    },
-
-    setResident: function(resident) {
-        this.resident = resident;
-    },
-
-    setTransient: function(isTransient) {
-        this.isTransient = isTransient;
+    setUrgent: function(urgent) {
+        this.urgent = urgent;
    },

    setUseActionIcons: function(useIcons) {
@ -647,16 +483,29 @@ Notification.prototype = {
        let metaDisplay = global.screen.get_display();

        this._prevFocusedWindow = metaDisplay.focus_window;
-        this._prevKeyFocusActor = global.stage.get_key_focus();
+        this._prevKeyFocus = global.stage.get_key_focus();

-        if (!Main.overview.visible)
+        // We need to use the captured event in the overview, because we don't want to change the stage input mode to
+        // FOCUSED there. On the other hand, using the captured event doesn't work correctly in the main view because
+        // it doesn't allow focusing the windows again correctly. So we are using the FOCUSED stage input mode in the
+        // main view.
+        if (Main.overview.visible) {
+            if (!Main.pushModal(this.actor))
+                return;
+            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+        } else {
            global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);

-        // Use captured-event to notice clicks outside the notification
-        // without consuming them.
-        this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
+            this._focusWindowChangedId = metaDisplay.connect('notify::focus-window', Lang.bind(this, this._focusWindowChanged));
+            this._stageInputModeChangedId = global.connect('notify::stage-input-mode', Lang.bind(this, this._stageInputModeChanged));

-        this._stageInputModeChangedId = global.connect('notify::stage-input-mode', Lang.bind(this, this._stageInputModeChanged));
+            this._keyPressId = global.stage.connect('key-press-event', Lang.bind(this, this._onKeyPress));
+        }
+
+        // We need to listen to this signal in the overview, as well as in the main view, to make the key bindings such as
+        // Alt+F2 work. When a notification has key focus, which is the case with chat notifications, all captured KEY_PRESS
+        // events have the actor with the key focus as their source. This makes it impossible to distinguish between the chat
+        // window input and the key bindings based solely on the KEY_PRESS event.
        this._focusActorChangedId = global.stage.connect('notify::key-focus', Lang.bind(this, this._focusActorChanged));

        this._hasFocus = true;
@ -664,6 +513,19 @@ Notification.prototype = {
            Main.messageTray.lock();
    },

+    _focusWindowChanged: function() {
+        let metaDisplay = global.screen.get_display();
+        // this._focusWindowChanged() will be called when we call
+        // global.set_stage_input_mode(Shell.StageInputMode.FOCUSED) ,
+        // however metaDisplay.focus_window will be null in that case. We only
+        // want to ungrab focus if the focus has been moved to an application
+        // window.
+        if (metaDisplay.focus_window) {
+            this._prevFocusedWindow = null;
+            this.ungrabFocus();
+        }
+    },
+
    _focusActorChanged: function() {
        let focusedActor = global.stage.get_key_focus();
        if (!focusedActor || !this.actor.contains(focusedActor)) {
@ -673,6 +535,15 @@ Notification.prototype = {
    },

    _stageInputModeChanged: function() {
+        let focusedActor = global.stage.get_key_focus();
+        // TODO: We need to set this._prevFocusedWindow to null in order to
+        // get the cursor in the run dialog. However, that also means it's
+        // set to null when the application menu is activated, which defeats
+        // the point of keeping the name of the previously focused application
+        // in the panel. It'd be good to be able to distinguish between these
+        // two cases.
+        this._prevFocusedWindow = null;
+        this._prevKeyFocusActor = null;
        this.ungrabFocus();
    },

@ -695,26 +566,13 @@ Notification.prototype = {
        return false;
    },

-    _onActionInvoked: function(actor, id) {
-        this.emit('action-invoked', id);
-        if (!this.resident) {
-            // We don't hide a resident notification when the user invokes one of its actions,
-            // because it is common for such notifications to update themselves with new
-            // information based on the action. We'd like to display the updated information
-            // in place, rather than pop-up a new notification.
-            this.emit('done-displaying');
-            this.destroy();
+    _onKeyPress: function(actor, event) {
+        let symbol = event.get_key_symbol();
+        if (symbol == Clutter.Escape) {
+            Main.messageTray.escapeTray();
+            return true;
        }
-    },
-
-    _onClicked: function() {
-        this.emit('clicked');
-        // We hide all types of notifications once the user clicks on them because the common
-        // outcome of clicking should be the relevant window being brought forward and the user's
-        // attention switching to the window.
-        this.emit('done-displaying');
-        if (!this.resident)
-            this.destroy();
+        return false;
    },

    ungrabFocus: function() {
@ -722,6 +580,10 @@ Notification.prototype = {
            return;

        let metaDisplay = global.screen.get_display();
+        if (this._focusWindowChangedId > 0) {
+            metaDisplay.disconnect(this._focusWindowChangedId);
+            this._focusWindowChangedId = 0;
+        }

        if (this._focusActorChangedId > 0) {
            global.stage.disconnect(this._focusActorChangedId);
@ -734,14 +596,20 @@ Notification.prototype = {
        }

        if (this._capturedEventId > 0) {
+            Main.popModal(this.actor);
            global.stage.disconnect(this._capturedEventId);
            this._capturedEventId = 0;
        }

+        if (this._keyPressId > 0) {
+            global.stage.disconnect(this._keyPressId);
+            this._keyPressId = 0;
+        }
+
        this._hasFocus = false;
        Main.messageTray.unlock();

-        if (this._prevFocusedWindow && !metaDisplay.focus_window) {
+        if (this._prevFocusedWindow) {
            metaDisplay.set_input_focus_window(this._prevFocusedWindow, false, global.get_current_time());
            this._prevFocusedWindow = null;
        }
@ -766,10 +634,8 @@ Notification.prototype = {
        }
    },

-    destroy: function(reason) {
-        if (!reason)
-            reason = NotificationDestroyedReason.DISMISSED;
-        this.emit('destroy', reason);
+    destroy: function() {
+        this.emit('destroy');
    }
 };
 Signals.addSignalMethods(Notification.prototype);
@ -785,11 +651,6 @@ Source.prototype = {
        this.title = title;
        this._iconBin = new St.Bin({ width: this.ICON_SIZE,
                                     height: this.ICON_SIZE });
-        this.isTransient = false;
-    },
-
-    setTransient: function(isTransient) {
-        this.isTransient = isTransient;
    },

    // Called to create a new icon actor (of size this.ICON_SIZE).
@ -820,7 +681,6 @@ Source.prototype = {
                    this.notification = null;
                    this._notificationDestroyedId = 0;
                    this._notificationClickedId = 0;
-                    this._notificationRemoved();
                }
            }));

@ -840,13 +700,8 @@ Source.prototype = {
        this._iconBin.child = icon;
    },

-    // Default implementation is to do nothing, but subclasses can override
+    // Default implementation is to do nothing, but subclass can override
    _notificationClicked: function(notification) {
-    },
-
-    // Default implementation is to destroy this source, but subclasses can override
-    _notificationRemoved: function() {
-        this.destroy();
    }
 };
 Signals.addSignalMethods(Source.prototype);
@ -920,9 +775,8 @@ MessageTray.prototype = {
        this._notificationBin.hide();
        this._notificationQueue = [];
        this._notification = null;
-        this._notificationClickedId = 0;

-        this._summaryBin = new St.Bin({ x_align: St.Align.END });
+        this._summaryBin = new St.Bin({ anchor_gravity: Clutter.Gravity.NORTH_EAST });
        this.actor.add_actor(this._summaryBin);
        this._summary = new St.BoxLayout({ name: 'summary-mode',
                                           reactive: true,
@ -942,7 +796,6 @@ MessageTray.prototype = {
        this._summaryNotificationBoxPointer.actor.hide();

        this._summaryNotification = null;
-        this._summaryNotificationClickedId = 0;
        this._clickedSummaryItem = null;
        this._clickedSummaryItemAllocationChangedId = 0;
        this._expandedSummaryItem = null;
@ -1014,8 +867,9 @@ MessageTray.prototype = {
        this.actor.width = primary.width;
        this._notificationBin.x = 0;
        this._notificationBin.width = primary.width;
-        this._summaryBin.x = 0;
-        this._summaryBin.width = primary.width;
+
+        // These work because of their anchor_gravity
+        this._summaryBin.x = primary.width;
    },

    contains: function(source) {
@ -1049,15 +903,7 @@ MessageTray.prototype = {
        }

        this._summaryItems.push(summaryItem);
-
-        // We keep this._newSummaryItems to track any new sources that were added to the
-        // summary and show the summary with them to the user for a short period of time
-        // after notifications are done showing. However, we don't want that to happen for
-        // transient sources, which are removed after the notification is shown, but are
-        // not removed fast enough because of the callbacks to avoid the summary popping up.
-        // So we just don't add transient sources to this._newSummaryItems .
-        if (!source.isTransient)
-            this._newSummaryItems.push(summaryItem);
+        this._newSummaryItems.push(summaryItem);

        source.connect('notify', Lang.bind(this, this._onNotify));

@ -1182,11 +1028,13 @@ MessageTray.prototype = {
        } else if (this._notificationQueue.indexOf(notification) < 0) {
            notification.connect('destroy',
                                 Lang.bind(this, this.removeNotification));
-            this._notificationQueue.push(notification);
-            this._notificationQueue.sort(function(notification1, notification2) {
-                return (notification2.urgency - notification1.urgency);
-            });
+
+            if (notification.urgent)
+                this._notificationQueue.unshift(notification);
+            else
+                this._notificationQueue.push(notification);
        }
+
        this._updateState();
    },

@ -1385,7 +1233,7 @@ MessageTray.prototype = {
        let notificationsPending = this._notificationQueue.length > 0;
        let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
        let notificationExpanded = this._notificationBin.y < 0;
-        let notificationExpired = (this._notificationTimeoutId == 0 && !(this._notification && this._notification.urgency == Urgency.CRITICAL) && !this._pointerInTray && !this._locked) || this._notificationRemoved;
+        let notificationExpired = (this._notificationTimeoutId == 0 && !this._pointerInTray && !this._locked) || this._notificationRemoved;

        if (this._notificationState == State.HIDDEN) {
            if (notificationsPending)
@ -1487,8 +1335,6 @@ MessageTray.prototype = {

    _showNotification: function() {
        this._notification = this._notificationQueue.shift();
-        this._notificationClickedId = this._notification.connect('done-displaying',
-                                                                 Lang.bind(this, this.escapeTray));
        this._notificationBin.child = this._notification.actor;

        this._notificationBin.opacity = 0;
@ -1513,45 +1359,27 @@ MessageTray.prototype = {

    _updateShowingNotification: function() {
        Tweener.removeTweens(this._notificationBin);
+        this._tween(this._notificationBin, '_notificationState', State.SHOWN,
+                    { y: 0,
+                      opacity: 255,
+                      time: ANIMATION_TIME,
+                      transition: 'easeOutQuad',
+                      onComplete: this._showNotificationCompleted,
+                      onCompleteScope: this
+                    });

-        // We auto-expand notifications with CRITICAL urgency.
-        // We use Tweener.removeTweens() to remove a tween that was hiding the notification we are
-        // updating, in case that notification was in the process of being hidden. However,
-        // Tweener.removeTweens() would also remove a tween that was updating the position of the
-        // notification we are updating, in case that notification was already expanded and its height
-        // changed. Therefore we need to call this._expandNotification() for expanded notifications
-        // to make sure their position is updated.
-        if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
+        // We auto-expand urgent notifications.
+        // We call _expandNotification() again on the notifications that
+        // are expanded in case they were in the process of hiding and need
+        // to re-expand.
+        if (this._notification.urgent || this._notification.expanded)
+            // This will overwrite the y tween, but leave the opacity
+            // tween, and so the onComplete will remain as well.
            this._expandNotification(true);
-
-        // We tween all notifications to full opacity. This ensures that both new notifications and
-        // notifications that might have been in the process of hiding get full opacity.
-        //
-        // We tween any notification showing in the banner mode to banner height (this._notificationBin.y = 0).
-        // This ensures that both new notifications and notifications in the banner mode that might
-        // have been in the process of hiding are shown with the banner height.
-        //
-        // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
-        // notification is being shown.
-        //
-        // We don't set the y parameter for the tween for expanded notifications because
-        // this._expandNotification() will result in getting this._notificationBin.y set to the appropriate
-        // fully expanded value.
-        let tweenParams = { opacity: 255,
-                            time: ANIMATION_TIME,
-                            transition: 'easeOutQuad',
-                            onComplete: this._showNotificationCompleted,
-                            onCompleteScope: this
-                          };
-        if (!this._notification.expanded)
-            tweenParams.y = 0;
-
-        this._tween(this._notificationBin, '_notificationState', State.SHOWN, tweenParams);
   },

    _showNotificationCompleted: function() {
-        if (this._notification.urgency != Urgency.CRITICAL)
-            this._updateNotificationTimeout(NOTIFICATION_TIMEOUT * 1000);
+        this._updateNotificationTimeout(NOTIFICATION_TIMEOUT * 1000);
    },

    _updateNotificationTimeout: function(timeout) {
@ -1604,12 +1432,7 @@ MessageTray.prototype = {
        this._notificationBin.hide();
        this._notificationBin.child = null;
        this._notification.collapseCompleted();
-        this._notification.disconnect(this._notificationClickedId);
-        this._notificationClickedId = 0;
-        let notification = this._notification;
        this._notification = null;
-        if (notification.isTransient)
-            notification.destroy(NotificationDestroyedReason.EXPIRED);
    },

    _expandNotification: function(autoExpanding) {
@ -1636,7 +1459,7 @@ MessageTray.prototype = {
   },

    // We use this function to grab focus when the user moves the pointer
-    // to a notification with CRITICAL urgency that was already auto-expanded.
+    // to an urgent notification that was already auto-expanded.
    _ensureNotificationFocused: function() {
        this._notification.grabFocus(false);
    },
@ -1683,8 +1506,7 @@ MessageTray.prototype = {

    _showSummaryNotification: function() {
        this._summaryNotification = this._clickedSummaryItem.source.notification;
-        this._summaryNotificationClickedId = this._summaryNotification.connect('done-displaying',
-                                                                               Lang.bind(this, this.escapeTray));
+
        let index = this._notificationQueue.indexOf(this._summaryNotification);
        if (index != -1)
            this._notificationQueue.splice(index, 1);
@ -1707,8 +1529,8 @@ MessageTray.prototype = {
        this._summaryNotificationBoxPointer.actor.show();
        this._adjustNotificationBoxPointerPosition();

-        this._summaryNotificationState = State.SHOWING;
-        this._summaryNotificationBoxPointer.show(true, Lang.bind(this, function() {
+        this._summaryNotificationState = State.SHOWNING;
+        this._summaryNotificationBoxPointer.animateAppear(Lang.bind(this, function() {
            this._summaryNotificationState = State.SHOWN;
        }));
    },
@ -1747,46 +1569,18 @@ MessageTray.prototype = {

        this._summaryNotification.ungrabFocus();
        this._summaryNotificationState = State.HIDING;
-        this._summaryNotificationBoxPointer.hide(true, Lang.bind(this, this._hideSummaryNotificationCompleted));
+        this._summaryNotificationBoxPointer.animateDisappear(Lang.bind(this, this._hideSummaryNotificationCompleted));
    },

    _hideSummaryNotificationCompleted: function() {
        this._summaryNotificationState = State.HIDDEN;
        this._summaryNotificationBoxPointer.bin.child = null;
        this._summaryNotification.collapseCompleted();
-        this._summaryNotification.disconnect(this._summaryNotificationClickedId);
-        this._summaryNotificationClickedId = 0;
        let summaryNotification = this._summaryNotification;
        this._summaryNotification = null;
-        if (summaryNotification.isTransient && !this._reNotifyWithSummaryNotificationAfterHide)
-            summaryNotification.destroy(NotificationDestroyedReason.EXPIRED);
        if (this._reNotifyWithSummaryNotificationAfterHide) {
            this._onNotify(summaryNotification.source, summaryNotification);
            this._reNotifyWithSummaryNotificationAfterHide = false;
        }
    }
 };
-
-function SystemNotificationSource() {
-    this._init();
-}
-
-SystemNotificationSource.prototype = {
-    __proto__:  Source.prototype,
-
-    _init: function() {
-        Source.prototype._init.call(this, _("System Information"));
-
-        this._setSummaryIcon(this.createNotificationIcon());
-    },
-
-    createNotificationIcon: function() {
-        return new St.Icon({ icon_name: 'dialog-information',
-                             icon_type: St.IconType.SYMBOLIC,
-                             icon_size: this.ICON_SIZE });
-    },
-
-    _notificationClicked: function() {
-        this.destroy();
-    }
-};
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -1,233 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Gdk = imports.gi.Gdk;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const Params = imports.misc.params;
-
-const Lightbox = imports.ui.lightbox;
-const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-
-const OPEN_AND_CLOSE_TIME = 0.1;
-const FADE_OUT_DIALOG_TIME = 1.0;
-
-const State = {
-    OPENED: 0,
-    CLOSED: 1,
-    OPENING: 2,
-    CLOSING: 3,
-    FADED_OUT: 4
-};
-
-function ModalDialog() {
-    this._init();
-}
-
-ModalDialog.prototype = {
-    _init: function(params) {
-        params = Params.parse(params, { styleClass: null });
-
-        this.state = State.CLOSED;
-
-        this._group = new St.Group({ visible: false,
-                                     x: 0,
-                                     y: 0 });
-        Main.uiGroup.add_actor(this._group);
-        global.focus_manager.add_group(this._group);
-        this._initialKeyFocus = this._group;
-
-        this._group.connect('destroy', Lang.bind(this, this._onGroupDestroy));
-
-        this._actionKeys = {};
-        this._group.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
-
-        this._lightbox = new Lightbox.Lightbox(this._group,
-                                               { inhibitEvents: true });
-
-        this._backgroundBin = new St.Bin();
-
-        this._group.add_actor(this._backgroundBin);
-        this._lightbox.highlight(this._backgroundBin);
-
-        this._dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog',
-                                                vertical:    true });
-        if (params.styleClass != null) {
-            this._dialogLayout.add_style_class_name(params.styleClass);
-        }
-        this._backgroundBin.child = this._dialogLayout;
-
-        this.contentLayout = new St.BoxLayout({ vertical: true });
-        this._dialogLayout.add(this.contentLayout,
-                               { x_fill:  true,
-                                 y_fill:  true,
-                                 x_align: St.Align.MIDDLE,
-                                 y_align: St.Align.START });
-
-        this._buttonLayout = new St.BoxLayout({ opacity:  220,
-                                                vertical: false });
-        this._dialogLayout.add(this._buttonLayout,
-                               { expand:  true,
-                                 x_align: St.Align.MIDDLE,
-                                 y_align: St.Align.END });
-    },
-
-    setButtons: function(buttons) {
-        this._buttonLayout.remove_all();
-        let i = 0;
-        for (let index in buttons) {
-            let buttonInfo = buttons[index];
-            let label = buttonInfo['label'];
-            let action = buttonInfo['action'];
-            let key = buttonInfo['key'];
-
-            let button = new St.Button({ style_class: 'modal-dialog-button',
-                                         reactive:    true,
-                                         can_focus:   true,
-                                         label:       label });
-
-            let x_alignment;
-            if (buttons.length == 1)
-                x_alignment = St.Align.END;
-            else if (i == 0)
-                x_alignment = St.Align.START;
-            else if (i == buttons.length - 1)
-                x_alignment = St.Align.END;
-            else
-                x_alignment = St.Align.MIDDLE;
-
-            this._initialKeyFocus = button;
-            this._buttonLayout.add(button,
-                                   { expand: true,
-                                     x_fill: false,
-                                     y_fill: false,
-                                     x_align: x_alignment,
-                                     y_align: St.Align.MIDDLE });
-
-            button.connect('clicked', action);
-
-            if (key)
-                this._actionKeys[key] = action;
-            i++;
-        }
-    },
-
-    _onKeyPressEvent: function(object, keyPressEvent) {
-        let symbol = keyPressEvent.get_key_symbol();
-        let action = this._actionKeys[symbol];
-
-        if (action)
-            action();
-    },
-
-    _onGroupDestroy: function() {
-        this.emit('destroy');
-    },
-
-    _fadeOpen: function() {
-        let monitor = global.get_focus_monitor();
-
-        this._backgroundBin.set_position(monitor.x, monitor.y);
-        this._backgroundBin.set_size(monitor.width, monitor.height);
-
-        this.state = State.OPENING;
-
-        this._dialogLayout.opacity = 255;
-        this._lightbox.show();
-        this._group.opacity = 0;
-        this._group.show();
-        Tweener.addTween(this._group,
-                         { opacity: 255,
-                           time: OPEN_AND_CLOSE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this,
-                               function() {
-                                   this._initialKeyFocus.grab_key_focus();
-                                   this.state = State.OPENED;
-                                   this.emit('opened');
-                               }),
-                         });
-    },
-
-    open: function(timestamp) {
-        if (this.state == State.OPENED || this.state == State.OPENING)
-            return true;
-
-        if (!Main.pushModal(this._group, timestamp))
-            return false;
-
-        global.stage.set_key_focus(this._group);
-
-        this._fadeOpen();
-        return true;
-    },
-
-    close: function(timestamp) {
-        if (this.state == State.CLOSED || this.state == State.CLOSING)
-            return;
-
-        let needsPopModal;
-
-        if (this.state == State.OPENED || this.state == State.OPENING)
-            needsPopModal = true;
-        else
-            needsPopModal = false;
-
-        this.state = State.CLOSING;
-
-        Tweener.addTween(this._group,
-                         { opacity: 0,
-                           time: OPEN_AND_CLOSE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this,
-                               function() {
-                                   this.state = State.CLOSED;
-                                   this._group.hide();
-
-                                   if (needsPopModal)
-                                       Main.popModal(this._group, timestamp);
-                               })
-                         });
-    },
-
-    // This method is like close, but fades the dialog out much slower,
-    // and leaves the lightbox in place. Once in the faded out state,
-    // the dialog can be brought back by an open call, or the lightbox
-    // can be dismissed by a close call.
-    //
-    // The main point of this method is to give some indication to the user
-    // that the dialog reponse has been acknowledged but will take a few
-    // moments before being processed.
-    // e.g., if a user clicked "Log Out" then the dialog should go away
-    // imediately, but the lightbox should remain until the logout is
-    // complete.
-    _fadeOutDialog: function(timestamp) {
-        if (this.state == State.CLOSED || this.state == State.CLOSING)
-            return;
-
-        if (this.state == State.FADED_OUT)
-            return;
-
-        Tweener.addTween(this._dialogLayout,
-                         { opacity: 0,
-                           time:    FADE_OUT_DIALOG_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this,
-                               function() {
-                                   this.state = State.FADED_OUT;
-                                   Main.popModal(this._group, timestamp);
-                               })
-                         });
-    }
-};
-Signals.addSignalMethods(ModalDialog.prototype);
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -9,11 +9,9 @@ const St = imports.gi.St;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

-const Config = imports.misc.config;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const Params = imports.misc.params;
-const Util = imports.misc.util;

 let nextNotificationId = 1;

@ -77,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;' }
    ]
 };

@ -128,8 +126,17 @@ NotificationDaemon.prototype = {
            log('Failed to acquire org.freedesktop.Notifications');
        else {
            log('Failed to acquire org.freedesktop.Notifications; trying again');
-            Util.killall('notification-daemon');
-            Util.killall('notify-osd');
+
+            // kill the notification-daemon. pkill is more portable
+            // than killall, but on Linux at least it won't match if
+            // you pass more than 15 characters of the process name...
+            // However, if you use the '-f' flag to match the entire
+            // command line, it will work, but we have to be careful
+            // in that case that we don't match 'gedit
+            // notification-daemon.c' or whatever...
+            let p = new Shell.Process({ args: ['pkill', '-f',
+                                               '^([^ ]*/)?(notification-daemon|notify-osd)$']});
+            p.run();
        }
    },

@ -146,9 +153,9 @@ NotificationDaemon.prototype = {
                return new St.Icon({ icon_name: icon,
                                     icon_type: St.IconType.FULLCOLOR,
                                     icon_size: size });
-        } else if (hints['image-data']) {
+        } else if (hints.icon_data) {
            let [width, height, rowStride, hasAlpha,
-                 bitsPerSample, nChannels, data] = hints['image-data'];
+                 bitsPerSample, nChannels, data] = hints.icon_data;
            return textureCache.load_from_raw(data, data.length, hasAlpha,
                                              width, height, rowStride, size);
        } else {
@ -168,43 +175,14 @@ NotificationDaemon.prototype = {
        }
    },

-    // Returns the source associated with ndata.notification if it is set.
-    // Otherwise, returns the source associated with the pid if one is
-    // stored in this._sources and the notification is not transient.
-    // Otherwise, creates a new source as long as pid is provided.
-    //
-    // Either a pid or ndata.notification is needed to retrieve or
-    // create a source.
-    _getSource: function(title, pid, ndata) {
-        if (!pid && !(ndata && ndata.notification))
-            return null;
-
-        // We use notification's source for the notifications we still have
-        // around that are getting replaced because we don't keep sources
-        // for transient notifications in this._sources, but we still want
-        // the notification associated with them to get replaced correctly.
-        if (ndata && ndata.notification)
-            return ndata.notification.source;
-
-        let isForTransientNotification = (ndata && ndata.hints['transient'] == true);
-
-        // We don't want to override a persistent notification
-        // with a transient one from the same sender, so we
-        // always create a new source object for new transient notifications
-        // and never add it to this._sources .
-        if (!isForTransientNotification && this._sources[pid])
-            return this._sources[pid];
-
+    _newSource: function(title, pid) {
        let source = new Source(title, pid);
-        source.setTransient(isForTransientNotification);
+        this._sources[pid] = source;

-        if (!isForTransientNotification) {
-            this._sources[pid] = source;
-            source.connect('destroy', Lang.bind(this,
-                function() {
-                    delete this._sources[pid];
-                }));
-        }
+        source.connect('destroy', Lang.bind(this,
+            function() {
+                delete this._sources[pid];
+            }));

        Main.messageTray.add(source);
        return source;
@ -227,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++) {
@ -238,15 +218,6 @@ NotificationDaemon.prototype = {

        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);

-        // Be compatible with the various hints for image data
-        // 'image-data' is the latest name of this hint, introduced in 1.2
-        if (!hints['image-data']) {
-            if (hints['image_data'])
-                hints['image-data'] = hints['image_data']; // version 1.1 of the spec
-            else if (hints['icon_data'])
-                hints['image-data'] = hints['icon_data']; // previous versions of the spec
-        }
-
        let ndata = { appName: appName,
                      icon: icon,
                      summary: summary,
@ -265,8 +236,7 @@ NotificationDaemon.prototype = {

        let sender = DBus.getCurrentMessageContext().sender;
        let pid = this._senderToPid[sender];
-
-        let source = this._getSource(appName, pid, ndata);
+        let source = pid ? this._sources[pid] : null;

        if (source) {
            this._notifyForSource(source, ndata);
@ -287,23 +257,16 @@ NotificationDaemon.prototype = {
                if (!ndata)
                    return;

-                source = this._getSource(appName, pid, ndata);
+                this._senderToPid[sender] = pid;
+                source = this._sources[pid];
+
+                if (!source)
+                    source = this._newSource(appName, pid);
+                source.connect('destroy', Lang.bind(this,
+                    function() {
+                        delete this._senderToPid[sender];
+                    }));

-                // We only store sender-pid entries for persistent sources.
-                // Removing the entries once the source is destroyed
-                // would result in the entries associated with transient
-                // sources removed once the notification is shown anyway.
-                // However, keeping these pairs would mean that we would
-                // possibly remove an entry associated with a persistent
-                // source when a transient source for the same sender is
-                // distroyed.
-                if (!source.isTransient) {
-                    this._senderToPid[sender] = pid;
-                    source.connect('destroy', Lang.bind(this,
-                        function() {
-                            delete this._senderToPid[sender];
-                        }));
-                }
                this._notifyForSource(source, ndata);
            }));

@ -318,34 +281,19 @@ 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) {
+                    this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
+                }));
            notification.connect('destroy', Lang.bind(this,
-                function(n, reason) {
+                function(n) {
                    delete this._notifications[id];
-                    let notificationClosedReason;
-                    switch (reason) {
-                        case MessageTray.NotificationDestroyedReason.EXPIRED:
-                            notificationClosedReason = NotificationClosedReason.EXPIRED;
-                            break;
-                        case MessageTray.NotificationDestroyedReason.DISMISSED:
-                            notificationClosedReason = NotificationClosedReason.DISMISSED;
-                            break;
-                        case MessageTray.NotificationDestroyedReason.SOURCE_CLOSED:
-                            notificationClosedReason = NotificationClosedReason.APP_CLOSED;
-                            break;
-                    }
-                    this._emitNotificationClosed(id, notificationClosedReason);
-                }));
-            notification.connect('action-invoked', Lang.bind(this,
-                function(n, actionId) {
-                    this._emitActionInvoked(id, actionId);
                }));
+            notification.connect('action-invoked', Lang.bind(this, this._actionInvoked, source, id));
        } else {
            notification.update(summary, body, { icon: iconActor,
-                                                 bannerMarkup: true,
                                                 clear: true });
        }

@ -354,21 +302,8 @@ NotificationDaemon.prototype = {
            for (let i = 0; i < actions.length - 1; i += 2)
                notification.addButton(actions[i], actions[i + 1]);
        }
-        switch (hints.urgency) {
-            case Urgency.LOW:
-                notification.setUrgency(MessageTray.Urgency.LOW);
-                break;
-            case Urgency.NORMAL:
-                notification.setUrgency(MessageTray.Urgency.NORMAL);
-                break;
-            case Urgency.CRITICAL:
-                notification.setUrgency(MessageTray.Urgency.CRITICAL);
-                break;
-        }
-        notification.setResident(hints.resident == true);
-        // 'transient' is a reserved keyword in JS, so we have to retrieve the value
-        // of the 'transient' hint with hints['transient'] rather than hints.transient
-        notification.setTransient(hints['transient'] == true);
+
+        notification.setUrgent(hints.urgency == Urgency.CRITICAL);

        let sourceIconActor = source.useNotificationIcon ? this._iconForNotificationData(icon, hints, source.ICON_SIZE) : null;
        source.notify(notification, sourceIconActor);
@ -378,9 +313,10 @@ NotificationDaemon.prototype = {
        let ndata = this._notifications[id];
        if (ndata) {
            if (ndata.notification)
-                ndata.notification.destroy(MessageTray.NotificationDestroyedReason.SOURCE_CLOSED);
+                ndata.notification.destroy();
            delete this._notifications[id];
        }
+        this._emitNotificationClosed(id, NotificationClosedReason.APP_CLOSED);
    },

    GetCapabilities: function() {
@ -400,10 +336,10 @@ NotificationDaemon.prototype = {

    GetServerInformation: function() {
        return [
-            Config.PACKAGE_NAME,
+            'GNOME Shell',
            'GNOME',
-            Config.PACKAGE_VERSION,
-            '1.2'
+            '0.1', // FIXME, get this from somewhere
+            '1.0'
        ];
    },

@ -415,13 +351,17 @@ NotificationDaemon.prototype = {
        for (let id in this._sources) {
            let source = this._sources[id];
            if (source.app == tracker.focus_app) {
-                if (source.notification && !source.notification.resident)
-                    source.notification.destroy();
+                source.activated();
                return;
            }
        }
    },

+    _actionInvoked: function(notification, action, source, id) {
+        source.activated();
+        this._emitActionInvoked(id, action);
+    },
+
    _emitNotificationClosed: function(id, reason) {
        DBus.session.emit_signal('/org/freedesktop/Notifications',
                                 'org.freedesktop.Notifications',
@ -437,7 +377,9 @@ NotificationDaemon.prototype = {
    },

    _onTrayIconAdded: function(o, icon) {
-        let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null);
+        let source = this._sources[icon.pid];
+        if (!source)
+            source = this._newSource(icon.title || icon.wm_class || _("Unknown"), icon.pid);
        source.setTrayIcon(icon);
    },

@ -478,16 +420,13 @@ Source.prototype = {
    },

    _setApp: function() {
-        if (this.app)
-            return;
-
        this.app = Shell.WindowTracker.get_default().get_app_from_pid(this._pid);
        if (!this.app)
            return;

        // Only override the icon if we were previously using
-        // notification-based icons (ie, not a trayicon) or if it was unset before
-        if (!this._isTrayIcon) {
+        // notification-based icons (ie, not a trayicon)
+        if (this.useNotificationIcon) {
            this.useNotificationIcon = false;
            this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE));
        }
@ -500,10 +439,12 @@ Source.prototype = {
    },

    _notificationClicked: function(notification) {
+        notification.destroy();
        this.openApp();
+        this.activated();
    },

-    _notificationRemoved: function() {
+    activated: function() {
        if (!this._isTrayIcon)
            this.destroy();
    },
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -1,21 +1,18 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 const Lang = imports.lang;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
-const Gdk = imports.gi.Gdk;

 const AppDisplay = imports.ui.appDisplay;
 const Dash = imports.ui.dash;
-const DND = imports.ui.dnd;
 const DocDisplay = imports.ui.docDisplay;
+const GenericDisplay = imports.ui.genericDisplay;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
@ -31,19 +28,31 @@ const ANIMATION_TIME = 0.25;
 // We split the screen vertically between the dash and the view selector.
 const DASH_SPLIT_FRACTION = 0.1;

-const DND_WINDOW_SWITCH_TIMEOUT = 1250;
+const SHELL_INFO_HIDE_TIMEOUT = 10;

-const SwipeScrollDirection = {
-    NONE: 0,
-    HORIZONTAL: 1,
-    VERTICAL: 2
-};
+function Source() {
+    this._init();
+}

-const SwipeScrollResult = {
-    CANCEL: 0,
-    SWIPE: 1,
-    CLICK: 2
-};
+Source.prototype = {
+    __proto__:  MessageTray.Source.prototype,
+
+    _init: function() {
+        MessageTray.Source.prototype._init.call(this,
+                                                "System Information");
+        this._setSummaryIcon(this.createNotificationIcon());
+    },
+
+    createNotificationIcon: function() {
+        return new St.Icon({ icon_name: 'info',
+                             icon_type: St.IconType.FULLCOLOR,
+                             icon_size: this.ICON_SIZE });
+    },
+
+    _notificationClicked: function() {
+        this.destroy();
+    }
+}

 function ShellInfo() {
    this._init();
@ -52,10 +61,14 @@ function ShellInfo() {
 ShellInfo.prototype = {
    _init: function() {
        this._source = null;
+        this._timeoutId = 0;
        this._undoCallback = null;
    },

    _onUndoClicked: function() {
+        Mainloop.source_remove(this._timeoutId);
+        this._timeoutId = 0;
+
        if (this._undoCallback)
            this._undoCallback();
        this._undoCallback = null;
@ -64,9 +77,22 @@ ShellInfo.prototype = {
            this._source.destroy();
    },

+    _onTimeout: function() {
+        this._timeoutId = 0;
+        if (this._source)
+            this._source.destroy();
+        return false;
+    },
+
    setMessage: function(text, undoCallback, undoLabel) {
+        if (this._timeoutId)
+            Mainloop.source_remove(this._timeoutId);
+
+        this._timeoutId = Mainloop.timeout_add_seconds(SHELL_INFO_HIDE_TIMEOUT,
+                                                       Lang.bind(this, this._onTimeout));
+
        if (this._source == null) {
-            this._source = new MessageTray.SystemNotificationSource();
+            this._source = new Source();
            this._source.connect('destroy', Lang.bind(this,
                function() {
                    this._source = null;
@ -80,8 +106,6 @@ ShellInfo.prototype = {
        else
            notification.update(text, null, { clear: true });

-        notification.setTransient(true);
-
        this._undoCallback = undoCallback;
        if (undoCallback) {
            notification.addButton('system-undo',
@ -100,19 +124,18 @@ 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',
-                                     reactive: true });
+        this._group = new St.Group({ name: 'overview' });
        this._group._delegate = this;
        this._group.connect('style-changed',
            Lang.bind(this, function() {
@ -124,19 +147,11 @@ Overview.prototype = {
                }
            }));

-        this._scrollDirection = SwipeScrollDirection.NONE;
-        this._scrollAdjustment = null;
-        this._capturedEventId = 0;
-        this._buttonPressId = 0;
-
        this.shellInfo = new ShellInfo();

        this._workspacesDisplay = null;

-        this.visible = false;           // animating to overview, in overview, animating out
-        this._shown = false;            // show() and not hide()
-        this._shownTemporarily = false; // showTemporarily() and not hideTemporarily()
-        this._modal = false;            // have a modal grab
+        this.visible = false;
        this.animationInProgress = false;
        this._hideInProgress = false;

@ -156,16 +171,17 @@ Overview.prototype = {
        this._group.add_actor(this.viewSelector.actor);

        this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay();
-        this.viewSelector.addViewTab(_("Windows"), this._workspacesDisplay.actor);
+        this.viewSelector.addViewTab("Windows", this._workspacesDisplay.actor);

        let appView = new AppDisplay.AllAppDisplay();
-        this.viewSelector.addViewTab(_("Applications"), appView.actor);
+        this.viewSelector.addViewTab("Applications", appView.actor);

        // Default search providers
        this.viewSelector.addSearchProvider(new AppDisplay.AppSearchProvider());
        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();
@ -173,236 +189,11 @@ Overview.prototype = {
        this._dash.actor.add_constraint(this.viewSelector.constrainY);
        this._dash.actor.add_constraint(this.viewSelector.constrainHeight);

-        this._coverPane.hide();
-
-        // XDND
-        this._dragMonitor = {
-            dragMotion: Lang.bind(this, this._onDragMotion)
-        };
-
-        Main.xdndHandler.connect('drag-begin', Lang.bind(this, this._onDragBegin));
-        Main.xdndHandler.connect('drag-end', Lang.bind(this, this._onDragEnd));
-
-        this._windowSwitchTimeoutId = 0;
-        this._windowSwitchTimestamp = 0;
-        this._lastActiveWorkspaceIndex = -1;
-        this._lastHoveredWindow = null;
-        this._needsFakePointerEvent = false;
+        this._coverPane.lower_bottom();

        this.workspaces = null;
    },

-    _onDragBegin: function() {
-        DND.addDragMonitor(this._dragMonitor);
-        // Remember the workspace we started from
-        this._lastActiveWorkspaceIndex = global.screen.get_active_workspace_index();
-    },
-
-    _onDragEnd: function(time) {
-        // In case the drag was canceled while in the overview
-        // we have to go back to where we started and hide
-        // the overview
-        if (this._shownTemporarily)  {
-            global.screen.get_workspace_by_index(this._lastActiveWorkspaceIndex).activate(time);
-            this.hideTemporarily();
-        }
-        this._lastHoveredWindow = null;
-        DND.removeMonitor(this._dragMonitor);
-    },
-
-    _fakePointerEvent: function() {
-        let display = Gdk.Display.get_default();
-        let deviceManager = display.get_device_manager();
-        let pointer = deviceManager.get_client_pointer();
-        let [screen, pointerX, pointerY] = pointer.get_position();
-
-        pointer.warp(screen, pointerX, pointerY);
-    },
-
-    _onDragMotion: function(dragEvent) {
-        let targetIsWindow = dragEvent.targetActor &&
-                             dragEvent.targetActor._delegate &&
-                             dragEvent.targetActor._delegate.metaWindow;
-
-        if (targetIsWindow &&
-            dragEvent.targetActor._delegate.metaWindow == this._lastHoveredWindow)
-            return DND.DragMotionResult.CONTINUE;
-
-        this._lastHoveredWindow = null;
-
-        if (this._windowSwitchTimeoutId != 0) {
-            Mainloop.source_remove(this._windowSwitchTimeoutId);
-            this._windowSwitchTimeoutId = 0;
-            this._needsFakePointerEvent = false;
-        }
-
-        if (targetIsWindow) {
-            this._lastHoveredWindow = dragEvent.targetActor._delegate.metaWindow;
-            this._windowSwitchTimestamp = global.get_current_time();
-            this._windowSwitchTimeoutId = Mainloop.timeout_add(DND_WINDOW_SWITCH_TIMEOUT,
-                                            Lang.bind(this, function() {
-                                                this._needsFakePointerEvent = true;
-                                                Main.activateWindow(dragEvent.targetActor._delegate.metaWindow,
-                                                                    this._windowSwitchTimestamp);
-                                                this.hideTemporarily();
-                                                this._lastHoveredWindow = null;
-                                            }));
-        }
-
-        return DND.DragMotionResult.CONTINUE;
-    },
-
-    setScrollAdjustment: function(adjustment, direction) {
-        this._scrollAdjustment = adjustment;
-        if (this._scrollAdjustment == null)
-            this._scrollDirection = SwipeScrollDirection.NONE;
-        else
-            this._scrollDirection = direction;
-    },
-
-    _onButtonPress: function(actor, event) {
-        if (this._scrollDirection == SwipeScrollDirection.NONE)
-            return;
-
-        let [stageX, stageY] = event.get_coords();
-        this._dragStartX = this._dragX = stageX;
-        this._dragStartY = this._dragY = stageY;
-        this._dragStartValue = this._scrollAdjustment.value;
-        this._lastMotionTime = -1; // used to track "stopping" while swipe-scrolling
-        this._capturedEventId = global.stage.connect('captured-event',
-            Lang.bind(this, this._onCapturedEvent));
-        this.emit('swipe-scroll-begin');
-    },
-
-    _onCapturedEvent: function(actor, event) {
-        let stageX, stageY;
-        let threshold = Gtk.Settings.get_default().gtk_dnd_drag_threshold;
-
-        switch(event.type()) {
-            case Clutter.EventType.BUTTON_RELEASE:
-                [stageX, stageY] = event.get_coords();
-
-                // default to snapping back to the original value
-                let newValue = this._dragStartValue;
-
-                let minValue = this._scrollAdjustment.lower;
-                let maxValue = this._scrollAdjustment.upper - this._scrollAdjustment.page_size;
-
-                let direction;
-                if (this._scrollDirection == SwipeScrollDirection.HORIZONTAL) {
-                    direction = stageX > this._dragStartX ? -1 : 1;
-                    if (St.Widget.get_default_direction() == St.TextDirection.RTL)
-                        direction *= -1;
-                } else {
-                    direction = stageY > this._dragStartY ? -1 : 1;
-                }
-
-                // We default to scroll a full page size; both the first
-                // and the last page may be smaller though, so we need to
-                // adjust difference in those cases.
-                let difference = direction * this._scrollAdjustment.page_size;
-                if (this._dragStartValue + difference > maxValue)
-                    difference = maxValue - this._dragStartValue;
-                else if (this._dragStartValue + difference < minValue)
-                    difference = minValue - this._dragStartValue;
-
-                // If the user has moved more than half the scroll
-                // difference, we want to "settle" to the new value
-                // even if the user stops dragging rather "throws" by
-                // releasing during the drag.
-                let distance = this._dragStartValue - this._scrollAdjustment.value;
-                let noStop = Math.abs(distance / difference) > 0.5;
-
-                // We detect if the user is stopped by comparing the
-                // timestamp of the button release with the timestamp of
-                // the last motion. Experimentally, a difference of 0 or 1
-                // millisecond indicates that the mouse is in motion, a
-                // larger difference indicates that the mouse is stopped.
-                if ((this._lastMotionTime > 0 &&
-                     this._lastMotionTime > event.get_time() - 2) ||
-                    noStop) {
-                    if (this._dragStartValue + difference >= minValue &&
-                        this._dragStartValue + difference <= maxValue)
-                        newValue += difference;
-                }
-
-                let result;
-
-                // See if the user has moved the mouse enough to trigger
-                // a drag
-                if (Math.abs(stageX - this._dragStartX) < threshold &&
-                    Math.abs(stageY - this._dragStartY) < threshold) {
-                    // no motion? It's a click!
-                    result = SwipeScrollResult.CLICK;
-                    this.emit('swipe-scroll-end', result);
-                } else {
-                    if (newValue == this._dragStartValue)
-                        result = SwipeScrollResult.CANCEL;
-                    else
-                        result = SwipeScrollResult.SWIPE;
-
-                    // The event capture handler is disconnected
-                    // while scrolling to the final position, so
-                    // to avoid undesired prelights we raise
-                    // the cover pane.
-                    this._coverPane.raise_top();
-                    this._coverPane.show();
-
-                    Tweener.addTween(this._scrollAdjustment,
-                                     { value: newValue,
-                                       time: ANIMATION_TIME,
-                                       transition: 'easeOutQuad',
-                                       onCompleteScope: this,
-                                       onComplete: function() {
-                                          this._coverPane.hide();
-                                          this.emit('swipe-scroll-end',
-                                                    result);
-                                       }
-                                     });
-                }
-
-                global.stage.disconnect(this._capturedEventId);
-                this._capturedEventId = 0;
-
-                return result != SwipeScrollResult.CLICK;
-
-            case Clutter.EventType.MOTION:
-                [stageX, stageY] = event.get_coords();
-                let dx = this._dragX - stageX;
-                let dy = this._dragY - stageY;
-                let primary = global.get_primary_monitor();
-
-                this._dragX = stageX;
-                this._dragY = stageY;
-                this._lastMotionTime = event.get_time();
-
-                // See if the user has moved the mouse enough to trigger
-                // a drag
-                if (Math.abs(stageX - this._dragStartX) < threshold &&
-                    Math.abs(stageY - this._dragStartY) < threshold)
-                    return true;
-
-                if (this._scrollDirection == SwipeScrollDirection.HORIZONTAL) {
-                    if (St.Widget.get_default_direction() == St.TextDirection.RTL)
-                        this._scrollAdjustment.value -= (dx / primary.width) * this._scrollAdjustment.page_size;
-                    else
-                        this._scrollAdjustment.value += (dx / primary.width) * this._scrollAdjustment.page_size;
-                } else {
-                    this._scrollAdjustment.value += (dy / primary.height) * this._scrollAdjustment.page_size;
-                }
-
-                return true;
-
-            // Block enter/leave events to avoid prelights
-            // during swipe-scroll
-            case Clutter.EventType.ENTER:
-            case Clutter.EventType.LEAVE:
-                return true;
-        }
-
-        return false;
-    },
-
    _getDesktopClone: function() {
        let windows = global.get_window_actors().filter(function(w) {
            return w.meta_window.get_window_type() == Meta.WindowType.DESKTOP;
@ -493,26 +284,11 @@ Overview.prototype = {
        return [this.workspaces.actor.x, this.workspaces.actor.y];
    },

-    // show:
-    //
-    // Animates the overview visible and grabs mouse and keyboard input
    show : function() {
-        if (this._shown)
+        if (this.visible)
            return;
-        // Do this manually instead of using _syncInputMode, to handle failure
        if (!Main.pushModal(this.viewSelector.actor))
            return;
-        this._modal = true;
-        this._animateVisible();
-        this._shown = true;
-
-        this._buttonPressId = this._group.connect('button-press-event',
-            Lang.bind(this, this._onButtonPress));
-    },
-
-    _animateVisible: function() {
-        if (this.visible || this.animationInProgress)
-            return;

        this.visible = true;
        this.animationInProgress = true;
@ -575,110 +351,11 @@ Overview.prototype = {
                         });

        this._coverPane.raise_top();
-        this._coverPane.show();
        this.emit('showing');
    },

-    // showTemporarily:
-    //
-    // Animates the overview visible without grabbing mouse and keyboard input;
-    // if show() has already been called, this has no immediate effect, but
-    // will result in the overview not being hidden until hideTemporarily() is
-    // called.
-    showTemporarily: function() {
-        if (this._shownTemporarily)
-            return;
-
-        this._syncInputMode();
-        this._animateVisible();
-        this._shownTemporarily = true;
-    },
-
-    // hide:
-    //
-    // Reverses the effect of show()
    hide: function() {
-        if (!this._shown)
-            return;
-
-        if (!this._shownTemporarily)
-            this._animateNotVisible();
-
-        this._shown = false;
-        this._syncInputMode();
-
-        if (this._buttonPressId > 0)
-            this._group.disconnect(this._buttonPressId);
-        this._buttonPressId = 0;
-    },
-
-    // hideTemporarily:
-    //
-    // Reverses the effect of showTemporarily()
-    hideTemporarily: function() {
-        if (!this._shownTemporarily)
-            return;
-
-        if (!this._shown)
-            this._animateNotVisible();
-
-        this._shownTemporarily = false;
-        this._syncInputMode();
-    },
-
-    toggle: function() {
-        if (this._shown)
-            this.hide();
-        else
-            this.show();
-    },
-
-    /**
-     * getWorkspacesForWindow:
-     * @metaWindow: A #MetaWindow
-     *
-     * Returns the Workspaces object associated with the given window.
-     * This method is not be accessible if the overview is not open
-     * and will return %null.
-     */
-    getWorkspacesForWindow: function(metaWindow) {
-        return this.workspaces;
-    },
-
-    //// Private methods ////
-
-    _syncInputMode: function() {
-        // We delay input mode changes during animation so that when removing the
-        // overview we don't have a problem with the release of a press/release
-        // going to an application.
-        if (this.animationInProgress)
-            return;
-
-        if (this._shown) {
-            if (!this._modal) {
-                if (Main.pushModal(this._dash.actor))
-                    this._modal = true;
-                else
-                    this.hide();
-            }
-        } else if (this._shownTemporarily) {
-            if (this._modal) {
-                Main.popModal(this._dash.actor);
-                this._modal = false;
-            }
-            global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
-        } else {
-            if (this._modal) {
-                Main.popModal(this._dash.actor);
-                this._modal = false;
-            }
-            else if (global.stage_input_mode == Shell.StageInputMode.FULLSCREEN)
-                global.stage_input_mode = Shell.StageInputMode.NORMAL;
-        }
-    },
-
-    _animateNotVisible: function() {
-        if (!this.visible || this.animationInProgress)
+        if (!this.visible || this._hideInProgress)
            return;

        this.animationInProgress = true;
@ -719,21 +396,39 @@ Overview.prototype = {
                         });

        this._coverPane.raise_top();
-        this._coverPane.show();
        this.emit('hiding');
    },

+    toggle: function() {
+        if (this.visible)
+            this.hide();
+        else
+            this.show();
+    },
+
+    /**
+     * getWorkspacesForWindow:
+     * @metaWindow: A #MetaWindow
+     *
+     * Returns the Workspaces object associated with the given window.
+     * This method is not be accessible if the overview is not open
+     * and will return %null.
+     */
+    getWorkspacesForWindow: function(metaWindow) {
+        return this.workspaces;
+    },
+
+    //// Private methods ////
+
    _showDone: function() {
+        if (this._hideInProgress)
+            return;
+
        this.animationInProgress = false;
        this._desktopFade.hide();
-        this._coverPane.hide();
+        this._coverPane.lower_bottom();

        this.emit('shown');
-        // Handle any calls to hide* while we were showing
-        if (!this._shown && !this._shownTemporarily)
-            this._animateNotVisible();
-
-        this._syncInputMode();
    },

    _hideDone: function() {
@ -754,20 +449,10 @@ Overview.prototype = {
        this.animationInProgress = false;
        this._hideInProgress = false;

-        this._coverPane.hide();
+        this._coverPane.lower_bottom();

+        Main.popModal(this.viewSelector.actor);
        this.emit('hidden');
-        // Handle any calls to show* while we were hiding
-        if (this._shown || this._shownTemporarily)
-            this._animateVisible();
-
-        this._syncInputMode();
-
-        // Fake a pointer event if requested
-        if (this._needsFakePointerEvent) {
-            this._fakePointerEvent();
-            this._needsFakePointerEvent = false;
-        }
    }
 };
 Signals.addSignalMethods(Overview.prototype);
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -12,12 +12,10 @@ const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

 const Calendar = imports.ui.calendar;
-const Config = imports.misc.config;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
 const StatusMenu = imports.ui.statusMenu;
-const DateMenu = imports.ui.dateMenu;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

@ -27,8 +25,6 @@ const PANEL_ICON_SIZE = 24;

 const HOT_CORNER_ACTIVATION_TIMEOUT = 0.5;

-const BUTTON_DND_ACTIVATION_TIMEOUT = 250;
-
 const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const SPINNER_UPDATE_TIMEOUT = 130;
 const SPINNER_SPEED = 0.02;
@ -37,21 +33,11 @@ const STANDARD_TRAY_ICON_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'blue
 const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION = {
    'a11y': imports.ui.status.accessibility.ATIndicator,
    'volume': imports.ui.status.volume.Indicator,
-    'battery': imports.ui.status.power.Indicator,
-    'keyboard': imports.ui.status.keyboard.XKBIndicator
+    'battery': imports.ui.status.power.Indicator
 };

-if (Config.HAVE_BLUETOOTH)
-    STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
-
-const STANDARD_TRAY_INDICATOR_FACTORIES = [
-    imports.ui.status.keyboard.ModifierIndicatorFactory
-];
-
-// in org.gnome.desktop.interface
-const CLOCK_FORMAT_KEY        = 'clock-format';
-
-// in org.gnome.shell.clock
+const CLOCK_FORMAT_KEY        = 'format';
+const CLOCK_CUSTOM_FORMAT_KEY = 'custom-format';
 const CLOCK_SHOW_DATE_KEY     = 'show-date';
 const CLOCK_SHOW_SECONDS_KEY  = 'show-seconds';

@ -497,6 +483,147 @@ AppMenuButton.prototype = {

 Signals.addSignalMethods(AppMenuButton.prototype);

+function ClockButton() {
+    this._init();
+}
+
+ClockButton.prototype = {
+    __proto__: PanelMenu.Button.prototype,
+
+    _init: function() {
+        PanelMenu.Button.prototype._init.call(this, St.Align.START);
+        this.menu.addAction(_("Preferences"), Lang.bind(this, this._onPrefs));
+
+        this._clock = new St.Label();
+        this.actor.set_child(this._clock);
+
+        this._calendarPopup = null;
+
+        this._clockSettings = new Gio.Settings({ schema: 'org.gnome.shell.clock' });
+        this._clockSettings.connect('changed', Lang.bind(this, this._updateClock));
+
+        // Start the clock
+        this._updateClock();
+    },
+
+    _onButtonPress: function(actor, event) {
+        let button = event.get_button();
+        if (button == 3 &&
+            (!this._calendarPopup || !this._calendarPopup.isOpen))
+            this.menu.toggle();
+        else
+            this._toggleCalendar();
+    },
+
+    closeCalendar: function() {
+        if (!this._calendarPopup || !this._calendarPopup.isOpen)
+            return;
+
+        this._calendarPopup.hide();
+
+        this.menu.isOpen = false;
+        this.actor.remove_style_pseudo_class('pressed');
+    },
+
+    openCalendar: function() {
+        this._calendarPopup.show();
+
+        // simulate an open menu, so it won't appear beneath the calendar
+        this.menu.isOpen = true;
+        this.actor.add_style_pseudo_class('pressed');
+    },
+
+    _onPrefs: function() {
+        let args = ['gnome-shell-clock-preferences'];
+        let p = new Shell.Process({ args: args });
+
+        p.run();
+    },
+
+    _toggleCalendar: function() {
+        if (this._calendarPopup == null) {
+            this._calendarPopup = new CalendarPopup();
+            this._calendarPopup.actor.hide();
+        }
+
+        if (this.menu.isOpen && !this._calendarPopup.isOpen) {
+            this.menu.close();
+            return;
+        }
+
+        if (!this._calendarPopup.isOpen)
+            this.openCalendar();
+        else
+            this.closeCalendar();
+    },
+
+    _updateClock: function() {
+        let format = this._clockSettings.get_string(CLOCK_FORMAT_KEY);
+        let showDate = this._clockSettings.get_boolean(CLOCK_SHOW_DATE_KEY);
+        let showSeconds = this._clockSettings.get_boolean(CLOCK_SHOW_SECONDS_KEY);
+
+        let clockFormat;
+        switch (format) {
+            case 'unix':
+                // force updates every second
+                showSeconds = true;
+                clockFormat = '%s';
+                break;
+            case 'custom':
+                // force updates every second
+                showSeconds = true;
+                clockFormat = this._clockSettings.get_string(CLOCK_CUSTOM_FORMAT_KEY);
+                break;
+            case '24-hour':
+                if (showDate)
+	            /* Translators: This is the time format with date used
+                       in 24-hour mode. */
+                    clockFormat = showSeconds ? _("%a %b %e, %R:%S")
+                                              : _("%a %b %e, %R");
+                else
+	            /* Translators: This is the time format without date used
+                       in 24-hour mode. */
+                    clockFormat = showSeconds ? _("%a %R:%S")
+                                              : _("%a %R");
+                break;
+            case '12-hour':
+            default:
+                if (showDate)
+	            /* Translators: This is a time format with date used
+                       for AM/PM. */
+                    clockFormat = showSeconds ? _("%a %b %e, %l:%M:%S %p")
+                                              : _("%a %b %e, %l:%M %p");
+                else
+	            /* Translators: This is a time format without date used
+                       for AM/PM. */
+                    clockFormat = showSeconds ? _("%a %l:%M:%S %p")
+                                              : _("%a %l:%M %p");
+                break;
+        }
+
+        let displayDate = new Date();
+        let msecRemaining;
+        if (showSeconds) {
+            msecRemaining = 1000 - displayDate.getMilliseconds();
+            if (msecRemaining < 50) {
+                displayDate.setSeconds(displayDate.getSeconds() + 1);
+                msecRemaining += 1000;
+            }
+        } else {
+            msecRemaining = 60000 - (1000 * displayDate.getSeconds() +
+                                     displayDate.getMilliseconds());
+            if (msecRemaining < 500) {
+                displayDate.setMinutes(displayDate.getMinutes() + 1);
+                msecRemaining += 60000;
+            }
+        }
+
+        this._clock.set_text(displayDate.toLocaleFormat(clockFormat));
+        Mainloop.timeout_add(msecRemaining, Lang.bind(this, this._updateClock));
+        return false;
+    }
+};
+
 function Panel() {
    this._init();
 }
@ -621,20 +748,7 @@ Panel.prototype = {
                                         reactive: true,
                                         can_focus: true });
        this.button.set_child(label);
-        this.button._delegate = this.button;
-        this.button._xdndTimeOut = 0;
-        this.button.handleDragOver = Lang.bind(this,
-            function(source, actor, x, y, time) {
-                 if (source == Main.xdndHandler) {
-                    if (this.button._xdndTimeOut != 0)
-                        Mainloop.source_remove(this.button._xdndTimeOut);
-                    this.button._xdndTimeOut = Mainloop.timeout_add(BUTTON_DND_ACTIVATION_TIMEOUT,
-                                                                    Lang.bind(this,
-                                                                                function() {
-                                                                                    this._xdndShowOverview(actor);
-                                                                                }));
-                 }
-            });
+
        this._leftBox.add(this.button);

        // We use this flag to mark the case where the user has entered the
@ -672,18 +786,6 @@ Panel.prototype = {
        this._hotCorner.connect('leave-event',
                                Lang.bind(this, this._onHotCornerLeft));

-        this._hotCorner._delegate = this._hotCorner;
-        this._hotCorner.handleDragOver = Lang.bind(this,
-            function(source, actor, x, y, time) {
-                 if (source == Main.xdndHandler) {
-                    if(!Main.overview.visible && !Main.overview.animationInProgress) {
-                        this.rippleAnimation();
-                        Main.overview.showTemporarily();
-                        Main.overview.beginItemDrag(actor);
-                    }
-                 }
-            });
-
        this._boxContainer.add_actor(this._hotCornerEnvirons);
        this._boxContainer.add_actor(this._hotCorner);

@ -693,28 +795,45 @@ Panel.prototype = {
        this._menus.addMenu(appMenuButton.menu);

        /* center */
-        this._dateMenu = new DateMenu.DateMenuButton();
-        this._centerBox.add(this._dateMenu.actor, { y_fill: true });
-        this._menus.addMenu(this._dateMenu.menu);
+
+        this._clockButton = new ClockButton();
+        this._centerBox.add(this._clockButton.actor, { y_fill: true });
+
+        this._menus.addMenu(this._clockButton.menu);

        /* right */

-        // On-off indicators (for keyboard leds and accessx) are in indicatorBox
-        // System status applets live in statusBox, and legacy tray icons
+        // System status applets live in statusBox, while legacy tray icons
        // live in trayBox
        // The trayBox is hidden when there are no tray icons.
-        this._indicatorBox = new St.BoxLayout({ name: 'indicatorBox' });
-        this._trayBox = new St.BoxLayout({ name: 'legacyTray' });
-        this._statusBox = new St.BoxLayout({ name: 'statusTray' });
+        let statusBox = new St.BoxLayout({ name: 'statusTray' });
+        let trayBox = new St.BoxLayout({ name: 'legacyTray' });
+        this._trayBox = trayBox;
+        this._statusBox = statusBox;

-        this._trayBox.hide();
-        this._rightBox.add(this._indicatorBox);
-        this._rightBox.add(this._trayBox);
-        this._rightBox.add(this._statusBox);
+        trayBox.hide();
+        this._rightBox.add(trayBox);
+        this._rightBox.add(statusBox);
+
+        for (let i = 0; i < STANDARD_TRAY_ICON_ORDER.length; i++) {
+            let role = STANDARD_TRAY_ICON_ORDER[i];
+            let constructor = STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION[role];
+            if (!constructor) {
+                // This icon is not implemented (this is a bug)
+                continue;
+            }
+            let indicator = new constructor();
+            statusBox.add(indicator.actor);
+            this._menus.addMenu(indicator.menu);
+        }

        Main.statusIconDispatcher.connect('status-icon-added', Lang.bind(this, this._onTrayIconAdded));
        Main.statusIconDispatcher.connect('status-icon-removed', Lang.bind(this, this._onTrayIconRemoved));

+        this._statusmenu = new StatusMenu.StatusMenuButton();
+        this._menus.addMenu(this._statusmenu.menu);
+        this._rightBox.add(this._statusmenu.actor);
+
        // TODO: decide what to do with the rest of the panel in the Overview mode (make it fade-out, become non-reactive, etc.)
        // We get into the Overview mode on button-press-event as opposed to button-release-event because eventually we'll probably
        // have the Overview act like a menu that allows the user to release the mouse on the activity the user wants
@ -740,48 +859,8 @@ Panel.prototype = {
        Main.chrome.addActor(this.actor, { visibleInOverview: true });
    },

-    _xdndShowOverview: function (actor) {
-        let [x, y, mask] = global.get_pointer();
-        let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
-
-        if (pickedActor != this.button) {
-            Mainloop.source_remove(this.button._xdndTimeOut);
-            this.button._xdndTimeOut = 0;
-            return;
-        }
-
-        if(!Main.overview.visible && !Main.overview.animationInProgress) {
-            Main.overview.showTemporarily();
-            Main.overview.beginItemDrag(actor);
-        }
-
-        Mainloop.source_remove(this.button._xdndTimeOut);
-        this.button._xdndTimeOut = 0;
-    },
-
-    startStatusArea: function() {
-        for (let i = 0; i < STANDARD_TRAY_INDICATOR_FACTORIES.length; i++) {
-            let factory = new STANDARD_TRAY_INDICATOR_FACTORIES[i];
-            let indicators = factory.getIndicators();
-            for (let j = 0; j < indicators.length; j++)
-                this._indicatorBox.add(indicators[j]);
-        }
-
-        for (let i = 0; i < STANDARD_TRAY_ICON_ORDER.length; i++) {
-            let role = STANDARD_TRAY_ICON_ORDER[i];
-            let constructor = STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION[role];
-            if (!constructor) {
-                // This icon is not implemented (this is a bug)
-                continue;
-            }
-            let indicator = new constructor();
-            this._statusBox.add(indicator.actor);
-            this._menus.addMenu(indicator.menu);
-        }
-
-        this._statusmenu = new StatusMenu.StatusMenuButton();
-        this._menus.addMenu(this._statusmenu.menu);
-        this._rightBox.add(this._statusmenu.actor);
+    hideCalendar: function() {
+        this._clockButton.closeCalendar();
    },

    startupAnimation: function() {
@ -856,17 +935,6 @@ Panel.prototype = {
        Main.uiGroup.add_actor(ripple);
    },

-    rippleAnimation: function() {
-        // Show three concentric ripples expanding outwards; the exact
-        // parameters were found by trial and error, so don't look
-        // for them to make perfect sense mathematically
-
-        //              delay  time  scale opacity => scale opacity
-        this._addRipple(0.0,   0.83,  0.25,  1.0,    1.5,  0.0);
-        this._addRipple(0.05,  1.0,   0.0,   0.7,    1.25, 0.0);
-        this._addRipple(0.35,  1.0,   0.0,   0.3,    1,    0.0);
-    },
-
    _onHotCornerEntered : function() {
        if (this._menus.grabbed)
            return false;
@ -875,7 +943,14 @@ Panel.prototype = {
            if (!Main.overview.animationInProgress) {
                this._hotCornerActivationTime = Date.now() / 1000;

-                this.rippleAnimation();
+                // Show three concentric ripples expanding outwards; the exact
+                // parameters were found by trial and error, so don't look
+                // for them to make perfect sense mathematically
+
+                //              delay  time  scale opacity => scale opacity
+                this._addRipple(0.0,   0.83,  0.25,  1.0,    1.5,  0.0);
+                this._addRipple(0.05,  1.0,   0.0,   0.7,    1.25, 0.0);
+                this._addRipple(0.35,  1.0,   0.0,   0.3,    1,    0.0);
                Main.overview.toggle();
            }
        }
@ -922,9 +997,6 @@ function CalendarPopup() {
 CalendarPopup.prototype = {
    _init: function() {
        let panelActor = Main.panel.actor;
-        let alignConstraint = new Clutter.AlignConstraint({ source: panelActor,
-                                                            align_axis: Clutter.AlignAxis.X_AXIS,
-                                                            factor: 0.5 });

        this.actor = new St.Bin({ name: 'calendarPopup' });

@ -936,7 +1008,7 @@ CalendarPopup.prototype = {
        Main.chrome.addActor(this.actor, { visibleInOverview: true,
                                           affectsStruts: false });
        this.actor.y = (panelActor.y + panelActor.height - this.actor.height);
-        this.actor.add_constraint(alignConstraint);
+        this.calendar.actor.connect('notify::width', Lang.bind(this, this._centerPopup));
    },

    show: function() {
@ -949,6 +1021,7 @@ CalendarPopup.prototype = {
        // Reset the calendar to today's date
        this.calendar.setDate(new Date());

+        this._centerPopup();
        this.actor.lower(panelActor);
        this.actor.show();
        Tweener.addTween(this.actor,
@ -972,5 +1045,10 @@ CalendarPopup.prototype = {
                           onComplete: function() { this.actor.hide(); },
                           onCompleteScope: this
                         });
+    },
+
+    _centerPopup: function() {
+        let panelActor = Main.panel.actor;
+        this.actor.x = Math.round(panelActor.x + (panelActor.width - this.actor.width) / 2);
    }
 };
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@ -47,9 +47,12 @@ Button.prototype = {
    },

    _onOpenStateChanged: function(menu, open) {
-        if (open)
+        if (open) {
            this.actor.add_style_pseudo_class('pressed');
-        else
+            let focus = global.stage.get_key_focus();
+            if (!focus || (focus != this.actor && !menu.contains(focus)))
+                this.actor.grab_key_focus();
+        } else
            this.actor.remove_style_pseudo_class('pressed');
    }
 };
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@ -1,5 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

+const GConf = imports.gi.GConf;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Shell = imports.gi.Shell;
@ -13,7 +14,11 @@ const _ = Gettext.gettext;
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
 const Search = imports.ui.search;
-const Util = imports.misc.util;
+
+const NAUTILUS_PREFS_DIR = '/apps/nautilus/preferences';
+const DESKTOP_IS_HOME_KEY = NAUTILUS_PREFS_DIR + '/desktop_is_home_dir';
+
+const PLACES_ICON_SIZE = 16;

 /**
 * Represents a place object, which is most normally a bookmark entry,
@ -118,9 +123,13 @@ function PlacesManager() {

 PlacesManager.prototype = {
    _init: function() {
+        let gconf = GConf.Client.get_default();
+        gconf.add_dir(NAUTILUS_PREFS_DIR, GConf.ClientPreloadType.PRELOAD_NONE);
+
        this._defaultPlaces = [];
        this._mounts = [];
        this._bookmarks = [];
+        this._isDesktopHome = gconf.get_bool(DESKTOP_IS_HOME_KEY);

        let homeFile = Gio.file_new_for_path (GLib.get_home_dir());
        let homeUri = homeFile.get_uri();
@ -154,7 +163,7 @@ PlacesManager.prototype = {
                                     icon_size: size });
            },
            function () {
-                Util.spawn(['nautilus-connect-server']);
+                new Shell.Process({ args: ['nautilus-connect-server'] }).run();
            });

        let networkApp = null;
@ -179,7 +188,10 @@ PlacesManager.prototype = {
        }

        this._defaultPlaces.push(this._home);
-        this._defaultPlaces.push(this._desktopMenu);
+
+        this._desktopMenuIndex = this._defaultPlaces.length;
+        if (!this._isDesktopHome)
+            this._defaultPlaces.push(this._desktopMenu);

        if (this._network)
            this._defaultPlaces.push(this._network);
@ -217,6 +229,9 @@ PlacesManager.prototype = {
        }));

        this._reloadBookmarks();
+
+        gconf.notify_add(DESKTOP_IS_HOME_KEY, Lang.bind(this, this._updateDesktopMenuVisibility));
+
    },

    _updateDevices: function() {
@ -325,6 +340,21 @@ PlacesManager.prototype = {
        this.emit('places-updated');
    },

+    _updateDesktopMenuVisibility: function() {
+        let gconf = GConf.Client.get_default();
+        this._isDesktopHome = gconf.get_boolean(DESKTOP_IS_HOME_KEY);
+
+        if (this._isDesktopHome)
+            this._removeById(this._defaultPlaces, 'special:desktop');
+        else
+            this._defaultPlaces.splice(this._desktopMenuIndex, 0,
+                                       this._desktopMenu);
+
+        /* See comment in _updateDevices for explanation why there are two signals. */
+        this.emit('defaults-updated');
+        this.emit('places-updated');
+    },
+
    _addMount: function(mount) {
        let devItem = new PlaceDeviceInfo(mount);
        this._mounts.push(devItem);
@ -372,8 +402,150 @@ PlacesManager.prototype = {
        sourceArray.splice(this._lookupIndexById(sourceArray, id), 1);
    }
 };
+
 Signals.addSignalMethods(PlacesManager.prototype);

+/**
+ * An entry in the places menu.
+ * @info The corresponding PlaceInfo to populate this entry.
+ */
+function DashPlaceDisplayItem(info) {
+    this._init(info);
+}
+
+DashPlaceDisplayItem.prototype = {
+    _init: function(info) {
+        this.name = info.name;
+        this._info = info;
+        this._icon = info.iconFactory(PLACES_ICON_SIZE);
+
+        this.actor = new St.Clickable({ style_class: 'places-item',
+                                        reactive: true,
+                                        x_align: St.Align.START,
+                                        x_fill: true });
+
+        let box = new St.BoxLayout({ style_class: 'places-item-box' });
+        this.actor.set_child(box);
+
+        let bin = new St.Bin({ child: this._icon });
+        box.add(bin);
+
+        let text = new St.Label({ text: info.name });
+        box.add(text, { expand: true, x_fill: true });
+
+        if (info.isRemovable()) {
+            let removeIcon = new St.Icon({ icon_name: 'media-eject',
+                                           icon_type: St.IconType.FULLCOLOR,
+                                           icon_size: PLACES_ICON_SIZE });
+            let removeIconBox = new St.Clickable({ child: removeIcon,
+                                                   reactive: true });
+            box.add(removeIconBox);
+            removeIconBox.connect('clicked',
+                                  Lang.bind(this, function() {
+                                                  this._info.remove();
+                                            }));
+        }
+
+        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+
+        this.actor._delegate = this;
+        this._draggable = DND.makeDraggable(this.actor);
+        this._draggable.connect('drag-begin',
+                                Lang.bind(this, function() {
+                                    Main.overview.beginItemDrag(this);
+                                }));
+        this._draggable.connect('drag-end',
+                                Lang.bind(this, function() {
+                                    Main.overview.endItemDrag(this);
+                                }));
+    },
+
+    _onClicked: function(b) {
+        this._info.launch();
+        Main.overview.hide();
+    },
+
+    getDragActorSource: function() {
+        return this._icon;
+    },
+
+    getDragActor: function(stageX, stageY) {
+        return this._info.iconFactory(PLACES_ICON_SIZE);
+    },
+
+    //// Drag and drop methods ////
+
+    shellWorkspaceLaunch: function() {
+        this._info.launch();
+    }
+};
+
+function DashPlaceDisplay() {
+    this._init();
+}
+
+DashPlaceDisplay.prototype = {
+    _init: function() {
+
+        // Places is divided semi-arbitrarily into left and right; a grid would
+        // look better in that there would be an even number of items left+right,
+        // but it seems like we want some sort of differentiation between actions
+        // like "Connect to server..." and regular folders
+        this.actor = new St.Table({ style_class: 'places-section',
+                                    homogeneous: true });
+
+        this._defaultsList = [];
+        this._bookmarksList = [];
+        this._mountsList = [];
+
+        Main.placesManager.connect('defaults-updated', Lang.bind(this, this._updateDefaults));
+        Main.placesManager.connect('bookmarks-updated', Lang.bind(this, this._updateBookmarks));
+        Main.placesManager.connect('mounts-updated', Lang.bind(this, this._updateMounts));
+
+        this._updateDefaults();
+        this._updateMounts();
+        this._updateBookmarks();
+    },
+
+    _updateDefaults: function() {
+        for (let i = 0; i < this._defaultsList.length; i++)
+            this._defaultsList[i].destroy();
+
+        this._defaultsList = [];
+        let places = Main.placesManager.getDefaultPlaces();
+        for (let i = 0; i < places.length; i++) {
+            this._defaultsList[i] = new DashPlaceDisplayItem(places[i]).actor;
+            this.actor.add(this._defaultsList[i], {row: i, col: 0});
+        }
+        this._updateMounts();
+    },
+
+    _updateMounts: function() {
+        for (let i = 0; i < this._mountsList.length; i++)
+            this._mountsList[i].destroy();
+
+        this._mountsList = [];
+        let places = Main.placesManager.getMounts();
+        for (let i = 0; i < places.length; i++) {
+             this._mountsList[i] = new DashPlaceDisplayItem(places[i]).actor;
+             this.actor.add(this._mountsList[i], {row: this._defaultsList.length + i, col: 0});
+        }
+    },
+
+    _updateBookmarks: function() {
+        for (let i = 0; i < this._bookmarksList.length; i++)
+            this._bookmarksList[i].destroy();
+
+        this._bookmarksList = [];
+        let places = Main.placesManager.getBookmarks();
+        for (let i = 0; i < places.length; i ++) {
+            this._bookmarksList[i] = new DashPlaceDisplayItem(places[i]).actor;
+            this.actor.add(this._bookmarksList[i], {row: i, col: 1});
+        }
+    }
+};
+
+Signals.addSignalMethods(DashPlaceDisplay.prototype);

 function PlaceSearchProvider() {
    this._init();
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -87,7 +87,7 @@ PopupBaseMenuItem.prototype = {
    },

    _onButtonReleaseEvent: function (actor, event) {
-        this.activate(event);
+        this.emit('activate', event);
        return true;
    },

@ -95,7 +95,7 @@ PopupBaseMenuItem.prototype = {
        let symbol = event.get_key_symbol();

        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
-            this.activate(event);
+            this.emit('activate', event);
            return true;
        }
        return false;
@ -132,16 +132,29 @@ PopupBaseMenuItem.prototype = {
        this.emit('destroy');
    },

-    // adds an actor to the menu item; @params can contain %span
-    // (column span; defaults to 1, -1 means "all the remaining width"),
-    // %expand (defaults to #false), and %align (defaults to
-    // #St.Align.START)
-    addActor: function(child, params) {
-        params = Params.parse(params, { span: 1,
-                                        expand: false,
-                                        align: St.Align.START });
-        params.actor = child;
-        this._children.push(params);
+    // true if non descendant content includes @actor
+    contains: function(actor) {
+        return false;
+    },
+
+    // adds an actor to the menu item; @column defaults to the next
+    // open column, @span defaults to 1. If @span is -1, the actor
+    // will span the width of the menu item. Children are not
+    // allowed to overlap each other.
+    addActor: function(child, column, span) {
+        if (column == null) {
+            if (this._children.length) {
+                let lastChild = this._children[this._children.length - 1];
+                column = lastChild.column + lastChild.span;
+            } else
+                column = 0;
+            span = 1;
+        } else if (span == null)
+            span = 1;
+
+        this._children.push({ actor: child,
+                              column: column,
+                              span: span });
        this.actor.connect('destroy', Lang.bind(this, function () { this._removeChild(child); }));
        this.actor.add_actor(child);
    },
@ -259,58 +272,39 @@ PopupBaseMenuItem.prototype = {
        for (let i = 0, col = 0; i < this._children.length; i++) {
            let child = this._children[i];
            let childBox = new Clutter.ActorBox();
-
-            let [minWidth, naturalWidth] = child.actor.get_preferred_width(-1);
-            let availWidth, extraWidth;
+            childBox.x1 = x;
            if (this._columnWidths) {
                if (child.span == -1)
-                    availWidth = box.x2 - x;
+                    childBox.x2 = box.x2;
                else {
-                    availWidth = 0;
+                    childBox.x2 = x;
                    for (let j = 0; j < child.span; j++)
-                        availWidth += this._columnWidths[col++];
+                        childBox.x2 += this._columnWidths[col++];
                }
-                extraWidth = availWidth - naturalWidth;
            } else {
-                availWidth = naturalWidth;
-                extraWidth = 0;
+                let [min, natural] = child.actor.get_preferred_width(-1);
+                childBox.x2 = x + natural;
            }
-
-            if (child.expand) {
-                childBox.x1 = x;
-                childBox.x2 = x + availWidth;
-            } else if (child.align === St.Align.CENTER) {
-                childBox.x1 = x + Math.round(extraWidth / 2);
-                childBox.x2 = childBox.x1 + naturalWidth;
-            } else if (child.align === St.Align.END) {
-                childBox.x2 = x + availWidth;
-                childBox.x1 = childBox.x2 - naturalWidth;
-            } else {
-                childBox.x1 = x;
-                childBox.x2 = x + naturalWidth;
-            }
-
-            let [minHeight, naturalHeight] = child.actor.get_preferred_height(-1);
-            childBox.y1 = Math.round(box.y1 + (height - naturalHeight) / 2);
-            childBox.y2 = childBox.y1 + naturalHeight;
-
+            let [min, natural] = child.actor.get_preferred_height(-1);
+            childBox.y1 = Math.round(box.y1 + (height - natural) / 2);
+            childBox.y2 = childBox.y1 + natural;
            child.actor.allocate(childBox, flags);

-            x += availWidth + this._spacing;
+            x = childBox.x2 + this._spacing;
        }
    }
 };
 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);
@ -328,7 +322,7 @@ PopupSeparatorMenuItem.prototype = {
        PopupBaseMenuItem.prototype._init.call(this, { reactive: false });

        this._drawingArea = new St.DrawingArea({ style_class: 'popup-separator-menu-item' });
-        this.addActor(this._drawingArea, { span: -1, expand: true });
+        this.addActor(this._drawingArea, 0, -1);
        this._drawingArea.connect('repaint', Lang.bind(this, this._onRepaint));
    },

@ -373,7 +367,7 @@ PopupSliderMenuItem.prototype = {
        this._value = Math.max(Math.min(value, 1), 0);

        this._slider = new St.DrawingArea({ style_class: 'popup-slider-menu-item', reactive: true });
-        this.addActor(this._slider, { span: -1, expand: true });
+        this.addActor(this._slider, 0, -1);
        this._slider.connect('repaint', Lang.bind(this, this._sliderRepaint));
        this._slider.connect('button-press-event', Lang.bind(this, this._startDragging));
        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
@ -540,7 +534,7 @@ PopupSwitchMenuItem.prototype = {
        this._switch = new Switch(active);

        this.addActor(this.label);
-        this.addActor(this._switch.actor, { align: St.Align.END });
+        this.addActor(this._switch.actor);

        this.connect('activate', Lang.bind(this,function(from) {
            this.toggle();
@ -575,7 +569,7 @@ PopupImageMenuItem.prototype = {
        this.label = new St.Label({ text: text });
        this.addActor(this.label);
        this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
-        this.addActor(this._icon, { align: St.Align.END });
+        this.addActor(this._icon);

        this.setIcon(iconName);
    },
@ -607,21 +601,76 @@ function findNextInCycle(items, current, direction) {
    return items[mod(cur + direction, items.length)];
 }

-function PopupMenuBase() {
-    throw new TypeError('Trying to instantiate abstract class PopupMenuBase');
+function PopupMenu() {
+    this._init.apply(this, arguments);
 }

-PopupMenuBase.prototype = {
-    _init: function(sourceActor, styleClass) {
+PopupMenu.prototype = {
+    _init: function(sourceActor, alignment, arrowSide, gap) {
        this.sourceActor = sourceActor;
+        this._alignment = alignment;
+        this._arrowSide = arrowSide;
+        this._gap = gap;

-        this.box = new St.BoxLayout({ style_class: styleClass,
-                                      vertical: true });
+        this._boxPointer = new BoxPointer.BoxPointer(arrowSide,
+                                                     { x_fill: true,
+                                                       y_fill: true,
+                                                       x_align: St.Align.START });
+        this.actor = this._boxPointer.actor;
+        this.actor.style_class = 'popup-menu-boxpointer';
+        this._boxWrapper = new Shell.GenericContainer();
+        this._boxWrapper.connect('get-preferred-width', Lang.bind(this, this._boxGetPreferredWidth));
+        this._boxWrapper.connect('get-preferred-height', Lang.bind(this, this._boxGetPreferredHeight));
+        this._boxWrapper.connect('allocate', Lang.bind(this, this._boxAllocate));
+        this._boxPointer.bin.set_child(this._boxWrapper);
+
+        this._box = new St.BoxLayout({ style_class: 'popup-menu-content',
+                                       vertical: true });
+        this._boxWrapper.add_actor(this._box);
+        this.actor.add_style_class_name('popup-menu');
+
+        global.focus_manager.add_group(this.actor);
+
+        if (sourceActor._delegate instanceof PopupSubMenuMenuItem) {
+            this._isSubMenu = true;
+            this.actor.reactive = true;
+            this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
+        }

        this.isOpen = false;
        this._activeMenuItem = null;
    },

+    _boxGetPreferredWidth: function (actor, forHeight, alloc) {
+        // Update the menuitem column widths
+        let columnWidths = [];
+        let items = this._box.get_children();
+        for (let i = 0; i < items.length; i++) {
+            if (items[i]._delegate instanceof PopupBaseMenuItem) {
+                let itemColumnWidths = items[i]._delegate.getColumnWidths();
+                for (let j = 0; j < itemColumnWidths.length; j++) {
+                    if (j >= columnWidths.length || itemColumnWidths[j] > columnWidths[j])
+                        columnWidths[j] = itemColumnWidths[j];
+                }
+            }
+        }
+        for (let i = 0; i < items.length; i++) {
+            if (items[i]._delegate instanceof PopupBaseMenuItem)
+                items[i]._delegate.setColumnWidths(columnWidths);
+        }
+
+        // Now they will request the right sizes
+        [alloc.min_size, alloc.natural_size] = this._box.get_preferred_width(forHeight);
+    },
+
+    _boxGetPreferredHeight: function (actor, forWidth, alloc) {
+        [alloc.min_size, alloc.natural_size] = this._box.get_preferred_height(forWidth);
+    },
+
+    _boxAllocate: function (actor, box, flags) {
+        this._box.allocate(box, flags);
+    },
+
    addAction: function(title, callback) {
        var menuItem = new PopupMenuItem(title);
        this.addMenuItem(menuItem);
@ -631,37 +680,10 @@ PopupMenuBase.prototype = {
    },

    addMenuItem: function(menuItem, position) {
-        let before_item = null;
-        if (position == undefined) {
-            this.box.add(menuItem.actor);
-        } else {
-            let items = this.getMenuItems();
-            if (position < items.length) {
-                before_item = items[position].actor;
-                this.box.insert_before(menuItem.actor, before_item);
-            } else
-                this.box.add(menuItem.actor);
-        }
-        if (menuItem instanceof PopupSubMenuMenuItem) {
-            if (before_item == null)
-                this.box.add(menuItem.menu.actor);
-            else
-                this.box.insert_before(menuItem.menu.actor, before_item);
-            menuItem._subMenuActivateId = menuItem.menu.connect('activate', Lang.bind(this, function() {
-                this.emit('activate');
-                this.close(true);
-            }));
-            menuItem._subMenuActiveChangeId = menuItem.menu.connect('active-changed', Lang.bind(this, function(submenu, submenuItem) {
-                if (this._activeMenuItem && this._activeMenuItem != submenuItem)
-                    this._activeMenuItem.setActive(false);
-                this._activeMenuItem = submenuItem;
-                this.emit('active-changed', submenuItem);
-            }));
-            menuItem._closingId = this.connect('open-state-changed', function(self, open) {
-                if (!open)
-                    menuItem.menu.close(false);
-            });
-        }
+        if (position == undefined)
+            this._box.add(menuItem.actor);
+        else
+            this._box.insert_actor(menuItem.actor, position);
        menuItem._activeChangeId = menuItem.connect('active-changed', Lang.bind(this, function (menuItem, active) {
            if (active && this._activeMenuItem != menuItem) {
                if (this._activeMenuItem)
@ -675,50 +697,22 @@ PopupMenuBase.prototype = {
        }));
        menuItem._activateId = menuItem.connect('activate', Lang.bind(this, function (menuItem, event) {
            this.emit('activate', menuItem);
-            this.close(true);
+            this.close();
        }));
        menuItem.connect('destroy', Lang.bind(this, function(emitter) {
            menuItem.disconnect(menuItem._activateId);
            menuItem.disconnect(menuItem._activeChangeId);
-            if (menuItem.menu) {
-                menuItem.menu.disconnect(menuItem._subMenuActivateId);
-                menuItem.menu.disconnect(menuItem._subMenuActiveChangeId);
-                this.disconnect(menuItem._closingId);
-            }
            if (menuItem == this._activeMenuItem)
                this._activeMenuItem = null;
        }));
    },

-    getColumnWidths: function() {
-        let columnWidths = [];
-        let items = this.box.get_children();
-        for (let i = 0; i < items.length; i++) {
-            if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof PopupMenuBase) {
-                let itemColumnWidths = items[i]._delegate.getColumnWidths();
-                for (let j = 0; j < itemColumnWidths.length; j++) {
-                    if (j >= columnWidths.length || itemColumnWidths[j] > columnWidths[j])
-                        columnWidths[j] = itemColumnWidths[j];
-                }
-            }
-        }
-        return columnWidths;
-    },
-
-    setColumnWidths: function(widths) {
-        let items = this.box.get_children();
-        for (let i = 0; i < items.length; i++) {
-            if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof PopupMenuBase)
-                items[i]._delegate.setColumnWidths(widths);
-        }
-    },
-
    addActor: function(actor) {
-        this.box.add(actor);
+        this._box.add(actor);
    },

    getMenuItems: function() {
-        return this.box.get_children().map(function (actor) { return actor._delegate; }).filter(function(item) { return item instanceof PopupBaseMenuItem; });
+        return this._box.get_children().map(function (actor) { return actor._delegate; });
    },

    removeAll: function() {
@ -729,22 +723,110 @@ PopupMenuBase.prototype = {
        }
    },

+    setArrowOrigin: function(origin) {
+        this._boxPointer.setArrowOrigin(origin);
+    },
+
    activateFirst: function() {
-        let children = this.box.get_children();
+        let children = this._box.get_children();
        for (let i = 0; i < children.length; i++) {
            let actor = children[i];
-            if (actor._delegate && actor._delegate instanceof PopupBaseMenuItem && actor.visible && actor.reactive) {
+            if (actor._delegate && actor.visible && actor.reactive) {
                actor._delegate.setActive(true);
                break;
            }
        }
    },

+    open: function() {
+        if (this.isOpen)
+            return;
+
+        let primary = global.get_primary_monitor();
+
+        // We need to show it now to force an allocation,
+        // so that we can query the correct size.
+        this.actor.show();
+
+        // Position correctly relative to the sourceActor
+        let [sourceX, sourceY] = this.sourceActor.get_transformed_position();
+        let [sourceWidth, sourceHeight] = this.sourceActor.get_transformed_size();
+
+        let [minWidth, minHeight, natWidth, natHeight] = this.actor.get_preferred_size();
+
+        let menuWidth = natWidth, menuHeight = natHeight;
+
+        // Position the non-pointing axis
+        if (this._isSubmenu) {
+            if (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM) {
+                // vertical submenu
+                if (sourceY + sourceHeigth + menuHeight + this._gap < primary.y + primary.height)
+                    this._boxPointer._arrowSide = this._arrowSide = St.Side.TOP;
+                else if (primary.y + menuHeight + this._gap < sourceY)
+                    this._boxPointer._arrowSide = this._arrowSide = St.Side.BOTTOM;
+                else
+                    this._boxPointer._arrowSide = this._arrowSide = St.Side.TOP;
+            } else {
+                // horizontal submenu
+                if (sourceX + sourceWidth + menuWidth + this._gap < primary.x + primary.width)
+                    this._boxPointer._arrowSide = this._arrowSide = St.Side.LEFT;
+                else if (primary.x + menuWidth + this._gap < sourceX)
+                    this._boxPointer._arrowSide = this._arrowSide = St.Side.RIGHT;
+                else
+                    this._boxPointer._arrowSide = this._arrowSide = St.Side.LEFT;
+            }
+        }
+
+        this._boxPointer.setPosition(this.sourceActor, this._gap, this._alignment);
+
+        // Now show it
+        this.actor.reactive = true;
+        this._boxPointer.animateAppear();
+        this.isOpen = true;
+        this.emit('open-state-changed', true);
+    },
+
+    close: function() {
+        if (!this.isOpen)
+            return;
+
+        if (this._activeMenuItem)
+            this._activeMenuItem.setActive(false);
+        this.actor.reactive = false;
+        this._boxPointer.animateDisappear();
+        this.isOpen = false;
+        this.emit('open-state-changed', false);
+    },
+
    toggle: function() {
        if (this.isOpen)
-            this.close(true);
+            this.close();
        else
-            this.open(true);
+            this.open();
+    },
+
+    _onKeyPressEvent: function(actor, event) {
+        // Move focus back to parent menu if the user types Left.
+        // (This handler is only connected if the PopupMenu is a
+        // submenu.)
+        if (this.isOpen &&
+            this._activeMenuItem &&
+            event.get_key_symbol() == Clutter.KEY_Left) {
+            this._activeMenuItem.setActive(false);
+            return true;
+        }
+
+        return false;
+    },
+
+    // return true if the actor is inside the menu or
+    // any actor related to the active submenu
+    contains: function(actor) {
+        if (this.actor.contains(actor))
+            return true;
+        if (this._activeMenuItem)
+            return this._activeMenuItem.contains(actor);
+        return false;
    },

    destroy: function() {
@ -754,184 +836,7 @@ PopupMenuBase.prototype = {
        this.emit('destroy');
    }
 };
-Signals.addSignalMethods(PopupMenuBase.prototype);
-
-function PopupMenu() {
-    this._init.apply(this, arguments);
-}
-
-PopupMenu.prototype = {
-    __proto__: PopupMenuBase.prototype,
-
-    _init: function(sourceActor, alignment, arrowSide, gap) {
-        PopupMenuBase.prototype._init.call (this, sourceActor, 'popup-menu-content');
-
-        this._alignment = alignment;
-        this._arrowSide = arrowSide;
-        this._gap = gap;
-
-        this._boxPointer = new BoxPointer.BoxPointer(arrowSide,
-                                                     { x_fill: true,
-                                                       y_fill: true,
-                                                       x_align: St.Align.START });
-        this.actor = this._boxPointer.actor;
-        this.actor._delegate = this;
-        this.actor.style_class = 'popup-menu-boxpointer';
-        this._boxWrapper = new Shell.GenericContainer();
-        this._boxWrapper.connect('get-preferred-width', Lang.bind(this, this._boxGetPreferredWidth));
-        this._boxWrapper.connect('get-preferred-height', Lang.bind(this, this._boxGetPreferredHeight));
-        this._boxWrapper.connect('allocate', Lang.bind(this, this._boxAllocate));
-        this._boxPointer.bin.set_child(this._boxWrapper);
-        this._boxWrapper.add_actor(this.box);
-        this.actor.add_style_class_name('popup-menu');
-
-        global.focus_manager.add_group(this.actor);
-        this.actor.reactive = true;
-    },
-
-    _boxGetPreferredWidth: function (actor, forHeight, alloc) {
-        let columnWidths = this.getColumnWidths();
-        this.setColumnWidths(columnWidths);
-
-        // Now they will request the right sizes
-        [alloc.min_size, alloc.natural_size] = this.box.get_preferred_width(forHeight);
-    },
-
-    _boxGetPreferredHeight: function (actor, forWidth, alloc) {
-        [alloc.min_size, alloc.natural_size] = this.box.get_preferred_height(forWidth);
-    },
-
-    _boxAllocate: function (actor, box, flags) {
-        this.box.allocate(box, flags);
-    },
-
-    setArrowOrigin: function(origin) {
-        this._boxPointer.setArrowOrigin(origin);
-    },
-
-    open: function(animate) {
-        if (this.isOpen)
-            return;
-
-        this.isOpen = true;
-
-        this._boxPointer.setPosition(this.sourceActor, this._gap, this._alignment);
-        this._boxPointer.show(animate);
-
-        this.emit('open-state-changed', true);
-    },
-
-    close: function(animate) {
-        if (!this.isOpen)
-            return;
-
-        if (this._activeMenuItem)
-            this._activeMenuItem.setActive(false);
-
-        this._boxPointer.hide(animate);
-
-        this.isOpen = false;
-        this.emit('open-state-changed', false);
-    }
-};
-
-function PopupSubMenu() {
-    this._init.apply(this, arguments);
-}
-
-PopupSubMenu.prototype = {
-    __proto__: PopupMenuBase.prototype,
-
-    _init: function(sourceActor, sourceArrow) {
-        PopupMenuBase.prototype._init.call(this, sourceActor, 'popup-sub-menu');
-
-        this._arrow = sourceArrow;
-        this._arrow.rotation_center_z_gravity = Clutter.Gravity.CENTER;
-
-        this.actor = this.box;
-        this.actor._delegate = this;
-        this.actor.clip_to_allocation = true;
-        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
-        this.actor.hide();
-    },
-
-    open: function(animate) {
-        if (this.isOpen)
-            return;
-
-        this.isOpen = true;
-
-        // we don't implement the !animate case because that doesn't
-        // currently get used...
-
-        let [naturalHeight, minHeight] = this.actor.get_preferred_height(-1);
-        this.actor.height = 0;
-        this.actor.show();
-        this.actor._arrow_rotation = this._arrow.rotation_angle_z;
-        Tweener.addTween(this.actor,
-                         { _arrow_rotation: 90,
-                           height: naturalHeight,
-                           time: 0.25,
-                           onUpdateScope: this,
-                           onUpdate: function() {
-                               this._arrow.rotation_angle_z = this.actor._arrow_rotation;
-                           },
-                           onCompleteScope: this,
-                           onComplete: function() {
-                               this.actor.set_height(-1);
-                               this.emit('open-state-changed', true);
-                           }
-                         });
-    },
-
-    close: function(animate) {
-        if (!this.isOpen)
-            return;
-
-        this.isOpen = false;
-
-        if (this._activeMenuItem)
-            this._activeMenuItem.setActive(false);
-
-        if (animate) {
-            this.actor._arrow_rotation = this._arrow.rotation_angle_z;
-            Tweener.addTween(this.actor,
-                             { _arrow_rotation: 0,
-                               height: 0,
-                               time: 0.25,
-                               onCompleteScope: this,
-                               onComplete: function() {
-                                   this.actor.hide();
-                                   this.actor.set_height(-1);
-
-                                   this.emit('open-state-changed', false);
-                               },
-                               onUpdateScope: this,
-                               onUpdate: function() {
-                                   this._arrow.rotation_angle_z = this.actor._arrow_rotation;
-                               }
-                             });
-            } else {
-                this._arrow.rotation_angle_z = 0;
-                this.actor.hide();
-
-                this.isOpen = false;
-                this.emit('open-state-changed', false);
-            }
-    },
-
-    _onKeyPressEvent: function(actor, event) {
-        // Move focus back to parent menu if the user types Left.
-
-        if (this.isOpen && event.get_key_symbol() == Clutter.KEY_Left) {
-            this.close(true);
-            this.sourceActor._delegate.setActive(true);
-            return true;
-        }
-
-        return false;
-    }
-};
+Signals.addSignalMethods(PopupMenu.prototype);

 function PopupSubMenuMenuItem() {
    this._init.apply(this, arguments);
@ -941,46 +846,77 @@ PopupSubMenuMenuItem.prototype = {
    __proto__: PopupBaseMenuItem.prototype,

    _init: function(text) {
-        PopupBaseMenuItem.prototype._init.call(this);
-
-        this.actor.add_style_class_name('popup-submenu-menu-item');
+        PopupBaseMenuItem.prototype._init.call(this, { activate: false, hover: false });
+        this.actor.connect('enter-event', Lang.bind(this, this._mouseEnter));
+        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));

        this.label = new St.Label({ text: text });
        this.addActor(this.label);
-        this._triangle = new St.Label({ text: '\u25B8' });
-        this.addActor(this._triangle, { align: St.Align.END });
+        this.addActor(new St.Label({ text: '>' }));

-        this.menu = new PopupSubMenu(this.actor, this._triangle);
-        this.menu.connect('open-state-changed', Lang.bind(this, this._subMenuOpenStateChanged));
+        this.menu = new PopupMenu(this.actor, St.Align.MIDDLE, St.Side.LEFT, 0, true);
+        Main.chrome.addActor(this.menu.actor, { visibleInOverview: true,
+                                                affectsStruts: false });
+        this.menu.actor.hide();
+
+        this._openStateChangedId = this.menu.connect('open-state-changed', Lang.bind(this, this._subMenuOpenStateChanged));
+        this._activateId = this.menu.connect('activate', Lang.bind(this, this._subMenuActivate));
    },

    _subMenuOpenStateChanged: function(menu, open) {
-        if (open)
-            this.actor.add_style_pseudo_class('open');
-        else
-            this.actor.remove_style_pseudo_class('open');
+        PopupBaseMenuItem.prototype.setActive.call(this, open);
+    },
+
+    _subMenuActivate: function(menu, menuItem) {
+        this.emit('activate', null);
+    },
+
+    setMenu: function(newmenu) {
+        if (this.menu) {
+            this.menu.close();
+            this.menu.disconnect(this._openStateChangedId);
+            this.menu.disconnect(this._activateId);
+        }
+        if (newmenu) {
+            this._openStateChangedId = newmenu.connect('open-state-changed', Lang.bind(this, this._subMenuOpenStateChanged));
+            this._activateId = newmenu.connect('activate', Lang.bind(this, this._subMenuActivate));
+        }
+        this.menu = newmenu;
    },

    destroy: function() {
-        this.menu.destroy();
+        if (this.menu)
+            this.menu.destroy();
        PopupBaseMenuItem.prototype.destroy.call(this);
    },

+    setActive: function(active) {
+        if (this.menu) {
+            if (active)
+                this.menu.open();
+            else
+                this.menu.close();
+        }
+
+        PopupBaseMenuItem.prototype.setActive.call(this, active);
+    },
+
    _onKeyPressEvent: function(actor, event) {
+        if (!this.menu)
+            return false;
        if (event.get_key_symbol() == Clutter.KEY_Right) {
-            this.menu.open(true);
            this.menu.activateFirst();
            return true;
        }
-        return PopupBaseMenuItem.prototype._onKeyPressEvent.call(this, actor, event);
+        return false;
    },

-    activate: function(event) {
-        this.menu.open(true);
+    contains: function(actor) {
+        return this.menu && this.menu.contains(actor);
    },

-    _onButtonReleaseEvent: function(actor) {
-        this.menu.toggle();
+    _mouseEnter: function(event) {
+        this.setActive(true);
    }
 };

@ -1003,24 +939,23 @@ PopupMenuManager.prototype = {
        this._leaveEventId = 0;
        this._activeMenu = null;
        this._menus = [];
-        this._preGrabInputMode = null;
+        this._delayedMenus = [];
    },

    addMenu: function(menu, position) {
        let menudata = {
            menu:              menu,
            openStateChangeId: menu.connect('open-state-changed', Lang.bind(this, this._onMenuOpenState)),
+            activateId:        menu.connect('activate', Lang.bind(this, this._onMenuActivated)),
            destroyId:         menu.connect('destroy', Lang.bind(this, this._onMenuDestroy)),
            enterId:           0,
-            focusInId:         0,
-            focusOutId:        0
+            focusId:           0
        };

        let source = menu.sourceActor;
        if (source) {
            menudata.enterId = source.connect('enter-event', Lang.bind(this, function() { this._onMenuSourceEnter(menu); }));
-            menudata.focusInId = source.connect('key-focus-in', Lang.bind(this, function() { this._onMenuSourceEnter(menu); }));
-            menudata.focusOutId = source.connect('key-focus-out', Lang.bind(this, function() { this._onKeyFocusOut(menu); }));
+            menudata.focusId = source.connect('key-focus-in', Lang.bind(this, function() { this._onMenuSourceEnter(menu); }));
        }

        if (position == undefined)
@ -1039,19 +974,18 @@ PopupMenuManager.prototype = {

        let menudata = this._menus[position];
        menu.disconnect(menudata.openStateChangeId);
+        menu.disconnect(menudata.activateId);
        menu.disconnect(menudata.destroyId);

        if (menudata.enterId)
            menu.sourceActor.disconnect(menudata.enterId);
-        if (menudata.focusInId)
-            menu.sourceActor.disconnect(menudata.focusInId);
-        if (menudata.focusOutId)
-            menu.sourceActor.disconnect(menudata.focusOutId);
+        if (menudata.focusId)
+            menu.sourceActor.disconnect(menudata.focusId);

        this._menus.splice(position, 1);
    },

-    _grab: function() {
+    grab: function() {
        Main.pushModal(this._owner.actor);

        this._eventCaptureId = global.stage.connect('captured-event', Lang.bind(this, this._onEventCapture));
@ -1063,7 +997,7 @@ PopupMenuManager.prototype = {
        this.grabbed = true;
    },

-    _ungrab: function() {
+    ungrab: function() {
        global.stage.disconnect(this._eventCaptureId);
        this._eventCaptureId = 0;
        global.stage.disconnect(this._keyPressEventId);
@ -1079,100 +1013,40 @@ PopupMenuManager.prototype = {

    _onMenuOpenState: function(menu, open) {
        if (open) {
-            if (!this.grabbed) {
-                this._preGrabInputMode = global.stage_input_mode;
-                this._grab();
-            }
            this._activeMenu = menu;
-
-            // if the focus is not already associated with the menu,
-            // then focus the menu
-            let focus = global.stage.key_focus;
-            if (!this._activeMenuContains(focus))
-                menu.sourceActor.grab_key_focus();
+            if (!this.grabbed)
+                this.grab();
        } else if (menu == this._activeMenu) {
-            let focus = global.stage.key_focus;
-            let fromActive = this._activeMenuContains(focus);
-
+            this._activeMenu = null;
            if (this.grabbed)
-                this._ungrab();
-            this._activeMenu = null;
-
-            // If keynav was in effect before we grabbed, then we need
-            // to properly re-establish it after we ungrab. (popModal
-            // will have unset the focus.) If some part of the menu
-            // was focused at the time of the ungrab then focus its
-            // sourceActor. Otherwise just reset the focus to where it
-            // was right before the ungrab.
-            if (this._preGrabInputMode == Shell.StageInputMode.FOCUSED) {
-                global.stage_input_mode = Shell.StageInputMode.FOCUSED;
-                if (fromActive)
-                    menu.sourceActor.grab_key_focus();
-                else
-                    focus.grab_key_focus();
-            }
+                this.ungrab();
        }
    },

-    // change the currently-open menu without dropping grab
-    _changeMenu: function(newMenu) {
-        if (this._activeMenu) {
-            // _onOpenMenuState will drop the grab if it sees
-            // this._activeMenu being closed; so clear _activeMenu
-            // before closing it to keep that from happening
-            let oldMenu = this._activeMenu;
-            this._activeMenu = null;
-            oldMenu.close(false);
-            newMenu.open(false);
-        } else
-            newMenu.open(true);
-    },
-
    _onMenuSourceEnter: function(menu) {
        if (!this.grabbed || menu == this._activeMenu)
            return false;

-        this._changeMenu(menu);
+        if (this._activeMenu != null)
+            this._activeMenu.close();
+        menu.open();
        return false;
    },

-    _onKeyFocusOut: function(menu) {
-        if (!this.grabbed || menu != this._activeMenu)
-            return;
-
-        // We want to close the menu if the focus has moved somewhere
-        // other than inside the menu or to another menu's sourceActor.
-        // Unfortunately, when key-focus-out is emitted,
-        // stage.key_focus will be null. So we have to wait until
-        // after it emits the key-focus-in as well.
-        let id = global.stage.connect('notify::key-focus', Lang.bind(this,
-            function () {
-                global.stage.disconnect(id);
-
-                if (menu != this._activeMenu)
-                    return;
-
-                let focus = global.stage.key_focus;
-                if (!focus || this._activeMenuContains(focus))
-                    return;
-                if (focus._delegate && this._findMenu(focus._delegate.menu) != -1)
-                    return;
-                menu.close(true);
-            }));
+    _onMenuActivated: function(menu, item) {
+        if (this.grabbed)
+            this.ungrab();
    },

    _onMenuDestroy: function(menu) {
        this.removeMenu(menu);
    },

-    _activeMenuContains: function(actor) {
-        return this._activeMenu != null
-                && (this._activeMenu.actor.contains(actor) ||
-                    (this._activeMenu.sourceActor && this._activeMenu.sourceActor.contains(actor)));
-    },
-
    _eventIsOnActiveMenu: function(event) {
-        return this._activeMenuContains(event.get_source());
+        let src = event.get_source();
+        return this._activeMenu != null
+                && (this._activeMenu.contains(src) ||
+                    (this._activeMenu.sourceActor && this._activeMenu.sourceActor.contains(src)));
    },

    _eventIsOnAnyMenuSource: function(event) {
@ -1194,18 +1068,6 @@ PopupMenuManager.prototype = {
        return -1;
    },

-    _nextMenu: function(pos, direction) {
-        for (let i = 1; i < this._menus.length; i++) {
-            let candidate = mod(pos + i * direction, this._menus.length);
-            let menu = this._menus[candidate].menu;
-            if (!menu.sourceActor || menu.sourceActor.visible)
-                return menu;
-        }
-        // no menu is found? this should not happen
-        // anyway stay on current menu
-        return this._menus[pos];
-    },
-
    _onEventCapture: function(actor, event) {
        if (!this.grabbed)
            return false;
@ -1244,9 +1106,12 @@ PopupMenuManager.prototype = {
        if (symbol == Clutter.Left || symbol == Clutter.Right) {
            let direction = symbol == Clutter.Right ? 1 : -1;
            let pos = this._findMenu(this._activeMenu);
-            let next = this._nextMenu(pos, direction);
+            let next = this._menus[mod(pos + direction, this._menus.length)].menu;
            if (next != this._activeMenu) {
-                this._changeMenu(next);
+                let oldMenu = this._activeMenu;
+                this._activeMenu = next;
+                oldMenu.close();
+                next.open();
                next.activateFirst();
            }
            return true;
@ -1257,6 +1122,6 @@ PopupMenuManager.prototype = {

    _closeMenu: function() {
        if (this._activeMenu != null)
-            this._activeMenu.close(true);
+            this._activeMenu.close();
    }
 };
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -11,18 +11,16 @@ const Signals = imports.signals;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

-const FileUtils = imports.misc.fileUtils;
+const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
-const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
-const Util = imports.misc.util;

 const MAX_FILE_DELETED_BEFORE_INVALID = 10;

 const HISTORY_KEY = 'command-history';
 const HISTORY_LIMIT = 512;

-const DIALOG_GROW_TIME = 0.1;
+const DIALOG_FADE_TIME = 0.1;

 function CommandCompleter() {
    this._init();
@ -64,6 +62,25 @@ CommandCompleter.prototype = {
        this._update(0);
    },

+    _onGetEnumerateComplete : function(obj, res) {
+        this._enumerator = obj.enumerate_children_finish(res);
+        this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete));
+    },
+
+    _onNextFileComplete : function(obj, res) {
+        let files = obj.next_files_finish(res);
+        for (let i = 0; i < files.length; i++) {
+            this._childs[this._i].push(files[i].get_name());
+        }
+        if (files.length) {
+            this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete));
+        } else {
+            this._enumerator.close(null);
+            this._enumerator = null;
+            this._update(this._i + 1);
+        }
+    },
+
    update : function() {
        if (this._valid)
            return;
@ -83,12 +100,7 @@ CommandCompleter.prototype = {
        }
        let file = Gio.file_new_for_path(this._paths[i]);
        this._childs[this._i] = [];
-        FileUtils.listDirAsync(file, Lang.bind(this, function (files) {
-            for (let i = 0; i < files.length; i++) {
-                this._childs[this._i].push(files[i].get_name());
-            }
-            this._update(this._i + 1);
-        }));
+        file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME, Gio.FileQueryInfoFlags.NONE, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onGetEnumerateComplete));
    },

    _onChanged : function(m, f, of, type) {
@ -163,9 +175,8 @@ function RunDialog() {
 }

 RunDialog.prototype = {
-__proto__: ModalDialog.ModalDialog.prototype,
    _init : function() {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'run-dialog' });
+        this._isOpen = false;

        global.settings.connect('changed::development-tools', Lang.bind(this, function () {
            this._enableInternalCommands = global.settings.get_boolean('development-tools');
@ -196,45 +207,52 @@ __proto__: ModalDialog.ModalDialog.prototype,

                                   'debugexit': Lang.bind(this, function() {
                                       Meta.exit(Meta.ExitCode.ERROR);
-                                   }),
-
-                                   // rt is short for "reload theme"
-                                   'rt': Lang.bind(this, function() {
-                                       Main.loadTheme();
                                   })
                                 };

+        // All actors are inside _group. We create it initially
+        // hidden then show it in show()
+        this._group = new Clutter.Group({ visible: false,
+                                          x: 0, y: 0 });
+        Main.uiGroup.add_actor(this._group);
+
+        this._lightbox = new Lightbox.Lightbox(this._group,
+                                               { inhibitEvents: true });
+
+        this._box = new St.Bin({ x_align: St.Align.MIDDLE,
+                                 y_align: St.Align.MIDDLE });
+
+        this._group.add_actor(this._box);
+        this._lightbox.highlight(this._box);
+
+        let dialogBox = new St.BoxLayout({ style_class: 'run-dialog', vertical: true });
+
+        this._box.set_child(dialogBox);

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

-        this.contentLayout.add(label, { y_align: St.Align.START });
+        dialogBox.add(label, { expand: true, y_fill: false });

        let entry = new St.Entry({ style_class: 'run-dialog-entry' });

        this._entryText = entry.clutter_text;
-        this.contentLayout.add(entry, { y_align: St.Align.START });
-        this.connect('opened',
-                     Lang.bind(this, function() {
-                         this._entryText.grab_key_focus();
-                     }));
+        dialogBox.add(entry, { expand: true });

-        this._errorBox = new St.BoxLayout({ style_class: 'run-dialog-error-box' });
+        this._errorBox = new St.BoxLayout();

-        this.contentLayout.add(this._errorBox, { expand: true });
+        dialogBox.add(this._errorBox, { expand: true });

-        let errorIcon = new St.Icon({ icon_name: 'dialog-error', icon_size: 24, style_class: 'run-dialog-error-icon' });
+        let errorIcon = new St.Button({ style_class: 'run-dialog-error-icon' });

-        this._errorBox.add(errorIcon, { y_align: St.Align.MIDDLE });
+        this._errorBox.add(errorIcon);

        this._commandError = false;

        this._errorMessage = new St.Label({ style_class: 'run-dialog-error-label' });
        this._errorMessage.clutter_text.line_wrap = true;

-        this._errorBox.add(this._errorMessage, { expand: true,
-                                                 y_align: St.Align.MIDDLE,
-                                                 y_fill: false });
+        this._errorBox.add(this._errorMessage, { expand: true });

        this._errorBox.hide();

@ -257,10 +275,10 @@ __proto__: ModalDialog.ModalDialog.prototype,
                else
                    this._run(o.get_text(), false);
                if (!this._commandError)
-                    this.close(global.get_current_time());
+                    this.close();
            }
            if (symbol == Clutter.Escape) {
-                this.close(global.get_current_time());
+                this.close();
                return true;
            }
            if (symbol == Clutter.slash) {
@ -331,7 +349,9 @@ __proto__: ModalDialog.ModalDialog.prototype,
            try {
                if (inTerminal)
                    command = 'gnome-terminal -x ' + input;
-                Util.trySpawnCommandLine(command);
+                let [ok, len, args] = GLib.shell_parse_argv(command);
+                let p = new Shell.Process({ 'args' : args });
+                p.run();
            } catch (e) {
                // Mmmh, that failed - see if @input matches an existing file
                let path = null;
@ -349,24 +369,16 @@ __proto__: ModalDialog.ModalDialog.prototype,
                                                        global.create_app_launch_context());
                } else {
                    this._commandError = true;
+                    // The exception contains an error string like:
+                    // Error invoking Shell.run: Failed to execute child
+                    // process "foo" (No such file or directory)
+                    // We are only interested in the actual error, so parse
+                    //that out.
+                    let m = /.+\((.+)\)/.exec(e);
+                    let errorStr = _("Execution of '%s' failed:").format(command) + '\n' + m[1];
+                    this._errorMessage.set_text(errorStr);

-                    this._errorMessage.set_text(e.message);
-
-                    if (!this._errorBox.visible) {
-                        let [errorBoxMinHeight, errorBoxNaturalHeight] = this._errorBox.get_preferred_height(-1);
-
-                        let parentActor = this._errorBox.get_parent();
-                        Tweener.addTween(parentActor,
-                                         { height: parentActor.height + errorBoxNaturalHeight,
-                                           time: DIALOG_GROW_TIME,
-                                           transition: 'easeOutQuad',
-                                           onComplete: Lang.bind(this,
-                                               function() {
-                                                    parentActor.set_height(-1);
-                                                    this._errorBox.show();
-                                               })
-                                         });
-                    }
+                    this._errorBox.show();
                }
            }
        }
@ -388,14 +400,53 @@ __proto__: ModalDialog.ModalDialog.prototype,
            this._entryText.set_text('');
    },

-    open: function() {
-        this._historyIndex = this._history.length;
-        this._errorBox.hide();
-        this._entryText.set_text('');
-        this._commandError = false;
+    open : function() {
+        if (this._isOpen) // Already shown
+            return;

-        ModalDialog.ModalDialog.prototype.open.call(this);
+        if (!Main.pushModal(this._group))
+            return;
+
+        // Position the dialog on the current monitor
+        let monitor = global.get_focus_monitor();
+
+        this._historyIndex = this._history.length;
+
+        this._box.set_position(monitor.x, monitor.y);
+        this._box.set_size(monitor.width, monitor.height);
+
+        this._isOpen = true;
+        this._lightbox.show();
+        this._group.opacity = 0;
+        this._group.show();
+        Tweener.addTween(this._group,
+                         { opacity: 255,
+                           time: DIALOG_FADE_TIME,
+                           transition: 'easeOutQuad'
+                         });
+
+        global.stage.set_key_focus(this._entryText);
    },

+    close : function() {
+        if (!this._isOpen)
+            return;
+
+        this._isOpen = false;
+        this._commandError = false;
+
+        Main.popModal(this._group);
+
+        Tweener.addTween(this._group,
+                         { opacity: 0,
+                           time: DIALOG_FADE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this, function() {
+                               this._errorBox.hide();
+                               this._group.hide();
+                               this._entryText.set_text('');
+                           })
+                         });
+    }
 };
 Signals.addSignalMethods(RunDialog.prototype);
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -1,19 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const Util = imports.misc.util;
-
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const FileUtils = imports.misc.fileUtils;
-const Main = imports.ui.main;
-
-const DISABLED_OPEN_SEARCH_PROVIDERS_KEY = 'disabled-open-search-providers';

 const RESULT_ICON_SIZE = 48;

@ -224,107 +211,6 @@ SearchProvider.prototype = {
 };
 Signals.addSignalMethods(SearchProvider.prototype);

-function OpenSearchSystem() {
-    this._init();
-}
-
-OpenSearchSystem.prototype = {
-    _init: function() {
-        this._providers = [];
-        global.settings.connect('changed::' + DISABLED_OPEN_SEARCH_PROVIDERS_KEY, Lang.bind(this, this._refresh));
-        this._refresh();
-    },
-
-    getProviders: function() {
-        let res = [];
-        for (let i = 0; i < this._providers.length; i++)
-            res.push({ id: i, name: this._providers[i].name });
-
-        return res;
-    },
-
-    setSearchTerms: function(terms) {
-        this._terms = terms;
-    },
-
-    _checkSupportedProviderLanguage: function(provider) {
-        if (provider.url.search(/{language}/) == -1)
-            return true;
-
-        let langs = GLib.get_language_names();
-
-        langs.push('en');
-        let lang = null;
-        for (let i = 0; i < langs.length; i++) {
-            for (let k = 0; k < provider.langs.length; k++) {
-                if (langs[i] == provider.langs[k])
-                    lang = langs[i];
-            }
-            if (lang)
-                break;
-        }
-        provider.lang = lang;
-        return lang != null;
-    },
-
-    activateResult: function(id) {
-        let searchTerms = this._terms.join(' ');
-
-        let url = this._providers[id].url.replace('{searchTerms}', encodeURIComponent(searchTerms));
-        if (url.match('{language}'))
-            url = url.replace('{language}', this._providers[id].lang);
-
-        try {
-            Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context());
-        } catch (e) {
-            // TODO: remove this after glib will be removed from moduleset
-            // In the default jhbuild, gio is in our prefix but gvfs is not
-            Util.spawn(['gvfs-open', url])
-        }
-
-        Main.overview.hide();
-    },
-
-    _addProvider: function(fileName) {
-        let file = Gio.file_new_for_path(global.datadir + '/search_providers/' + fileName);
-        let source = '';
-
-        file.load_contents_async(null, Lang.bind(this, function (obj, res) {
-            let [success, source] = file.load_contents_finish(res);
-            if (source) {
-                let [success, name, url, langs, icon_uri] = global.parse_search_provider(source);
-                let provider ={ name: name,
-                                url: url,
-                                id: this._providers.length,
-                                icon_uri: icon_uri,
-                                langs: langs };
-                if (this._checkSupportedProviderLanguage(provider)) {
-                    this._providers.push(provider);
-                    this.emit('changed');
-                }
-            }
-        }));
-    },
-
-    _refresh: function() {
-        this._providers = [];
-        let names = global.settings.get_strv(DISABLED_OPEN_SEARCH_PROVIDERS_KEY);
-        let file = Gio.file_new_for_path(global.datadir + '/search_providers');
-        FileUtils.listDirAsync(file, Lang.bind(this, function(files) {
-            for (let i = 0; i < files.length; i++) {
-                let enabled = true;
-                let name = files[i].get_name();
-                for (let k = 0; k < names.length; k++)
-                    if (names[k] == name)
-                        enabled = false;
-                if (enabled)
-                    this._addProvider(name);
-            }
-        }));
-    }
-}
-Signals.addSignalMethods(OpenSearchSystem.prototype);
-
 function SearchSystem() {
    this._init();
 }
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@ -10,7 +10,6 @@ const St = imports.gi.St;
 const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
-const Overview = imports.ui.overview;
 const Search = imports.ui.search;

 const MAX_SEARCH_RESULTS_ROWS = 2;
@ -150,41 +149,28 @@ GridSearchResults.prototype = {
 };


-function SearchResults(searchSystem, openSearchSystem) {
-    this._init(searchSystem, openSearchSystem);
+function SearchResults(searchSystem) {
+    this._init(searchSystem);
 }

 SearchResults.prototype = {
-    _init: function(searchSystem, openSearchSystem) {
+    _init: function(searchSystem) {
        this._searchSystem = searchSystem;
-        this._openSearchSystem = openSearchSystem;
-
-        this.actor = new St.BoxLayout({ name: 'searchResults',
-                                        vertical: true });

+        this.actor = new St.Bin({ name: 'searchResults',
+                                  y_align: St.Align.START,
+                                  x_align: St.Align.START,
+                                  x_fill: true });
        this._content = new St.BoxLayout({ name: 'searchResultsContent',
                                           vertical: true });

        let scrollView = new St.ScrollView({ x_fill: true,
                                             y_fill: false,
-                                             vfade: true });
+                                             vshadows: true });
        scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
        scrollView.add_actor(this._content);

-        this.actor.add(scrollView, { x_fill: true,
-                                     y_fill: false,
-                                     expand: true,
-                                     x_align: St.Align.START,
-                                     y_align: St.Align.START });
-        this.actor.connect('notify::mapped', Lang.bind(this,
-            function() {
-                if (!this.actor.mapped)
-                    return;
-
-                let adjustment = scrollView.vscroll.adjustment;
-                let direction = Overview.SwipeScrollDirection.VERTICAL;
-                Main.overview.setScrollAdjustment(adjustment, direction);
-            }));
+        this.actor.set_child(scrollView);

        this._statusText = new St.Label({ style_class: 'search-statustext' });
        this._content.add(this._statusText);
@ -193,51 +179,6 @@ SearchResults.prototype = {
        this._providerMeta = [];
        for (let i = 0; i < this._providers.length; i++)
            this.createProviderMeta(this._providers[i]);
-
-        this._searchProvidersBox = new St.BoxLayout({ style_class: 'search-providers-box' });
-        this.actor.add(this._searchProvidersBox);
-
-        this._openSearchProviders = [];
-        this._openSearchSystem.connect('changed', Lang.bind(this, this._updateOpenSearchProviderButtons));
-        this._updateOpenSearchProviderButtons();
-    },
-
-    _updateOpenSearchProviderButtons: function() {
-        this._selectedOpenSearchButton = -1;
-        for (let i = 0; i < this._openSearchProviders.length; i++)
-            this._openSearchProviders[i].actor.destroy();
-        this._openSearchProviders = this._openSearchSystem.getProviders();
-        for (let i = 0; i < this._openSearchProviders.length; i++)
-            this._createOpenSearchProviderButton(this._openSearchProviders[i]);
-    },
-
-    _updateOpenSearchButtonState: function() {
-         for (let i = 0; i < this._openSearchProviders.length; i++) {
-             if (i == this._selectedOpenSearchButton)
-                 this._openSearchProviders[i].actor.add_style_pseudo_class('selected');
-             else
-                 this._openSearchProviders[i].actor.remove_style_pseudo_class('selected');
-         }
-    },
-
-    _createOpenSearchProviderButton: function(provider) {
-        let clickable = new St.Clickable({ style_class: 'dash-search-button',
-                                           reactive: true,
-                                           x_fill: true,
-                                           y_align: St.Align.MIDDLE });
-        let bin = new St.Bin({ x_fill: false,
-                               x_align:St.Align.MIDDLE });
-        clickable.connect('clicked', Lang.bind(this, function() {
-            this._openSearchSystem.activateResult(provider.id);
-        }));
-        let title = new St.Label({ text: provider.name,
-                                   style_class: 'dash-search-button-label' });
-
-        bin.set_child(title);
-        clickable.set_child(bin);
-        provider.actor = clickable;
-
-        this._searchProvidersBox.add(clickable);
    },

    createProviderMeta: function(provider) {
@ -286,8 +227,6 @@ SearchResults.prototype = {
        this._searchSystem.reset();
        this._statusText.hide();
        this._clearDisplay();
-        this._selectedOpenSearchButton = -1;
-        this._updateOpenSearchButtonState();
    },

    startingSearch: function() {
@ -308,14 +247,12 @@ SearchResults.prototype = {
        if (results.length == 0) {
            this._statusText.set_text(_("No matching results."));
            this._statusText.show();
+            return true;
        } else {
-            this._selectedOpenSearchButton = -1;
-            this._updateOpenSearchButtonState();
            this._statusText.hide();
        }

        let terms = this._searchSystem.getTerms();
-        this._openSearchSystem.setSearchTerms(terms);

        for (let i = 0; i < results.length; i++) {
            let [provider, providerResults] = results[i];
@ -325,8 +262,7 @@ SearchResults.prototype = {
            meta.count.set_text('' + providerResults.length);
        }

-        if (this._selectedOpenSearchButton == -1)
-            this.selectDown(false);
+        this.selectDown(false);

        return true;
    },
@ -348,26 +284,16 @@ SearchResults.prototype = {
    },

    selectUp: function(recursing) {
-        if (this._selectedOpenSearchButton == -1) {
-            for (let i = this._selectedProvider; i >= 0; i--) {
-                let meta = this._providerMeta[i];
-                if (!meta.actor.visible)
-                    continue;
-                let success = this._modifyActorSelection(meta.resultDisplay, true);
-                if (success) {
-                    this._selectedProvider = i;
-                    return;
-                }
+        for (let i = this._selectedProvider; i >= 0; i--) {
+            let meta = this._providerMeta[i];
+            if (!meta.actor.visible)
+                continue;
+            let success = this._modifyActorSelection(meta.resultDisplay, true);
+            if (success) {
+                this._selectedProvider = i;
+                return;
            }
        }
-
-        if (this._selectedOpenSearchButton == -1)
-            this._selectedOpenSearchButton = this._openSearchProviders.length;
-        this._selectedOpenSearchButton--;
-        this._updateOpenSearchButtonState();
-        if (this._selectedOpenSearchButton >= 0)
-            return;
-
        if (this._providerMeta.length > 0 && !recursing) {
            this._selectedProvider = this._providerMeta.length - 1;
            this.selectUp(true);
@ -376,30 +302,18 @@ SearchResults.prototype = {

    selectDown: function(recursing) {
        let current = this._selectedProvider;
-        if (this._selectedOpenSearchButton == -1) {
-            if (current == -1)
-                current = 0;
-            for (let i = current; i < this._providerMeta.length; i++) {
-                let meta = this._providerMeta[i];
-                if (!meta.actor.visible)
-                    continue;
-                 let success = this._modifyActorSelection(meta.resultDisplay, false);
-                 if (success) {
-                    this._selectedProvider = i;
-                    return;
-                 }
+        if (current == -1)
+            current = 0;
+        for (let i = current; i < this._providerMeta.length; i++) {
+            let meta = this._providerMeta[i];
+            if (!meta.actor.visible)
+                continue;
+            let success = this._modifyActorSelection(meta.resultDisplay, false);
+            if (success) {
+                this._selectedProvider = i;
+                return;
            }
        }
-        this._selectedOpenSearchButton++;
-
-        if (this._selectedOpenSearchButton < this._openSearchProviders.length) {
-            this._updateOpenSearchButtonState();
-            return;
-        }
-
-        this._selectedOpenSearchButton = -1;
-        this._updateOpenSearchButtonState();
-
        if (this._providerMeta.length > 0 && !recursing) {
            this._selectedProvider = 0;
            this.selectDown(true);
@ -407,13 +321,6 @@ SearchResults.prototype = {
    },

    activateSelected: function() {
-        if (this._selectedOpenSearchButton != -1) {
-            let provider = this._openSearchProviders[this._selectedOpenSearchButton];
-            this._openSearchSystem.activateResult(provider.id);
-            Main.overview.hide();
-            return;
-        }
-
        let current = this._selectedProvider;
        if (current < 0)
            return;
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@ -10,25 +10,24 @@ const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;

+const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Util = imports.misc.util;

 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

-const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
-const KEY_STICKY_KEYS_ENABLED = 'stickykeys-enable';
-const KEY_BOUNCE_KEYS_ENABLED = 'bouncekeys-enable';
-const KEY_SLOW_KEYS_ENABLED   = 'slowkeys-enable';
-const KEY_MOUSE_KEYS_ENABLED  = 'mousekeys-enable';
+const A11Y_SCHEMA = "org.gnome.desktop.a11y.keyboard";
+const KEY_STICKY_KEYS_ENABLED = "stickykeys-enable";
+const KEY_BOUNCE_KEYS_ENABLED = "bouncekeys-enable";
+const KEY_SLOW_KEYS_ENABLED   = "slowkeys-enable";
+const KEY_MOUSE_KEYS_ENABLED  = "mousekeys-enable";

-const MAGNIFIER_SCHEMA = 'org.gnome.accessibility.magnifier';
-const AT_SCREEN_KEYBOARD_SCHEMA = 'org.gnome.desktop.default-applications.at.mobility';
-const AT_SCREEN_READER_SCHEMA   = 'org.gnome.desktop.default-applications.at.visual';
+const AT_SCREEN_KEYBOARD_SCHEMA = "org.gnome.desktop.default-applications.at.mobility";
+const AT_SCREEN_READER_SCHEMA   = "org.gnome.desktop.default-applications.at.visual";

-const XSETTINGS_SCHEMA = 'org.gnome.settings-daemon.plugins.xsettings';
-const KEY_DPI = 'dpi';
+const XSETTINGS_SCHEMA = "org.gnome.settings-daemon.plugins.xsettings";
+const KEY_DPI = "dpi";

 const DPI_LOW_REASONABLE_VALUE  = 50;
 const DPI_HIGH_REASONABLE_VALUE = 500;
@ -38,14 +37,14 @@ const DPI_FACTOR_LARGER  = 1.5;
 const DPI_FACTOR_LARGEST = 2.0;
 const DPI_DEFAULT        = 96;

-const KEY_META_DIR       = '/apps/metacity/general';
-const KEY_VISUAL_BELL = KEY_META_DIR + '/visual_bell';
+const KEY_META_DIR       = "/apps/metacity/general";
+const KEY_VISUAL_BELL = KEY_META_DIR + "/visual_bell";

-const DESKTOP_INTERFACE_SCHEMA = 'org.gnome.desktop.interface';
-const KEY_GTK_THEME      = 'gtk-theme';
-const KEY_ICON_THEME     = 'icon-theme';
+const DESKTOP_INTERFACE_SCHEMA = "org.gnome.desktop.interface";
+const KEY_GTK_THEME      = "gtk-theme";
+const KEY_ICON_THEME     = "icon-theme";

-const HIGH_CONTRAST_THEME = 'HighContrast';
+const HIGH_CONTRAST_THEME = "HighContrast";

 function getDPIFromX() {
    let screen = global.get_gdk_screen();
@ -80,7 +79,7 @@ ATIndicator.prototype = {
        let highContrast = this._buildHCItem();
        this.menu.addMenuItem(highContrast);

-        let magnifier = this._buildItem(_("Zoom"), MAGNIFIER_SCHEMA, 'show-magnifier');
+        let magnifier = this._buildMagItem();
        this.menu.addMenuItem(magnifier);

        let textZoom = this._buildFontItem();
@ -109,7 +108,8 @@ ATIndicator.prototype = {

        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this.menu.addAction(_("Universal Access Settings"), function() {
-            Util.spawnDesktop('gnome-universal-access-panel');
+            let p = new Shell.Process({ args: ['gnome-control-center','universal-access'] });
+            p.run();
        });
    },

@ -219,6 +219,18 @@ ATIndicator.prototype = {
        return widget;
    },

+    _buildMagItem: function() {
+        let mag = Main.magnifier;
+        let widget = this._buildItemExtended(_("Zoom"),
+            mag.isActive(),
+            true,
+            Lang.bind(mag, mag.setActive));
+        mag.connect('active-changed', function(magnifier, active) {
+            widget.setToggleState(active);
+        });
+        return widget;
+    },
+
    _keyChanged: function() {
        this.emit('gconf-changed');
    }
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@ -1,492 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Gdk = imports.gi.Gdk;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const GnomeBluetoothApplet = imports.gi.GnomeBluetoothApplet;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-
-const Main = imports.ui.main;
-const MessageTray = imports.ui.messageTray;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const ConnectionState = {
-    DISCONNECTED: 0,
-    CONNECTED: 1,
-    DISCONNECTING: 2,
-    CONNECTING: 3
-}
-
-function Indicator() {
-    this._init.apply(this, arguments);
-}
-
-Indicator.prototype = {
-    __proto__: PanelMenu.SystemStatusButton.prototype,
-
-    _init: function() {
-        PanelMenu.SystemStatusButton.prototype._init.call(this, 'bluetooth-disabled', null);
-
-        GLib.spawn_command_line_sync ('pkill -f "^bluetooth-applet$"');
-        this._applet = new GnomeBluetoothApplet.Applet();
-
-        this._killswitch = new PopupMenu.PopupSwitchMenuItem(_("Bluetooth"), false);
-        this._applet.connect('notify::killswitch-state', Lang.bind(this, this._updateKillswitch));
-        this._killswitch.connect('toggled', Lang.bind(this, function() {
-            let current_state = this._applet.killswitch_state;
-            if (current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED &&
-                current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER) {
-                this._applet.killswitch_state = this._killswitch.state ?
-                    GnomeBluetoothApplet.KillswitchState.UNBLOCKED:
-                    GnomeBluetoothApplet.KillswitchState.SOFT_BLOCKED;
-            } else
-                this._killswitch.setToggleState(false);
-        }));
-
-        this._discoverable = new PopupMenu.PopupSwitchMenuItem(_("Visibility"), this._applet.discoverable);
-        this._applet.connect('notify::discoverable', Lang.bind(this, function() {
-            this._discoverable.setToggleState(this._applet.discoverable);
-        }));
-        this._discoverable.connect('toggled', Lang.bind(this, function() {
-            this._applet.discoverable = this._discoverable.state;
-        }));
-
-        this._updateKillswitch();
-        this.menu.addMenuItem(this._killswitch);
-        this.menu.addMenuItem(this._discoverable);
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        this._fullMenuItems = [new PopupMenu.PopupSeparatorMenuItem(),
-                               new PopupMenu.PopupMenuItem(_("Send Files to Device...")),
-                               new PopupMenu.PopupMenuItem(_("Setup a New Device...")),
-                               new PopupMenu.PopupSeparatorMenuItem()];
-        this._hasDevices = false;
-        this._deviceSep = this._fullMenuItems[0]; // hidden if no device exists
-
-        this._fullMenuItems[1].connect('activate', function() {
-            GLib.spawn_command_line_async('bluetooth-sendto');
-        });
-        this._fullMenuItems[2].connect('activate', function() {
-            GLib.spawn_command_line_async('bluetooth-wizard');
-        });
-
-        for (let i = 0; i < this._fullMenuItems.length; i++) {
-            let item = this._fullMenuItems[i];
-            this.menu.addMenuItem(item);
-        }
-
-        this._deviceItemPosition = 3;
-        this._deviceItems = [];
-        this._applet.connect('devices-changed', Lang.bind(this, this._updateDevices));
-        this._updateDevices();
-
-        this._applet.connect('notify::show-full-menu', Lang.bind(this, this._updateFullMenu));
-        this._updateFullMenu();
-
-        this.menu.addAction(_("Bluetooth Settings"), function() {
-            GLib.spawn_command_line_async('gnome-control-center bluetooth');
-        });
-
-        this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest));
-        this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest));
-        this._applet.connect('auth-request', Lang.bind(this, this._authRequest));
-        this._applet.connect('cancel-request', Lang.bind(this, this._cancelRequest));
-    },
-
-    _updateKillswitch: function() {
-        let current_state = this._applet.killswitch_state;
-        let on = current_state == GnomeBluetoothApplet.KillswitchState.UNBLOCKED;
-        let has_adapter = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER;
-        let can_toggle = current_state != GnomeBluetoothApplet.KillswitchState.NO_ADAPTER &&
-                         current_state != GnomeBluetoothApplet.KillswitchState.HARD_BLOCKED;
-
-        this._killswitch.setToggleState(on);
-        this._killswitch.actor.reactive = can_toggle;
-
-        if (has_adapter)
-            this.actor.show();
-        else
-            this.actor.hide();
-
-        if (on) {
-            this._discoverable.actor.show();
-            this.setIcon('bluetooth-active');
-        } else {
-            this._discoverable.actor.hide();
-            this.setIcon('bluetooth-disabled');
-        }
-    },
-
-    _deviceCompare: function(d1, d2) {
-        return d1.device_path == d2.device_path &&
-            d1.bdaddr == d2.bdaddr &&
-            d1.can_connect == d2.can_connect &&
-            d1.capabilities == d2.capabilities;
-    },
-
-    _updateDevices: function() {
-        let devices = this._applet.get_devices();
-
-        for (let i = 0; i < this._deviceItems.length; i++) {
-            let item = this._deviceItems[i];
-            let destroy = true;
-            for (let j = 0; j < devices.length; j++) {
-                // we need to deep compare because BluetoothSimpleDevice is a boxed type
-                // (but we take advantage of that, because _skip will disappear the next
-                // time get_devices() is called)
-                if (this._deviceCompare(item._device, devices[i])) {
-                    item.label.text = devices[i].alias;
-                    devices[i]._skip = true;
-                    destroy = false;
-                }
-            }
-            if (destroy) {
-                item.destroy();
-                item._destroyed = true;
-            }
-        }
-
-        let newlist = [ ];
-        for (let i = 0; i < this._deviceItems.length; i++) {
-            let item = this._deviceItems[i];
-            if (!item._destroyed)
-                newlist.push(item);
-        }
-        this._deviceItems = newlist;
-
-        this._hasDevices = newlist.length > 0;
-        for (let i = 0; i < devices.length; i++) {
-            let d = devices[i];
-            if (d._skip)
-                continue;
-            let item = this._createDeviceItem(d);
-            if (item) {
-                this.menu.addMenuItem(item, this._deviceItemPosition + this._deviceItems.length);
-                this._deviceItems.push(item);
-                this._hasDevices = true;
-            }
-        }
-        if (this._hasDevices)
-            this._deviceSep.actor.show();
-        else
-            this._deviceSep.actor.hide();
-    },
-
-    _createDeviceItem: function(device) {
-        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
-            return null;
-        let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
-        item._device = device;
-
-        if (device.can_connect) {
-            item._connected = device.connected;
-            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
-
-            menuitem.connect('toggled', Lang.bind(this, function() {
-                if (item._connected > ConnectionState.CONNECTED) {
-                    // operation already in progress, revert
-                    menuitem.setToggleState(menuitem.state);
-                }
-                if (item._connected) {
-                    item._connected = ConnectionState.DISCONNECTING;
-                    this._applet.disconnect_device(item._device.device_path, function(applet, success) {
-                        if (success) { // apply
-                            item._connected = ConnectionState.DISCONNECTED;
-                            menuitem.setToggleState(false);
-                        } else { // revert
-                            item._connected = ConnectionState.CONNECTED;
-                            menuitem.setToggleState(true);
-                        }
-                    });
-                } else {
-                    item._connected = ConnectionState.CONNECTING;
-                    this._applet.connect_device(item._device.device_path, function(applet, success) {
-                        if (success) { // apply
-                            item._connected = ConnectionState.CONNECTED;
-                            menuitem.setToggleState(true);
-                        } else { // revert
-                            item._connected = ConnectionState.DISCONNECTED;
-                            menuitem.setToggleState(false);
-                        }
-                    });
-                }
-            }));
-
-            item.menu.addMenuItem(menuitem);
-        }
-
-        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
-            item.menu.addAction(_("Send Files..."), Lang.bind(this, function() {
-                this._applet.send_to_address(device.bdaddr, device.alias);
-            }));
-        }
-        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) {
-            item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) {
-                this._applet.browse_address(device.bdaddr, event.get_time(),
-                    Lang.bind(this, function(applet, result) {
-                        try {
-                            applet.browse_address_finish(result);
-                        } catch (e) {
-                            this._ensureSource();
-                            this._source.notify(new MessageTray.Notification(this._source,
-                                 _("Bluetooth"),
-                                 _("Error browsing device"),
-                                 { body: _("The requested device cannot be browsed, error is '%s'").format(e) }));
-                        }
-                    }));
-            }));
-        }
-
-        switch (device.type) {
-        case GnomeBluetoothApplet.Type.KEYBOARD:
-            item.menu.addAction(_("Keyboard Settings"), function() {
-                GLib.spawn_command_line_async('gnome-control-center keyboard');
-            });
-            break;
-        case GnomeBluetoothApplet.Type.MOUSE:
-            item.menu.addAction(_("Mouse Settings"), function() {
-                GLib.spawn_command_line_async('gnome-control-center mouse');
-            });
-            break;
-        case GnomeBluetoothApplet.Type.HEADSET:
-        case GnomeBluetoothApplet.Type.HEADPHONES:
-        case GnomeBluetoothApplet.Type.OTHER_AUDIO:
-            item.menu.addAction(_("Sound Settings"), function() {
-                GLib.spawn_command_line_async('gnome-control-center sound');
-            });
-            break;
-        default:
-            break;
-        }
-
-        return item;
-    },
-
-    _updateFullMenu: function() {
-        if (this._applet.show_full_menu) {
-            this._showAll(this._fullMenuItems);
-            if (this._hasDevices)
-                this._showAll(this._deviceItems);
-            else
-                this._deviceSep.actor.hide();
-        } else {
-            this._hideAll(this._fullMenuItems);
-            this._hideAll(this._deviceItems);
-        }
-    },
-
-    _showAll: function(items) {
-        for (let i = 0; i < items.length; i++)
-            items[i].actor.show();
-    },
-
-    _hideAll: function(items) {
-        for (let i = 0; i < items.length; i++)
-            items[i].actor.hide();
-    },
-
-    _destroyAll: function(items) {
-        for (let i = 0; i < items.length; i++)
-            items[i].destroy();
-    },
-
-    _ensureSource: function() {
-        if (!this._source) {
-            this._source = new Source();
-            Main.messageTray.add(this._source);
-        }
-    },
-
-    _authRequest: function(applet, device_path, name, long_name, uuid) {
-        this._ensureSource();
-        this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name, uuid));
-    },
-
-    _confirmRequest: function(applet, device_path, name, long_name, pin) {
-        this._ensureSource();
-        this._source.notify(new ConfirmNotification(this._source, this._applet, device_path, name, long_name, pin));
-    },
-
-    _pinRequest: function(applet, device_path, name, long_name, numeric) {
-        this._ensureSource();
-        this._source.notify(new PinNotification(this._source, this._applet, device_path, name, long_name, numeric));
-    },
-
-    _cancelRequest: function() {
-        this._source.destroy();
-    }
-}
-
-function Source() {
-    this._init.apply(this, arguments);
-}
-
-Source.prototype = {
-    __proto__: MessageTray.Source.prototype,
-
-    _init: function() {
-        MessageTray.Source.prototype._init.call(this, _("Bluetooth Agent"));
-
-        this._setSummaryIcon(this.createNotificationIcon());
-    },
-
-    notify: function(notification) {
-        this._private_destroyId = notification.connect('destroy', Lang.bind(this, function(notification) {
-            if (this.notification == notification) {
-                // the destroyed notification is the last for this source
-                this.notification.disconnect(this._private_destroyId);
-                this.destroy();
-            }
-        }));
-
-        MessageTray.Source.prototype.notify.call(this, notification);
-    },
-
-    createNotificationIcon: function() {
-        return new St.Icon({ icon_name: 'bluetooth-active',
-                             icon_type: St.IconType.SYMBOLIC,
-                             icon_size: this.ICON_SIZE });
-    }
-}
-
-function AuthNotification() {
-    this._init.apply(this, arguments);
-}
-
-AuthNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
-
-    _init: function(source, applet, device_path, name, long_name, uuid) {
-        MessageTray.Notification.prototype._init.call(this,
-                                                      source,
-                                                      _("Bluetooth Agent"),
-                                                      _("Authorization request from %s").format(name),
-                                                      { customContent: true });
-        this.setResident(true);
-
-        this._applet = applet;
-        this._devicePath = device_path;
-        this.addBody(_("Device %s wants access to the service '%s'").format(long_name, uuid));
-
-        this.addButton('always-grant', _("Always grant access"));
-        this.addButton('grant', _("Grant this time only"));
-        this.addButton('reject', _("Reject"));
-
-        this.connect('action-invoked', Lang.bind(this, function(self, action) {
-            switch (action) {
-            case 'always-grant':
-                this._applet.agent_reply_auth(this._devicePath, true, true);
-                break;
-            case 'grant':
-                this._applet.agent_reply_auth(this._devicePath, true, false);
-                break;
-            case 'reject':
-            default:
-                this._applet.agent_reply_auth(this._devicePath, false, false);
-            }
-            this.destroy();
-        }));
-    }
-}
-
-function ConfirmNotification() {
-    this._init.apply(this, arguments);
-}
-
-ConfirmNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
-
-    _init: function(source, applet, device_path, name, long_name, pin) {
-        MessageTray.Notification.prototype._init.call(this,
-                                                      source,
-                                                      _("Bluetooth Agent"),
-                                                      _("Pairing confirmation for %s").format(name),
-                                                      { customContent: true });
-        this.setResident(true);
-
-        this._applet = applet;
-        this._devicePath = device_path;
-        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
-        this.addBody(_("Please confirm whether the PIN '%s' matches the one on the device.").format(pin));
-
-        this.addButton('matches', _("Matches"));
-        this.addButton('does-not-match', _("Does not match"));
-
-        this.connect('action-invoked', Lang.bind(this, function(self, action) {
-            if (action == 'matches')
-                this._applet.agent_reply_confirm(this._devicePath, true);
-            else
-                this._applet.agent_reply_confirm(this._devicePath, false);
-            this.destroy();
-        }));
-    }
-}
-
-function PinNotification() {
-    this._init.apply(this, arguments);
-}
-
-PinNotification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
-
-    _init: function(source, applet, device_path, name, long_name, numeric) {
-        MessageTray.Notification.prototype._init.call(this,
-                                                      source,
-                                                      _("Bluetooth Agent"),
-                                                      _("Pairing request for %s").format(name),
-                                                      { customContent: true });
-        this.setResident(true);
-
-        this._applet = applet;
-        this._devicePath = device_path;
-        this._numeric = numeric;
-        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
-        this.addBody(_("Please enter the PIN mentioned on the device."));
-
-        this._entry = new St.Entry();
-        this._entry.connect('key-release-event', Lang.bind(this, function(entry, event) {
-            let key = event.get_key_symbol();
-            if (key == Clutter.KEY_Return) {
-                this.emit('action-invoked', 'ok');
-                return true;
-            } else if (key == Clutter.KEY_Escape) {
-                this.emit('action-invoked', 'cancel');
-                return true;
-            }
-            return false;
-        }));
-        this.addActor(this._entry);
-
-        this.addButton('ok', _("OK"));
-        this.addButton('cancel', _("Cancel"));
-
-        this.connect('action-invoked', Lang.bind(this, function(self, action) {
-            if (action == 'ok') {
-                if (this._numeric)
-                    this._applet.agent_reply_passkey(this._devicePath, parseInt(this._entry.text));
-                else
-                    this._applet.agent_reply_pincode(this._devicePath, this._entry.text);
-            } else {
-                if (this._numeric)
-                    this._applet.agent_reply_passkey(this._devicePath, -1);
-                else
-                    this._applet.agent_reply_pincode(this._devicePath, null);
-            }
-            this.destroy();
-        }));
-    },
-
-    grabFocus: function(lockTray) {
-        MessageTray.Notification.prototype.grabFocus.call(this, lockTray);
-        global.stage.set_key_focus(this._entry);
-    }
-}
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -1,255 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const GdkPixbuf = imports.gi.GdkPixbuf;
-const Gkbd = imports.gi.Gkbd;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-
-const PopupMenu = imports.ui.popupMenu;
-const PanelMenu = imports.ui.panelMenu;
-
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const INDICATOR_SCHEMA = 'org.gnome.settings-daemon.plugins.keyboard';
-
-function LayoutMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-LayoutMenuItem.prototype = {
-    __proto__: PopupMenu.PopupBaseMenuItem.prototype,
-
-    _init: function(config, id, indicator, long_name) {
-        PopupMenu.PopupBaseMenuItem.prototype._init.call(this);
-
-        this._config = config;
-        this._id = id;
-        this.label = new St.Label({ text: long_name });
-        this.indicator = indicator;
-        this.addActor(this.label);
-        this.addActor(this.indicator);
-    },
-
-    activate: function(event) {
-        PopupMenu.PopupBaseMenuItem.prototype.activate.call(this);
-        this._config.lock_group(this._id);
-    }
-};
-
-function XKBIndicator() {
-    this._init.call(this);
-}
-
-XKBIndicator.prototype = {
-    __proto__: PanelMenu.Button.prototype,
-
-    _init: function() {
-        PanelMenu.Button.prototype._init.call(this, St.Align.START);
-
-        this._container = new Shell.GenericContainer();
-        this._container.connect('get-preferred-width', Lang.bind(this, this._get_preferred_width));
-        this._container.connect('get-preferred-height', Lang.bind(this, this._get_preferred_height));
-        this._container.connect('allocate', Lang.bind(this, this._allocate));
-        this.actor.set_child(this._container);
-
-        this._iconActor = new St.Icon({ icon_name: 'keyboard', icon_type: St.IconType.SYMBOLIC, style_class: 'system-status-icon' });
-        this._container.add_actor(this._iconActor);
-        this._labelActors = [ ];
-        this._layoutItems = [ ];
-
-        this._indicatorSettings = new Gio.Settings({ schema: INDICATOR_SCHEMA });
-        this._indicatorSettings.connect('changed::disable-indicator', Lang.bind(this, this._sync_config));
-
-        this._disableIndicator = false;
-        this._showFlags = false;
-        this._config = Gkbd.Configuration.get();
-        this._config.connect('changed', Lang.bind(this, this._sync_config));
-        this._config.connect('group-changed', Lang.bind(this, this._sync_group));
-        this._config.start_listen();
-
-        this._sync_config();
-
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addAction(_("Localization Settings"), function() {
-            GLib.spawn_command_line_async('gnome-control-center region');
-        });
-    },
-
-    _sync_config: function() {
-        this._disableIndicator = this._indicatorSettings.get_boolean('disable-indicator');
-
-        this._showFlags = this._config.if_flags_shown();
-        if (this._showFlags) {
-            this._container.set_skip_paint(this._iconActor, false);
-        } else {
-            this._container.set_skip_paint(this._iconActor, true);
-        }
-
-        let groups = this._config.get_group_names();
-        if (groups.length > 1 && !this._disableIndicator) {
-            this.actor.show();
-        } else {
-            this.menu.close();
-            this.actor.hide();
-        }
-
-        for (let i = 0; i < this._layoutItems.length; i++)
-            this._layoutItems[i].destroy();
-
-        for (let i = 0; i < this._labelActors.length; i++)
-            this._labelActors[i].destroy();
-
-        let short_names = this._config.get_short_group_names();
-
-        this._selectedLayout = null;
-        this._layoutItems = [ ];
-        this._selectedLabel = null;
-        this._labelActors = [ ];
-        for (let i = 0; i < groups.length; i++) {
-            let icon_name = this._config.get_group_name(i);
-            let actor;
-            if (this._showFlags)
-                actor = new St.Icon({ icon_name: icon_name, icon_type: St.IconType.SYMBOLIC, style_class: 'popup-menu-icon' });
-            else
-                actor = new St.Label({ text: short_names[i] });
-            let item = new LayoutMenuItem(this._config, i, actor, groups[i]);
-            item._short_group_name = short_names[i];
-            item._icon_name = icon_name;
-            this._layoutItems.push(item);
-            this.menu.addMenuItem(item, i);
-
-            let shortLabel = new St.Label({ text: short_names[i] });
-            this._labelActors.push(shortLabel);
-            this._container.add_actor(shortLabel);
-            this._container.set_skip_paint(shortLabel, true);
-        }
-
-        this._sync_group();
-    },
-
-    _sync_group: function() {
-        let selected = this._config.get_current_group();
-
-        if (this._selectedLayout) {
-            this._selectedLayout.setShowDot(false);
-            this._selectedLayout = null;
-        }
-
-        if (this._selectedLabel) {
-            this._container.set_skip_paint(this._selectedLabel, true);
-            this._selectedLabel = null;
-        }
-
-        let item = this._layoutItems[selected];
-        item.setShowDot(true);
-
-        this._iconActor.icon_name = item._icon_name;
-        this._selectedLabel = this._labelActors[selected];
-        this._container.set_skip_paint(this._selectedLabel, this._showFlags);
-
-        this._selectedLayout = item;
-    },
-
-    _get_preferred_width: function(container, for_height, alloc) {
-        /* Here, and in _get_preferred_height, we need to query for the
-           height of all children, but we ignore the results for those
-           we don't actually display. */
-        let max_min_width = 0, max_natural_width = 0;
-        if (this._showFlags)
-            [max_min_width, max_natural_width] = this._iconActor.get_preferred_width(for_height);
-
-        for (let i = 0; i < this._labelActors.length; i++) {
-            let [min_width, natural_width] = this._labelActors[i].get_preferred_width(for_height);
-            if (!this._showFlags) {
-                max_min_width = Math.max(max_min_width, min_width);
-                max_natural_width = Math.max(max_natural_width, natural_width);
-            }
-        }
-
-        alloc.min_size = max_min_width;
-        alloc.natural_size = max_natural_width;
-    },
-
-    _get_preferred_height: function(container, for_width, alloc) {
-        let max_min_height = 0, max_natural_height = 0;
-        if (this._showFlags)
-            [max_min_height, max_natural_height] = this._iconActor.get_preferred_height(for_width);
-        
-        for (let i = 0; i < this._labelActors.length; i++) {
-            let [min_height, natural_height] = this._labelActors[i].get_preferred_height(for_width);
-            if (!this._showFlags) {
-                max_min_height = Math.max(max_min_height, min_height);
-                max_natural_height = Math.max(max_natural_height, natural_height);
-            }
-        }
-
-        alloc.min_size = max_min_height;
-        alloc.natural_size = max_natural_height;
-    },
-
-    _allocate: function(container, box, flags) {
-        // translate box to (0, 0)
-        box.x2 -= box.x1;
-        box.x1 = 0;
-        box.y2 -= box.y1;
-        box.y1 = 0;
-
-        this._iconActor.allocate_align_fill(box, 0.5, 0, false, false, flags);
-        for (let i = 0; i < this._labelActors.length; i++)
-            this._labelActors[i].allocate_align_fill(box, 0.5, 0, false, false, flags);
-    }
-};
-
-function ModifierIndicatorFactory() {
-    this._init.call(this);
-}
-
-ModifierIndicatorFactory.prototype = {
-    _init: function() {
-        this._settings = new Gio.Settings({ schema: INDICATOR_SCHEMA });
-        this._settings.connect('changed::show-keyboard-leds-indicator', Lang.bind(this, this._changed));
-
-        this._config = Gkbd.Configuration.get();
-        this._config.connect('indicators-changed', Lang.bind(this, this._changed));
-
-        this._scrollLock = new St.Icon({ icon_name: 'kbdled-scroll-lock', icon_type: St.IconType.SYMBOLIC, style_class: 'system-status-icon' });
-        this._numLock = new St.Icon({ icon_name: 'kbdled-num-lock', icon_type: St.IconType.SYMBOLIC, style_class: 'system-status-icon' });
-        this._capsLock = new St.Icon({ icon_name: 'kbdled-caps-lock', icon_type: St.IconType.SYMBOLIC, style_class: 'system-status-icon' });
-
-        this._changed();
-    },
-
-    getIndicators: function() {
-        return [this._scrollLock, this._numLock, this._capsLock];
-    },
-
-    _changed: function() {
-        let enable = this._settings.get_boolean('show-keyboard-leds-indicator');
-
-        if (enable) {
-            if (this._config.get_scroll_lock_state())
-                this._scrollLock.show();
-            else
-                this._scrollLock.hide();
-
-            if (this._config.get_num_lock_state())
-                this._numLock.show();
-            else
-                this._numLock.hide();
-
-            if (this._config.get_caps_lock_state())
-                this._capsLock.show();
-            else
-                this._capsLock.hide();
-        } else {
-            this._scrollLock.hide();
-            this._numLock.hide();
-            this._capsLock.hide();
-        }
-    }
-};
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@ -1,6 +1,7 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const DBus = imports.dbus;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
@ -9,7 +10,6 @@ const St = imports.gi.St;

 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Util = imports.misc.util;

 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
@ -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,17 @@ Indicator.prototype = {
        this._deviceItems = [ ];
        this._hasPrimary = false;
        this._primaryDeviceId = null;
-
        this._batteryItem = new PopupMenu.PopupMenuItem('');
-        this._primaryPercentage = new St.Label();
-        this._batteryItem.addActor(this._primaryPercentage, { align: St.Align.END });
        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');
+        });
        this.menu.addAction(_("Power Settings"),function() {
-            Util.spawnDesktop('gnome-power-panel');
+            GLib.spawn_command_line_async('gnome-control-center power');
        });

        this._proxy.connect('Changed', Lang.bind(this, this._devicesChanged));
@ -100,26 +95,10 @@ Indicator.prototype = {
                this._deviceSep.actor.hide();
                return;
            }
-            let [device_id, device_type, icon, percentage, state, seconds] = device;
+            let [device_id, device_type, summary, percentage, state, time] = device;
            if (device_type == UPDeviceType.BATTERY) {
                this._hasPrimary = true;
-                let time = Math.round(seconds / 60);
-                let minutes = time % 60;
-                let hours = Math.floor(time / 60);
-                let timestring;
-                if (time > 60) {
-                    if (minutes == 0) {
-                        timestring = Gettext.ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
-                    } else {
-                        /* TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" */
-                        let template = _("%d %s %d %s remaining");
-
-                        timestring = template.format (hours, Gettext.ngettext("hour", "hours", hours), minutes, Gettext.ngettext("minute", "minutes", minutes));
-                    }
-                } else
-                    timestring = Gettext.ngettext("%d minute remaining", "%d minutes remaining", minutes).format(minutes);
-                this._batteryItem.label.text = timestring;
-                this._primaryPercentage.text = Math.round(percentage) + '%';
+                this._batteryItem.label.text = summary;
                this._batteryItem.actor.show();
                if (this._deviceItems.length > 0)
                    this._deviceSep.actor.show();
@ -130,17 +109,6 @@ Indicator.prototype = {
            }

            this._primaryDeviceId = device_id;
-            if (this._primaryDeviceId) {
-                this._batteryItem.actor.reactive = true;
-                this._batteryItem.actor.can_focus = true;
-                this._batteryItem.connect('activate', function(item) {
-                    Util.spawn(['gnome-power-statistics', '--device', device_id]);
-                });
-            } else {
-                // virtual device
-                this._batteryItem.actor.reactive = false;
-                this._batteryItem.actor.can_focus = false;
-            }
        }));
    },

@ -163,7 +131,8 @@ Indicator.prototype = {

                let item = new DeviceItem (devices[i]);
                item.connect('activate', function() {
-                    Util.spawn(['gnome-power-statistics', '--device', device_id]);
+                    let p = new Shell.Process({ args: ['gnome-power-statistics', '--device', device_id] });
+                    p.run();
                });
                this._deviceItems.push(item);
                this.menu.addMenuItem(item, this._otherDevicePosition + position);
@ -195,8 +164,8 @@ Indicator.prototype = {

    _checkError: function(error) {
        if (!this._restarted && error && error.message.match(/org\.freedesktop\.DBus\.Error\.(UnknownMethod|InvalidArgs)/)) {
-            Util.killall('gnome-power-manager');
-            Util.spawn(['gnome-power-manager']);
+            GLib.spawn_command_line_sync('pkill -f "^gnome-power-manager$"');
+            GLib.spawn_command_line_async('gnome-power-manager');
            this._restarted = true;
        }
    }
@ -212,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' });

@ -225,36 +206,21 @@ DeviceItem.prototype = {
        this._box.add_actor(this._label);
        this.addActor(this._box);

+        let percentBin = new St.Bin({ x_align: St.Align.END });
        let percentLabel = new St.Label({ text: '%d%%'.format(Math.round(percentage)) });
-        this.addActor(percentLabel, { align: St.Align.END });
+        percentBin.child = percentLabel;
+        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
@ -11,7 +11,6 @@ const St = imports.gi.St;

 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Util = imports.misc.util;

 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
@ -39,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();
@ -52,16 +52,18 @@ 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());
        this.menu.addAction(_("Sound Settings"), function() {
-            Util.spawnDesktop('gnome-sound-panel');
+            let p = new Shell.Process({ args: ['gnome-control-center', 'sound'] });
+            p.run();
        });

        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
@ -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/statusIconDispatcher.js
+++ b/js/ui/statusIconDispatcher.js
@ -6,7 +6,6 @@ const Signals = imports.signals;

 const MessageTray = imports.ui.messageTray;
 const NotificationDaemon = imports.ui.notificationDaemon;
-const Util = imports.misc.util;

 const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
    'bluetooth-applet': 'bluetooth',
@ -16,10 +15,7 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
    'nm-applet': 'network',
    'gnome-power-manager': 'battery',
    'keyboard': 'keyboard',
-    'a11y-keyboard': 'a11y',
-    'kbd-scrolllock': 'keyboard',
-    'kbd-numlock': 'keyboard',
-    'kbd-capslock': 'keyboard'
+    'gnome-settings-daemon': 'display'
 };

 function StatusIconDispatcher() {
@ -37,7 +33,8 @@ StatusIconDispatcher.prototype = {
        // app-indicators, so that applications fall back to normal
        // status icons
        // http://bugzilla.gnome.org/show_bug.cgi=id=621382
-        Util.killall('indicator-application-service');
+        let p = new Shell.Process({ args: ['pkill', '-f', '^([^ ]*/)?indicator-application-service$']});
+        p.run();
    },

    _onTrayIconAdded: function(o, icon) {
--- a/js/ui/statusMenu.js
+++ b/js/ui/statusMenu.js
@ -12,7 +12,6 @@ const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-const Util = imports.misc.util;

 // Adapted from gdm/gui/user-switch-applet/applet.c
 //
@ -32,7 +31,7 @@ StatusMenuButton.prototype = {
        this.actor.set_child(box);

        this._gdm = Gdm.UserManager.ref_default();
-        this._gdm.queue_load();
+        this._gdm.queue_load()

        this._user = this._gdm.get_user(GLib.get_user_name());
        this._presence = new GnomeSession.Presence();
@ -112,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);

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

@ -154,17 +153,17 @@ StatusMenuButton.prototype = {

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

    _onPreferencesActivate: function() {
        Main.overview.hide();
-        Util.spawnDesktop('gnome-control-center');
+        this._spawn(['gnome-control-center']);
    },

    _onLockScreenActivate: function() {
        Main.overview.hide();
-        Util.spawn(['gnome-screensaver-command', '--lock']);
+        this._spawn(['gnome-screensaver-command', '--lock']);
    },

    _onLoginScreenActivate: function() {
@ -175,11 +174,19 @@ StatusMenuButton.prototype = {

    _onQuitSessionActivate: function() {
        Main.overview.hide();
-        Util.spawn(['gnome-session-save', '--logout-dialog']);
+        this._spawn(['gnome-session-save', '--logout-dialog']);
    },

    _onShutDownActivate: function() {
        Main.overview.hide();
-        Util.spawn(['gnome-session-save', '--shutdown-dialog']);
+        this._spawn(['gnome-session-save', '--shutdown-dialog']);
+    },
+
+    _spawn: function(args) {
+        // FIXME: once Shell.Process gets support for signalling
+        // errors we should pop up an error dialog or something here
+        // on failure
+        let p = new Shell.Process({'args' : args});
+        p.run();
    }
 };
--- 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;
@ -44,10 +42,6 @@ subscribedContactsChannel[Telepathy.CHANNEL_NAME + '.ChannelType'] = Telepathy.C
 subscribedContactsChannel[Telepathy.CHANNEL_NAME + '.TargetHandleType'] = Telepathy.HandleType.LIST;
 subscribedContactsChannel[Telepathy.CHANNEL_NAME + '.TargetID'] = 'subscribe';

-const NotificationDirection = {
-    SENT: 'chat-sent',
-    RECEIVED: 'chat-received'
-};

 // This is GNOME Shell's implementation of the Telepathy 'Client'
 // interface. Specifically, the shell is a Telepathy 'Observer', which
@ -475,8 +469,8 @@ Source.prototype = {
                }));
        }

-        this._notification = new Notification(this);
-        this._notification.setUrgency(MessageTray.Urgency.HIGH);
+        this._notification = undefined;
+        this._sentMessages = [];

        // Since we only create sources when receiving a message, this
        // is a plausible default
@ -531,23 +525,32 @@ Source.prototype = {
        this.destroy();
    },

-    _messageReceived: function(channel, id, timestamp, sender,
-                               type, flags, text) {
-        this._notification.appendMessage(text, timestamp, NotificationDirection.RECEIVED);
-        this.notify();
-    },
-
-    // This is called for both messages we send from
-    // our client and other clients as well.
-    _messageSent: function(channel, timestamp, type, text) {
-        this._notification.appendMessage(text, timestamp, NotificationDirection.SENT);
-    },
-
-    notify: function() {
+    _ensureNotification: function() {
        if (!Main.messageTray.contains(this))
            Main.messageTray.add(this);

-        MessageTray.Source.prototype.notify.call(this, 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, 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) {
@ -555,22 +558,22 @@ Source.prototype = {
    },

    setPresence: function(presence, message) {
-        let msg, shouldNotify;
+        let msg, notify;

        if (presence == Telepathy.ConnectionPresenceType.AVAILABLE) {
            msg = _("%s is online.").format(this.title);
-            shouldNotify = (this._presence == Telepathy.ConnectionPresenceType.OFFLINE);
+            notify = (this._presence == Telepathy.ConnectionPresenceType.OFFLINE);
        } else if (presence == Telepathy.ConnectionPresenceType.OFFLINE ||
                   presence == Telepathy.ConnectionPresenceType.EXTENDED_AWAY) {
            presence = Telepathy.ConnectionPresenceType.OFFLINE;
            msg = _("%s is offline.").format(this.title);
-            shouldNotify = (this._presence != Telepathy.ConnectionPresenceType.OFFLINE);
+            notify = (this._presence != Telepathy.ConnectionPresenceType.OFFLINE);
        } else if (presence == Telepathy.ConnectionPresenceType.AWAY) {
            msg = _("%s is away.").format(this.title);
-            shouldNotify = false;
+            notify = false;
        } else if (presence == Telepathy.ConnectionPresenceType.BUSY) {
            msg = _("%s is busy.").format(this.title);
-            shouldNotify = false;
+            notify = false;
        } else
            return;

@ -579,9 +582,10 @@ Source.prototype = {
        if (message)
            msg += ' <i>(' + GLib.markup_escape_text(message, -1) + ')</i>';

-        this._notification.appendPresence(msg, shouldNotify);
-        if (shouldNotify)
-            this.notify();
+        this._ensureNotification();
+        this._notification.appendMessage(msg, true, false);
+        if (notify)
+            this.notify(this._notification);
    }
 };

@ -594,47 +598,29 @@ Notification.prototype = {

    _init: function(source) {
        MessageTray.Notification.prototype._init.call(this, source, source.title, null, { customContent: true });
-        this.setResident(true);

        this._responseEntry = new St.Entry({ style_class: 'chat-response' });
        this._responseEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivated));
        this.setActionArea(this._responseEntry);

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

-    appendMessage: function(text, timestamp, direction) {
-        this.update(this.source.title, text, { customContent: true });
-        this._append(text, direction, 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
@ -643,44 +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. */
-        // xgettext:no-c-format
-        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.
@ -693,8 +652,6 @@ Notification.prototype = {
        if (text == '')
            return;

-        // Telepathy sends out the Sent signal for us.
-        // see Source._messageSent
        this._responseEntry.set_text('');
        this.source.respond(text);
    }
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -16,12 +16,12 @@ const SearchDisplay = imports.ui.searchDisplay;
 const Tweener = imports.ui.tweener;


-function SearchEntry(focusBase) {
-    this._init(focusBase);
+function SearchEntry() {
+    this._init();
 }

 SearchEntry.prototype = {
-    _init : function(focusBase) {
+    _init : function() {
        this.actor = new St.Entry({ name: 'searchEntry',
                                    hint_text: _("Search your computer") });
        this.entry = this.actor.clutter_text;
@ -45,12 +45,11 @@ SearchEntry.prototype = {
        this.pane = null;

        this._capturedEventId = 0;
-        this._focusBase = focusBase;
    },

    _updateCursorVisibility: function() {
        let focus = global.stage.get_key_focus();
-        if (focus == this._focusBase || focus == this.entry)
+        if (focus == global.stage || focus == this.entry)
            this.entry.set_cursor_visible(true);
        else
            this.entry.set_cursor_visible(false);
@ -82,8 +81,8 @@ SearchEntry.prototype = {

        this.entry.text = '';

-        // Return focus to the viewSelector
-        global.stage.set_key_focus(this._focusBase);
+        // Return focus to the stage
+        global.stage.set_key_focus(null);

        this.entry.set_cursor_visible(true);
        this.entry.set_selection(0, 0);
@ -118,11 +117,11 @@ SearchEntry.prototype = {
                }
                return false;
            case Clutter.EventType.KEY_PRESS:
-                // If some "special" actor grabbed the focus (run
-                // dialog, looking glass); we don't want to interfere
-                // with that
+                // If neither the stage nor our entry have key focus, some
+                // "special" actor grabbed the focus (run dialog, looking
+                // glass); we don't want to interfere with that
                let focus = global.stage.get_key_focus();
-                if (focus != this._focusBase && focus != this.entry)
+                if (focus != global.stage && focus != this.entry)
                    return false;

                let sym = event.get_key_symbol();
@ -232,25 +231,23 @@ ViewTab.prototype = {
 };


-function SearchTab(focusBase) {
-    this._init(focusBase);
+function SearchTab() {
+    this._init();
 }

 SearchTab.prototype = {
    __proto__: BaseTab.prototype,

-    _init: function(focusBase) {
+    _init: function() {
        this._searchActive = false;
        this._searchPending = false;
        this._keyPressId = 0;
        this._searchTimeoutId = 0;
-        this._focusBase = focusBase;

        this._searchSystem = new Search.SearchSystem();
-        this._openSearchSystem = new Search.OpenSearchSystem();

-        this._searchEntry = new SearchEntry(focusBase);
-        this._searchResults = new SearchDisplay.SearchResults(this._searchSystem, this._openSearchSystem);
+        this._searchEntry = new SearchEntry();
+        this._searchResults = new SearchDisplay.SearchResults(this._searchSystem);
        BaseTab.prototype._init.call(this,
                                     this._searchEntry.actor,
                                     this._searchResults.actor);
@ -277,15 +274,15 @@ SearchTab.prototype = {
        BaseTab.prototype.show.call(this);

        if (this._keyPressId == 0)
-            this._keyPressId = this._searchEntry.entry.connect('key-press-event',
-                                                               Lang.bind(this, this._onKeyPress));
+            this._keyPressId = global.stage.connect('key-press-event',
+                                                    Lang.bind(this, this._onKeyPress));
    },

    hide: function() {
        BaseTab.prototype.hide.call(this);

        if (this._keyPressId > 0) {
-            this._searchEntry.entry.disconnect(this._keyPressId);
+            global.stage.disconnect(this._keyPressId);
            this._keyPressId = 0;
        }
        this._searchEntry.reset();
@ -320,7 +317,14 @@ SearchTab.prototype = {
        this._searchTimeoutId = Mainloop.timeout_add(150, Lang.bind(this, this._doSearch));
    },

-    _onKeyPress: function(entry, event) {
+    _onKeyPress: function(stage, event) {
+        // If neither the stage nor the search entry have key focus, some
+        // "special" actor grabbed the focus (run dialog, looking glass);
+        // we don't want to interfere with that
+        let focus = stage.get_key_focus();
+        if (focus != stage && focus != this._searchEntry.entry)
+            return false;
+
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.Up) {
            if (!this._searchActive)
@ -389,7 +393,7 @@ ViewSelector.prototype = {
        this._tabs = [];
        this._activeTab = null;

-        this._searchTab = new SearchTab(this.actor);
+        this._searchTab = new SearchTab();
        this._searchArea.set_child(this._searchTab.title);
        this._addTab(this._searchTab);

@ -555,7 +559,14 @@ ViewSelector.prototype = {
            }));
    },

-    _onKeyPress: function(actor, event) {
+    _onKeyPress: function(stage, event) {
+        // Only process events if the stage has key focus - search is handled
+        // by the search tab, and we do not want to interfere with "special"
+        // actors grabbing focus (run dialog, looking glass, notifications).
+        let focus = stage.get_key_focus();
+        if (focus != stage)
+            return false;
+
        let modifiers = Shell.get_event_state(event);
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.Escape) {
@ -589,8 +600,8 @@ ViewSelector.prototype = {
            this._overviewHidingId = Main.overview.connect('hiding',
                                                           Lang.bind(this, this._switchDefaultTab));
        if (this._keyPressId == 0)
-            this._keyPressId = this.actor.connect('key-press-event',
-                                                  Lang.bind(this, this._onKeyPress));
+            this._keyPressId = global.stage.connect('key-press-event',
+                                                    Lang.bind(this, this._onKeyPress));

        this._switchDefaultTab();
    },
@ -599,7 +610,7 @@ ViewSelector.prototype = {
        this._searchTab.setFindAsYouType(false);

        if (this._keyPressId > 0) {
-            this.actor.disconnect(this._keyPressId);
+            global.stage.disconnect(this._keyPressId);
            this._keyPressId = 0;
        }

--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -497,8 +497,6 @@ WindowManager.prototype = {

        for (let i = 0; i < switchData.windows.length; i++) {
                let w = switchData.windows[i];
-                if (w.window.is_destroyed()) // Window gone
-                    continue;
                if (w.window.get_parent() == switchData.outGroup) {
                    w.window.reparent(w.parent);
                    w.window.hide();
@ -545,34 +543,24 @@ WindowManager.prototype = {
    },

    actionMoveWorkspaceLeft: function() {
-        let rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        let indexToActivate = activeWorkspaceIndex;
-        if (rtl && activeWorkspaceIndex < global.screen.n_workspaces - 1)
-            indexToActivate++;
-        else if (!rtl && activeWorkspaceIndex > 0)
-            indexToActivate--;
-
-        if (indexToActivate != activeWorkspaceIndex)
-            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());
-
-        if (!Main.overview.visible)
-            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, indexToActivate);
+        if (activeWorkspaceIndex > 0) {
+            global.screen.get_workspace_by_index(activeWorkspaceIndex - 1).activate(global.get_current_time());
+            if (!Main.overview.visible)
+                this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, activeWorkspaceIndex - 1);
+        } else if (!Main.overview.visible) {
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, activeWorkspaceIndex);
+        }
    },

    actionMoveWorkspaceRight: function() {
-        let rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        let indexToActivate = activeWorkspaceIndex;
-        if (rtl && activeWorkspaceIndex > 0)
-            indexToActivate--;
-        else if (!rtl && activeWorkspaceIndex < global.screen.n_workspaces - 1)
-            indexToActivate++;
-
-        if (indexToActivate != activeWorkspaceIndex)
-            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());
-
-        if (!Main.overview.visible)
-            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, indexToActivate);
+        if (activeWorkspaceIndex <  global.screen.n_workspaces - 1) {
+            global.screen.get_workspace_by_index(activeWorkspaceIndex + 1).activate(global.get_current_time());
+            if (!Main.overview.visible)
+                this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, activeWorkspaceIndex + 1);
+        } else if (!Main.overview.visible) {
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, activeWorkspaceIndex);
+        }
    }
 };
--- 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');
    }
@ -396,7 +386,7 @@ WindowOverlay.prototype = {
    // These parameters are not the values retrieved with
    // get_transformed_position() and get_transformed_size(),
    // as windowClone might be moving.
-    // See Workspace._showWindowOverlay
+    // See Workspace._fadeInWindowOverlay
    updatePositions: function(cloneX, cloneY, cloneWidth, cloneHeight) {
        let button = this.closeButton;
        let title = this.title;
@ -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;
    },

@ -517,10 +509,20 @@ Workspace.prototype = {
        // Without this the drop area will be overlapped.
        this._windowOverlaysGroup.set_size(0, 0);

-        this.actor = new Clutter.Group();
+        this.actor = new Clutter.Group({ reactive: true });
        this.actor._delegate = this;

        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+        this.actor.connect('button-release-event', Lang.bind(this,
+            function(actor, event) {
+                // Only switch to the workspace when there's no application
+                // windows open. The problem is that it's too easy to miss
+                // an app window and get the wrong one focused.
+                if (this._windows.length == 0) {
+                    this.metaWorkspace.activate(event.get_time());
+                    Main.overview.hide();
+                }
+            }));

        // Items in _windowOverlaysGroup should not be scaled, so we don't
        // add them to this.actor, but to its parent whenever it changes
@ -556,6 +558,8 @@ Workspace.prototype = {
                                                            Lang.bind(this, this._windowRemoved));
        this._repositionWindowsId = 0;

+        this._visible = false;
+
        this.leavingOverview = false;
    },

@ -595,10 +599,6 @@ Workspace.prototype = {
        return this._lookupIndex(metaWindow) >= 0;
    },

-    isEmpty: function() {
-        return this._windows.length == 0;
-    },
-
    setShowOnlyWindows: function(showOnlyWindows, reposition) {
        this._showOnlyWindows = showOnlyWindows;
        this._resetCloneVisibility();
@ -873,7 +873,8 @@ Workspace.prototype = {

        xCenter = xCenter * global.screen_width;

-        let rect = metaWindow.get_outer_rect();
+        let rect = new Meta.Rectangle();
+        metaWindow.get_outer_rect(rect);
        let buttonOuterHeight, captionHeight;
        let buttonOuterWidth = 0;

@ -940,9 +941,6 @@ Workspace.prototype = {
        let slots = this._computeAllWindowSlots(visibleClones.length);
        visibleClones = this._orderWindowsByMotionAndStartup(visibleClones, slots);

-        let currentWorkspace = global.screen.get_active_workspace();
-        let isOnCurrentWorkspace = this.metaWorkspace == currentWorkspace;
-
        for (let i = 0; i < visibleClones.length; i++) {
            let slot = slots[i];
            let clone = visibleClones[i];
@ -959,7 +957,7 @@ Workspace.prototype = {

            if (overlay)
                overlay.hide();
-            if (animate && isOnCurrentWorkspace) {
+            if (animate) {
                if (!metaWindow.showing_on_its_workspace()) {
                    /* Hidden windows should fade in and grow
                     * therefore we need to resize them now so they
@ -989,18 +987,20 @@ Workspace.prototype = {
                                   time: Overview.ANIMATION_TIME,
                                   transition: 'easeOutQuad',
                                   onComplete: Lang.bind(this, function() {
-                                      this._showWindowOverlay(clone, overlay, true);
+                                      this._fadeInWindowOverlay(clone, overlay);
                                   })
                                 });
            } else {
                clone.actor.set_position(x, y);
                clone.actor.set_scale(scale, scale);
-                this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
+                this._fadeInWindowOverlay(clone, overlay);
            }
        }
    },

    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()]; });

@ -1008,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);
@ -1016,7 +1016,7 @@ Workspace.prototype = {
        }
    },

-    _showWindowOverlay: function(clone, overlay, fade) {
+    _fadeInWindowOverlay: function(clone, overlay) {
        if (clone.inDrag)
            return;

@ -1038,21 +1038,17 @@ Workspace.prototype = {

        if (overlay) {
            overlay.updatePositions(cloneX, cloneY, cloneWidth, cloneHeight);
-            if (fade)
-                overlay.fadeIn();
-            else
-                overlay.show();
+            overlay.fadeIn();
        }
    },

-    _showAllOverlays: function() {
-        let currentWorkspace = global.screen.get_active_workspace();
+    _fadeInAllOverlays: function() {
        for (let i = 0; i < this._windows.length; i++) {
            let clone = this._windows[i];
            let overlay = this._windowOverlays[i];
            if (this._showOnlyWindows != null && !(clone.metaWindow in this._showOnlyWindows))
                continue;
-            this._showWindowOverlay(clone, overlay, this.metaWorkspace == currentWorkspace);
+            this._fadeInWindowOverlay(clone, overlay);
        }
    },

@ -1088,7 +1084,7 @@ Workspace.prototype = {

    showWindowsOverlays: function() {
        this._windowOverlaysGroup.show();
-        this._showAllOverlays();
+        this._fadeInAllOverlays();
    },

    hideWindowsOverlays: function() {
@ -1205,12 +1201,12 @@ Workspace.prototype = {
            this.positionWindows(WindowPositionFlags.ANIMATE | WindowPositionFlags.ZOOM);
        else
            this.positionWindows(WindowPositionFlags.ZOOM);
+
+        this._visible = true;
    },

    // Animates the return from Overview mode
    zoomFromOverview : function() {
-        let currentWorkspace = global.screen.get_active_workspace();
-
        this.leavingOverview = true;

        this._hideAllOverlays();
@ -1222,9 +1218,6 @@ Workspace.prototype = {
        this._overviewHiddenId = Main.overview.connect('hidden', Lang.bind(this,
                                                                           this._doneLeavingOverview));

-        if (this._metaWorkspace == currentWorkspace)
-            return;
-
        // Position and scale the windows.
        for (let i = 0; i < this._windows.length; i++) {
            let clone = this._windows[i];
@ -1255,6 +1248,7 @@ Workspace.prototype = {
            }
        }

+        this._visible = false;
    },

    destroy : function() {
@ -1325,10 +1319,6 @@ Workspace.prototype = {
                      Lang.bind(this, function() {
                          this._windowIsZooming = false;
                      }));
-        win.connect('size-changed',
-                    Lang.bind(this, function() {
-                        this.positionWindows(0);
-                    }));

        this.actor.add_actor(clone.actor);

--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -89,7 +89,6 @@ WorkspaceSwitcherPopup.prototype = {
        let children = this._list.get_children();
        let childBox = new Clutter.ActorBox();

-        let rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
        let x = box.x1;
        let prevChildBoxX2 = box.x1 - this._itemSpacing;
        for (let i = 0; i < children.length; i++) {
@ -99,11 +98,6 @@ WorkspaceSwitcherPopup.prototype = {
            childBox.y2 = box.y1 + this._childHeight;
            x += this._childWidth + this._itemSpacing;
            prevChildBoxX2 = childBox.x2;
-            if (rtl) {
-                let ltrChildBoxX1 = childBox.x1;
-                childBox.x1 = box.x2 - (childBox.x2 - box.x1);
-                childBox.x2 = box.x2 - (ltrChildBoxX1 - box.x1);
-            }
            children[i].allocate(childBox, flags);
        }
    },
--- 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));
@ -45,8 +46,6 @@ WorkspacesView.prototype = {
                this._spacing = node.get_length('spacing');
                this._computeWorkspacePositions();
            }));
-        this.actor.connect('notify::mapped',
-                           Lang.bind(this, this._onMappedChanged));

        this._width = width;
        this._height = height;
@ -57,9 +56,10 @@ WorkspacesView.prototype = {
        this._activeWorkspaceY = 0; // y offset of active ws while dragging
        this._lostWorkspaces = [];
        this._animating = false; // tweening
-        this._scrolling = false; // swipe-scrolling
+        this._scrolling = false; // dragging desktop
        this._animatingScroll = false; // programatically updating the adjustment
        this._inDrag = false; // dragging a window
+        this._lastMotionTime = -1; // used to track "stopping" while dragging workspaces

        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
        this._workspaces = workspaces;
@ -90,6 +90,10 @@ WorkspacesView.prototype = {
        this._scrollAdjustment.connect('notify::value',
                                       Lang.bind(this, this._onScroll));

+        this._dragIndex = -1;
+
+        this._buttonPressId = 0;
+        this._capturedEventId = 0;
        this._timeoutId = 0;

        this._windowSelectionAppId = null;
@ -110,8 +114,6 @@ WorkspacesView.prototype = {
                                                        Lang.bind(this, this._dragBegin));
        this._windowDragEndId = Main.overview.connect('window-drag-end',
                                                      Lang.bind(this, this._dragEnd));
-        this._swipeScrollBeginId = 0;
-        this._swipeScrollEndId = 0;
    },

    _lookupWorkspaceForMetaWindow: function (metaWindow) {
@ -289,6 +291,8 @@ WorkspacesView.prototype = {
        if (this._inDrag)
            scale *= WORKSPACE_DRAGGING_SCALE;

+        this._setWorkspaceDraggable(active, true);
+
        let _width = this._workspaces[0].actor.width * scale;
        let _height = this._workspaces[0].actor.height * scale;

@ -320,6 +324,128 @@ WorkspacesView.prototype = {
        this._updateScrollAdjustment(active, showAnimation);
    },

+    // _setWorkspaceDraggable:
+    // @index: workspace index
+    // @draggable: whether workspace @index should be draggable
+    //
+    // If @draggable is %true, set up workspace @index to allow switching
+    // workspaces by dragging the desktop - if a draggable workspace has
+    // been set up before, it will be reset before the new one is made
+    // draggable.
+    // If @draggable is %false, workspace @index is reset to no longer allow
+    // dragging.
+    _setWorkspaceDraggable: function(index, draggable) {
+        if (index < 0 || index >= global.n_workspaces)
+            return;
+
+        let dragActor = this._workspaces[index].actor;
+
+        if (draggable) {
+            this._workspaces[index].actor.reactive = true;
+
+            // reset old draggable workspace
+            if (this._dragIndex > -1)
+                this._setWorkspaceDraggable(this._dragIndex, false);
+
+            this._dragIndex = index;
+            this._buttonPressId = dragActor.connect('button-press-event',
+                                      Lang.bind(this, this._onButtonPress));
+        } else {
+            this._dragIndex = -1;
+
+            if (this._buttonPressId > 0) {
+                if (dragActor.get_stage())
+                    dragActor.disconnect(this._buttonPressId);
+                this._buttonPressId = 0;
+            }
+
+            if (this._capturedEventId > 0) {
+                global.stage.disconnect(this._capturedEventId);
+                this._capturedEventId = 0;
+            }
+        }
+    },
+
+    // start dragging the active workspace
+    _onButtonPress: function(actor, event) {
+        if (actor != event.get_source())
+            return;
+
+        if (this._dragIndex == -1)
+            return;
+
+        let [stageX, stageY] = event.get_coords();
+        this._dragStartX = this._dragX = stageX;
+        this._scrolling = true;
+        this._capturedEventId = global.stage.connect('captured-event',
+            Lang.bind(this, this._onCapturedEvent));
+    },
+
+    // handle captured events while dragging a workspace
+    _onCapturedEvent: function(actor, event) {
+        let active = global.screen.get_active_workspace_index();
+        let stageX, stageY;
+
+        switch (event.type()) {
+            case Clutter.EventType.BUTTON_RELEASE:
+                this._scrolling = false;
+
+                [stageX, stageY] = event.get_coords();
+
+                // default to snapping back to the original workspace
+                let activate = this._dragIndex;
+                let last = global.screen.n_workspaces - 1;
+
+                // If the user has moved more than half a workspace, we want to "settle"
+                // to the new workspace even if the user stops dragging rather "throws"
+                // by releasing during the drag.
+                let noStop = Math.abs(activate - this._scrollAdjustment.value) > 0.5;
+
+                let difference = stageX > this._dragStartX ? -1 : 1;
+                if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+                    difference *= -1;
+
+                // We detect if the user is stopped by comparing the timestamp of the button
+                // release with the timestamp of the last motion. Experimentally, a difference
+                // of 0 or 1 millisecond indicates that the mouse is in motion, a larger
+                // difference indicates that the mouse is stopped.
+                if ((this._lastMotionTime > 0 && this._lastMotionTime > event.get_time() - 2) || noStop) {
+                    if (activate + difference >= 0 &&
+                        activate + difference <= last)
+                        activate += difference;
+                }
+
+                if (activate != active) {
+                    let workspace = this._workspaces[activate].metaWorkspace;
+                    workspace.activate(global.get_current_time());
+                } else {
+                    this._scrollToActive(true);
+                }
+
+                if (stageX == this._dragStartX)
+                    // no motion? It's a click!
+                    return false;
+
+                return true;
+
+            case Clutter.EventType.MOTION:
+                [stageX, stageY] = event.get_coords();
+                let dx = this._dragX - stageX;
+                let primary = global.get_primary_monitor();
+
+                if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+                    this._scrollAdjustment.value -= (dx / primary.width);
+                else
+                    this._scrollAdjustment.value += (dx / primary.width);
+                this._dragX = stageX;
+                this._lastMotionTime = event.get_time();
+
+                return true;
+        }
+
+        return false;
+    },
+
    // Update workspace actors parameters to the values calculated in
    // _computeWorkspacePositions()
    // @showAnimation: iff %true, transition between states
@ -329,6 +455,7 @@ WorkspacesView.prototype = {
        let targetWorkspaceCurrentX = this._workspaces[active].x;
        let dx = targetWorkspaceNewX - targetWorkspaceCurrentX;

+        this._setWorkspaceDraggable(active, true);
        this._animating = showAnimation;

        for (let w = 0; w < this._workspaces.length; w++) {
@ -480,6 +607,7 @@ WorkspacesView.prototype = {
        global.window_manager.disconnect(this._switchWorkspaceNotifyId);
        global.screen.disconnect(this._restackedNotifyId);

+        this._setWorkspaceDraggable(this._dragIndex, false);
        if (this._timeoutId) {
            Mainloop.source_remove(this._timeoutId);
            this._timeoutId = 0;
@ -502,21 +630,6 @@ WorkspacesView.prototype = {
        }
    },

-    _onMappedChanged: function() {
-        if (this.actor.mapped) {
-            let direction = Overview.SwipeScrollDirection.HORIZONTAL;
-            Main.overview.setScrollAdjustment(this._scrollAdjustment,
-                                              direction);
-            this._swipeScrollBeginId = Main.overview.connect('swipe-scroll-begin',
-                                                             Lang.bind(this, this._swipeScrollBegin));
-            this._swipeScrollEndId = Main.overview.connect('swipe-scroll-end',
-                                                           Lang.bind(this, this._swipeScrollEnd));
-        } else {
-            Main.overview.disconnect(this._swipeScrollBeginId);
-            Main.overview.disconnect(this._swipeScrollEndId);
-        }
-    },
-
    _dragBegin: function() {
        if (this._scrolling)
            return;
@ -532,9 +645,6 @@ WorkspacesView.prototype = {
    },

    _onDragMotion: function(dragEvent) {
-        if (Main.overview.animationInProgress)
-             return DND.DragMotionResult.CONTINUE;
-
        let primary = global.get_primary_monitor();

        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
@ -624,37 +734,6 @@ WorkspacesView.prototype = {
            this._workspaces[i].setReservedSlot(null);
    },

-    _swipeScrollBegin: function() {
-        this._scrolling = true;
-    },
-
-    _swipeScrollEnd: function(overview, result) {
-        this._scrolling = false;
-
-        if (result == Overview.SwipeScrollResult.CLICK) {
-            let [x, y, mod] = global.get_pointer();
-            let actor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
-                                                      x, y);
-
-            // Only switch to the workspace when there's no application
-            // windows open. The problem is that it's too easy to miss
-            // an app window and get the wrong one focused.
-            let active = global.screen.get_active_workspace_index();
-            if (this._workspaces[active].isEmpty() &&
-                this.actor.contains(actor))
-                Main.overview.hide();
-        }
-
-        if (result == Overview.SwipeScrollResult.SWIPE)
-            // The active workspace has changed; while swipe-scrolling
-            // has already taken care of the positioning, the cached
-            // positions need to be updated
-            this._computeWorkspacePositions();
-
-        // Make sure title captions etc are shown as necessary
-        this._updateVisibility();
-    },
-
    // sync the workspaces' positions to the value of the scroll adjustment
    // and change the active workspace if appropriate
    _onScroll: function(adj) {
@ -724,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);
@ -762,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',
@ -866,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) {
@ -913,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;
@ -1015,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);
@ -1064,8 +1099,6 @@ WorkspacesDisplay.prototype = {
    },

    hide: function() {
-        this._controlsContainer.hide();
-
        if (this._nWorkspacesNotifyId > 0)
            global.screen.disconnect(this._nWorkspacesNotifyId);
        this.workspacesView.destroy();
@ -1120,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/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@ -1,127 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const Mainloop = imports.mainloop;
-const DND = imports.ui.dnd;
-
-function XdndHandler() {
-    this._init();
-}
-
-XdndHandler.prototype = {
-    _init: function() {
-        // Used to display a clone of the cursor window when the
-        // window group is hidden (like it happens in the overview)
-        this._cursorWindowClone = null;
-
-        // Used as a drag actor in case we don't have a cursor window clone
-        this._dummy = new Clutter.Rectangle({ width: 1, height: 1, opacity: 0 });
-        global.stage.add_actor(this._dummy);
-        this._dummy.hide();
-
-        // Mutter delays the creation of the output window as long
-        // as possible to avoid flicker. In case a plugin wants to
-        // access it directly it has to connect to the stage's show
-        // signal. (see comment in compositor.c:meta_compositor_manage_screen)
-        global.stage.connect('show', function () {
-                                        global.init_xdnd();
-                                        return false;
-                                      });
-
-        global.connect('xdnd-enter', Lang.bind(this, this._onEnter));
-        global.connect('xdnd-position-changed', Lang.bind(this, this._onPositionChanged));
-        global.connect('xdnd-leave', Lang.bind(this, this._onLeave));
-
-        this._windowGroupVisibilityHandlerId = 0;
-    },
-
-    // Called when the user cancels the drag (i.e release the button)
-    _onLeave: function() {
-        if (this._windowGroupVisibilityHandlerId != 0) {
-            Mainloop.source_remove(this._windowGroupVisibilityHandlerId);
-            this._windowGroupVisibilityHandlerId = 0;
-        }
-        this.emit('drag-end');
-    },
-
-    _onEnter: function() {
-        this._windowGroupVisibilityHandlerId  =
-                global.window_group.connect('notify::visible',
-                    Lang.bind(this, this._onWindowGroupVisibilityChanged));
-
-        this.emit('drag-begin', global.get_current_time());
-    },
-
-    _onWindowGroupVisibilityChanged: function() {
-        if (!global.window_group.visible) {
-            if (this._cursorWindowClone)
-                return;
-
-            let windows = global.get_window_actors();
-            let cursorWindow = windows[windows.length - 1];
-
-            // FIXME: more reliable way?
-            if (!cursorWindow.is_override_redirect())
-                return;
-
-            let constraint_position = new Clutter.BindConstraint({ coordinate : Clutter.BindCoordinate.POSITION,
-                                                                   source: cursorWindow});
-
-            this._cursorWindowClone = new Clutter.Clone({ source: cursorWindow });
-            global.overlay_group.add_actor(this._cursorWindowClone);
-            Shell.util_set_hidden_from_pick(this._cursorWindowClone, true);
-
-            // Make sure that the clone has the same position as the source
-            this._cursorWindowClone.add_constraint(constraint_position);
-        } else {
-            if (this._cursorWindowClone)
-            {
-                this._cursorWindowClone.destroy();
-                this._cursorWindowClone = null;
-            }
-        }
-    },
-
-    _onPositionChanged: function(obj, x, y) {
-        let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y);
-
-        // Make sure that the cursor window is on top
-        if (this._cursorWindowClone)
-             this._cursorWindowClone.raise_top();
-
-        let dragEvent = {
-            x: x,
-            y: y,
-            dragActor: this._cursorWindowClone ? this._cursorWindowClone : this._dummy,
-            source: this,
-            targetActor: pickedActor
-        };
-
-        for (let i = 0; i < DND.dragMonitors.length; i++) {
-            let motionFunc = DND.dragMonitors[i].dragMotion;
-            if (motionFunc) {
-                let result = motionFunc(dragEvent);
-                if (result != DND.DragMotionResult.CONTINUE)
-                    return;
-            }
-        }
-
-        while (pickedActor) {
-                if (pickedActor._delegate && pickedActor._delegate.handleDragOver) {
-                    let result = pickedActor._delegate.handleDragOver(this,
-                                                                      dragEvent.dragActor,
-                                                                      x,
-                                                                      y,
-                                                                      global.get_current_time());
-                    if (result != DND.DragMotionResult.CONTINUE)
-                        return;
-                }
-                pickedActor = pickedActor.get_parent();
-        }
-    }
-}
-
-Signals.addSignalMethods(XdndHandler.prototype);
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -8,7 +8,6 @@ el
 en_GB
 es
 et
-fa
 fi
 fr
 ga
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -1,14 +1,13 @@
 data/gnome-shell.desktop.in.in
+data/gnome-shell-clock-preferences.desktop.in.in
 data/org.gnome.shell.gschema.xml.in
 data/org.gnome.accessibility.magnifier.gschema.xml.in
-js/misc/util.js
+[type: gettext/glade]data/clock-preferences.ui
 js/ui/appDisplay.js
 js/ui/appFavorites.js
 js/ui/dash.js
 js/ui/docDisplay.js
-js/ui/endSessionDialog.js
 js/ui/lookingGlass.js
-js/ui/messageTray.js
 js/ui/overview.js
 js/ui/panel.js
 js/ui/placeDisplay.js
@ -16,17 +15,10 @@ js/ui/popupMenu.js
 js/ui/runDialog.js
 js/ui/statusMenu.js
 js/ui/status/accessibility.js
-js/ui/status/bluetooth.js
-js/ui/status/keyboard.js
-js/ui/status/power.js
-js/ui/status/volume.js
-js/ui/telepathyClient.js
 js/ui/viewSelector.js
 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/ar.po
+++ b/po/ar.po
--- a/po/de.po
+++ b/po/de.po
@ -6,21 +6,19 @@
 #
 # Hendrik Brandt <heb@gnome-de.org>, 2009.
 # Hendrik Richter <hendrikr@gnome.org>, 2009.
-# Mario Blättermann <mariobl@gnome.org>, 2009, 2010, 2011.
+# Mario Blättermann <mariobl@gnome.org>, 2009, 2010.
 # Mario Klug <mario@klug.me>, 2010.
-# Jakob Kramer <jakob.kramer@gmx.de>, 2010.
-# Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2010.
-# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010, 2011.
+# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-01 23:21+0100\n"
-"PO-Revision-Date: 2011-01-01 16:25+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&component=general\n"
+"POT-Creation-Date: 2010-10-10 03:14+0000\n"
+"PO-Revision-Date: 2010-10-10 20:23+0200\n"
 "Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -107,8 +105,12 @@ msgstr ""
 msgid "List of desktop file IDs for favorite applications"
 msgstr "Liste der Kennungen der Desktop-Dateien für bevorzugte Anwendungen"

-# Hier blicke ich überhaupt nicht durch.
 #: ../data/org.gnome.shell.gschema.xml.in.h:13
+msgid "Overview workspace view mode"
+msgstr "Modus des Arbeitsflächen-Überblicks"
+
+# Hier blicke ich überhaupt nicht durch.
+#: ../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 "
@ -128,22 +130,22 @@ msgstr ""
 "Das kann zum Senden der Ausgabe über shout2send an einen Icecast-Server oder "
 "Ähnliches verwendet werden. Falls nicht (oder auf einen leeren Wert) "
 "gesetzt, so wird die vorgegebene Weiterleitung verwendet, welche derzeit "
-"»videorate ! theoraenc ! oggmux« lautet und die Aufnahme im Ogg-Theora-"
-"Format speichert."
+"»videorate ! theoraenc ! oggmux« lautet und die Aufnahme im Ogg-Theora-Format "
+"speichert."

-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show date in clock"
 msgstr "Datum in der Uhr anzeigen"

-#: ../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 "Wochentag im Kalender anzeigen"

-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid "Show time with seconds"
 msgstr "Zeit sekundengenau anzeigen"

-#: ../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."
@ -151,7 +153,7 @@ msgstr ""
 "Programme, welche auf diese Bezeichner zutreffen, werden im Favoriten-"
 "Bereich angezeigt."

-#: ../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 "
@ -162,7 +164,7 @@ msgstr ""
 "Dateiname sollte geändert werden, wenn Sie in einem anderen Containerformat "
 "aufnehmen."

-#: ../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."
@ -171,11 +173,19 @@ msgstr ""
 "der GNOME-Shell aufgezeichnet werden soll, in Einzelbildern pro Sekunde."

 # hmm Enkodieren oder Kodieren?
-#: ../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 "Die GStreamer-Weiterleitung zur Enkodierung des Screencasts"

-#: ../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 ""
+"Die gewählte Ansicht des Arbeitsflächen-Überblicks. Mögliche Werte sind "
+"»single« (einfach) und »grid« (Raster)."
+
+#: ../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 "
@ -188,7 +198,7 @@ msgstr ""
 "deaktivieren, um Ihre Privatsphäre zu schützen. Bitte beachten Sie, dass "
 "bereits gespeicherte Daten hiervon nicht beeinflusst werden."

-#: ../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"
@ -201,7 +211,7 @@ msgstr ""
 "Format zu erhalten. Weitere Informationen finden Sie in der Handbuchseite zu "
 "strftime()."

-#: ../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\", "
@ -211,18 +221,18 @@ msgid ""
 "the show_date and show_seconds keys are ignored."
 msgstr ""
 "Dieser Schlüssel legt das Stundenformat für die Anzeige der Panel-Uhr fest. "
-"Mögliche Werte sind »12-hour«, »24-hour«, »unix« und »custom«. Wenn Sie "
-"»unix« verwenden, zeigt die Uhr die Sekunden seit Epoch, dem Beginn der Unix-"
+"Mögliche Werte sind »12-hour«, »24-hour«, »unix« und »custom«. Wenn Sie »unix« "
+"verwenden, zeigt die Uhr die Sekunden seit Epoch, dem Beginn der Unix-"
 "Zeitrechnung am 1. Januar 1970 an. Wenn Sie »custom« (benutzerdefiniert) "
 "verwenden, zeigt die Uhr die Zeit gemäß dem im Schlüssel »custom_format« "
 "angegebenen Format an. Beachten Sie, dass bei »unix« oder »custom« die "
 "Schlüssel »show_date« und »show_seconds« ignoriert werden."

-#: ../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 "UUIDs der zu deaktivierenden Erweiterungen"

-#: ../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 "Legt fest, ob der Status der Anwendungsnutzung erfasst werden soll"

@ -256,14 +266,14 @@ msgid ""
 msgstr ""
 "Legt die Position des vergrößerten Bildes der Maus innerhalb der "
 "vergrößerten Ansicht fest, und wie die Maus auf die Mausbewegungen des "
-"Systems reagiert. Folgende Werte sind möglich: »none« - keine "
-"Mausverfolgung; »centered« - das Mausbild wird in der Mitte des vergrößerten "
-"Bereiches dargestellt (welche auch den Zeiger der Systemmaus darstellt), "
-"wobei der vergrößerte Inhalt gerollt wird, sobald die Systemmaus bewegt "
-"wird; »proportional« - die Position der vergrößerten Maus im vergrößerten "
-"Bereich ist proportional zur Position der Systemmaus auf dem Bildschirm; "
-"»push« - wenn die vergrößerte Maus einen der Ränder des vergrößerten "
-"Bereichs berührt, wird der entsprechende Inhalt in die Ansicht geschoben."
+"Systems reagiert. Folgende Werte sind möglich: »none« - keine Mausverfolgung; "
+"»centered« - das Mausbild wird in der Mitte des vergrößerten Bereiches "
+"dargestellt (welche auch den Zeiger der Systemmaus darstellt), wobei der "
+"vergrößerte Inhalt gerollt wird, sobald die Systemmaus bewegt wird; "
+"»proportional« - die Position der vergrößerten Maus im vergrößerten Bereich "
+"ist proportional zur Position der Systemmaus auf dem Bildschirm; »push« - "
+"wenn die vergrößerte Maus einen der Ränder des vergrößerten Bereichs "
+"berührt, wird der entsprechende Inhalt in die Ansicht geschoben."

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:5
 msgid ""
@ -412,46 +422,62 @@ msgstr "_12-Stunden-Format"
 msgid "_24 hour format"
 msgstr "_24-Stunden-Format"

-#. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:155
-msgid "All"
-msgstr "Alle"
-
-#: ../js/ui/appDisplay.js:236
+#. **** Applications ****
+#: ../js/ui/appDisplay.js:316 ../js/ui/dash.js:778
 msgid "APPLICATIONS"
 msgstr "ANWENDUNGEN"

-#: ../js/ui/appDisplay.js:266
+#: ../js/ui/appDisplay.js:348
 msgid "PREFERENCES"
 msgstr "EINSTELLUNGEN"

-#: ../js/ui/appDisplay.js:563
+#: ../js/ui/appDisplay.js:648
 msgid "New Window"
 msgstr "Neues Fenster"

-#: ../js/ui/appDisplay.js:567
+#: ../js/ui/appDisplay.js:652
 msgid "Remove from Favorites"
 msgstr "Aus Favoriten entfernen"

-#: ../js/ui/appDisplay.js:568
+#: ../js/ui/appDisplay.js:653
 msgid "Add to Favorites"
 msgstr "Zu Favoriten hinzufügen"

-#: ../js/ui/appFavorites.js:91
+#: ../js/ui/appDisplay.js:830
+msgid "Drag here to add favorites"
+msgstr "Hier ablegen, um zu Favoriten hinzuzufügen"
+
+#: ../js/ui/appFavorites.js:88
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s wurde zu Ihren Favoriten hinzugefügt"

-#: ../js/ui/appFavorites.js:122
+#: ../js/ui/appFavorites.js:107
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s wurde aus Ihren Favoriten entfernt"

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

-#: ../js/ui/docDisplay.js:494
+#: ../js/ui/dash.js:473
+msgid "Searching..."
+msgstr "Suche läuft …"
+
+#: ../js/ui/dash.js:487
+msgid "No matching results."
+msgstr "Keine passenden Ergebnisse."
+
+#. **** 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 "ORTE UND GERÄTE"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:804 ../js/ui/docDisplay.js:494
 msgid "RECENT ITEMS"
 msgstr "ZULETZT GEÖFFNETE DOKUMENTE"

@ -463,9 +489,7 @@ msgstr "Keine Erweiterungen installiert"
 msgid "Enabled"
 msgstr "Aktiviert"

-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:591 ../src/gvc/gvc-mixer-control.c:1087
+#: ../js/ui/lookingGlass.js:591
 msgid "Disabled"
 msgstr "Deaktiviert"

@ -485,71 +509,63 @@ msgstr "Quelle zeigen"
 msgid "Web Page"
 msgstr "Webseite"

-#: ../js/ui/overview.js:96
+#: ../js/ui/overview.js:160
 msgid "Undo"
 msgstr "Rückgängig"

-#: ../js/ui/overview.js:158
-msgid "Windows"
-msgstr "Fenster"
-
-#: ../js/ui/overview.js:161
-msgid "Applications"
-msgstr "Anwendungen"
-
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:474
+#: ../js/ui/panel.js:468
 #, c-format
 msgid "Quit %s"
 msgstr "%s beenden"

-#: ../js/ui/panel.js:499
+#: ../js/ui/panel.js:493
 msgid "Preferences"
 msgstr "Einstellungen"

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

-#: ../js/ui/panel.js:586
+#: ../js/ui/panel.js:580
 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:590
+#: ../js/ui/panel.js:584
 msgid "%a %R:%S"
 msgstr "%a %R:%S"

-#: ../js/ui/panel.js:591
+#: ../js/ui/panel.js:585
 msgid "%a %R"
 msgstr "%a %R"

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

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

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

-#: ../js/ui/panel.js:604
+#: ../js/ui/panel.js:598
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"

 #. 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:749
+#: ../js/ui/panel.js:743
 msgid "Activities"
 msgstr "Aktivitäten"

@ -566,10 +582,6 @@ msgstr "Erneut versuchen"
 msgid "Connect to..."
 msgstr "Verbinden mit …"

-#: ../js/ui/placeDisplay.js:558
-msgid "PLACES & DEVICES"
-msgstr "ORTE UND GERÄTE"
-
 #. Translators: this MUST be either "toggle-switch-us"
 #. (for toggle switches containing the English words
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
@ -588,332 +600,42 @@ msgstr "Bitte geben Sie einen Befehl ein:"
 msgid "Execution of '%s' failed:"
 msgstr "Ausführung von »%s« ist gescheitert:"

-#: ../js/ui/statusMenu.js:101
+#: ../js/ui/statusMenu.js:91
 msgid "Available"
 msgstr "Verfügbar"

-#: ../js/ui/statusMenu.js:106
+#: ../js/ui/statusMenu.js:95
 msgid "Busy"
 msgstr "Beschäftigt"

-#: ../js/ui/statusMenu.js:114
-msgid "My Account"
-msgstr "Eigenes Konto"
+#: ../js/ui/statusMenu.js:99
+msgid "Invisible"
+msgstr "Unsichtbar"

-#: ../js/ui/statusMenu.js:118
-msgid "System Settings"
-msgstr "Systemeinstellungen"
+#: ../js/ui/statusMenu.js:106
+msgid "Account Information..."
+msgstr "Benutzerinformationen …"

-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:110
+msgid "System Settings..."
+msgstr "Systemeinstellungen …"
+
+#: ../js/ui/statusMenu.js:117
 msgid "Lock Screen"
 msgstr "Bildschirm sperren"

-#: ../js/ui/statusMenu.js:129
+#: ../js/ui/statusMenu.js:121
 msgid "Switch User"
 msgstr "Benutzer wechseln"

-#: ../js/ui/statusMenu.js:134
+#: ../js/ui/statusMenu.js:126
 msgid "Log Out..."
 msgstr "Abmelden …"

-#: ../js/ui/statusMenu.js:141
-msgid "Suspend..."
-msgstr "Bereitschaft …"
-
-#: ../js/ui/statusMenu.js:145
+#: ../js/ui/statusMenu.js:130
 msgid "Shut Down..."
 msgstr "Ausschalten …"

-#: ../js/ui/status/accessibility.js:82
-msgid "Zoom"
-msgstr "Vergrößern"
-
-#: ../js/ui/status/accessibility.js:88
-msgid "Screen Reader"
-msgstr "Bildschirmleser"
-
-#: ../js/ui/status/accessibility.js:91
-msgid "Screen Keyboard"
-msgstr "Bildschirmtastatur"
-
-#: ../js/ui/status/accessibility.js:94
-msgid "Visual Alerts"
-msgstr "Visuelle Warnungen"
-
-#: ../js/ui/status/accessibility.js:97
-msgid "Sticky Keys"
-msgstr "Klebrige Tasten"
-
-#: ../js/ui/status/accessibility.js:100
-msgid "Slow Keys"
-msgstr "Tastenverzögerung"
-
-#: ../js/ui/status/accessibility.js:103
-msgid "Bounce Keys"
-msgstr "Springende Tasten"
-
-#: ../js/ui/status/accessibility.js:106
-msgid "Mouse Keys"
-msgstr "Maustasten"
-
-#: ../js/ui/status/accessibility.js:110
-msgid "Universal Access Settings"
-msgstr "Einstellungen zur Barrierefreiheit"
-
-#: ../js/ui/status/accessibility.js:163
-msgid "High Contrast"
-msgstr "Hoher Kontrast"
-
-#: ../js/ui/status/accessibility.js:205
-msgid "Large Text"
-msgstr "Große Schrift"
-
-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:234
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: ../js/ui/status/bluetooth.js:55
-msgid "Visibility"
-msgstr "Sichtbarkeit"
-
-#: ../js/ui/status/bluetooth.js:69
-msgid "Send Files to Device..."
-msgstr "Dateien an Gerät senden …"
-
-#: ../js/ui/status/bluetooth.js:70
-msgid "Setup a New Device..."
-msgstr "Ein neues Gerät einrichten …"
-
-#: ../js/ui/status/bluetooth.js:94
-msgid "Bluetooth Settings"
-msgstr "Bluetooth-Einstellungen"
-
-#: ../js/ui/status/bluetooth.js:185
-msgid "Connection"
-msgstr "Verbindung"
-
-#: ../js/ui/status/bluetooth.js:221
-msgid "Send Files..."
-msgstr "Dateien senden …"
-
-#: ../js/ui/status/bluetooth.js:226
-msgid "Browse Files..."
-msgstr "Dateien durchsuchen …"
-
-#: ../js/ui/status/bluetooth.js:235
-msgid "Error browsing device"
-msgstr "Fehler beim Durchsuchen des Geräts"
-
-#: ../js/ui/status/bluetooth.js:236
-#, c-format
-msgid "The requested device cannot be browsed, error is '%s'"
-msgstr ""
-"Das angesprochene Gerät kann nicht durchsucht werden. Der Fehler lautet »%s«"
-
-#: ../js/ui/status/bluetooth.js:244
-msgid "Keyboard Settings"
-msgstr "Tastatureinstellungen"
-
-#: ../js/ui/status/bluetooth.js:249
-msgid "Mouse Settings"
-msgstr "Maus-Einstellungen"
-
-#: ../js/ui/status/bluetooth.js:256 ../js/ui/status/volume.js:62
-msgid "Sound Settings"
-msgstr "Klangeinstellungen"
-
-#: ../js/ui/status/bluetooth.js:327 ../js/ui/status/bluetooth.js:361
-#: ../js/ui/status/bluetooth.js:401 ../js/ui/status/bluetooth.js:434
-msgid "Bluetooth Agent"
-msgstr "Bluetooth-Agent"
-
-#: ../js/ui/status/bluetooth.js:362
-#, c-format
-msgid "Authorization request from %s"
-msgstr "Legitimierungsanfrage von %s"
-
-#: ../js/ui/status/bluetooth.js:368
-#, c-format
-msgid "Device %s wants access to the service '%s'"
-msgstr "Gerät »%s« bittet um Zugriff auf den Dienst »%s«"
-
-#: ../js/ui/status/bluetooth.js:370
-msgid "Always grant access"
-msgstr "Immer Zugriff gewähren"
-
-#: ../js/ui/status/bluetooth.js:371
-msgid "Grant this time only"
-msgstr "Nur dieses Mal gewähren"
-
-#: ../js/ui/status/bluetooth.js:372
-msgid "Reject"
-msgstr "Abweisen"
-
-#: ../js/ui/status/bluetooth.js:402
-#, c-format
-msgid "Pairing confirmation for %s"
-msgstr "Koppelungsbestätigung für %s"
-
-#: ../js/ui/status/bluetooth.js:408 ../js/ui/status/bluetooth.js:442
-#, c-format
-msgid "Device %s wants to pair with this computer"
-msgstr "Gerät »%s« möchte mit diesem Rechner gekoppelt werden"
-
-#: ../js/ui/status/bluetooth.js:409
-#, c-format
-msgid "Please confirm whether the PIN '%s' matches the one on the device."
-msgstr ""
-"Bitte bestätigen Sie, ob die PIN »%s« mit der des Gerätes übereinstimmt."
-
-#: ../js/ui/status/bluetooth.js:411
-msgid "Matches"
-msgstr "Stimmt überein"
-
-#: ../js/ui/status/bluetooth.js:412
-msgid "Does not match"
-msgstr "Stimmt nicht überein"
-
-#: ../js/ui/status/bluetooth.js:435
-#, c-format
-msgid "Pairing request for %s"
-msgstr "Koppelungsanfrage für %s"
-
-#: ../js/ui/status/bluetooth.js:443
-msgid "Please enter the PIN mentioned on the device."
-msgstr "Bitte geben Sie die auf dem Gerät angezeigte PIN ein."
-
-#: ../js/ui/status/bluetooth.js:459
-msgid "OK"
-msgstr "OK"
-
-#: ../js/ui/status/bluetooth.js:460
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ../js/ui/status/power.js:85
-msgid "Power Settings"
-msgstr "Energieeinstellungen"
-
-#: ../js/ui/status/power.js:112
-#, c-format
-msgid "%d hour remaining"
-msgid_plural "%d hours remaining"
-msgstr[0] "%d Stunde verbleibend"
-msgstr[1] "%d Stunden verbleibend"
-
-#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:115
-#, c-format
-msgid "%d %s %d %s remaining"
-msgstr "%d %s %d %s verbleibend"
-
-#: ../js/ui/status/power.js:117
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "Stunde"
-msgstr[1] "Stunden"
-
-#: ../js/ui/status/power.js:117
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "Minute"
-msgstr[1] "Minuten"
-
-#: ../js/ui/status/power.js:120
-#, c-format
-msgid "%d minute remaining"
-msgid_plural "%d minutes remaining"
-msgstr[0] "%d Minute verbleibend"
-msgstr[1] "%d Minuten verbleibend"
-
-#: ../js/ui/status/power.js:237
-msgid "AC adapter"
-msgstr "Netzteil"
-
-#: ../js/ui/status/power.js:239
-msgid "Laptop battery"
-msgstr "Laptop-Akku"
-
-#: ../js/ui/status/power.js:241
-msgid "UPS"
-msgstr "Notstromversorgung"
-
-#: ../js/ui/status/power.js:243
-msgid "Monitor"
-msgstr "Bildschirm"
-
-#: ../js/ui/status/power.js:245
-msgid "Mouse"
-msgstr "Maus"
-
-#: ../js/ui/status/power.js:247
-msgid "Keyboard"
-msgstr "Tastatur"
-
-#: ../js/ui/status/power.js:249
-msgid "PDA"
-msgstr "PDA"
-
-#: ../js/ui/status/power.js:251
-msgid "Cell phone"
-msgstr "Mobiltelefon"
-
-#: ../js/ui/status/power.js:253
-msgid "Media player"
-msgstr "Medienwiedergabegerät"
-
-#: ../js/ui/status/power.js:255
-msgid "Tablet"
-msgstr "Tablet"
-
-#: ../js/ui/status/power.js:257
-msgid "Computer"
-msgstr "Rechner"
-
-#: ../js/ui/status/power.js:259 ../src/shell-app-system.c:1012
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: ../js/ui/status/volume.js:41
-msgid "Volume"
-msgstr "Lautstärke"
-
-#: ../js/ui/status/volume.js:54
-msgid "Microphone"
-msgstr "Mikrofon"
-
-#: ../js/ui/telepathyClient.js:560
-#, c-format
-msgid "%s is online."
-msgstr "%s ist angemeldet."
-
-#: ../js/ui/telepathyClient.js:565
-#, c-format
-msgid "%s is offline."
-msgstr "%s ist abgemeldet."
-
-#: ../js/ui/telepathyClient.js:568
-#, c-format
-msgid "%s is away."
-msgstr "»%s« ist abwesend."
-
-#: ../js/ui/telepathyClient.js:571
-#, c-format
-msgid "%s is busy."
-msgstr "%s ist beschäftigt."
-
-#. Translators: this is a time format string followed by a date.
-#. If applicable, replace %X with a strftime format valid for your
-#. locale, without seconds.
-#: ../js/ui/telepathyClient.js:665
-#, no-c-format
-msgid "Sent at %X on %A"
-msgstr "Gesendet am %A um %X "
-
-#: ../js/ui/viewSelector.js:26
-msgid "Search your computer"
-msgstr "Ihren Rechner durchsuchen"
-
 #: ../js/ui/windowAttentionHandler.js:43
 #, c-format
 msgid "%s has finished starting"
@ -924,82 +646,60 @@ msgstr "Start von %s ist abgeschlossen"
 msgid "'%s' is ready"
 msgstr "»%s« ist bereit"

-#: ../js/ui/workspacesView.js:244
+#: ../js/ui/workspacesView.js:230
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr ""
 "Es kann keine weitere Arbeitsfläche hinzugefügt werden, weil das Maximum an "
 "Arbeitsflächen erreicht worden ist."

-#: ../js/ui/workspacesView.js:260
+#: ../js/ui/workspacesView.js:247
 msgid "Can't remove the first workspace."
 msgstr "Die erste Arbeitsfläche kann nicht entfernt werden."

-#. 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] "%u Ausgang"
-msgstr[1] "%u Ausgänge"
-
-#. 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] "%u Eingang"
-msgstr[1] "%u Eingänge"
-
-#: ../src/gvc/gvc-mixer-control.c:1402
-msgid "System Sounds"
-msgstr "Systemklänge"
-
-#: ../src/shell-global.c:1156
+#: ../src/shell-global.c:1196
 msgid "Less than a minute ago"
 msgstr "Vor weniger als einer Minute"

-#: ../src/shell-global.c:1160
+#: ../src/shell-global.c:1200
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Vor %d Minute"
 msgstr[1] "Vor %d Minuten"

-#: ../src/shell-global.c:1165
+#: ../src/shell-global.c:1205
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Vor %d Stunde"
 msgstr[1] "Vor %d Stunden"

-#: ../src/shell-global.c:1170
+#: ../src/shell-global.c:1210
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Vor %d Tag"
 msgstr[1] "Vor %d Tagen"

-#: ../src/shell-global.c:1175
+#: ../src/shell-global.c:1215
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Vor %d Woche"
 msgstr[1] "Vor %d Wochen"

-#: ../src/shell-util.c:89
+#: ../src/shell-uri-util.c:89
 msgid "Home Folder"
 msgstr "Persönlicher Ordner"

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

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

@ -1008,42 +708,11 @@ msgstr "Suchen"
 #. * 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 "What's using power..."
-#~ msgstr "Energieverbraucher …"
-
-#~ msgid "Overview workspace view mode"
-#~ msgstr "Modus des Arbeitsflächen-Überblicks"
-
-#~ msgid ""
-#~ "The selected workspace view mode in the overview. Supported values are "
-#~ "\"single\" and \"grid\"."
-#~ msgstr ""
-#~ "Die gewählte Ansicht des Arbeitsflächen-Überblicks. Mögliche Werte sind "
-#~ "»single« (einfach) und »grid« (Raster)."
-
-#~ msgid "Drag here to add favorites"
-#~ msgstr "Hier ablegen, um zu Favoriten hinzuzufügen"
-
-#~ msgid "Find"
-#~ msgstr "Suchen"
-
-#~ msgid "Searching..."
-#~ msgstr "Suche läuft …"
-
-#~ msgid "No matching results."
-#~ msgstr "Keine passenden Ergebnisse."
-
-#~ msgid "Invisible"
-#~ msgstr "Unsichtbar"
-
-#~ msgid "Account Information..."
-#~ msgstr "Benutzerinformationen …"
-
 #~ msgid "ON"
 #~ msgstr "EIN"

@ -1056,6 +725,9 @@ msgstr "%1$s: %2$s"
 #~ msgid "%H:%M"
 #~ msgstr "%H:%M"

+#~ msgid "Applications"
+#~ msgstr "Anwendungen"
+
 #~ msgid "Recent Documents"
 #~ msgstr "Zuletzt geöffnete Dokumente"

@ -1074,6 +746,9 @@ msgstr "%1$s: %2$s"
 #~ msgid "SEARCH RESULTS"
 #~ msgstr "SUCHERGEBNISSE"

+#~ msgid "Unknown"
+#~ msgstr "Unbekannt"
+
 #~ msgid "Can't lock screen: %s"
 #~ msgstr "Bildschirm kann nicht gesperrt werden: %s"

--- a/po/el.po
+++ b/po/el.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/et.po
+++ b/po/et.po
@ -1,26 +1,21 @@
-# GNOME kesta eesti keele tõlge.
 # Estonian translation for gnome-shell.
-#
-# Copyright (C) 2010, 2011 The Gnome Project
-#
+# Copyright (C) 2010 The Gnome Project
 # This file is distributed under the same license as the gnome-shell package.
-#
-# Mattias Põldaru <mahfiaz gmail com>, 2010, 2011.
-# Ivar Smolin <okul linux ee>, 2011.
+# Mattias Põldaru <mahfiaz gmail com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell MASTER\n"
+"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: 2011-01-21 18:46+0000\n"
-"PO-Revision-Date: 2011-01-24 08:04+0200\n"
-"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
+"POT-Creation-Date: 2010-10-16 19:24+0000\n"
+"PO-Revision-Date: 2010-10-17 17:16+0300\n"
+"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Estonian\n"
 "X-Poedit-Country: Estonia\n"
@ -31,6 +26,12 @@ msgstr "GNOME kest"
 msgid "Window management and application launching"
 msgstr "Aknahaldur ja rakenduste käivitaja"

+msgid "Clock"
+msgstr "Kell"
+
+msgid "Customize the panel clock"
+msgstr "Paneelikella kohandamine"
+
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
@ -38,12 +39,15 @@ msgstr ""
 "Lubab ligipääsu sisemistele silumise ja monitoorimise tööriistadele Alt-F2 "
 "dialoogi kaudu."

+msgid "Custom format of the clock"
+msgstr "Kellaaaja kohandatud vorming"
+
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
 "Arendajate ja testijate jaoks sisemiste tööriistade lubamine Alt-F2 alt"

 msgid "File extension used for storing the screencast"
-msgstr "Ekraanivideo salvestamisel kasutatav faililaiend"
+msgstr "Faililaiend, mida kasutatakse ekraanivideo salvestamisel"

 msgid "Framerate used for recording screencasts."
 msgstr "Ekraanivideo lindistamisel kasutatav kaadrikiirus."
@ -52,25 +56,36 @@ msgid ""
 "GNOME Shell extensions have a uuid property; this key lists extensions which "
 "should not be loaded."
 msgstr ""
-"GNOME Shelli laiendustel on omadus UUID. Selle võtmega määratakse "
-"laiendused, mida ei peaks laaditama."

 msgid "History for command (Alt-F2) dialog"
 msgstr "Käsudialoogi (Alt-F2) ajalugu"

-msgid "If true, display date in the clock, in addition to time."
-msgstr "Kui määratud, siis kuvatakse kellaaja kõrval ka kuupäeva."
+msgid "Hour format"
+msgstr "Tundide vorming"

-msgid "If true, display seconds in time."
-msgstr "Kui määratud, siis kuvatakse aja juures ka sekundeid."
+msgid ""
+"If true and format is either \"12-hour\" or \"24-hour\", display date in the "
+"clock, in addition to time."
+msgstr ""
+"Kui tõene ja vorming on kas \"12-tundi\" või \"24-tundi\", kuvatakse "
+"kellaaja kõrval ka kuupäeva."
+
+msgid ""
+"If true and format is either \"12-hour\" or \"24-hour\", display seconds in "
+"time."
+msgstr ""
+"Kui tõene ja vorming on kas \"12-tundi\" või \"24-tundi\", kuvatakse "
+"kellaaega koos sekunditega."

 msgid "If true, display the ISO week date in the calendar."
-msgstr "Kui määratud, kuvatakse kalendris kuupäeva ISO nädalavormingus."
+msgstr "Kui tõene, kuvatakse kalendris kuupäeva ISO nädalate järgi."

 msgid "List of desktop file IDs for favorite applications"
 msgstr "Lemmikrakenduste töölauafailide ID-de loend"

-#, no-c-format
+msgid "Overview workspace view mode"
+msgstr ""
+
 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 "
@ -79,16 +94,14 @@ msgid ""
 "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 ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
-"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
-"at the optimal thread count on the system."
+"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
 msgstr ""

 msgid "Show date in clock"
 msgstr "Kell näitab kuupäeva"

 msgid "Show the week date in the calendar"
-msgstr "Kalendris näidatakse kuupäeva nädalavormingus"
+msgstr "Kalendris näidatakse nädala kuupäeva"

 msgid "Show time with seconds"
 msgstr "Kellaaega näidatakse sekunditega"
@ -103,10 +116,6 @@ msgid ""
 "current date, and use this extension. It should be changed when recording to "
 "a different container format."
 msgstr ""
-"Ekraanivideo jaoks kasutatav failinimi on unikaalne, see sisaldab "
-"salvestamise kuupäeva ja ka käesoleva võtmega määratud laiendit. Mõnda teise "
-"konteinervormingusse salvestades tuleks ka sellele vormingule vastav laiend "
-"määrata."

 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
@ -116,6 +125,11 @@ msgstr ""
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr ""

+msgid ""
+"The selected workspace view mode in the overview. Supported values are "
+"\"single\" and \"grid\"."
+msgstr ""
+
 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 "
@ -123,15 +137,28 @@ msgid ""
 "remove already saved data."
 msgstr ""

+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 ""
+
+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 ""
+
 msgid "Uuids of extensions to disable"
 msgstr "Keelatavate laienduste UUID-d"

 msgid "Whether to collect stats about applications usage"
 msgstr ""

-msgid "disabled OpenSearch providers"
-msgstr ""
-
 msgid "Clip the crosshairs at the center"
 msgstr "Niitristi keskel on auk"

@ -242,22 +269,28 @@ msgstr ""
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr "Niitristi moodustavate püst- ja rõhtjoone laius"

-#. Replace "Error invoking GLib.shell_parse_argv: " with
-#. something nicer
-msgid "Could not parse command:"
-msgstr "Käsku pole võimalik analüüsida:"
+msgid "Clock Format"
+msgstr "Kella formaat"

-msgid "No such application"
-msgstr "Sellist rakendust ei ole"
+msgid "Clock Preferences"
+msgstr "Kella eelistused"

-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "'%s' käivitamine nurjus:"
+msgid "Panel Display"
+msgstr "Paneelikuva"

-#. Translators: Filter to display all applications
-msgid "All"
-msgstr "Kõik"
+msgid "Show seco_nds"
+msgstr "_Sekundeid näidatakse"

+msgid "Show the _date"
+msgstr "_Kuupäeva näidatakse"
+
+msgid "_12 hour format"
+msgstr "_12 tunni vorming"
+
+msgid "_24 hour format"
+msgstr "_24 tunni vorming"
+
+#. **** Applications ****
 msgid "APPLICATIONS"
 msgstr "Rakendused"

@ -273,6 +306,9 @@ msgstr "Eemalda lemmikutest"
 msgid "Add to Favorites"
 msgstr "Lisa lemmikutesse"

+msgid "Drag here to add favorites"
+msgstr "Lemmikute lisamiseks lohista need siia"
+
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s lisati lemmikutesse."
@ -281,75 +317,31 @@ msgstr "%s lisati lemmikutesse."
 msgid "%s has been removed from your favorites."
 msgstr "%s eemaldati lemmikutest."

-msgid "Remove"
-msgstr "Eemalda"
+msgid "Find"
+msgstr "Otsi"

+msgid "Searching..."
+msgstr "Otsimine..."
+
+msgid "No matching results."
+msgstr "Tulemused puuduvad."
+
+#. **** Places ****
+#. Translators: This is in the sense of locations for documents,
+#. network locations, etc.
+msgid "PLACES & DEVICES"
+msgstr "Asukohad ja seadmed"
+
+#. **** Documents ****
 msgid "RECENT ITEMS"
 msgstr "Hiljutised dokumendid"

-#, c-format
-msgid "Log Out %s"
-msgstr "Logi %s välja"
-
-msgid "Log Out"
-msgstr "Logi välja"
-
-msgid "Click Log Out to quit these applications and log out of the system."
-msgstr ""
-
-#, c-format
-msgid "%s will be logged out automatically in %d seconds."
-msgstr "%s logitakse %d sekundi pärast automaatselt välja."
-
-#, c-format
-msgid "You will be logged out automatically in %d seconds."
-msgstr "Sind logitakse %d sekundi pärast automaatselt välja."
-
-msgid "Logging out of the system."
-msgstr "Süsteemist väljalogimine"
-
-msgid "Shut Down"
-msgstr "Seiska"
-
-msgid "Click Shut Down to quit these applications and shut down the system."
-msgstr ""
-
-#, c-format
-msgid "The system will shut down automatically in %d seconds."
-msgstr "Süsteem seisatakse automaatselt %d sekundi pärast."
-
-msgid "Shutting down the system."
-msgstr "Süsteemi seiskamine."
-
-msgid "Restart"
-msgstr "Taaskäivita"
-
-msgid "Click Restart to quit these applications and restart the system."
-msgstr ""
-"Nende rakenduste sulgemiseks ja süsteemi taaskäivitamiseks klõpsa "
-"\"Taaskäivita\"."
-
-#, c-format
-msgid "The system will restart automatically in %d seconds."
-msgstr "Süsteem taaskäivitatakse automaatselt %d sekundi pärast."
-
-msgid "Restarting the system."
-msgstr "Süsteemi taaskäivitamine."
-
-msgid "Confirm"
-msgstr "Kinnita"
-
-msgid "Cancel"
-msgstr "Katkesta"
-
 msgid "No extensions installed"
 msgstr "Ühtegi laiendust pole paigaldatud"

 msgid "Enabled"
 msgstr "Lubatud"

-#. translators:
-#. * The device has been disabled
 msgid "Disabled"
 msgstr "Keelatud"

@ -365,23 +357,17 @@ msgstr "Kuva lähtekoodi"
 msgid "Web Page"
 msgstr "Veebileht"

-msgid "System Information"
-msgstr "Süsteemi andmed"
-
 msgid "Undo"
 msgstr "Võta tagasi"

-msgid "Windows"
-msgstr "Aknad"
-
-msgid "Applications"
-msgstr "Rakendused"
-
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
 #, c-format
 msgid "Quit %s"
 msgstr "Lõpeta %s"

+msgid "Preferences"
+msgstr "Eelistused"
+
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
 msgid "%a %b %e, %R:%S"
@ -429,9 +415,6 @@ msgstr "Proovi uuesti"
 msgid "Connect to..."
 msgstr "Ühendumine..."

-msgid "PLACES & DEVICES"
-msgstr "Asukohad ja seadmed"
-
 #. Translators: this MUST be either "toggle-switch-us"
 #. (for toggle switches containing the English words
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
@ -443,17 +426,24 @@ msgstr "toggle-switch-intl"
 msgid "Please enter a command:"
 msgstr "Palun sisesta käsk:"

+#, c-format
+msgid "Execution of '%s' failed:"
+msgstr "'%s' käivitamine nurjus:"
+
 msgid "Available"
 msgstr "Saadaval"

 msgid "Busy"
 msgstr "Hõivatud"

-msgid "My Account"
-msgstr "Minu konto"
+msgid "Invisible"
+msgstr "Nähtamatu"

-msgid "System Settings"
-msgstr "Süsteemi sätted"
+msgid "Account Information..."
+msgstr "Konto andmed..."
+
+msgid "System Settings..."
+msgstr "Süsteemi sätted..."

 msgid "Lock Screen"
 msgstr "Lukusta ekraan"
@ -464,234 +454,9 @@ msgstr "Vaheta kasutajat"
 msgid "Log Out..."
 msgstr "Logi välja..."

-msgid "Suspend..."
-msgstr "Peata..."
-
 msgid "Shut Down..."
 msgstr "Lülita välja..."

-msgid "Zoom"
-msgstr ""
-
-msgid "Screen Reader"
-msgstr "Ekraanilugeja"
-
-msgid "Screen Keyboard"
-msgstr "Ekraaniklaviatuur"
-
-msgid "Visual Alerts"
-msgstr "Visuaalsed märguanded"
-
-msgid "Sticky Keys"
-msgstr "Kleepuvad klahvid"
-
-msgid "Slow Keys"
-msgstr "Aeglased klahvid"
-
-msgid "Bounce Keys"
-msgstr "Põrkeklahvid"
-
-msgid "Mouse Keys"
-msgstr "Hiireklahvid"
-
-msgid "Universal Access Settings"
-msgstr "Universaalse ligipääsu sätted"
-
-msgid "High Contrast"
-msgstr ""
-
-msgid "Large Text"
-msgstr ""
-
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-msgid "Visibility"
-msgstr "Nähtavus"
-
-msgid "Send Files to Device..."
-msgstr "Failide saatmine seadmesse..."
-
-msgid "Setup a New Device..."
-msgstr ""
-
-msgid "Bluetooth Settings"
-msgstr "Bluetoothi sätted"
-
-msgid "Connection"
-msgstr "Ühendus"
-
-msgid "Send Files..."
-msgstr "Failide saatmine..."
-
-msgid "Browse Files..."
-msgstr "Failide sirvimine..."
-
-msgid "Error browsing device"
-msgstr "Viga seadme sirvimisel"
-
-#, c-format
-msgid "The requested device cannot be browsed, error is '%s'"
-msgstr ""
-
-msgid "Keyboard Settings"
-msgstr "Klaviatuurisätted"
-
-msgid "Mouse Settings"
-msgstr "Hiiresätted"
-
-msgid "Sound Settings"
-msgstr "Helisätted"
-
-msgid "Bluetooth Agent"
-msgstr "Bluetoothi agent"
-
-#, c-format
-msgid "Authorization request from %s"
-msgstr "Autoriseerimise päring seadmelt %s"
-
-#, c-format
-msgid "Device %s wants access to the service '%s'"
-msgstr "Seade %s soovib ligipääsu teenusele '%s'"
-
-msgid "Always grant access"
-msgstr "Luba alati"
-
-msgid "Grant this time only"
-msgstr "Luba ainult seekord"
-
-msgid "Reject"
-msgstr "Lükka tagasi"
-
-#, c-format
-msgid "Pairing confirmation for %s"
-msgstr "Paardumise kinnitus seadmele %s"
-
-#, c-format
-msgid "Device %s wants to pair with this computer"
-msgstr "Seade '%s' tahab selle arvutiga paarduda"
-
-#, c-format
-msgid "Please confirm whether the PIN '%s' matches the one on the device."
-msgstr "Palun kontrolli, et PIN-kood '%s' kattuks seadme parooliga."
-
-msgid "Matches"
-msgstr "Kattub"
-
-msgid "Does not match"
-msgstr "Ei kattu"
-
-#, c-format
-msgid "Pairing request for %s"
-msgstr "Seadmega %s paardumise päring"
-
-msgid "Please enter the PIN mentioned on the device."
-msgstr "Palun sisesta seadme poolt öeldav PIN-kood."
-
-msgid "OK"
-msgstr "Olgu"
-
-msgid "Localization Settings"
-msgstr "Lokaliseerimissätted"
-
-msgid "Power Settings"
-msgstr "Toitesätted..."
-
-#, c-format
-msgid "%d hour remaining"
-msgid_plural "%d hours remaining"
-msgstr[0] "jäänud %d tund"
-msgstr[1] "jäänud %d tundi"
-
-#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#, c-format
-msgid "%d %s %d %s remaining"
-msgstr "jäänud %d %s ja %d %s"
-
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "tund"
-msgstr[1] "tundi"
-
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "minutit"
-
-#, c-format
-msgid "%d minute remaining"
-msgid_plural "%d minutes remaining"
-msgstr[0] "jäänud %d minut"
-msgstr[1] "jäänud %d minutit"
-
-msgid "AC adapter"
-msgstr "Võrgutoite adapter"
-
-msgid "Laptop battery"
-msgstr "Sülearvuti aku"
-
-msgid "UPS"
-msgstr "UPS"
-
-msgid "Monitor"
-msgstr "Monitor"
-
-msgid "Mouse"
-msgstr "Hiir"
-
-msgid "Keyboard"
-msgstr "Klaviatuur"
-
-msgid "PDA"
-msgstr "Elektronmärkmik"
-
-msgid "Cell phone"
-msgstr "Mobiiltelefon"
-
-msgid "Media player"
-msgstr "Meediaesitaja"
-
-msgid "Tablet"
-msgstr "Graafikalaud"
-
-msgid "Computer"
-msgstr "Arvuti"
-
-msgid "Unknown"
-msgstr "Tundmatu"
-
-msgid "Volume"
-msgstr "Helivaljus"
-
-msgid "Microphone"
-msgstr "Mikrofon"
-
-#, c-format
-msgid "%s is online."
-msgstr "%s on ühendatud."
-
-#, c-format
-msgid "%s is offline."
-msgstr "%s on ühendamata."
-
-#, c-format
-msgid "%s is away."
-msgstr "%s on eemal."
-
-#, c-format
-msgid "%s is busy."
-msgstr "%s on hõivatud."
-
-#. Translators: this is a time format string followed by a date.
-#. If applicable, replace %X with a strftime format valid for your
-#. locale, without seconds.
-#, no-c-format
-msgid "Sent at %X on %A"
-msgstr "Saadetud: %a, kell %X"
-
-msgid "Search your computer"
-msgstr ""
-
 #, c-format
 msgid "%s has finished starting"
 msgstr "%s läks käima"
@ -707,25 +472,6 @@ msgstr "Pole võimalik uut tööala lisada, kuna tööalade piir on saavutatud."
 msgid "Can't remove the first workspace."
 msgstr "Esimest tööala pole võimalik eemaldada."

-#. translators:
-#. * The number of sound outputs on a particular device
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "System Sounds"
-msgstr "Süsteemi helid"
-
 msgid "Less than a minute ago"
 msgstr "Vähem kui minuti eest"

@ -772,54 +518,3 @@ msgstr "Otsing"
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
-
-#~ msgid "Clock"
-#~ msgstr "Kell"
-
-#~ msgid "Customize the panel clock"
-#~ msgstr "Paneelikella kohandamine"
-
-#~ msgid "Custom format of the clock"
-#~ msgstr "Kellaaaja kohandatud vorming"
-
-#~ msgid "Hour format"
-#~ msgstr "Tundide vorming"
-
-#~ msgid "Clock Format"
-#~ msgstr "Kellaaja vorming"
-
-#~ msgid "Clock Preferences"
-#~ msgstr "Kella eelistused"
-
-#~ msgid "Panel Display"
-#~ msgstr "Paneelikuva"
-
-#~ msgid "Show seco_nds"
-#~ msgstr "_Sekundeid näidatakse"
-
-#~ msgid "Show the _date"
-#~ msgstr "_Kuupäeva näidatakse"
-
-#~ msgid "_12 hour format"
-#~ msgstr "_12 tunni vorming"
-
-#~ msgid "_24 hour format"
-#~ msgstr "_24 tunni vorming"
-
-#~ msgid "Preferences"
-#~ msgstr "Eelistused"
-
-#~ msgid "Drag here to add favorites"
-#~ msgstr "Lemmikute lisamiseks lohista need siia"
-
-#~ msgid "Find"
-#~ msgstr "Otsi"
-
-#~ msgid "Searching..."
-#~ msgstr "Otsimine..."
-
-#~ msgid "No matching results."
-#~ msgstr "Tulemused puuduvad."
-
-#~ msgid "Invisible"
-#~ msgstr "Nähtamatu"
--- a/po/fa.po
+++ b/po/fa.po
@ -1,730 +0,0 @@
-# Persian translation for gnome-shell.
-# Copyright (C) 2010 Iranian Free Software Users Group (IFSUG.org)translation team.
-# This file is distributed under the same license as the gnome-shell package.
-# Arash Mousavi <mousavi.arash@gmail.com>, 2010.
-# Mahyar Moghimi <mahyar.moqimi@gmail.com>, 2010.
-#
-msgid ""
-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-12-01 18:12+0000\n"
-"PO-Revision-Date: 2010-12-03 13:24+0330\n"
-"Last-Translator: Mahyar Moghimi <mahyar.moqimi@gmail.com>\n"
-"Language-Team: Persian <translate@ifsug.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Poedit-Language: Persian\n"
-"X-Poedit-Country: IRAN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "پوسته‌ی گنوم"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "مدیریت پنجره‌ها و اجرا کننده‌ی برنامه‌ها"
-
-#: ../data/gnome-shell-clock-preferences.desktop.in.in.h:1
-msgid "Clock"
-msgstr "ساعت"
-
-#: ../data/gnome-shell-clock-preferences.desktop.in.in.h:2
-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 "اجازه دسترسی به ابزارهای اشکال‌زدا و پایشگر داخلی با استفاده از محاوره‌ی Alt-F2."
-
-#: ../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 "فعال کردن ابزارهای داخلی مفید برای توسعه دهندگان و آزمایش کنندگان از طریق Alt-F2"
-
-#: ../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 "افزونه‌های پوسته‌ی گنوم مشخصه‌ی 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 "اگر روی «درست» تنظیم شود و قالب ساعت هر یک از حالت‌های «۱۲ ساعته» و یا «۲۴ ساعته» باشد، تاریخ را در کنار ساعت نشان می‌دهد."
-
-#: ../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 "اگر بر روی «درست» تنظیم شود و قالب ساعت هر یک از جالت‌های «۱۲ ساعته» و یا «۲۴ ساعته» باشد، ثانیه را در کنار ساعت نشان می‌دهد."
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:11
-msgid "If true, display the ISO week date in the calendar."
-msgstr "در صورت تنظیم بر روی «درست»، تاریخ هفتگی ایزو را در تقویم نشان می‌دهد."
-
-#: ../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 "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:14
-msgid "Show date in clock"
-msgstr "نمایش تاریخ در ساعت"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
-msgid "Show the week date in the calendar"
-msgstr "نمایش هفته در تقویم"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
-msgid "Show time with seconds"
-msgstr "نمایش ساعت همراه با ثانیه"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
-msgid "The applications corresponding to these identifiers will be displayed in the favorites area."
-msgstr "برنامه‌های مشابه این شناسه‌ها در قسمت مورد پسندها نمایش داده می‌شود."
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
-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:19
-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:20
-msgid "The gstreamer pipeline used to encode the screencast"
-msgstr "مجرای ارتباطی gstreamer برای کدگذاری تصویربرداری از صفحه نمایش"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
-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:22
-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 "این کلید قالب ساعتِ قاب را هنگامی که بر روی «سفارشی» تنظیم شده باشد تعیین می‌کند. شما می‌توانید از مبدل‌های قابل فهم در تابع ()strftime برای اختصاص قالب مشخص استفاده کنید. برای اطلاعات بیشتر مستندات ()strftime را مشاهده کنید."
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:23
-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 "این کلید قالب ساعت را در تابلو مشخص می‌کند. مقادیر ممکن عبارتند از: «۱۲ ساعته»، «۲۴ ساعته»، «یونیکس» و «سفارشی». چنانچه بر روی «یونیکس» تنظیم گردد، ساعت زمان را به ثانیه از زمان مبدا تاریخ نشان می‌دهد، برای مثال ۰۱-۰۱-۱۹۷۰. اگر بر روی «سفارشی» تنظیم شود ساعت زمان را با توجه به قالب معرفی شده در کلید custom_format نمایش خواهد داد. توجه کنید که چنانچه بر روی یکی از حالت‌های «یونیکس» و یا «سفارشی» تنظیم شود، کلیدهای show_date و show_seconds نادیده گرفته خواهند شد."
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:24
-msgid "Uuids of extensions to disable"
-msgstr "شناسه‌های Uuid مربوط به افزونه‌ها که غیرفعال شود"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:25
-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 "Enabled"
-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 ""
-
-#: ../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 "قالب ساعت"
-
-#: ../data/clock-preferences.ui.h:2
-msgid "Clock Preferences"
-msgstr "ترجیحات ساعت"
-
-#: ../data/clock-preferences.ui.h:3
-msgid "Panel Display"
-msgstr "نمایش تابلو"
-
-#: ../data/clock-preferences.ui.h:4
-msgid "Show seco_nds"
-msgstr "نمایش _ثانیه‌ها"
-
-#: ../data/clock-preferences.ui.h:5
-msgid "Show the _date"
-msgstr "نمایش _تاریخ"
-
-#: ../data/clock-preferences.ui.h:6
-msgid "_12 hour format"
-msgstr "فالب _۱۲ ساعته"
-
-#: ../data/clock-preferences.ui.h:7
-msgid "_24 hour format"
-msgstr "قالب _۲۴ ساعته"
-
-#: ../js/ui/appDisplay.js:215
-msgid "APPLICATIONS"
-msgstr "برنامه‌ها"
-
-#: ../js/ui/appDisplay.js:245
-msgid "PREFERENCES"
-msgstr "ترجیحات"
-
-#: ../js/ui/appDisplay.js:542
-msgid "New Window"
-msgstr "پنجره‌ی جدید"
-
-#: ../js/ui/appDisplay.js:546
-msgid "Remove from Favorites"
-msgstr "حذف از مورد پسندها"
-
-#: ../js/ui/appDisplay.js:547
-msgid "Add to Favorites"
-msgstr "اضافه کردن به مورد پسندها"
-
-#: ../js/ui/appFavorites.js:91
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "مورد %s به مورد پسندهای شما اضافه شد."
-
-#: ../js/ui/appFavorites.js:122
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "مورد %s ازمورد پسندهای شما حذف شد."
-
-#: ../js/ui/dash.js:27
-msgid "Remove"
-msgstr "حذف"
-
-#: ../js/ui/docDisplay.js:494
-msgid "RECENT ITEMS"
-msgstr "موارد اخیر"
-
-#: ../js/ui/lookingGlass.js:552
-msgid "No extensions installed"
-msgstr "هیچ افزونه‌ای نصب نشده است"
-
-#: ../js/ui/lookingGlass.js:589
-msgid "Enabled"
-msgstr "به کار انداختن"
-
-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:591
-#: ../src/gvc/gvc-mixer-control.c:1087
-msgid "Disabled"
-msgstr "از کار انداختن"
-
-#: ../js/ui/lookingGlass.js:593
-msgid "Error"
-msgstr "خطا"
-
-#: ../js/ui/lookingGlass.js:595
-msgid "Out of date"
-msgstr "قدیمی"
-
-#: ../js/ui/lookingGlass.js:620
-msgid "View Source"
-msgstr "نمایش کدمنبع"
-
-#: ../js/ui/lookingGlass.js:626
-msgid "Web Page"
-msgstr "صفحه‌ی وب"
-
-#: ../js/ui/overview.js:112
-msgid "Undo"
-msgstr "برگردان"
-
-#. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:470
-#, c-format
-msgid "Quit %s"
-msgstr "خروج از %s"
-
-#: ../js/ui/panel.js:495
-msgid "Preferences"
-msgstr "ترجیحات"
-
-#. Translators: This is the time format with date used
-#. in 24-hour mode.
-#: ../js/ui/panel.js:581
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
-
-#: ../js/ui/panel.js:582
-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
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
-
-#: ../js/ui/panel.js:587
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format with date used
-#. for AM/PM.
-#: ../js/ui/panel.js:594
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../js/ui/panel.js:595
-msgid "%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
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../js/ui/panel.js:600
-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
-msgid "Activities"
-msgstr "فعالیت‌ها"
-
-#: ../js/ui/placeDisplay.js:111
-#, c-format
-msgid "Failed to unmount '%s'"
-msgstr "عدم توانایی در پیاده کردن «%s»"
-
-#: ../js/ui/placeDisplay.js:114
-msgid "Retry"
-msgstr "سعی مجدد"
-
-#: ../js/ui/placeDisplay.js:159
-msgid "Connect to..."
-msgstr "اتصال به..."
-
-#: ../js/ui/placeDisplay.js:558
-msgid "PLACES & DEVICES"
-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 "toggle-switch-intl"
-
-#: ../js/ui/runDialog.js:233
-msgid "Please enter a command:"
-msgstr "لطفا یک فرمان وارد کنید:"
-
-#: ../js/ui/runDialog.js:378
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "اجرای «%s» شکست خورد:"
-
-#: ../js/ui/statusMenu.js:101
-msgid "Available"
-msgstr "در دسترس"
-
-#: ../js/ui/statusMenu.js:106
-msgid "Busy"
-msgstr "مشغول"
-
-#: ../js/ui/statusMenu.js:114
-msgid "My Account"
-msgstr "حساب من"
-
-#: ../js/ui/statusMenu.js:118
-#| msgid "System Settings..."
-msgid "System Settings"
-msgstr "تنظیمات سیستم"
-
-#: ../js/ui/statusMenu.js:125
-msgid "Lock Screen"
-msgstr "قفل کردن صفحه"
-
-#: ../js/ui/statusMenu.js:129
-msgid "Switch User"
-msgstr "تعویض کاربر"
-
-#: ../js/ui/statusMenu.js:134
-msgid "Log Out..."
-msgstr "خروج از سیستم..."
-
-#: ../js/ui/statusMenu.js:141
-msgid "Suspend..."
-msgstr "معلق کردن..."
-
-#: ../js/ui/statusMenu.js:145
-msgid "Shut Down..."
-msgstr "خاموش کردن..."
-
-#: ../js/ui/status/accessibility.js:82
-msgid "Zoom"
-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/power.js:87
-msgid "What's using power..."
-msgstr ""
-
-#: ../js/ui/status/power.js:90
-#| msgid "System Settings..."
-msgid "Power Settings"
-msgstr "تنظیمات برق"
-
-#: ../js/ui/status/power.js:117
-#, c-format
-#| msgid "%d hour ago"
-#| msgid_plural "%d hours ago"
-msgid "%d hour remaining"
-msgid_plural "%d hours remaining"
-msgstr[0] "%Id ساعت مانده"
-
-#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:120
-#, c-format
-msgid "%d %s %d %s remaining"
-msgstr "%d %s %d %s مانده"
-
-#: ../js/ui/status/power.js:122
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "ساعت"
-
-#: ../js/ui/status/power.js:122
-#| msgid "%d minute ago"
-#| msgid_plural "%d minutes ago"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "%Id دقیقه‌"
-
-#: ../js/ui/status/power.js:125
-#, c-format
-#| msgid "%d minute ago"
-#| msgid_plural "%d minutes ago"
-msgid "%d minute remaining"
-msgid_plural "%d minutes remaining"
-msgstr[0] "%Id دقیقه‌ی مانده"
-
-#: ../js/ui/status/power.js:244
-msgid "AC adapter"
-msgstr "آداپتور برق مستقیم"
-
-#: ../js/ui/status/power.js:246
-msgid "Laptop battery"
-msgstr "باتری لپتاپ"
-
-#: ../js/ui/status/power.js:248
-msgid "UPS"
-msgstr "UPS"
-
-#: ../js/ui/status/power.js:250
-msgid "Monitor"
-msgstr "صفحه نمایش"
-
-#: ../js/ui/status/power.js:252
-msgid "Mouse"
-msgstr "موشی"
-
-#: ../js/ui/status/power.js:254
-msgid "Keyboard"
-msgstr "صفحه‌کلید"
-
-#: ../js/ui/status/power.js:256
-msgid "PDA"
-msgstr "دستیار دیجیتال شخصی"
-
-#: ../js/ui/status/power.js:258
-msgid "Cell phone"
-msgstr "تلفن سلولی"
-
-#: ../js/ui/status/power.js:260
-msgid "Media player"
-msgstr "پخش کننده‌ی رسانه"
-
-#: ../js/ui/status/power.js:262
-#| msgid "Enabled"
-msgid "Tablet"
-msgstr "لوح‌رایانه"
-
-#: ../js/ui/status/power.js:264
-msgid "Computer"
-msgstr "رایانه"
-
-#: ../js/ui/status/power.js:266
-#: ../src/shell-app-system.c:1012
-msgid "Unknown"
-msgstr "ناشناخته"
-
-#: ../js/ui/status/volume.js:41
-msgid "Volume"
-msgstr "بلندی صدا"
-
-#: ../js/ui/status/volume.js:54
-msgid "Microphone"
-msgstr "میکروفون"
-
-#: ../js/ui/status/volume.js:62
-#| msgid "System Settings..."
-msgid "Sound Settings"
-msgstr "تنظیمات صدا"
-
-#: ../js/ui/viewSelector.js:26
-msgid "Search your computer"
-msgstr "جستجوی رایانه‌ی شما"
-
-#: ../js/ui/windowAttentionHandler.js:43
-#, c-format
-msgid "%s has finished starting"
-msgstr "راه‌اندازی %s پایان یافته است"
-
-#: ../js/ui/windowAttentionHandler.js:45
-#, c-format
-msgid "'%s' is ready"
-msgstr "«%s» آماده است"
-
-#: ../js/ui/workspacesView.js:244
-msgid "Can't add a new workspace because maximum workspaces limit has been reached."
-msgstr "نمی‌توان میزکار جدیدی اضافه کرد زیرا به مرز بیشترین تعداد میزکار رسیده‌ایم."
-
-#: ../js/ui/workspacesView.js:260
-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] "%u خروجی"
-
-#. 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] "%u ورودی"
-
-#: ../src/gvc/gvc-mixer-control.c:1402
-#| msgid "System Settings..."
-msgid "System Sounds"
-msgstr "صداهای سیستم"
-
-#: ../src/shell-global.c:1163
-msgid "Less than a minute ago"
-msgstr "کمتر از یک دقیقه قبل"
-
-#: ../src/shell-global.c:1167
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%Id دقیقه‌ی پیش"
-
-#: ../src/shell-global.c:1172
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%Id ساعت پیش"
-
-#: ../src/shell-global.c:1177
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%Id روز پیش"
-
-#: ../src/shell-global.c:1182
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%Id هفته‌ی پیش"
-
-#: ../src/shell-util.c:89
-msgid "Home Folder"
-msgstr "پوشه‌ی آغازه"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-util.c:104
-msgid "File System"
-msgstr "سیستم پرونده‌ها"
-
-#: ../src/shell-util.c:250
-msgid "Search"
-msgstr "جستجو"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-util.c:300
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "Overview workspace view mode"
-#~ msgstr "حالت بررسی اجمالی میزکار"
-#~ msgid ""
-#~ "The selected workspace view mode in the overview. Supported values are "
-#~ "\"single\" and \"grid\"."
-#~ msgstr ""
-#~ "میزکار انتخاب شده در حال مشاهده اجمالی. مقادیر قابل پشتیبانی عبارتند از "
-#~ "«تکی» و «شبکه‌ای»."
-#~ msgid "Drag here to add favorites"
-#~ msgstr "به اینجا بکشید تا به مجبوب‌ها اضافه شود"
-#~ msgid "Find"
-#~ msgstr "جستجو"
-#~ msgid "Searching..."
-#~ msgstr "درحال حستجو..."
-#~ msgid "No matching results."
-#~ msgstr "نتیجه‌ی منطبقی پیدا نشد."
-#~ msgid "Invisible"
-#~ msgstr "نامرئی"
-#~ msgid "Account Information..."
-#~ msgstr "اطلاعات جساب"
-
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@ -5,17 +5,16 @@
 # Rodrigo Flores <mail@rodrigoflores.org>, 2009.
 # Felipe Borges <felipe10borges@gmail.com>, 2010.
 # Henrique P. Machado <hpmachado@gnome.org>, 2010.
-# Jonh Wendell <wendell@bani.com.br>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-07 08:59-0200\n"
-"PO-Revision-Date: 2010-12-06 16:03+0100\n"
-"Last-Translator: Jonh Wendell <wendell@bani.com.br>\n"
-"Language-Team: Brazilian Portuguese <pt_BR>\n"
-"Language: pt_BR\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&component=general\n"
+"POT-Creation-Date: 2010-10-30 17:51+0000\n"
+"PO-Revision-Date: 2010-09-02 17:36-0300\n"
+"Last-Translator: Henrique P. Machado <hpmachado@gnome.org>\n"
+"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -105,6 +104,10 @@ msgstr ""
 "Lista dos IDs de arquivo de área de trabalho para os aplicativos favoritos"

 #: ../data/org.gnome.shell.gschema.xml.in.h:13
+msgid "Overview workspace view mode"
+msgstr "Resumo do modo de visão de áreas de trabalho"
+
+#: ../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 "
@ -125,19 +128,19 @@ msgstr ""
 "o fluxo de processamento padrão será usado. Atualmente é 'videorate ! "
 "theoraenc ! oggmux' e gravação no formato 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 data no relógio"

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

-#: ../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 horário com 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."
@ -145,7 +148,7 @@ msgstr ""
 "Os aplicativos correspondentes a estes identificadores serão exibidos na "
 "área de favoritos."

-#: ../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 "
@ -155,7 +158,7 @@ msgstr ""
 "baseado na data atual e usará esta extensão. Ele deve ser alterado ao gravar "
 "para um contêiner de formato 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."
@ -163,11 +166,19 @@ msgstr ""
 "A taxa de quadros do screencast resultante gravado pelo gravador de "
 "screencastsdo GNOME Shell em quadros 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 fila de processamento 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 o modo de visão do espaço de trabalho na visão geral. Valores aceitos são: "
+"\"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 "
@ -179,7 +190,7 @@ msgstr ""
 "segurança, você pode querer desabilitá-los por razões de privacidade. Por "
 "favor, note que que ao fazer isso não removerá os dado já salvos."

-#: ../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"
@ -191,7 +202,7 @@ msgstr ""
 "especificadores de conversão entendidos pela função strftime() para obter um "
 "formato específico. Veja o manual da strftime() para maiores informações."

-#: ../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\", "
@ -208,11 +219,11 @@ msgstr ""
 "custom_format. Note que se definida tanto como \"unix\" ou \"custom\", as "
 "chaves show_date e show_seconds serão igoradas."

-#: ../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 "Uuids das extensões a desabilitar"

-#: ../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 "Quando coletar dados sobre uso de aplicativos"

@ -258,6 +269,7 @@ msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:7
 #, fuzzy
+#| msgid "Enabled"
 msgid "Enable lens mode"
 msgstr "Habilitado"

@ -370,41 +382,62 @@ msgstr "Formato de _12 horas"
 msgid "_24 hour format"
 msgstr "Formato de _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 "PREFERÊNCIAS"

-#: ../js/ui/appDisplay.js:542
+#: ../js/ui/appDisplay.js:647
 msgid "New Window"
 msgstr "Nova janela"

-#: ../js/ui/appDisplay.js:546
+#: ../js/ui/appDisplay.js:651
 msgid "Remove from Favorites"
-msgstr "Remover dos favoritos"
+msgstr "Remover dos Favoritos"

-#: ../js/ui/appDisplay.js:547
+#: ../js/ui/appDisplay.js:652
 msgid "Add to Favorites"
-msgstr "Adicionar aos favoritos"
+msgstr "Adicionar aos Favoritos"

-#: ../js/ui/appFavorites.js:91
+#: ../js/ui/appDisplay.js:829
+msgid "Drag here to add favorites"
+msgstr "Arraste até aqui para adicionar aos favoritos"
+
+#: ../js/ui/appFavorites.js:88
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s foi adicionado 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 removido dos seus favoritos."

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

-#: ../js/ui/docDisplay.js:494
+#: ../js/ui/dash.js:473
+msgid "Searching..."
+msgstr "Pesquisando..."
+
+#: ../js/ui/dash.js:487
+msgid "No matching results."
+msgstr "Nenhum resultado encontrado."
+
+#. **** 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 "LOCAIS & DISPOSITIVOS"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:804 ../js/ui/docDisplay.js:494
 msgid "RECENT ITEMS"
 msgstr "DOCUMENTOS RECENTES"

@ -438,63 +471,63 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Página Web"

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

 #. 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 "Sair de %s"

-#: ../js/ui/panel.js:495
+#: ../js/ui/panel.js:494
 msgid "Preferences"
 msgstr "Preferências"

 #. 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 %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 %H:%M"

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

@ -511,10 +544,6 @@ msgstr "Tentar novamente"
 msgid "Connect to..."
 msgstr "Conectar ao..."

-#: ../js/ui/placeDisplay.js:558
-msgid "PLACES & DEVICES"
-msgstr "LOCAIS & 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
@ -522,7 +551,7 @@ msgstr "LOCAIS & DISPOSITIVOS"
 #. 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:"
@ -541,181 +570,86 @@ msgstr "Disponível"
 msgid "Busy"
 msgstr "Ocupado"

-#: ../js/ui/statusMenu.js:114
-msgid "My Account"
-msgstr "Minha conta"
+#: ../js/ui/statusMenu.js:111
+msgid "Invisible"
+msgstr "Invisível"

-#: ../js/ui/statusMenu.js:118
-msgid "System Settings"
-msgstr "Configurações do sistema"
+#: ../js/ui/statusMenu.js:119
+msgid "My Account..."
+msgstr ""

-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:123
+#| msgid "System Preferences..."
+msgid "System Settings..."
+msgstr "Configurações do sistema..."
+
+#: ../js/ui/statusMenu.js:130
 msgid "Lock Screen"
-msgstr "Bloquear a tela"
+msgstr "Travar a tela"

-#: ../js/ui/statusMenu.js:129
+#: ../js/ui/statusMenu.js:134
 msgid "Switch User"
 msgstr "Alternar usuário"

-#: ../js/ui/statusMenu.js:134
+#: ../js/ui/statusMenu.js:139
 msgid "Log Out..."
 msgstr "Encerrar sessão..."

-#: ../js/ui/statusMenu.js:141
-msgid "Suspend..."
-msgstr "Suspender..."
+#: ../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 "Desligar..."

-#: ../js/ui/status/accessibility.js:82
-msgid "Zoom"
-msgstr "Ampliador"
-
 #: ../js/ui/status/accessibility.js:88
 msgid "Screen Reader"
-msgstr "Leitor de tela"
+msgstr ""

 #: ../js/ui/status/accessibility.js:91
 msgid "Screen Keyboard"
-msgstr "Teclado na tela"
+msgstr ""

 #: ../js/ui/status/accessibility.js:94
 msgid "Visual Alerts"
-msgstr "Alertas visuais"
+msgstr ""

 #: ../js/ui/status/accessibility.js:97
 msgid "Sticky Keys"
-msgstr "Teclas de aderência"
+msgstr ""

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

 #: ../js/ui/status/accessibility.js:103
 msgid "Bounce Keys"
-msgstr "Teclas de repercussão"
+msgstr ""

 #: ../js/ui/status/accessibility.js:106
 msgid "Mouse Keys"
-msgstr "Teclas do mouse"
+msgstr ""

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

 #: ../js/ui/status/accessibility.js:163
 msgid "High Contrast"
-msgstr "Alto contraste"
+msgstr ""

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

-#: ../js/ui/status/power.js:87
-msgid "What's using power..."
-msgstr "Onde a energia está sendo gasta..."
-
-#: ../js/ui/status/power.js:90
-msgid "Power Settings"
-msgstr "Gerenciamento de energia..."
-
-#: ../js/ui/status/power.js:117
-#, c-format
-msgid "%d hour remaining"
-msgid_plural "%d hours remaining"
-msgstr[0] "%d hora restante"
-msgstr[1] "%d horas restantes"
-
-#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:120
-#, c-format
-msgid "%d %s %d %s remaining"
-msgstr "%d %s e %d %s restantes"
-
-#: ../js/ui/status/power.js:122
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "horas"
-
-#: ../js/ui/status/power.js:122
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minutos"
-
-#: ../js/ui/status/power.js:125
-#, c-format
-msgid "%d minute remaining"
-msgid_plural "%d minutes remaining"
-msgstr[0] "%d minuto restante"
-msgstr[1] "%d minutos restantes"
-
-#: ../js/ui/status/power.js:244
-msgid "AC adapter"
-msgstr "Tomada"
-
-#: ../js/ui/status/power.js:246
-msgid "Laptop battery"
-msgstr "Bateria do laptop"
-
-#: ../js/ui/status/power.js:248
-msgid "UPS"
-msgstr "UPS"
-
-#: ../js/ui/status/power.js:250
-msgid "Monitor"
-msgstr "Monitor"
-
-#: ../js/ui/status/power.js:252
-msgid "Mouse"
-msgstr "Mouse"
-
-#: ../js/ui/status/power.js:254
-msgid "Keyboard"
-msgstr "Teclado"
-
-#: ../js/ui/status/power.js:256
-msgid "PDA"
-msgstr "PDA"
-
-#: ../js/ui/status/power.js:258
-msgid "Cell phone"
-msgstr "Telefone celular"
-
-#: ../js/ui/status/power.js:260
-msgid "Media player"
-msgstr "Reprodutor de música"
-
-#: ../js/ui/status/power.js:262
-msgid "Tablet"
-msgstr "Tablet"
-
-#: ../js/ui/status/power.js:264
-msgid "Computer"
-msgstr "Computador"
-
-#: ../js/ui/status/power.js:266 ../src/shell-app-system.c:1012
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../js/ui/status/volume.js:41
-msgid "Volume"
-msgstr "Volume"
-
-#: ../js/ui/status/volume.js:54
-msgid "Microphone"
-msgstr "Microfone"
-
-#: ../js/ui/status/volume.js:62
-msgid "Sound Settings"
-msgstr "Configurações de som"
-
-#: ../js/ui/viewSelector.js:26
-msgid "Search your computer"
-msgstr "Pesquise no seu computador"
+#: ../js/ui/status/accessibility.js:223
+msgid "Zoom"
+msgstr ""

 #: ../js/ui/windowAttentionHandler.js:43
 #, c-format
@ -727,14 +661,14 @@ msgstr "%s terminou sua inicialização"
 msgid "'%s' is ready"
 msgstr "\"%s\" está pronto"

-#: ../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 ""
 "Não é possível adicionar um novo espaço de trabalho porque foi atingido o "
 "limite."

-#: ../js/ui/workspacesView.js:260
+#: ../js/ui/workspacesView.js:246
 msgid "Can't remove the first workspace."
 msgstr "Não é possível remover o primeiro espaço de trabalho."

@ -744,8 +678,8 @@ msgstr "Não é possível remover o primeiro espaço de trabalho."
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
-msgstr[0] "%u saída"
-msgstr[1] "%u saídas"
+msgstr[0] ""
+msgstr[1] ""

 #. translators:
 #. * The number of sound inputs on a particular device
@ -753,56 +687,56 @@ msgstr[1] "%u saídas"
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
-msgstr[0] "%u entrada"
-msgstr[1] "%u entradas"
+msgstr[0] ""
+msgstr[1] ""

 #: ../src/gvc/gvc-mixer-control.c:1402
 msgid "System Sounds"
-msgstr "Sons do sistema"
+msgstr ""

-#: ../src/shell-global.c:1163
+#: ../src/shell-global.c:1219
 msgid "Less than a minute ago"
 msgstr "Há menos de um minuto"

-#: ../src/shell-global.c:1167
+#: ../src/shell-global.c:1223
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Há %d minuto"
 msgstr[1] "Há %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] "Há %d hora"
 msgstr[1] "Há %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] "Há %d dia"
 msgstr[1] "Há %d dias"

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

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

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

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

@ -811,36 +745,11 @@ msgstr "Pesquisar"
 #. * 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 "Resumo do modo de visão de áreas de trabalho"
-
-#~ msgid ""
-#~ "The selected workspace view mode in the overview. Supported values are "
-#~ "\"single\" and \"grid\"."
-#~ msgstr ""
-#~ "O o modo de visão do espaço de trabalho na visão geral. Valores aceitos "
-#~ "são: \"single\" e \"grid\"."
-
-#~ msgid "Drag here to add favorites"
-#~ msgstr "Arraste até aqui para adicionar aos favoritos"
-
-#~ msgid "Find"
-#~ msgstr "Localizar"
-
-#~ msgid "Searching..."
-#~ msgstr "Pesquisando..."
-
-#~ msgid "No matching results."
-#~ msgstr "Nenhum resultado encontrado."
-
-#~ msgid "Invisible"
-#~ msgstr "Invisível"
-
 #~ msgid "ON"
 #~ msgstr "⚪"

@ -868,6 +777,9 @@ msgstr "%1$s: %2$s"
 #~ msgid "SEARCH RESULTS"
 #~ msgstr "RESULTADOS DA BUSCA"

+#~ msgid "Unknown"
+#~ msgstr "Desconhecido"
+
 #~ msgid "Can't lock screen: %s"
 #~ msgstr "Não foi possível travar a tela: %s"

--- a/po/sl.po
+++ b/po/sl.po
@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2010-12-11 15:45+0000\n"
-"PO-Revision-Date: 2010-12-11 20:40+0100\n"
+"POT-Creation-Date: 2010-10-26 14:37+0000\n"
+"PO-Revision-Date: 2010-10-26 19:29+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: Slovenian\n"
@ -86,54 +86,62 @@ msgid "List of desktop file IDs for favorite applications"
 msgstr "Seznam določil ID namiznih datotek priljubljenih programov"

 #: ../data/org.gnome.shell.gschema.xml.in.h:13
+msgid "Overview workspace view mode"
+msgstr "Način pregleda predogleda delovnih površin"
+
+#: ../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 "Določa cevovod programa GStreamer, ki se uporablja za kodiranje posnetkov. Ta sledi skladnji, ki je uporabljena za gst-launch. Cevovod mora imeti nepovezano korito, kamor se posnetek snema. Običajno je za to namenjen nepovezan izvorni pomnilnik, katerega odvod se zapiše v odvodno datoteko. Vendar pa lahko cevovod ta korak naredi v lastni odvod - možnost se lahko uporabi pri pošiljanju odvoda na strežnik icecast preko shout2send ali podobno. Nedoločena ali prazna možnost se odrazi kot privzeti cevovod. Trenutno je to 'videorate ! theoraenc ! oggmux' in omogoča snemanje v zapis 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 "Pokaži datum v uri"

-#: ../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 "Pokaži tedenski datum v koledarju"

-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid "Show time with seconds"
 msgstr "Pokaži čas s sekundami"

-#: ../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."
 msgstr "Programi določeni s temi določili bodo prikazani v območju priljubljenih programov"

-#: ../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 a different container format."
 msgstr "Ime datoteke zaslonskega posnetka bo enoznačno ime, kateremu bo dodan datum in določena pripona. Pripona mora ustrezati zapisu zabojnika."

-#: ../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."
 msgstr "Hitrost sličic shranjenega končnega zaslonskega posnetka v sličicah na sekundo."

-#: ../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 "Uporabljen GStreamer cevovod za kodiranje zaslonskega posnetka."

-#: ../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 "Izbrani pogled delovnih površin v predogledu. Podprte vrednosti sta \"enojno\" in \"mrežno\"."
+
+#: ../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 "Lupina običajno nadzira dejavne programe zaradi možnosti prikazovanja najpogosteje uporabljenih v zaganjalniku. Čeprav so podatki krajevni, jih je dobro onemogočiti zaradi varovanja zasebnosti. Z onemogočenje ne bodo odstranjeni že shranjeni podatki."

-#: ../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() to obtain a specific format. See the strftime() manual for more information."
 msgstr "Ključ določa zapis, ki naj ga uporablja vstavek ure, kadar je ključ zapisa nastavljen kot \"prikrojen\". Za določitev zapisa lahko uporabite tudi oznake funkcije strftime(), ki so podrobneje zapisane v priročniku funkcije."

-#: ../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\", 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 "Ključ določa zapis ure. Mogoče vrednosti so \"12-urni\", \"24-urni\", \"unix\" in \"po meri\". Možnost \"unix\" prikazuje čas v sekundah od začetka ere, torej od 01.01.1970, možnost \"po meri\" pa omogoča prikrojen zapis. Pri izbiri zapisa \"unix\" ali \"po meri\" sta izbiri pokaži datum in pokaži sekunde, prezrti."

-#: ../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 "Določila UUID razširitev za onemogočenje"

-#: ../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 "Ali naj se beleži statistika uporabe programov"

@ -171,7 +179,7 @@ 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 "Pri usredinjenem sledenju miški, ko je sistemski kazalnik ob robu zaslona, približanje vsebine drsi naprej tako, da je rob zaslona v približanem pogledu."
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:10
 msgid "Length of the crosshairs"
@ -215,11 +223,11 @@ msgstr "Barva navpične in vodoravne črte, ki določata merek."

 #: ../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 "Približan pogled lahko zapolni celoten zaslon, lahko pa zasede zgornjo, spodnjo, levo ali pa desno polovico zaslona."
+msgstr ""

 #: ../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 "Vrednost približanja. Vrednost 1.0 pomeni brez približanja, vrednost 2.0 pa podvoji učinek približanja."
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:22
 msgid "Thickness of the crosshairs"
@ -227,7 +235,7 @@ msgstr "Debelina merka"

 #: ../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 "Ali naj bo približan pogled usredinjen na mesto sistemske miške in se z njo premika."
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:24
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
@ -261,40 +269,64 @@ msgstr "_12-urni zapis časa"
 msgid "_24 hour format"
 msgstr "_24-urni zapis časa"

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

-#: ../js/ui/appDisplay.js:245
+#: ../js/ui/appDisplay.js:348
 msgid "PREFERENCES"
 msgstr "Možnosti"

-#: ../js/ui/appDisplay.js:542
+#: ../js/ui/appDisplay.js:648
 msgid "New Window"
 msgstr "Novo okno"

-#: ../js/ui/appDisplay.js:546
+#: ../js/ui/appDisplay.js:652
 msgid "Remove from Favorites"
 msgstr "Odstrani iz priljubljenih"

-#: ../js/ui/appDisplay.js:547
+#: ../js/ui/appDisplay.js:653
 msgid "Add to Favorites"
 msgstr "Dodaj med priljubljene"

-#: ../js/ui/appFavorites.js:91
+#: ../js/ui/appDisplay.js:830
+msgid "Drag here to add favorites"
+msgstr "S potegom na to mesto se izbor doda med priljubljene"
+
+#: ../js/ui/appFavorites.js:88
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "Program \"%s\" je dodan med priljubljeno."

-#: ../js/ui/appFavorites.js:122
+#: ../js/ui/appFavorites.js:107
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "Program \"%s\" je odstranjen iz priljubljenih."

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

+#: ../js/ui/dash.js:473
+msgid "Searching..."
+msgstr "Iskanje ..."
+
+#: ../js/ui/dash.js:487
+msgid "No matching results."
+msgstr "Ni zadetkov iskanja"
+
+#. **** 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 "Mesta in naprave"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:804
 #: ../js/ui/docDisplay.js:494
 msgid "RECENT ITEMS"
 msgstr "Nedavni predmeti"
@ -307,10 +339,7 @@ msgstr "Ni nameščenih razširitev"
 msgid "Enabled"
 msgstr "Omogočeno"

-#. translators:
-#. * The device has been disabled
 #: ../js/ui/lookingGlass.js:591
-#: ../src/gvc/gvc-mixer-control.c:1087
 msgid "Disabled"
 msgstr "Onemogočeno"

@ -330,63 +359,63 @@ msgstr "Poglej vir"
 msgid "Web Page"
 msgstr "Spletna stran"

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

 #. 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 "Končaj %s"

-#: ../js/ui/panel.js:495
+#: ../js/ui/panel.js:494
 msgid "Preferences"
 msgstr "Možnosti"

 #. 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., %H:%M:%S"

-#: ../js/ui/panel.js:595
+#: ../js/ui/panel.js:594
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a. %e. %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, %H:%M"

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

@ -403,10 +432,6 @@ msgstr "Poskusi znova"
 msgid "Connect to..."
 msgstr "Povezava z ..."

-#: ../js/ui/placeDisplay.js:558
-msgid "PLACES & DEVICES"
-msgstr "Mesta in naprave"
-
 #. Translators: this MUST be either "toggle-switch-us"
 #. (for toggle switches containing the English words
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
@ -433,38 +458,42 @@ msgstr "Na voljo"
 msgid "Busy"
 msgstr "Zaposleno"

-#: ../js/ui/statusMenu.js:114
-msgid "My Account"
-msgstr "Račun"
+#: ../js/ui/statusMenu.js:111
+msgid "Invisible"
+msgstr "Nevidno"

-#: ../js/ui/statusMenu.js:118
-msgid "System Settings"
-msgstr "Sistemske nastavitve"
+#: ../js/ui/statusMenu.js:119
+msgid "My Account..."
+msgstr "Račun ..."

-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:123
+msgid "System Preferences..."
+msgstr "Sistemske možnosti ..."
+
+#: ../js/ui/statusMenu.js:130
 msgid "Lock Screen"
 msgstr "Zakleni zaslon"

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

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

-#: ../js/ui/statusMenu.js:141
-msgid "Suspend..."
-msgstr "V pripravljenost"
+#: ../js/ui/statusMenu.js:146
+msgid "Suspend"
+msgstr "V mirovanje"

-#: ../js/ui/statusMenu.js:145
+#: ../js/ui/statusMenu.js:150
+msgid "Restart..."
+msgstr "Ponoven zagon ..."
+
+#: ../js/ui/statusMenu.js:154
 msgid "Shut Down..."
 msgstr "Izklopi ..."

-#: ../js/ui/status/accessibility.js:82
-msgid "Zoom"
-msgstr "Približanje"
-
 #: ../js/ui/status/accessibility.js:88
 msgid "Screen Reader"
 msgstr "Zaslonski bralnik"
@ -501,122 +530,13 @@ msgstr "Splošne nastavitve dostopa"
 msgid "High Contrast"
 msgstr "Visok kontrast"

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

-#: ../js/ui/status/power.js:87
-msgid "What's using power..."
-msgstr "Kaj porablja napetost ..."
-
-#: ../js/ui/status/power.js:90
-msgid "Power Settings"
-msgstr "Upravljanje napajanja"
-
-#: ../js/ui/status/power.js:117
-#, c-format
-msgid "%d hour remaining"
-msgid_plural "%d hours remaining"
-msgstr[0] "preostaja še %d ur"
-msgstr[1] "preostaja še %d ura"
-msgstr[2] "preostajata še %d uri"
-msgstr[3] "preostajajo še %d ure"
-
-#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:120
-#, c-format
-msgid "%d %s %d %s remaining"
-msgstr "Preostaja še %d %s %d %s"
-
-#: ../js/ui/status/power.js:122
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "ur"
-msgstr[1] "ura"
-msgstr[2] "uri"
-msgstr[3] "ure"
-
-#: ../js/ui/status/power.js:122
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "minuta"
-msgstr[2] "minuti"
-msgstr[3] "minute"
-
-#: ../js/ui/status/power.js:125
-#, c-format
-msgid "%d minute remaining"
-msgid_plural "%d minutes remaining"
-msgstr[0] "preostaja še %d minut"
-msgstr[1] "preostaja še %d minuta"
-msgstr[2] "preostajata še %d minuti"
-msgstr[3] "preostajajo še %d minute"
-
-#: ../js/ui/status/power.js:244
-msgid "AC adapter"
-msgstr "Električni prilagodilnik"
-
-#: ../js/ui/status/power.js:246
-msgid "Laptop battery"
-msgstr "Baterija prenosnika"
-
-#: ../js/ui/status/power.js:248
-msgid "UPS"
-msgstr "UPS"
-
-#: ../js/ui/status/power.js:250
-msgid "Monitor"
-msgstr "Zaslon"
-
-#: ../js/ui/status/power.js:252
-msgid "Mouse"
-msgstr "Miška"
-
-#: ../js/ui/status/power.js:254
-msgid "Keyboard"
-msgstr "Tipkovnica"
-
-#: ../js/ui/status/power.js:256
-msgid "PDA"
-msgstr "Dlančnik"
-
-#: ../js/ui/status/power.js:258
-msgid "Cell phone"
-msgstr "Mobilni telefon"
-
-#: ../js/ui/status/power.js:260
-msgid "Media player"
-msgstr "Predstavni predvajalnik"
-
-#: ../js/ui/status/power.js:262
-msgid "Tablet"
-msgstr "Tablični računalnik"
-
-#: ../js/ui/status/power.js:264
-msgid "Computer"
-msgstr "Računalnik"
-
-#: ../js/ui/status/power.js:266
-#: ../src/shell-app-system.c:1012
-msgid "Unknown"
-msgstr "Neznano"
-
-#: ../js/ui/status/volume.js:41
-msgid "Volume"
-msgstr "Glasnost"
-
-#: ../js/ui/status/volume.js:54
-msgid "Microphone"
-msgstr "Mikrofon"
-
-#: ../js/ui/status/volume.js:62
-msgid "Sound Settings"
-msgstr "Nastavitve zvoka"
-
-#: ../js/ui/viewSelector.js:26
-msgid "Search your computer"
-msgstr "Iskanje po računalniku"
+#: ../js/ui/status/accessibility.js:223
+msgid "Zoom"
+msgstr "Približanje"

 #: ../js/ui/windowAttentionHandler.js:43
 #, c-format
@ -628,45 +548,19 @@ msgstr "%s je končal začenjanje"
 msgid "'%s' is ready"
 msgstr "'%s' storitev je pripravljena"

-#: ../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 "Ni mogoče dodati nove delovne površine, ker je doseženo njihovo največje dovoljeno število."

-#: ../js/ui/workspacesView.js:260
+#: ../js/ui/workspacesView.js:246
 msgid "Can't remove the first workspace."
 msgstr "Ni mogoče odstraniti prve delovne površine."

-#. 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] "%u odvodov naprave"
-msgstr[1] "%u odvod naprave"
-msgstr[2] "%u odvoda naprave"
-msgstr[3] "%u odvodi naprave"
-
-#. 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] "%u dovodov naprave"
-msgstr[1] "%u dovod naprave"
-msgstr[2] "%u dovoda naprave"
-msgstr[3] "%u dovodi naprave"
-
-#: ../src/gvc/gvc-mixer-control.c:1402
-msgid "System Sounds"
-msgstr "Sistemski zvoki"
-
-#: ../src/shell-global.c:1155
+#: ../src/shell-global.c:1204
 msgid "Less than a minute ago"
 msgstr "Pred manj kot eno minuto"

-#: ../src/shell-global.c:1159
+#: ../src/shell-global.c:1208
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@ -675,7 +569,7 @@ msgstr[1] "Pred %d minuto"
 msgstr[2] "Pred %d minutama"
 msgstr[3] "Pred %d minutami"

-#: ../src/shell-global.c:1164
+#: ../src/shell-global.c:1213
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@ -684,7 +578,7 @@ msgstr[1] "Pred %d uro"
 msgstr[2] "Pred %d urama"
 msgstr[3] "Pred %d urami"

-#: ../src/shell-global.c:1169
+#: ../src/shell-global.c:1218
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@ -693,7 +587,7 @@ msgstr[1] "Pred %d dnevom"
 msgstr[2] "Pred %d dnevoma"
 msgstr[3] "Pred %d dnevi"

-#: ../src/shell-global.c:1174
+#: ../src/shell-global.c:1223
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -702,17 +596,17 @@ msgstr[1] "Pred %d tednom"
 msgstr[2] "Pred %d tednoma"
 msgstr[3] "Pred %d tedni"

-#: ../src/shell-util.c:89
+#: ../src/shell-uri-util.c:89
 msgid "Home Folder"
 msgstr "Domača mapa"

 #. 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 "Datotečni sistem"

-#: ../src/shell-util.c:250
+#: ../src/shell-uri-util.c:250
 msgid "Search"
 msgstr "Poišči"

@ -721,35 +615,15 @@ msgstr "Poišči"
 #. * 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 "Način pregleda predogleda delovnih površin"
-#~ msgid ""
-#~ "The selected workspace view mode in the overview. Supported values are "
-#~ "\"single\" and \"grid\"."
-#~ msgstr ""
-#~ "Izbrani pogled delovnih površin v predogledu. Podprte vrednosti sta "
-#~ "\"enojno\" in \"mrežno\"."
-#~ msgid "Drag here to add favorites"
-#~ msgstr "S potegom na to mesto se izbor doda med priljubljene"
-#~ msgid "Find"
-#~ msgstr "Najdi"
-#~ msgid "Searching..."
-#~ msgstr "Iskanje ..."
-#~ msgid "No matching results."
-#~ msgstr "Ni zadetkov iskanja"
-#~ msgid "Invisible"
-#~ msgstr "Nevidno"
-#~ msgid "System Preferences..."
-#~ msgstr "Sistemske možnosti ..."
-#~ msgid "Restart..."
-#~ msgstr "Ponoven zagon ..."
 #~ msgid "Account Information..."
 #~ msgstr "Podrobnosti računa ..."
+#~ msgid "System Settings..."
+#~ msgstr "Sistemske nastavitve ..."
 #~ msgid "ON"
 #~ msgstr "⚪"
 #~ msgid "OFF"
@ -766,6 +640,8 @@ msgstr "%1$s: %2$s"
 #~ msgstr "Mesta"
 #~ msgid "SEARCH RESULTS"
 #~ msgstr "Rezultati iskanja"
+#~ msgid "Unknown"
+#~ msgstr "Neznano"
 #~ msgid "Can't lock screen: %s"
 #~ msgstr "Ni mogoče zakleniti zaslona: %s"
 #~ msgid "Can't temporarily set screensaver to blank screen: %s"
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/ta.po
+++ b/po/ta.po
@ -6,17 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 14:13+0530\n"
-"PO-Revision-Date: 2010-12-01 12:57+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=gnome-shell&component=general\n"
+"POT-Creation-Date: 2010-08-04 19:41+0000\n"
+"PO-Revision-Date: 2010-08-05 21:37+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
-"Language-Team: Tamil <kde-i18n-doc@kde.org>\n"
-"Language: ta\n"
+"Language-Team: Tamil <<Ubuntu-l10n-tam@lists.ubuntu.com>>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.0\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@ -39,8 +39,8 @@ msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
 msgstr ""
-"உள்ளமை வழி நீக்கம் மற்றும் Alt-F2 உரையாடல் மூலம் கருவிகள் கண்காணிப்பு ஆகியவற்றை அணுக "
-"உதவும்."
+"உள்ளமை வழி நீக்கம் மற்றும் Alt-F2 உரையாடல் மூலம் கருவிகள் கண்காணிப்பு "
+"ஆகியவற்றை அணுக உதவும்."

 #: ../data/org.gnome.shell.gschema.xml.in.h:2
 msgid "Custom format of the clock"
@ -49,8 +49,8 @@ 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 வழியாக உள்ளமை கருவிகளை "
-"செயலாக்கு"
+"உருவாக்குவோர் மற்றூம் சோதிப்போருக்கு பயன்படுமாறு Alt-F2 வழியாக உள்ளமை "
+"கருவிகளை செயலாக்கு"

 #: ../data/org.gnome.shell.gschema.xml.in.h:4
 msgid "File extension used for storing the screencast"
@ -65,8 +65,8 @@ msgid ""
 "GNOME Shell extensions have a uuid property; this key lists extensions which "
 "should not be loaded."
 msgstr ""
-"க்னோம் ஷெல் நீட்சிகளுக்கு ஒரு யூயூஐடி பண்பு உண்டு. இந்த விசை எந்த நீட்சிகள் ஏற்றப்பட வேண்டும் "
-"என பட்டியலிடுகிறது."
+"க்னோம் ஷெல் நீட்சிகளுக்கு ஒரு யூயூஐடி பண்பு உண்டு. இந்த விசை எந்த நீட்சிகள் "
+"ஏற்றப்பட வேண்டும் என பட்டியலிடுகிறது."

 #: ../data/org.gnome.shell.gschema.xml.in.h:7
 msgid "History for command (Alt-F2) dialog"
@ -81,8 +81,8 @@ msgid ""
 "If true and format is either \"12-hour\" or \"24-hour\", display date in the "
 "clock, in addition to time."
 msgstr ""
-"உண்மையெனில், அமைப்பு \"12 மணி\" அல்லது \"24 மணி\" என இருப்பின் நேரத்துடன் நாளையும் "
-"காட்டு"
+"உண்மையெனில், அமைப்பு \"12 மணி\" அல்லது \"24 மணி\" என இருப்பின் நேரத்துடன் "
+"நாளையும் காட்டு"

 #: ../data/org.gnome.shell.gschema.xml.in.h:10
 msgid ""
@ -101,6 +101,10 @@ 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 "
@ -111,76 +115,93 @@ msgid ""
 "to an empty value, the default pipeline will be used. This is currently "
 "'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
 msgstr ""
-"பதிவுகளை குறியாக்க ஜிஸ்ட்ரீமர் குழாயை அமைக்கிறது. ஜிஎஸ்டி லான்ஸ் க்கு பயன்படும் அதே "
-"இலக்கணத்தை பின் பற்றும். குழாய்க்கு இணைப்பில்லா பதிவுக்குழி இருத்தல் வேண்டும். இதில் விடியோ "
-"பதிவாகும். சாதாரணமாக இதில் ஒரு மூல பதிவேடு இருக்கும்; இதன் வெளியீடு வெளியீட்டு "
-"கோப்பாக பதிவாகும். எனினும் குழாய் தன் வெளியீட்டை தானே கவனித்துக்கொள்ள இயலும். இது "
-"வெளியீட்டை ஐஸ்காஸ்ட் அல்லது ஷௌட்2சென்ட் போன்றவற்றுக்கு நேரடியாக அனுப்ப இயலும். அமைப்பை "
-"அன்செட் செய்தாலல்லது காலி மதிப்புக்கு அமைத்தாலும் முன்னிருப்பு குழாய் பயன்படுத்தப்படும். "
-"நடப்பில் இது 'விடியோரேட்!தியோரேங்க்!ஆக்மக்ஸ்' ஆகும்; இது ஆக் தியோராவுக்கு பதிவுசெய்யும்."
+"பதிவுகளை குறியாக்க ஜிஸ்ட்ரீமர் குழாயை அமைக்கிறது. ஜிஎஸ்டி லான்ஸ் க்கு "
+"பயன்படும் அதே இலக்கணத்தை பின் பற்றும். குழாய்க்கு இணைப்பில்லா பதிவுக்குழி "
+"இருத்தல் வேண்டும். இதில் விடியோ பதிவாகும். சாதாரணமாக இதில் ஒரு மூல பதிவேடு "
+"இருக்கும்; இதன் வெளியீடு வெளியீட்டு கோப்பாக பதிவாகும். எனினும் குழாய் தன் "
+"வெளியீட்டை தானே கவனித்துக்கொள்ள இயலும். இது வெளியீட்டை ஐஸ்காஸ்ட் அல்லது "
+"ஷௌட்2சென்ட் போன்றவற்றுக்கு நேரடியாக அனுப்ப இயலும். அமைப்பை அன்செட் "
+"செய்தாலல்லது காலி மதிப்புக்கு அமைத்தாலும் முன்னிருப்பு குழாய் "
+"பயன்படுத்தப்படும். நடப்பில் இது 'விடியோரேட்!தியோரேங்க்!ஆக்மக்ஸ்' ஆகும்; இது "
+"ஆக் தியோராவுக்கு பதிவுசெய்யும்."

-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show date in clock"
 msgstr "தேதியை கடிகாரத்தில் காட்டுக"

-#: ../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 "நாட்காட்டியில் வார நாளை காட்டவும்"

-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid "Show time with seconds"
 msgstr "நொடிகளுடன் நேரம் காட்டுக"

-#: ../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."
-msgstr "இந்த அடையாளங் காட்டிகளுக்கு பொருத்தமான பயன்பாடுகள் விருப்ப இடத்தில் காட்டப்படும்."
+msgstr ""
+"இந்த அடையாளங் காட்டிகளுக்கு பொருத்தமான பயன்பாடுகள் விருப்ப இடத்தில் "
+"காட்டப்படும்."

-#: ../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 "
 "a different container format."
 msgstr ""
-"ஸ்க்ரீன்காஸ்ட் இல் பதிவாவனக்கான கோப்புப்பெயர் தனித்தன்மை வாய்ந்தது. இது நடப்பு தேதியை "
-"அடிப்படையாக கொண்டது; இந்த பின்னொட்டை பயன்படுத்தும். பதிவதை வேறு கொள்கலத்தின் ஒழுங்கில் "
-"மாற்றுகையில் இதையும் மாற்ற வேண்டும்."
+"ஸ்க்ரீன்காஸ்ட் இல் பதிவாவனக்கான கோப்புப்பெயர் தனித்தன்மை வாய்ந்தது. இது "
+"நடப்பு தேதியை அடிப்படையாக கொண்டது; இந்த பின்னொட்டை பயன்படுத்தும். பதிவதை "
+"வேறு கொள்கலத்தின் ஒழுங்கில் மாற்றுகையில் இதையும் மாற்ற வேண்டும்."

-#: ../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."
 msgstr ""
-"க்னோம்ஷெல் இன் ஸ்க்ரீன்காஸ்ட் பதிவரில் ஸ்க்ரீன்காட் ஐ பதிகையில் வினாடிக்கு சட்டங்களின் விகிதம்."
+"க்னோம்ஷெல் இன் ஸ்க்ரீன்காஸ்ட் பதிவரில் ஸ்க்ரீன்காட் ஐ பதிகையில் வினாடிக்கு "
+"சட்டங்களின் விகிதம்."

-#: ../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 "ஸ்க்ரீன்காஸ்டை குறியாக்க பயனாகும் ஜிஸ்ட்ரீமர் குழாய்."

-#: ../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 ""
+"மேல்பார்வையில் தேர்ந்தெடுத்த பணீட காட்சி பாங்கு. ஆதரவுள்ள மதிப்புகள் 'ஒன்று' "
+"மற்றும் 'வலை'"
+
+#: ../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: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"
 "() to obtain a specific format. See the strftime() manual for more "
 "information."
 msgstr ""
-"வடிவமைப்பு விசை \"தனிப்பயன்\" என்று அமைக்கப்படும் போது பலக கடிகாரம் இந்த விசையை "
-"பயன்படுத்தும். குறிப்பிட்ட அமைப்பை பெற்றுக்கொள்ள strftime() ஆல் புரிந்துகொள்ளக்கூடிய "
-"மாற்று குறிப்புகளை தரவும். மேலும் அதிக விவரங்களுக்கு strftime() கையேட்டை பார்க்கவும்."
+"வடிவமைப்பு விசை \"தனிப்பயன்\" என்று அமைக்கப்படும் போது பலக கடிகாரம் இந்த "
+"விசையை "
+"பயன்படுத்தும். குறிப்பிட்ட அமைப்பை பெற்றுக்கொள்ள strftime() ஆல் "
+"புரிந்துகொள்ளக்கூடிய மாற்று "
+"குறிப்புகளை தரவும். மேலும் அதிக விவரங்களுக்கு strftime() கையேட்டை "
+"பார்க்கவும்."

-#: ../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\", "
@ -190,159 +211,21 @@ msgid ""
 "the show_date and show_seconds keys are ignored."
 msgstr ""
 "இந்த விசை பலக கடிகாரம் பயன்படுத்த வேண்டிய மணி ஒழுங்கை குறிக்கிறது. தரக்கூடிய "
-"மதிப்புகள் \"12-மணி\", \"24-மணி\", \"யூனிக்ஸ்\" மற்றும் \"தனிப்பயன்\". \"யூனிக்ஸ்\" "
-"எனில் அது எபோக் அதாவது 1970-01-01 முதல் நடந்த காலத்தை வினாடிகளில் காட்டும். \"தனிப்பயன்"
-"\" எனில் தனிப்பயன்_ஒழுங்கு இல் காட்டப்பட்ட ஒழுங்கில் நேரத்தைக் காட்டும். \"யூனிக்ஸ்\" அல்லது "
-"\"தனிப்பயன்\" என மைக்கும்போது தேதி_காட்டு, வினாடிகளை_காட்டு விசைகள் "
-"உதாசீனப்படுத்தப்படும் என அறிக."
+"மதிப்புகள் \"12-மணி\", \"24-மணி\", \"யூனிக்ஸ்\" மற்றும் \"தனிப்பயன்\". "
+"\"யூனிக்ஸ்\" எனில் அது எபோக் அதாவது 1970-01-01 முதல் நடந்த காலத்தை "
+"வினாடிகளில் காட்டும். \"தனிப்பயன்\" எனில் தனிப்பயன்_ஒழுங்கு இல் காட்டப்பட்ட "
+"ஒழுங்கில் நேரத்தைக் காட்டும். \"யூனிக்ஸ்\" அல்லது \"தனிப்பயன்\" என "
+"மைக்கும்போது தேதி_காட்டு, வினாடிகளை_காட்டு விசைகள் உதாசீனப்படுத்தப்படும் என "
+"அறிக."

-#: ../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 "செயல்நீக்க வேண்டிய நீட்சிகளின் யூயூஐடிக்கள்."

-#: ../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 "நிரல்களின் பயன்பாடு குறித்த புள்ளிவிவரம் சேகரிக்க வேண்டுமா"

-#: ../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 ""
-"பெரிதாக்கப்பட்ட காட்சி முழுத்திரையயும் ஆக்ரமிக்கலாம் அல்லது மேல் பாதி, கீழ் பாதி, வலது பாதி, "
-"இடது பாதி என இருக்கலாம்."
-
-#: ../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 "பெரிதாக்கும் அளவு. 1.0 எனில் பெரிதாக்கம் இல்லை. மதிப்பு 2.0 எனில் இரண்டு மடங்கு."
-
-#: ../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 "கடிகார வடிவம்"
@ -371,159 +254,177 @@ msgstr "_12 மணி வடிவமைப்பு"
 msgid "_24 hour format"
 msgstr "_24 மணி வடிவமைப்பு"

-#: ../js/ui/appDisplay.js:215
+#. **** Applications ****
+#: ../js/ui/appDisplay.js:384 ../js/ui/dash.js:776
 msgid "APPLICATIONS"
 msgstr "பயன்பாடுகள்"

-#: ../js/ui/appDisplay.js:245
+#: ../js/ui/appDisplay.js:416
 msgid "PREFERENCES"
 msgstr "விருப்பங்கள்"

-#: ../js/ui/appDisplay.js:538
+#: ../js/ui/appDisplay.js:721
 msgid "New Window"
 msgstr "புதிய சாளரம்"

-#: ../js/ui/appDisplay.js:542
+#: ../js/ui/appDisplay.js:725
 msgid "Remove from Favorites"
 msgstr "விருப்பத்தில் இருந்து நீக்கு"

-#: ../js/ui/appDisplay.js:543
+#: ../js/ui/appDisplay.js:726
 msgid "Add to Favorites"
 msgstr "விருப்பங்களுக்கு சேர்"

-#: ../js/ui/appFavorites.js:91
+#: ../js/ui/appDisplay.js:1033
+msgid "Drag here to add favorites"
+msgstr "விருப்பங்களுக்கு சேர்க்க இங்கு இழுத்துவிடு"
+
+#: ../js/ui/appFavorites.js:88
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s உங்கள் விருப்பங்களில் சேர்க்கப்பட்டது"

-#: ../js/ui/appFavorites.js:122
+#: ../js/ui/appFavorites.js:107
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s உங்கள் விருப்பங்களில் இருந்து நீக்கப்பட்டது"

-#: ../js/ui/dash.js:27
-msgid "Remove"
-msgstr "நீக்கு"
+#: ../js/ui/dash.js:142
+msgid "Find"
+msgstr "தேடு"

-#: ../js/ui/docDisplay.js:494
+#: ../js/ui/dash.js:471
+msgid "Searching..."
+msgstr "தேடுகிறது..."
+
+#: ../js/ui/dash.js:485
+msgid "No matching results."
+msgstr "பொருத்தமான விடைகள் இல்லை"
+
+#. **** Places ****
+#. Translators: This is in the sense of locations for documents,
+#. network locations, etc.
+#: ../js/ui/dash.js:795 ../js/ui/placeDisplay.js:550
+msgid "PLACES & DEVICES"
+msgstr "PLACES & DEVICES"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:802 ../js/ui/docDisplay.js:494
 msgid "RECENT ITEMS"
 msgstr "RECENT ITEMS"

-#: ../js/ui/lookingGlass.js:552
+#: ../js/ui/lookingGlass.js:471
 msgid "No extensions installed"
 msgstr "நீட்சிகள் ஏதும் நிறுவப்படவில்லை"

-#: ../js/ui/lookingGlass.js:589
+#: ../js/ui/lookingGlass.js:508
 msgid "Enabled"
 msgstr "செயலாக்கப்பட்டது"

-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:591 ../src/gvc/gvc-mixer-control.c:1087
+#: ../js/ui/lookingGlass.js:510
 msgid "Disabled"
 msgstr "செயல்நீக்கப்பட்டது"

-#: ../js/ui/lookingGlass.js:593
+#: ../js/ui/lookingGlass.js:512
 msgid "Error"
 msgstr "பிழை"

-#: ../js/ui/lookingGlass.js:595
+#: ../js/ui/lookingGlass.js:514
 msgid "Out of date"
 msgstr "காலாவதியானது"

-#: ../js/ui/lookingGlass.js:620
+#: ../js/ui/lookingGlass.js:539
 msgid "View Source"
 msgstr "மூலத்தை பார்க்க"

-#: ../js/ui/lookingGlass.js:626
+#: ../js/ui/lookingGlass.js:545
 msgid "Web Page"
 msgstr "இணைய பக்கம்"

-#: ../js/ui/overview.js:112
+#: ../js/ui/overview.js:159
 msgid "Undo"
 msgstr "மறை"

 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:470
+#: ../js/ui/panel.js:473
 #, c-format
 msgid "Quit %s"
 msgstr "%s லிருந்து வெளியேறு"

-#: ../js/ui/panel.js:495
+#: ../js/ui/panel.js:498
 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:584
 msgid "%a %b %e, %R:%S"
 msgstr "%a %b %e, %R:%S"

-#: ../js/ui/panel.js:582
+#: ../js/ui/panel.js:585
 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:589
 msgid "%a %R:%S"
 msgstr "%a %R:%S"

-#: ../js/ui/panel.js:587
+#: ../js/ui/panel.js:590
 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:597
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %b %e, %l:%M:%S %p"

-#: ../js/ui/panel.js:595
+#: ../js/ui/panel.js:598
 msgid "%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:602
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l:%M:%S %p"

-#: ../js/ui/panel.js:600
+#: ../js/ui/panel.js:603
 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:741
 msgid "Activities"
 msgstr "செயல்பாடுகள்"

-#: ../js/ui/placeDisplay.js:111
+#: ../js/ui/placeDisplay.js:107
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "'%s' ஐ இறக்க முடியவில்லை"

-#: ../js/ui/placeDisplay.js:114
+#: ../js/ui/placeDisplay.js:110
 msgid "Retry"
 msgstr "மறு முயற்சி"

-#: ../js/ui/placeDisplay.js:159
+#: ../js/ui/placeDisplay.js:155
 msgid "Connect to..."
 msgstr "இணைக்கவும்..."

-#: ../js/ui/placeDisplay.js:558
-msgid "PLACES & DEVICES"
-msgstr "PLACES & DEVICES"
+#. Translators: the "ON" and "OFF" strings are used in the
+#. toggle switches in the status area menus, and must be SHORT.
+#. If you don't have suitable short words, consider initials,
+#. "0"/"1", "⚪"/"⚫", etc.
+#: ../js/ui/popupMenu.js:30 ../js/ui/popupMenu.js:40
+msgid "ON"
+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/popupMenu.js:31 ../js/ui/popupMenu.js:45
+msgid "OFF"
+msgstr "செயல் நீக்கு"

 #: ../js/ui/runDialog.js:233
 msgid "Please enter a command:"
@ -534,177 +435,106 @@ msgstr "தயை செய்து ஒரு கட்டளையை உள
 msgid "Execution of '%s' failed:"
 msgstr "'%s' ஐ நிறைவேற்றுதல் தோல்வி அடைந்தது:"

-#: ../js/ui/statusMenu.js:101
+#: ../js/ui/statusMenu.js:91
 msgid "Available"
 msgstr "இருப்பவை"

-#: ../js/ui/statusMenu.js:106
+#: ../js/ui/statusMenu.js:95
 msgid "Busy"
 msgstr "வேலையில்"

-#: ../js/ui/statusMenu.js:114
-msgid "My Account"
-msgstr "என் கணக்கு"
+#: ../js/ui/statusMenu.js:99
+msgid "Invisible"
+msgstr "பார்க்கமுடியாதது"

-#: ../js/ui/statusMenu.js:118
-msgid "System Settings"
-msgstr "கணினி அமைப்புகள்"
+#: ../js/ui/statusMenu.js:106
+msgid "Account Information..."
+msgstr "கணக்கு தகவல்..."

-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:110
+msgid "System Preferences..."
+msgstr "கணினி முன்னுரிமைகள்..."
+
+#: ../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/viewSelector.js:26
-msgid "Search your computer"
-msgstr "உங்கள் கணினியில் தேடுக"
-
-#: ../js/ui/windowAttentionHandler.js:43
+#: ../js/ui/windowAttentionHandler.js:45
 #, c-format
 msgid "%s has finished starting"
 msgstr "%s இன் துவக்கம் முடிந்துவிட்டது"

-#: ../js/ui/windowAttentionHandler.js:45
+#: ../js/ui/windowAttentionHandler.js:47
 #, c-format
 msgid "'%s' is ready"
 msgstr "'%s' தயாராக உள்ளது"

-#: ../js/ui/workspacesView.js:244
-msgid "Can't add a new workspace because maximum workspaces limit has been reached."
-msgstr "பணிக்களத்தை சேர்க்க முடியாது; ஏனெனில் பணிக்களங்களின் உச்ச வரம்பு எட்டப்பட்டுவிட்டது."
+#: ../js/ui/workspacesView.js:230
+msgid ""
+"Can't add a new workspace because maximum workspaces limit has been reached."
+msgstr ""
+"பணிக்களத்தை சேர்க்க முடியாது; ஏனெனில் பணிக்களங்களின் உச்ச வரம்பு "
+"எட்டப்பட்டுவிட்டது."

-#: ../js/ui/workspacesView.js:260
+#: ../js/ui/workspacesView.js:247
 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] "%u வெளிப்பாடு"
-msgstr[1] "%u வெளிப்பாடுகள்"
-
-#. 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] "%u உள்ளீடு"
-msgstr[1] "%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:1105
 msgid "Less than a minute ago"
 msgstr "ஒரு நிமிடத்திற்கும் குறைவாக"

-#: ../src/shell-global.c:1167
+#: ../src/shell-global.c:1109
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutes ago"
 msgstr[1] "%d நிமிடங்களுக்கு முன்"

-#: ../src/shell-global.c:1172
+#: ../src/shell-global.c:1114
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d மணிநேரத்துக்கு முன்"
 msgstr[1] "%d மணிகள் முன்"

-#: ../src/shell-global.c:1177
+#: ../src/shell-global.c:1119
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d நாளைக்கு முன்"
 msgstr[1] "%d நாட்களுக்கு முன்"

-#: ../src/shell-global.c:1182
+#: ../src/shell-global.c:1124
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d வாரம் முன்"
 msgstr[1] "%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 "தேடு"

@ -713,44 +543,8 @@ 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 "Overview workspace view mode"
-#~ msgstr "பணி இட மேல்பார்வை காட்சிப் பாங்கு."
-
-#~ msgid ""
-#~ "The selected workspace view mode in the overview. Supported values are "
-#~ "\"single\" and \"grid\"."
-#~ msgstr ""
-#~ "மேல்பார்வையில் தேர்ந்தெடுத்த பணீட காட்சி பாங்கு. ஆதரவுள்ள மதிப்புகள் 'ஒன்று' மற்றும் "
-#~ "'வலை'"
-
-#~ msgid "Drag here to add favorites"
-#~ msgstr "விருப்பங்களுக்கு சேர்க்க இங்கு இழுத்துவிடு"
-
-#~ msgid "Find"
-#~ msgstr "தேடு"
-
-#~ msgid "Searching..."
-#~ msgstr "தேடுகிறது..."
-
-#~ msgid "No matching results."
-#~ msgstr "பொருத்தமான விடைகள் இல்லை"
-
-#~ msgid "ON"
-#~ msgstr "இயக்கத்தில்"
-
-#~ msgid "OFF"
-#~ msgstr "செயல் நீக்கு"
-
-#~ msgid "Invisible"
-#~ msgstr "பார்க்கமுடியாதது"
-
-#~ msgid "Account Information..."
-#~ msgstr "கணக்கு தகவல்..."
-
-#~ msgid "System Preferences..."
-#~ msgstr "கணினி முன்னுரிமைகள்..."
--- 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
@ -4,14 +4,14 @@
 # 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-12-20 21:07+0000\n"
-"PO-Revision-Date: 2010-11-25 14:28+0600\n"
-"Last-Translator: Sahran <sahran@live.com>\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"
@ -20,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"
@ -32,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 ""
@ -42,7 +42,7 @@ 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"
@ -50,11 +50,11 @@ msgstr "ئىچكى قورال قوزغىتىلسا ئىجادكارلار ۋە

 #: ../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 ""
@ -88,9 +88,13 @@ 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 "قىسقىچە بايان خىزمەت رايون كۆرۈنۈش ھالىتى"
+
+#: ../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 "
@ -100,44 +104,50 @@ msgid ""
 "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 "ئۈن ئېلىشنى كودلاشتا ئىشلىتىلىدىغان GStreamer ئاقما لىنىيىنى تەڭشەيدۇ. ئۇ gst-launch گرامماتىكىسىغا بوي سۇنىدۇ. بۇ ئاقما لىنىيىدە ئۇلانمىغان sink pad بولۇشى لازىم، خاتىرىلىنىدىغان سىن مۇشۇ جايدا خاتىرىلىنىدۇ. بۇ لىنىيىدە ئادەتتە يەنە بىر ئۇلانمىغان مەنبە pad بولىدۇ؛ بۇ pad چىقارغان ئۇچۇرلار ھۆججەتكە يېزىلىدۇ. ئەمما ئاقما لىنىيە ئۆزىنىڭ چىقىرىشىنى بىر تەرەپ قىلالايدۇ، بۇنداق بولغاندا shout2send ئارقىلىق ياكى شۇنىڭغا ئوخشاش ئۇسۇلدا چىقىرىشنى icecast مۇلازىمېتىرىغا يوللايدۇ. ئاقما لىنىيە تەڭشەلمىگەن ياكى بوش قىممەتكە تەڭشەلگەندە كۆڭۈلدىكى ئاقما لىنىيە قوزغىتىلىدۇ. ئۇنىڭ نۆۋەتتىكى قىممىتى 'videorate ! theoraenc ! oggmux' بولۇپ، فورماتى Ogg شەكلىدە خاتىرىلىنىدۇ."
+msgstr ""

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

-#: ../data/org.gnome.shell.gschema.xml.in.h:15
-msgid "Show the week date in the calendar"
-msgstr "يىلنامىدە ھەپتىنى كۆرسىتىدۇ"
-
 #: ../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:17
+#: ../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: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 "
 "a different container format."
 msgstr "خاتىرىلەنگەن ئېكراننىڭ ھۆججەت ئاتى نۆۋەتتىكى چېسلا ئاساسىدا بىردىنبىر بولۇپ بۇ كېڭەيتىلگەن ئاتىنى ئىشلىتىدۇ. ئۇ ئۆزگەرسە ئوخشاش بولمىغان قاچا فورماتىدا خاتىرىلەيدۇ."

-#: ../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."
-msgstr "GNOME Shell ئېكران خاتىرىلىگۈچ ھەر سېكۇنتتا خاتىرىلەيدىغان ئېكران كەسمىسى كاندۇك سۈرىتى(ھەر سېكۇنتتىكى كاندۇك سانى)."
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
-msgid "The gstreamer pipeline used to encode the screencast"
-msgstr "ئېكران كەسمىسىنى كودلاشتا ئىشلىتىلىدىغان gstreamer ئاقما لىنىيىسى"
+msgstr "GNOME Shell ئېكران خاتىرىلىگۈچ ھەر سېكۇنتتا خاتىرىلەيدىغان ئېكران كەسمىسى كاندۇك نىسبىتى"

 #: ../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 "
@ -145,7 +155,7 @@ msgid ""
 "remove already saved data."
 msgstr "چاپان (shell) ئادەتتىكى ئەھۋالدا كۆپ ئىشلىتىلىدىغان ئاكتىپ پروگراممىلار(مەسىلەن، ئىجرا قىلىنىۋاتقان)نى كۆزىتىدۇ. گەرچە بۇ سانلىق مەلۇماتلار مەخپىي ساقلانسىمۇ، شەخسىي سىر سەۋەبىدىن بۇنى چەكلىشىڭىز مۇمكىن. دىققەت بۇنداق قىلغاندا ئاللىبۇرۇن ساقلانغان سانلىق مەلۇماتلار چىقىرىۋېتىلمەيدۇ."

-#: ../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"
@ -153,7 +163,7 @@ msgid ""
 "information."
 msgstr "format (فورمات) كۇنۇپكىسى \"custom\" (ئىختىيارى) قىلىپ تەڭشەلسە بۇ كۇنۇپكا تاختا سائەت ئىشلىتىدىغان فورماتنى بەلگىلەيدۇ. سىز strftime()نىڭ فورمات بەلگىسىنى ئىشلىتىپ بەلگىلەنگەن فورماتقا ئېرىشەلەيسىز. تەپسىلاتىنى strftime() نىڭ قوللانمىسىدىن كۆرۈڭ."

-#: ../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\", "
@ -163,27 +173,27 @@ msgid ""
 "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 قىممىتىگە پەرۋا قىلمايدۇ"

-#: ../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 "چەكلىنىدىغان كېڭەيتىلمىنىڭ Uuid سى"
+msgstr "كېڭەيتىلمىنىڭ Uuid چەكلەندى"

-#: ../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 "پروگراممىنىڭ ئىشلىتىلىشى ھەققىدىكى ستاتىستىكىنى توپلامدۇ يوق"

 #: ../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 "نىشانلىغۇچنى ھاسىل قىلىدىغان توغرا ۋە بوي سىزىقنىڭ ئۇزۇنلۇقى بەلگىلىنىدۇ."
+msgstr ""

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:4
 msgid ""
@ -202,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 ""
@ -213,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 ""
@ -230,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"
@ -250,25 +260,25 @@ msgstr "ئېكران ئورنى"

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:15
 msgid "Scroll magnified contents beyond the edges of the desktop"
-msgstr "دومىلىما چوڭايتقۇچ ئۈستەلئۈستى گىرۋەك مەزمۇنىدىن ھالقىپ كەتتى"
+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 ""
@ -280,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 ""
@ -294,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"
@ -306,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"
@ -324,45 +334,62 @@ msgstr "_12 سائەت فورماتى"
 msgid "_24 hour format"
 msgstr "_24 سائەت فورماتى"

-#: ../js/ui/appDisplay.js:154
-msgid "All"
-msgstr "ھەممىسى"
-
-#: ../js/ui/appDisplay.js:235
+#. **** Applications ****
+#: ../js/ui/appDisplay.js:316 ../js/ui/dash.js:778
 msgid "APPLICATIONS"
 msgstr "پروگراممىلار"

-#: ../js/ui/appDisplay.js:265
+#: ../js/ui/appDisplay.js:348
 msgid "PREFERENCES"
 msgstr "مايىللىق"

-#: ../js/ui/appDisplay.js:562
+#: ../js/ui/appDisplay.js:647
 msgid "New Window"
 msgstr "يېڭى كۆزنەك"

-#: ../js/ui/appDisplay.js:566
+#: ../js/ui/appDisplay.js:651
 msgid "Remove from Favorites"
 msgstr "يىغقۇچتىن چىقىرىۋەت"

-#: ../js/ui/appDisplay.js:567
+#: ../js/ui/appDisplay.js:652
 msgid "Add to Favorites"
 msgstr "يىغقۇچقا قوش"

-#: ../js/ui/appFavorites.js:91
+#: ../js/ui/appDisplay.js:829
+msgid "Drag here to add favorites"
+msgstr "بۇ جايغا سۆرەپ قىسقۇچقا قوش"
+
+#: ../js/ui/appFavorites.js:88
 #, c-format
 msgid "%s has been added to your favorites."
-msgstr "%s يىغقۇچىڭىزغا قوشۇلدى."
+msgstr "%s يىغقۇچىڭىزغا قوشۇلىدۇ."

-#: ../js/ui/appFavorites.js:122
+#: ../js/ui/appFavorites.js:107
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s يىغقۇچىڭىزدىن چىقىرىۋېتىلىدۇ."

-#: ../js/ui/dash.js:27
-msgid "Remove"
-msgstr "چىقىرىۋەت"
+#: ../js/ui/dash.js:142
+msgid "Find"
+msgstr "ئىزدە"

-#: ../js/ui/docDisplay.js:494
+#: ../js/ui/dash.js:473
+msgid "Searching..."
+msgstr "ئىزدەۋاتىدۇ…"
+
+#: ../js/ui/dash.js:487
+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:554
+msgid "PLACES & DEVICES"
+msgstr "ئورۇن ۋە ئۈسكۈنىلەر"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:804 ../js/ui/docDisplay.js:494
 msgid "RECENT ITEMS"
 msgstr "يېقىنقى تۈرلەر"

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

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

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

-#: ../js/ui/overview.js:158
-#| msgid "New Window"
-msgid "Windows"
-msgstr "كۆزنەكلەر"
-
-#: ../js/ui/overview.js:161
-msgid "Applications"
-msgstr "پروگراممىلار"
-
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:474
+#: ../js/ui/panel.js:469
 #, c-format
 msgid "Quit %s"
 msgstr "%s چېكىن"

-#: ../js/ui/panel.js:499
+#: ../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:585
+#: ../js/ui/panel.js:580
 msgid "%a %b %e, %R:%S"
 msgstr "%a %b %e، %R:%S"

-#: ../js/ui/panel.js:586
+#: ../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:590
+#: ../js/ui/panel.js:585
 msgid "%a %R:%S"
 msgstr "%a %R:%S"

-#: ../js/ui/panel.js:591
+#: ../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:598
+#: ../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:599
+#: ../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:603
+#: ../js/ui/panel.js:598
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l:%M:%S %p"

-#: ../js/ui/panel.js:604
+#: ../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:749
+#: ../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"
@ -476,11 +494,7 @@ msgstr "قايتا سىنا"

 #: ../js/ui/placeDisplay.js:159
 msgid "Connect to..."
-msgstr "باغلىنىش…"
-
-#: ../js/ui/placeDisplay.js:558
-msgid "PLACES & DEVICES"
-msgstr "ئورۇن ۋە ئۈسكۈنىلەر"
+msgstr "باغلانماق..."

 #. Translators: this MUST be either "toggle-switch-us"
 #. (for toggle switches containing the English words
@ -489,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:"
@ -498,51 +512,52 @@ 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
-#| msgid "My Account..."
-msgid "My Account"
-msgstr "ھېساباتىم"
+#: ../js/ui/statusMenu.js:111
+msgid "Invisible"
+msgstr "يوشۇرۇن"

-#: ../js/ui/statusMenu.js:118
-#| msgid "System Settings..."
-msgid "System Settings"
-msgstr "سىستېما تەڭشىكى"
-
-#: ../js/ui/statusMenu.js:125
-msgid "Lock Screen"
-msgstr "ئېكراننى قۇلۇپلاش"
-
-#: ../js/ui/statusMenu.js:129
-msgid "Switch User"
-msgstr "ئىشلەتكۈچى ئالماشتۇرۇش"
-
-#: ../js/ui/statusMenu.js:134
-msgid "Log Out..."
-msgstr "تىزىمدىن چىقىش…"
-
-#: ../js/ui/statusMenu.js:141
-#| msgid "Suspend"
-msgid "Suspend..."
+#: ../js/ui/statusMenu.js:119
+msgid "My Account..."
 msgstr ""

-#: ../js/ui/statusMenu.js:145
+#: ../js/ui/statusMenu.js:123
+msgid "System Settings..."
+msgstr "سىستېما تەڭشەكلىرى"
+
+#: ../js/ui/statusMenu.js:130
+msgid "Lock Screen"
+msgstr "ئېكراننى قۇلۇپلا"
+
+#: ../js/ui/statusMenu.js:134
+msgid "Switch User"
+msgstr "ئىشلەتكۈچى ئالماشتۇر"
+
+#: ../js/ui/statusMenu.js:139
+msgid "Log Out..."
+msgstr "تىزىمدىن چىق…"
+
+#: ../js/ui/statusMenu.js:146
+msgid "Suspend"
+msgstr "ۋاقىتلىق توختىتىش"
+
+#: ../js/ui/statusMenu.js:150
+msgid "Restart..."
+msgstr ""
+
+#: ../js/ui/statusMenu.js:154
 msgid "Shut Down..."
 msgstr "تاقا…"

-#: ../js/ui/status/accessibility.js:82
-msgid "Zoom"
-msgstr "كېڭەيت تارايت"
-
 #: ../js/ui/status/accessibility.js:88
 msgid "Screen Reader"
 msgstr "ئېكران ئوقۇغۇچ"
@ -557,288 +572,35 @@ 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/bluetooth.js:42 ../js/ui/status/bluetooth.js:200
-msgid "Bluetooth"
-msgstr "كۆكچىش"
-
-#: ../js/ui/status/bluetooth.js:55
-msgid "Visibility"
-msgstr "كۆرۈشچانلىقى"
-
-#: ../js/ui/status/bluetooth.js:68
-msgid "Send Files to Device..."
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:71
-msgid "Setup a New Device..."
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:94
-#| msgid "System Settings..."
-msgid "Bluetooth Settings"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:151
-#| msgid "Connect to..."
-msgid "Connection"
-msgstr "باغلىنىش"
-
-#: ../js/ui/status/bluetooth.js:187
-#| msgid "Suspend"
-msgid "Send Files..."
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:192
-msgid "Browse Files..."
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:201
-msgid "Error browsing device"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:202
-#, c-format
-msgid "The requested device cannot be browsed, error is '%s'"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:210
-#| msgid "System Settings..."
-msgid "Keyboard Settings"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:215
-#| msgid "System Settings..."
-msgid "Mouse Settings"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:222 ../js/ui/status/volume.js:62
-#| msgid "System Settings..."
-msgid "Sound Settings"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:293 ../js/ui/status/bluetooth.js:327
-#: ../js/ui/status/bluetooth.js:367 ../js/ui/status/bluetooth.js:400
-msgid "Bluetooth Agent"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:328
-#, c-format
-msgid "Authorization request from %s"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:334
-#, c-format
-msgid "Device %s wants access to the service '%s'"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:336
-msgid "Always grant access"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:337
-msgid "Grant this time only"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:338
-msgid "Reject"
-msgstr "رەت قىل"
-
-#: ../js/ui/status/bluetooth.js:368
-#, c-format
-msgid "Pairing confirmation for %s"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:374 ../js/ui/status/bluetooth.js:408
-#, c-format
-msgid "Device %s wants to pair with this computer"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:375
-#, c-format
-msgid "Please confirm whether the PIN '%s' matches the one on the device."
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:377
-msgid "Matches"
-msgstr "جۈپلەش تۈرى"
-
-#: ../js/ui/status/bluetooth.js:378
-msgid "Does not match"
-msgstr "جۈپلىمە"
-
-#: ../js/ui/status/bluetooth.js:401
-#, c-format
-msgid "Pairing request for %s"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:409
-msgid "Please enter the PIN mentioned on the device."
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:425
-msgid "OK"
-msgstr "جەزملە"
-
-#: ../js/ui/status/bluetooth.js:426
-msgid "Cancel"
-msgstr "ۋاز كەچ"
-
-#: ../js/ui/status/power.js:85
-#| msgid "System Settings..."
-msgid "Power Settings"
-msgstr ""
-
-#: ../js/ui/status/power.js:112
-#, c-format
-#| msgid "%d hour ago"
-#| msgid_plural "%d hours ago"
-msgid "%d hour remaining"
-msgid_plural "%d hours remaining"
-msgstr[0] ""
-
-#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:115
-#, c-format
-msgid "%d %s %d %s remaining"
-msgstr ""
-
-#: ../js/ui/status/power.js:117
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "سائەت"
-
-#: ../js/ui/status/power.js:117
-#| msgid "%d minute ago"
-#| msgid_plural "%d minutes ago"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "مىنۇت"
-
-#: ../js/ui/status/power.js:120
-#, c-format
-#| msgid "%d minute ago"
-#| msgid_plural "%d minutes ago"
-msgid "%d minute remaining"
-msgid_plural "%d minutes remaining"
-msgstr[0] ""
-
-#: ../js/ui/status/power.js:237
-msgid "AC adapter"
-msgstr ""
-
-#: ../js/ui/status/power.js:239
-msgid "Laptop battery"
-msgstr ""
-
-#: ../js/ui/status/power.js:241
-msgid "UPS"
-msgstr "UPS"
-
-#: ../js/ui/status/power.js:243
-msgid "Monitor"
-msgstr "ئېكران"
-
-#: ../js/ui/status/power.js:245
-#| msgid "Mouse Keys"
-msgid "Mouse"
-msgstr "چاشقىنەك"
-
-#: ../js/ui/status/power.js:247
-#| msgid "Screen Keyboard"
-msgid "Keyboard"
-msgstr "ھەرپتاختا"
-
-#: ../js/ui/status/power.js:249
-msgid "PDA"
-msgstr "PDA"
-
-#: ../js/ui/status/power.js:251
-msgid "Cell phone"
-msgstr ""
-
-#: ../js/ui/status/power.js:253
-msgid "Media player"
-msgstr "Media چالغۇ"
-
-#: ../js/ui/status/power.js:255
-#| msgid "Enabled"
-msgid "Tablet"
-msgstr "سەزمە تاختا"
-
-#: ../js/ui/status/power.js:257
-msgid "Computer"
-msgstr "كومپيۇتېر"
-
-#: ../js/ui/status/power.js:259 ../src/shell-app-system.c:1012
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#: ../js/ui/status/volume.js:41
-msgid "Volume"
-msgstr "دىسكا"
-
-#: ../js/ui/status/volume.js:54
-msgid "Microphone"
-msgstr ""
-
-#: ../js/ui/telepathyClient.js:560
-#, c-format
-msgid "%s is online."
-msgstr ""
-
-#: ../js/ui/telepathyClient.js:565
-#, c-format
-msgid "%s is offline."
-msgstr ""
-
-#: ../js/ui/telepathyClient.js:568
-#, c-format
-#| msgid "'%s' is ready"
-msgid "%s is away."
-msgstr ""
-
-#: ../js/ui/telepathyClient.js:571
-#, c-format
-msgid "%s is busy."
-msgstr ""
-
-#. Translators: this is a time format string followed by a date.
-#. If applicable, replace %X with a strftime format valid for your
-#. locale, without seconds.
-#: ../js/ui/telepathyClient.js:664
-#, no-c-format
-msgid "Sent at %X on %A"
-msgstr ""
-
-#: ../js/ui/viewSelector.js:26
-msgid "Search your computer"
-msgstr ""
+#: ../js/ui/status/accessibility.js:223
+msgid "Zoom"
+msgstr "كېڭەيت تارايت"

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

-#: ../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 "يېڭى خىزمەت رايونى قوشالمايدۇ چۈنكى ئەڭ كۆپ خىزمەت رايون چېكىگە يەتتى."

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

 #. translators:
 #. * The number of sound outputs on a particular device
@ -865,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
@ -873,51 +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-global.c:1155
+#: ../src/shell-global.c:1219
 msgid "Less than a minute ago"
 msgstr "بىر مىنۇتتىنمۇ ئىلگىرى"

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

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

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

-#: ../src/shell-global.c:1174
+#: ../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 "ئىزدە"

@ -926,32 +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 "Overview workspace view mode"
-#~ msgstr "خىزمەت رايون كۆرۈنۈش ھالىتى ھەققىدە قىسقىچە بايان"
-
-#~ msgid ""
-#~ "The selected workspace view mode in the overview. Supported values are "
-#~ "\"single\" and \"grid\"."
-#~ msgstr ""
-#~ "قىسقىچە باياندىكى تاللانغان خىزمەت رايونىنىڭ كۆرۈنۈش ھالىتى. ئىشلىتىشكە "
-#~ "بولىدىغان قىممەتلەر «يەككە» ۋە «سېتكا»"
-
-#~ msgid "Drag here to add favorites"
-#~ msgstr "بۇ جايغا سۆرەپ يىغقۇچقا قوش"
-
-#~ msgid "Find"
-#~ msgstr "ئىزدە"
-
-#~ msgid "Searching..."
-#~ msgstr "ئىزدەۋاتىدۇ..."
-
-#~ msgid "No matching results."
-#~ msgstr "ماس كېلىدىغان نەتىجە يوق."
-
-#~ msgid "Invisible"
-#~ msgstr "يوشۇرۇن"
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@ -6,22 +6,19 @@
 # Aron Xu <aronxu@gnome.org>, 2010.
 # Jessica Ban <bancage@gmail.com>, 2010.
 # YunQiang Su <wzssyqa@gmail.com>, 2010.
-# zhang ping <zhangping159@gmail.com>, 2010.
-# 指冷玉笙寒 (dhyang) <dhyang555@gmail.com>, 2010
 #
 msgid ""
 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-12-23 17:30+0000\n"
-"PO-Revision-Date: 2010-12-25 20:54+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"POT-Creation-Date: 2010-10-30 17:51+0000\n"
+"PO-Revision-Date: 2010-10-28 01:24+0800\n"
+"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
@ -97,6 +94,10 @@ msgid "List of desktop file IDs for favorite applications"
 msgstr "收藏夹中的应用程序的 desktop 文件 ID 的列表"

 #: ../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 "
@ -114,25 +115,25 @@ msgstr ""
 "器。当管道未被设置或者设置为空值时，默认的管道将被启用。其值当前"
 "为“videorate ! theoraenc ! oggmux”并记录为 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 "显示日期"

-#: ../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 "在日历中显示星期"

-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid "Show time with seconds"
 msgstr "显示秒"

-#: ../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."
 msgstr "符合这些标示的应用程序将显示在收藏区中。"

-#: ../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 "
@ -141,17 +142,25 @@ msgstr ""
 "录制的屏幕录像的文件名将是根据当前时间得到的独特值，并使用这个扩展名。录制另"
 "外一个不同容器格式的录像时，它应该被更改。"

-#: ../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."
 msgstr "GNOME Shell 的屏幕录像程序录制的屏幕录像的帧率，以 帧/秒 为格式。"

-#: ../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 "用于编码屏幕录像的 GStreamer 管线"

-#: ../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 ""
+"总览中，选中的工作区的试图模式。支持的值有 \"single\"(单独) 和 \"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 "
@ -162,7 +171,7 @@ msgstr ""
 "时，此数据将保持私密，您可能因为隐私原因想要禁用此项。请注意，这么做，并不会"
 "移除已经保存的数据。"

-#: ../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"
@ -173,7 +182,7 @@ msgstr ""
 "以被 strftime() 理解的转义符获取特定的格式。请查看 strftime() 的文档获取更多"
 "信息。"

-#: ../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\", "
@ -188,11 +197,11 @@ msgstr ""
 "示时间。注意，如果设置为 \"unix\" 或 \"custom\"，show_date 和 show_seconds 键"
 "将被忽略。"

-#: ../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 "要禁用的扩展的 uuid"

-#: ../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 "是否收集应用程序的使用情况"

@ -357,46 +366,62 @@ msgstr "_12 时格式"
 msgid "_24 hour format"
 msgstr "_24 小时格式"

-#. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:155
-msgid "All"
-msgstr "全部"
-
-#: ../js/ui/appDisplay.js:236
+#. **** Applications ****
+#: ../js/ui/appDisplay.js:316 ../js/ui/dash.js:778
 msgid "APPLICATIONS"
 msgstr "应用程序"

-#: ../js/ui/appDisplay.js:266
+#: ../js/ui/appDisplay.js:348
 msgid "PREFERENCES"
 msgstr "首选项"

-#: ../js/ui/appDisplay.js:563
+#: ../js/ui/appDisplay.js:647
 msgid "New Window"
 msgstr "新窗口"

-#: ../js/ui/appDisplay.js:567
+#: ../js/ui/appDisplay.js:651
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"

-#: ../js/ui/appDisplay.js:568
+#: ../js/ui/appDisplay.js:652
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"

-#: ../js/ui/appFavorites.js:91
+#: ../js/ui/appDisplay.js:829
+msgid "Drag here to add favorites"
+msgstr "拖到这里加入收藏夹"
+
+#: ../js/ui/appFavorites.js:88
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s 已经添加到了您的收藏夹。"

-#: ../js/ui/appFavorites.js:122
+#: ../js/ui/appFavorites.js:107
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s 已经从您的收藏夹移除。"

-#: ../js/ui/dash.js:27
-msgid "Remove"
-msgstr "移除"
+#: ../js/ui/dash.js:142
+msgid "Find"
+msgstr "查找"

-#: ../js/ui/docDisplay.js:494
+#: ../js/ui/dash.js:473
+msgid "Searching..."
+msgstr "正在搜索..."
+
+#: ../js/ui/dash.js:487
+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:554
+msgid "PLACES & DEVICES"
+msgstr "位置和设备"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:804 ../js/ui/docDisplay.js:494
 msgid "RECENT ITEMS"
 msgstr "最近的项目"

@ -430,71 +455,63 @@ msgstr "查看源"
 msgid "Web Page"
 msgstr "网页"

-#: ../js/ui/overview.js:96
+#: ../js/ui/overview.js:160
 msgid "Undo"
 msgstr "撤销"

-#: ../js/ui/overview.js:158
-msgid "Windows"
-msgstr "窗口"
-
-#: ../js/ui/overview.js:161
-msgid "Applications"
-msgstr "应用程序"
-
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:474
+#: ../js/ui/panel.js:469
 #, c-format
 msgid "Quit %s"
 msgstr "退出 %s"

-#: ../js/ui/panel.js:499
+#: ../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:585
+#: ../js/ui/panel.js:580
 msgid "%a %b %e, %R:%S"
 msgstr "%A %b %e, %R:%S"

-#: ../js/ui/panel.js:586
+#: ../js/ui/panel.js:581
 msgid "%a %b %e, %R"
 msgstr "%A %m月%d日 %R"

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

-#: ../js/ui/panel.js:591
+#: ../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:598
+#: ../js/ui/panel.js:593
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%A %m月%d日 %p%I:%M:%S"

-#: ../js/ui/panel.js:599
+#: ../js/ui/panel.js:594
 msgid "%a %b %e, %l:%M %p"
 msgstr "%A %m月%d日 %p%I:%M"

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

-#: ../js/ui/panel.js:604
+#: ../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:749
+#: ../js/ui/panel.js:744
 msgid "Activities"
 msgstr "活动"

@ -511,10 +528,6 @@ msgstr "重试"
 msgid "Connect to..."
 msgstr "连接到..."

-#: ../js/ui/placeDisplay.js:558
-msgid "PLACES & DEVICES"
-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
@ -541,38 +554,44 @@ msgstr "可用"
 msgid "Busy"
 msgstr "忙碌"

-#: ../js/ui/statusMenu.js:114
-msgid "My Account"
-msgstr "我的帐户"
+#: ../js/ui/statusMenu.js:111
+msgid "Invisible"
+msgstr "隐身"

-#: ../js/ui/statusMenu.js:118
-msgid "System Settings"
-msgstr "系统设置"
+#: ../js/ui/statusMenu.js:119
+msgid "My Account..."
+msgstr "我的帐户..."

-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:123
+#, fuzzy
+#| msgid "System Preferences..."
+msgid "System Settings..."
+msgstr "系统首选项..."
+
+#: ../js/ui/statusMenu.js:130
 msgid "Lock Screen"
 msgstr "锁住屏幕"

-#: ../js/ui/statusMenu.js:129
+#: ../js/ui/statusMenu.js:134
 msgid "Switch User"
 msgstr "切换用户"

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

-#: ../js/ui/statusMenu.js:141
-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 "关机..."

-#: ../js/ui/status/accessibility.js:82
-msgid "Zoom"
-msgstr "缩放"
-
 #: ../js/ui/status/accessibility.js:88
 msgid "Screen Reader"
 msgstr "屏幕阅读器"
@ -609,249 +628,13 @@ msgstr "通用访问设置"
 msgid "High Contrast"
 msgstr "高对比度"

-#: ../js/ui/status/accessibility.js:205
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "大号文本"

-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:234
-msgid "Bluetooth"
-msgstr "蓝牙"
-
-#: ../js/ui/status/bluetooth.js:55
-msgid "Visibility"
-msgstr "可见性"
-
-#: ../js/ui/status/bluetooth.js:69
-msgid "Send Files to Device..."
-msgstr "发送文件到设备..."
-
-#: ../js/ui/status/bluetooth.js:70
-msgid "Setup a New Device..."
-msgstr "安装新设备..."
-
-#: ../js/ui/status/bluetooth.js:94
-msgid "Bluetooth Settings"
-msgstr "蓝牙设置"
-
-#: ../js/ui/status/bluetooth.js:185
-msgid "Connection"
-msgstr "连接"
-
-#: ../js/ui/status/bluetooth.js:221
-msgid "Send Files..."
-msgstr "发送文件..."
-
-#: ../js/ui/status/bluetooth.js:226
-msgid "Browse Files..."
-msgstr "浏览文件..."
-
-#: ../js/ui/status/bluetooth.js:235
-msgid "Error browsing device"
-msgstr "浏览设备出错"
-
-#: ../js/ui/status/bluetooth.js:236
-#, c-format
-msgid "The requested device cannot be browsed, error is '%s'"
-msgstr "无法浏览请求的设备，错误为 %s"
-
-#: ../js/ui/status/bluetooth.js:244
-msgid "Keyboard Settings"
-msgstr "键盘设置"
-
-#: ../js/ui/status/bluetooth.js:249
-msgid "Mouse Settings"
-msgstr "鼠标设置"
-
-#: ../js/ui/status/bluetooth.js:256 ../js/ui/status/volume.js:62
-msgid "Sound Settings"
-msgstr "声音设置"
-
-#: ../js/ui/status/bluetooth.js:327 ../js/ui/status/bluetooth.js:361
-#: ../js/ui/status/bluetooth.js:401 ../js/ui/status/bluetooth.js:434
-msgid "Bluetooth Agent"
-msgstr "蓝牙助手"
-
-#: ../js/ui/status/bluetooth.js:362
-#, c-format
-msgid "Authorization request from %s"
-msgstr "来自 %s 的认证请求"
-
-#: ../js/ui/status/bluetooth.js:368
-#, c-format
-msgid "Device %s wants access to the service '%s'"
-msgstr "设备 %s 希望访问 %s 服务"
-
-#: ../js/ui/status/bluetooth.js:370
-msgid "Always grant access"
-msgstr "始终允许"
-
-#: ../js/ui/status/bluetooth.js:371
-msgid "Grant this time only"
-msgstr "允许一次"
-
-#: ../js/ui/status/bluetooth.js:372
-msgid "Reject"
-msgstr "拒绝"
-
-#: ../js/ui/status/bluetooth.js:402
-#, c-format
-msgid "Pairing confirmation for %s"
-msgstr "%s 的配对确认"
-
-#: ../js/ui/status/bluetooth.js:408 ../js/ui/status/bluetooth.js:442
-#, c-format
-msgid "Device %s wants to pair with this computer"
-msgstr "设备 %s 希望与此电脑配对"
-
-#: ../js/ui/status/bluetooth.js:409
-#, c-format
-msgid "Please confirm whether the PIN '%s' matches the one on the device."
-msgstr "请确认 PIN 码 %s 和要配对的设备是否相同。"
-
-#: ../js/ui/status/bluetooth.js:411
-msgid "Matches"
-msgstr "相同"
-
-#: ../js/ui/status/bluetooth.js:412
-msgid "Does not match"
-msgstr "不同"
-
-#: ../js/ui/status/bluetooth.js:435
-#, c-format
-msgid "Pairing request for %s"
-msgstr "%s 的配对请求"
-
-#: ../js/ui/status/bluetooth.js:443
-msgid "Please enter the PIN mentioned on the device."
-msgstr "请输入设备上的 PIN 码。"
-
-#: ../js/ui/status/bluetooth.js:459
-msgid "OK"
-msgstr "确定"
-
-#: ../js/ui/status/bluetooth.js:460
-msgid "Cancel"
-msgstr "取消"
-
-#: ../js/ui/status/power.js:85
-msgid "Power Settings"
-msgstr "电源设置"
-
-#: ../js/ui/status/power.js:112
-#, c-format
-msgid "%d hour remaining"
-msgid_plural "%d hours remaining"
-msgstr[0] "剩余 %d 小时"
-
-#. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:115
-#, c-format
-msgid "%d %s %d %s remaining"
-msgstr "剩余 %d %s %d %s"
-
-#: ../js/ui/status/power.js:117
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "小时"
-
-#: ../js/ui/status/power.js:117
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "分钟"
-
-#: ../js/ui/status/power.js:120
-#, c-format
-msgid "%d minute remaining"
-msgid_plural "%d minutes remaining"
-msgstr[0] "剩余 %d 分钟"
-
-#: ../js/ui/status/power.js:237
-msgid "AC adapter"
-msgstr "AC 适配器"
-
-#: ../js/ui/status/power.js:239
-msgid "Laptop battery"
-msgstr "笔记本电池"
-
-#: ../js/ui/status/power.js:241
-msgid "UPS"
-msgstr "UPS"
-
-#: ../js/ui/status/power.js:243
-msgid "Monitor"
-msgstr "显示器"
-
-#: ../js/ui/status/power.js:245
-msgid "Mouse"
-msgstr "鼠标"
-
-#: ../js/ui/status/power.js:247
-msgid "Keyboard"
-msgstr "键盘"
-
-#: ../js/ui/status/power.js:249
-msgid "PDA"
-msgstr "PDA"
-
-#: ../js/ui/status/power.js:251
-msgid "Cell phone"
-msgstr "手机"
-
-#: ../js/ui/status/power.js:253
-msgid "Media player"
-msgstr "媒体播放器"
-
-#: ../js/ui/status/power.js:255
-msgid "Tablet"
-msgstr "触摸板"
-
-#: ../js/ui/status/power.js:257
-msgid "Computer"
-msgstr "计算机"
-
-#: ../js/ui/status/power.js:259 ../src/shell-app-system.c:1012
-msgid "Unknown"
-msgstr "未知"
-
-#: ../js/ui/status/volume.js:41
-msgid "Volume"
-msgstr "音量"
-
-#: ../js/ui/status/volume.js:54
-msgid "Microphone"
-msgstr "麦克风"
-
-#: ../js/ui/telepathyClient.js:560
-#, c-format
-msgid "%s is online."
-msgstr "%s 在线。"
-
-#: ../js/ui/telepathyClient.js:565
-#, c-format
-msgid "%s is offline."
-msgstr "%s 离线。"
-
-#: ../js/ui/telepathyClient.js:568
-#, c-format
-msgid "%s is away."
-msgstr "%s 离开。"
-
-#: ../js/ui/telepathyClient.js:571
-#, c-format
-msgid "%s is busy."
-msgstr "%s 忙碌。"
-
-#. Translators: this is a time format string followed by a date.
-#. If applicable, replace %X with a strftime format valid for your
-#. locale, without seconds.
-#: ../js/ui/telepathyClient.js:665
-#, no-c-format
-msgid "Sent at %X on %A"
-msgstr "发送于 %X on %A"
-
-#: ../js/ui/viewSelector.js:26
-msgid "Search your computer"
-msgstr "搜索您的计算机"
+#: ../js/ui/status/accessibility.js:223
+msgid "Zoom"
+msgstr "缩放"

 #: ../js/ui/windowAttentionHandler.js:43
 #, c-format
@ -863,12 +646,12 @@ msgstr "%s 已启动"
 msgid "'%s' is ready"
 msgstr "%s 已就绪"

-#: ../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 "无法添加新工作区，因为已经达到了工作区数量限制。"

-#: ../js/ui/workspacesView.js:260
+#: ../js/ui/workspacesView.js:246
 msgid "Can't remove the first workspace."
 msgstr "不能移除第一个工作区。"

@ -878,7 +661,7 @@ msgstr "不能移除第一个工作区。"
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
-msgstr[0] "%u 个输出"
+msgstr[0] ""

 #. translators:
 #. * The number of sound inputs on a particular device
@ -886,51 +669,51 @@ msgstr[0] "%u 个输出"
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
-msgstr[0] "%u 个输入"
+msgstr[0] ""

 #: ../src/gvc/gvc-mixer-control.c:1402
 msgid "System Sounds"
-msgstr "系统声音"
+msgstr ""

-#: ../src/shell-global.c:1156
+#: ../src/shell-global.c:1219
 msgid "Less than a minute ago"
 msgstr "少于一分钟前"

-#: ../src/shell-global.c:1160
+#: ../src/shell-global.c:1223
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"

-#: ../src/shell-global.c:1165
+#: ../src/shell-global.c:1228
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"

-#: ../src/shell-global.c:1170
+#: ../src/shell-global.c:1233
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"

-#: ../src/shell-global.c:1175
+#: ../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 "主文件夹"

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

@ -939,42 +722,11 @@ 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 "What's using power..."
-#~ msgstr "哪些设备在用电..."
-
-#~ msgid "Overview workspace view mode"
-#~ msgstr "工作区视图模式的总览"
-
-#~ msgid ""
-#~ "The selected workspace view mode in the overview. Supported values are "
-#~ "\"single\" and \"grid\"."
-#~ msgstr ""
-#~ "总览中，选中的工作区的试图模式。支持的值有 \"single\"(单独) 和 \"grid\"(网"
-#~ "格)。"
-
-#~ msgid "Drag here to add favorites"
-#~ msgstr "拖到这里加入收藏夹"
-
-#~ msgid "Find"
-#~ msgstr "查找"
-
-#~ msgid "Searching..."
-#~ msgstr "正在搜索..."
-
-#~ msgid "No matching results."
-#~ msgstr "无匹配结果。"
-
-#~ msgid "Invisible"
-#~ msgstr "隐身"
-
-#~ msgid "Restart..."
-#~ msgstr "重启..."
-
 #~ msgid "ON"
 #~ msgstr "开"

@ -987,6 +739,9 @@ msgstr "%1$s: %2$s"
 #~ msgid "%H:%M"
 #~ msgstr "%H:%M"

+#~ msgid "Applications"
+#~ msgstr "应用程序"
+
 #~ msgid "Recent Documents"
 #~ msgstr "最近文档"

@ -1002,6 +757,9 @@ msgstr "%1$s: %2$s"
 #~ msgid "SEARCH RESULTS"
 #~ msgstr "搜索结果"

+#~ msgid "Unknown"
+#~ msgstr "未知"
+
 #~ msgid "Can't lock screen: %s"
 #~ msgstr "不能锁住屏幕：%s"

--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/Makefile-calendar-client.am
+++ b/src/Makefile-calendar-client.am
@ -1,22 +0,0 @@
-
-noinst_LTLIBRARIES += libcalendar-client.la
-
-libcalendar_client_la_SOURCES = 							\
-	calendar-client/calendar-client.h	calendar-client/calendar-client.c	\
-	calendar-client/calendar-debug.h						\
-	calendar-client/calendar-sources.c	calendar-client/calendar-sources.h	\
-	$(NULL)
-
-libcalendar_client_la_CFLAGS = 			\
-	-I$(top_srcdir)/src			\
-	-DPREFIX=\""$(prefix)"\"		\
-	-DLIBDIR=\""$(libdir)"\"		\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DG_DISABLE_DEPRECATED			\
-	-DG_LOG_DOMAIN=\"CalendarClient\"	\
-	$(LIBECAL_CFLAGS)			\
-	$(NULL)
-
-libcalendar_client_la_LIBADD = $(LIBECAL_LIBS)
-
-EXTRA_DIST += calendar-client/README
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@ -47,7 +47,7 @@ st-marshal.c: Makefile st/st-marshal.list

 st-enum-types.h: stamp-st-enum-types.h Makefile
 	@true
-stamp-st-enum-types.h: $(source_h) st/st-enum-types.h.in $(st_source_h)
+stamp-st-enum-types.h: $(source_h) st/st-enum-types.h.in
 	$(AM_V_GEN) ( cd $(srcdir) &&					\
 	  $(GLIB_MKENUMS)						\
 	    --template st/st-enum-types.h.in				\
@ -98,22 +98,15 @@ st_source_h =					\
 	st/st-tooltip.h				\
 	st/st-types.h				\
 	st/st-widget.h				\
-	st/st-widget-accessible.h		\
 	$(NULL)

-st.h: stamp-st.h
-	@true
-stamp-st.h: Makefile
+st.h: Makefile
 	$(AM_V_GEN) (echo "#define ST_H_INSIDE 1";	\
 	for name in $(st_source_h); do			\
 	  echo "#include <"$$name">";			\
-	done; echo "#undef ST_H_INSIDE") > $@.tmp &&  \
-	(cmp -s $@.tmp st.h || cp $@.tmp st.h) &&	\
-	rm -f $@.tmp &&				\
-	echo timestamp > $(@F)
+	done; echo "#undef ST_H_INSIDE") > st.h.tmp && mv st.h.tmp st.h

 BUILT_SOURCES += st.h
-CLEANFILES += stamp-st.h

 st_source_private_h =				\
 	st/st-private.h				\
@ -159,17 +152,11 @@ st_source_c =					\
 	st/st-widget.c				\
 	$(NULL)

-st_non_gir_sources =           \
-	st/st-scroll-view-fade.c	\
-	st/st-scroll-view-fade.h	\
-	$(NULL)
-
 noinst_LTLIBRARIES += libst-1.0.la

 libst_1_0_la_LIBADD = -lm $(ST_LIBS)
 libst_1_0_la_SOURCES =				\
-	$(st_source_c)					\
-	$(st_non_gir_sources)			\
+	$(st_source_c)				\
 	$(st_source_private_h)			\
 	$(st_source_private_c)			\
 	$(st_source_h)				\
--- a/src/Makefile-tray.am
+++ b/src/Makefile-tray.am
@ -15,6 +15,7 @@ TRAY_STAMP_FILES = stamp-na-marshal.h

 # please, keep this sorted alphabetically
 tray_source =			\
+	gtk-compat.h		\
 	tray/na-tray-child.c	\
 	tray/na-tray-child.h	\
 	tray/na-tray-manager.c	\
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -8,11 +8,13 @@ noinst_PROGRAMS =

 .AUTOPARALLEL:

-bin_SCRIPTS = gnome-shell
+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)|" \
@ -23,11 +25,19 @@ gnome-shell: gnome-shell.in
 CLEANFILES += gnome-shell
 EXTRA_DIST += gnome-shell.in

+gnome-shell-clock-preferences: gnome-shell-clock-preferences.in
+	$(AM_V_GEN) sed -e "s|@datadir[@]|$(datadir)|" \
+	    -e "s|@pkgdatadir[@]|$(pkgdatadir)|" \
+	    -e "s|@localedir[@]|$(datadir)/locale|" \
+	    -e "s|@GJS_CONSOLE[@]|$(GJS_CONSOLE)|" \
+	    $< > $@ && chmod a+x $@
+CLEANFILES += gnome-shell-clock-preferences
+EXTRA_DIST += gnome-shell-clock-preferences.in
+
 include Makefile-gdmuser.am
 include Makefile-st.am
 include Makefile-tray.am
 include Makefile-gvc.am
-include Makefile-calendar-client.am

 gnome_shell_cflags =				\
 	$(MUTTER_PLUGIN_CFLAGS)			\
@ -60,6 +70,7 @@ shell_public_headers_h =		\
 	shell-embedded-window.h		\
 	shell-generic-container.h	\
 	shell-gtk-embed.h		\
+	shell-process.h			\
 	shell-global.h			\
 	shell-perf-log.h		\
 	shell-slicer.h			\
@ -81,19 +92,17 @@ libgnome_shell_la_SOURCES =		\
 	shell-window-tracker-private.h	\
 	shell-wm-private.h		\
 	gnome-shell-plugin.c		\
+	gtk-compat.h			\
 	shell-app.c			\
-	shell-a11y.h			\
-	shell-a11y.c			\
 	shell-app-system.c		\
 	shell-app-usage.c		\
 	shell-arrow.c			\
 	shell-doc-system.c		\
 	shell-drawing.c			\
 	shell-embedded-window.c		\
-	shell-evolution-event-source.h	\
-	shell-evolution-event-source.c	\
 	shell-generic-container.c	\
 	shell-gtk-embed.c		\
+	shell-process.c			\
 	shell-global.c			\
 	shell-perf-log.c		\
 	shell-slicer.c			\
@ -211,14 +220,10 @@ libgnome_shell_la_LIBADD =	\
 	-lm			\
 	$(MUTTER_PLUGIN_LIBS)	\
 	$(LIBGNOMEUI_LIBS)      \
-	$(BLUETOOTH_LIBS)	\
 	libst-1.0.la       	\
 	libgdmuser-1.0.la	\
 	libtray.la		\
-	libgvc.la		\
-	libcalendar-client.la	\
-	$(NULL)
-
+	libgvc.la
 libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)

 typelibdir = $(pkglibdir)
@ -267,7 +272,7 @@ St-1.0.gir: $(mutter) $(G_IR_SCANNER) libst-1.0.la Makefile
 	        --libtool="$(LIBTOOL)"						\
 	        --library=libst-1.0.la						\
 	        -DST_COMPILATION						\
-	        $(filter-out %-private.h $(st_non_gir_sources), $(addprefix $(srcdir)/,$(st_source_h))) \
+	        $(filter-out %-private.h, $(addprefix $(srcdir)/,$(st_source_h))) \
 	        $(addprefix $(srcdir)/,$(st_source_c))				\
 	        $(srcdir)/st-enum-types.h					\
 	        $(st_cflags)							\
--- a/src/calendar-client/README
+++ b/src/calendar-client/README
@ -1 +0,0 @@
-Please keep in sync with gnome-panel.
--- a/src/calendar-client/calendar-client.c
+++ b/src/calendar-client/calendar-client.c
--- a/src/calendar-client/calendar-client.h
+++ b/src/calendar-client/calendar-client.h
@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2004 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Authors:
- *     Mark McLoughlin  <mark@skynet.ie>
- *     William Jon McCann  <mccann@jhu.edu>
- *     Martin Grimme  <martin@pycage.de>
- *     Christian Kellner  <gicmo@xatom.net>
- */
-
-#ifndef __CALENDAR_CLIENT_H__
-#define __CALENDAR_CLIENT_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef enum
-{
-  CALENDAR_EVENT_APPOINTMENT = 1 << 0,
-  CALENDAR_EVENT_TASK        = 1 << 1,
-  CALENDAR_EVENT_ALL         = (1 << 2) - 1
-} CalendarEventType;
-
-#define CALENDAR_TYPE_CLIENT        (calendar_client_get_type ())
-#define CALENDAR_CLIENT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), CALENDAR_TYPE_CLIENT, CalendarClient))
-#define CALENDAR_CLIENT_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), CALENDAR_TYPE_CLIENT, CalendarClientClass))
-#define CALENDAR_IS_CLIENT(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), CALENDAR_TYPE_CLIENT))
-#define CALENDAR_IS_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CALENDAR_TYPE_CLIENT))
-#define CALENDAR_CLIENT_GET_CLASS(o)(G_TYPE_INSTANCE_GET_CLASS ((o), CALENDAR_TYPE_CLIENT, CalendarClientClass))
-
-typedef struct _CalendarClient        CalendarClient;
-typedef struct _CalendarClientClass   CalendarClientClass;
-typedef struct _CalendarClientPrivate CalendarClientPrivate;
-
-struct _CalendarClient
-{
-  GObject                parent;
-  CalendarClientPrivate *priv;
-};
-
-struct _CalendarClientClass
-{
-  GObjectClass    parent_class;
-
-  void         (* appointments_changed) (CalendarClient *client);
-  void         (* tasks_changed)        (CalendarClient *client);
-};
-
-
-typedef struct
-{
-  time_t start_time;
-  time_t end_time;
-} CalendarOccurrence;
-
-typedef struct
-{
-  char   *uid;
-  char   *rid;
-  char   *uri;
-  char   *summary;
-  char   *description;
-  char   *color_string;
-  time_t  start_time;
-  time_t  end_time;
-  guint   is_all_day : 1;
-
-  /* Only used internally */
-  GSList *occurrences;
-} CalendarAppointment;
-
-typedef struct
-{
-  char  *uid;
-  char  *summary;
-  char  *description;
-  char  *color_string;
-  char  *url;
-  time_t start_time;
-  time_t due_time;
-  guint  percent_complete;
-  time_t completed_time;
-  int    priority;
-} CalendarTask;
-
-typedef struct
-{
-  union
-  {
-    CalendarAppointment appointment;
-    CalendarTask        task;
-  } event;
-  CalendarEventType type;
-} CalendarEvent;
-
-#define CALENDAR_EVENT(e)       ((CalendarEvent *)(e))
-#define CALENDAR_APPOINTMENT(e) ((CalendarAppointment *)(e))
-#define CALENDAR_TASK(e)        ((CalendarTask *)(e))
-
-typedef void (* CalendarDayIter) (CalendarClient *client,
-				  guint           day,
-				  gpointer        user_data);
-
-
-GType           calendar_client_get_type                (void) G_GNUC_CONST;
-CalendarClient *calendar_client_new                     (void);
-
-void            calendar_client_get_date                (CalendarClient      *client,
-							 guint               *year,
-                                                         guint               *month,
-							 guint               *day);
-void            calendar_client_select_month            (CalendarClient      *client,
-							 guint                month,
-							 guint                year);
-void            calendar_client_select_day              (CalendarClient      *client,
-							 guint                day);
-
-GSList         *calendar_client_get_events              (CalendarClient      *client,
-							 CalendarEventType    event_mask);
-void            calendar_client_foreach_appointment_day (CalendarClient      *client,
-							 CalendarDayIter      iter_func,
-							 gpointer             user_data);
-
-void            calendar_client_set_task_completed       (CalendarClient     *client,
-							  char               *task_uid,
-							  gboolean            task_completed,
-							  guint               percent_complete);
-
-void calendar_event_free (CalendarEvent *event);
-
-G_END_DECLS
-
-#endif /* __CALENDAR_CLIENT_H__ */
--- a/src/calendar-client/calendar-debug.h
+++ b/src/calendar-client/calendar-debug.h
@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2004 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Authors:
- *     Mark McLoughlin  <mark@skynet.ie>
- */
-
-#ifndef __CALENDAR_DEBUG_H__
-#define __CALENDAR_DEBUG_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#ifdef CALENDAR_ENABLE_DEBUG
-
-#include <stdio.h>
-
-#ifdef G_HAVE_ISO_VARARGS
-#  define dprintf(...) fprintf (stderr, __VA_ARGS__);
-#elif defined(G_HAVE_GNUC_VARARGS)
-#  define dprintf(args...) fprintf (stderr, args);
-#endif
-
-#else /* if !defined (CALENDAR_DEBUG) */
-
-#ifdef G_HAVE_ISO_VARARGS
-#  define dprintf(...)
-#elif defined(G_HAVE_GNUC_VARARGS)
-#  define dprintf(args...)
-#endif
-
-#endif /* CALENDAR_ENABLE_DEBUG */
-
-G_END_DECLS
-
-#endif /* __CALENDAR_DEBUG_H__ */
--- a/src/calendar-client/calendar-sources.c
+++ b/src/calendar-client/calendar-sources.c
@ -1,658 +0,0 @@
-/*
- * Copyright (C) 2004 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Authors:
- *     Mark McLoughlin  <mark@skynet.ie>
- *     William Jon McCann  <mccann@jhu.edu>
- *     Martin Grimme  <martin@pycage.de>
- *     Christian Kellner  <gicmo@xatom.net>
- */
-
-#include <config.h>
-
-#include "calendar-sources.h"
-
-#include <libintl.h>
-#include <string.h>
-#include <gconf/gconf-client.h>
-#define HANDLE_LIBICAL_MEMORY
-#include <libecal/e-cal.h>
-#include <libedataserver/e-source-list.h>
-#include <libedataserverui/e-passwords.h>
-
-#undef CALENDAR_ENABLE_DEBUG
-#include "calendar-debug.h"
-
-#ifndef _
-#define _(x) gettext(x)
-#endif
-
-#ifndef N_
-#define N_(x) x
-#endif
-
-#define CALENDAR_SOURCES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CALENDAR_TYPE_SOURCES, CalendarSourcesPrivate))
-
-#define CALENDAR_SOURCES_EVO_DIR                          "/apps/evolution"
-#define CALENDAR_SOURCES_APPOINTMENT_SOURCES_KEY          CALENDAR_SOURCES_EVO_DIR "/calendar/sources"
-#define CALENDAR_SOURCES_SELECTED_APPOINTMENT_SOURCES_DIR CALENDAR_SOURCES_EVO_DIR "/calendar/display"
-#define CALENDAR_SOURCES_SELECTED_APPOINTMENT_SOURCES_KEY CALENDAR_SOURCES_SELECTED_APPOINTMENT_SOURCES_DIR "/selected_calendars"
-#define CALENDAR_SOURCES_TASK_SOURCES_KEY                 CALENDAR_SOURCES_EVO_DIR "/tasks/sources"
-#define CALENDAR_SOURCES_SELECTED_TASK_SOURCES_DIR        CALENDAR_SOURCES_EVO_DIR "/calendar/tasks"
-#define CALENDAR_SOURCES_SELECTED_TASK_SOURCES_KEY        CALENDAR_SOURCES_SELECTED_TASK_SOURCES_DIR "/selected_tasks"
-
-typedef struct _CalendarSourceData CalendarSourceData;
-
-struct _CalendarSourceData
-{
-  ECalSourceType   source_type;
-  CalendarSources *sources;
-  guint            changed_signal;
-
-  GSList          *clients;
-  GSList          *selected_sources;
-  ESourceList     *esource_list;
-
-  guint            selected_sources_listener;
-  char            *selected_sources_dir;
-
-  guint            timeout_id;
-
-  guint            loaded : 1;
-};
-
-struct _CalendarSourcesPrivate
-{
-  CalendarSourceData  appointment_sources;
-  CalendarSourceData  task_sources;
-
-  GConfClient        *gconf_client;
-};
-
-static void calendar_sources_class_init (CalendarSourcesClass *klass);
-static void calendar_sources_init       (CalendarSources      *sources);
-static void calendar_sources_finalize   (GObject             *object);
-
-static void backend_died_cb (ECal *client, CalendarSourceData *source_data);
-static void calendar_sources_esource_list_changed (ESourceList        *source_list,
-                                                   CalendarSourceData *source_data);
-
-enum
-{
-  APPOINTMENT_SOURCES_CHANGED,
-  TASK_SOURCES_CHANGED,
-  LAST_SIGNAL
-};
-static guint signals [LAST_SIGNAL] = { 0, };
-
-static GObjectClass    *parent_class = NULL;
-static CalendarSources *calendar_sources_singleton = NULL;
-
-GType
-calendar_sources_get_type (void)
-{
-  static GType sources_type = 0;
-  
-  if (!sources_type)
-    {
-      static const GTypeInfo sources_info =
-      {
-	sizeof (CalendarSourcesClass),
-	NULL,		/* base_init */
-	NULL,		/* base_finalize */
-	(GClassInitFunc) calendar_sources_class_init,
-	NULL,           /* class_finalize */
-	NULL,		/* class_data */
-	sizeof (CalendarSources),
-	0,		/* n_preallocs */
-	(GInstanceInitFunc) calendar_sources_init,
-      };
-      
-      sources_type = g_type_register_static (G_TYPE_OBJECT,
-					     "CalendarSources",
-					     &sources_info, 0);
-    }
-  
-  return sources_type;
-}
-
-static void
-calendar_sources_class_init (CalendarSourcesClass *klass)
-{
-  GObjectClass *gobject_class = (GObjectClass *) klass;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  gobject_class->finalize = calendar_sources_finalize;
-
-  g_type_class_add_private (klass, sizeof (CalendarSourcesPrivate));
-
-  signals [APPOINTMENT_SOURCES_CHANGED] =
-    g_signal_new ("appointment-sources-changed",
-		  G_TYPE_FROM_CLASS (gobject_class),
-		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (CalendarSourcesClass,
-				   appointment_sources_changed),
-		  NULL,
-		  NULL,
-		  g_cclosure_marshal_VOID__VOID,
-		  G_TYPE_NONE,
-		  0);
-
-  signals [TASK_SOURCES_CHANGED] =
-    g_signal_new ("task-sources-changed",
-		  G_TYPE_FROM_CLASS (gobject_class),
-		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (CalendarSourcesClass,
-				   task_sources_changed),
-		  NULL,
-		  NULL,
-		  g_cclosure_marshal_VOID__VOID,
-		  G_TYPE_NONE,
-		  0);
-}
-
-static void
-calendar_sources_init (CalendarSources *sources)
-{
-  sources->priv = CALENDAR_SOURCES_GET_PRIVATE (sources);
-
-  sources->priv->appointment_sources.source_type    = E_CAL_SOURCE_TYPE_EVENT;
-  sources->priv->appointment_sources.sources        = sources;
-  sources->priv->appointment_sources.changed_signal = signals [APPOINTMENT_SOURCES_CHANGED];
-  sources->priv->appointment_sources.timeout_id     = 0;
-
-  sources->priv->task_sources.source_type    = E_CAL_SOURCE_TYPE_TODO;
-  sources->priv->task_sources.sources        = sources;
-  sources->priv->task_sources.changed_signal = signals [TASK_SOURCES_CHANGED];
-  sources->priv->task_sources.timeout_id     = 0;
-
-  sources->priv->gconf_client = gconf_client_get_default ();
-}
-
-static void
-calendar_sources_finalize_source_data (CalendarSources    *sources,
-				       CalendarSourceData *source_data)
-{
-  if (source_data->loaded)
-    {
-      GSList *l;
-
-      if (source_data->selected_sources_dir)
-	{
-	  gconf_client_remove_dir (sources->priv->gconf_client,
-				   source_data->selected_sources_dir,
-				   NULL);
-
-	  g_free (source_data->selected_sources_dir);
-	  source_data->selected_sources_dir = NULL;
-	}
-
-      if (source_data->selected_sources_listener)
-	{
-	  gconf_client_notify_remove (sources->priv->gconf_client,
-				      source_data->selected_sources_listener);
-	  source_data->selected_sources_listener = 0;
-	}
-
-      for (l = source_data->clients; l; l = l->next)
-        {
-          g_signal_handlers_disconnect_by_func (G_OBJECT (l->data),
-                                                G_CALLBACK (backend_died_cb),
-                                                source_data);
-          g_object_unref (l->data);
-        }
-      g_slist_free (source_data->clients);
-      source_data->clients = NULL;
-
-      if (source_data->esource_list)
-        {
-          g_signal_handlers_disconnect_by_func (source_data->esource_list,
-                                                G_CALLBACK (calendar_sources_esource_list_changed),
-                                                source_data);
-          g_object_unref (source_data->esource_list);
-	}
-      source_data->esource_list = NULL;
-
-      for (l = source_data->selected_sources; l; l = l->next)
-	g_free (l->data);
-      g_slist_free (source_data->selected_sources);
-      source_data->selected_sources = NULL;
-
-      if (source_data->timeout_id != 0)
-        {
-          g_source_remove (source_data->timeout_id);
-          source_data->timeout_id = 0;
-        }
-
-      source_data->loaded = FALSE;
-    }
-}
-
-static void
-calendar_sources_finalize (GObject *object)
-{
-  CalendarSources *sources = CALENDAR_SOURCES (object);
-
-  calendar_sources_finalize_source_data (sources, &sources->priv->appointment_sources);
-  calendar_sources_finalize_source_data (sources, &sources->priv->task_sources);
-
-  if (sources->priv->gconf_client)
-    g_object_unref (sources->priv->gconf_client);
-  sources->priv->gconf_client = NULL;
-
-  if (G_OBJECT_CLASS (parent_class)->finalize)
-    G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-CalendarSources *
-calendar_sources_get (void)
-{
-  gpointer singleton_location = &calendar_sources_singleton;
-
-  if (calendar_sources_singleton)
-    return g_object_ref (calendar_sources_singleton);
-
-  calendar_sources_singleton = g_object_new (CALENDAR_TYPE_SOURCES, NULL);
-  g_object_add_weak_pointer (G_OBJECT (calendar_sources_singleton),
-			     singleton_location);
-
-  return calendar_sources_singleton;
-}
-
-static gboolean
-is_source_selected (ESource *esource,
-		    GSList  *selected_sources)
-{
-  const char *uid;
-  GSList     *l;
-
-  uid = e_source_peek_uid (esource);
-
-  for (l = selected_sources; l; l = l->next)
-    {
-      const char *source = l->data;
-
-      if (!strcmp (source, uid))
-	return TRUE;
-    }
-
-  return FALSE;
-}
-
-static char *
-auth_func_cb (ECal       *ecal,
-	      const char *prompt,
-	      const char *key,
-	      gpointer    user_data)
-{
-	ESource *source;
-	const gchar *auth_domain;
-	const gchar *component_name;
-
-	source = e_cal_get_source (ecal);
-	auth_domain = e_source_get_property (source, "auth-domain");
-	component_name = auth_domain ? auth_domain : "Calendar";
-
-	return e_passwords_get_password (component_name, key);
-}
-
-/* The clients are just created here but not loaded */
-static ECal *
-get_ecal_from_source (ESource        *esource,
-		      ECalSourceType  source_type,
-		      GSList         *existing_clients)
-{
-  ECal *retval;
-
-  if (existing_clients)
-    {
-      GSList *l;
-
-      for (l = existing_clients; l; l = l->next)
-	{
-	  ECal *client = E_CAL (l->data);
-
-	  if (e_source_equal (esource, e_cal_get_source (client)))
-	    {
-	      dprintf ("        load_esource: found existing source ... returning that\n");
-
-	      return g_object_ref (client);
-	    }
-	}
-    }
-
-  retval = e_cal_new (esource, source_type);
-  if (!retval)
-    {
-      g_warning ("Could not load source '%s' from '%s'\n",
-		 e_source_peek_name (esource),
-		 e_source_peek_relative_uri (esource));
-      return NULL;
-    }
-
-  e_cal_set_auth_func (retval, auth_func_cb, NULL);
-
-  return retval;
-}
-
-/* - Order doesn't matter
- * - Can just compare object pointers since we
- *   re-use client connections
- */
-static gboolean
-compare_ecal_lists (GSList *a,
-		    GSList *b)
-{
-  GSList *l;
-
-  if (g_slist_length (a) != g_slist_length (b))
-    return FALSE;
-
-  for (l = a; l; l = l->next)
-    {
-      if (!g_slist_find (b, l->data))
-	return FALSE;
-    }
-
-  return TRUE;
-}
-
-static inline void
-debug_dump_selected_sources (GSList *selected_sources)
-{
-#ifdef CALENDAR_ENABLE_DEBUG
-  GSList *l;
-
-  dprintf ("Selected sources:\n");
-  for (l = selected_sources; l; l = l->next)
-    {
-      char *source = l->data;
-
-      dprintf ("  %s\n", source);
-    }
-  dprintf ("\n");
-#endif
-}
-
-static inline void
-debug_dump_ecal_list (GSList *ecal_list)
-{
-#ifdef CALENDAR_ENABLE_DEBUG
-  GSList *l;
-
-  dprintf ("Loaded clients:\n");
-  for (l = ecal_list; l; l = l->next)
-    {
-      ECal    *client = l->data;
-      ESource *source = e_cal_get_source (client);
-
-      dprintf ("  %s %s %s\n",
-	       e_source_peek_uid (source),
-	       e_source_peek_name (source),
-	       e_cal_get_uri (client));
-    }
-#endif
-}
-
-static void
-calendar_sources_load_esource_list (CalendarSourceData *source_data);
-
-static gboolean
-backend_restart (gpointer data)
-{
-  CalendarSourceData *source_data = data;
-
-  calendar_sources_load_esource_list (source_data);
-
-  source_data->timeout_id = 0;
-    
-  return FALSE;
-}
-
-static void
-backend_died_cb (ECal *client, CalendarSourceData *source_data)
-{
-  const char *uristr;
-
-  source_data->clients = g_slist_remove (source_data->clients, client);
-  if (g_slist_length (source_data->clients) < 1) 
-    {
-      g_slist_free (source_data->clients);
-      source_data->clients = NULL;
-    }
-  uristr = e_cal_get_uri (client);
-  g_warning ("The calendar backend for %s has crashed.", uristr);
-
-  if (source_data->timeout_id != 0)
-    {
-      g_source_remove (source_data->timeout_id);
-      source_data->timeout_id = 0;
-    }
-
-  source_data->timeout_id = g_timeout_add_seconds (2, backend_restart,
-		  				   source_data);
-}
-
-static void
-calendar_sources_load_esource_list (CalendarSourceData *source_data)
-{
-  GSList  *clients = NULL;
-  GSList  *groups, *l;
-  gboolean emit_signal = FALSE;
-
-  g_return_if_fail (source_data->esource_list != NULL);
-
-  debug_dump_selected_sources (source_data->selected_sources);
-
-  dprintf ("Source groups:\n");
-  groups = e_source_list_peek_groups (source_data->esource_list);
-  for (l = groups; l; l = l->next)
-    {
-      GSList *esources, *s;
-
-      dprintf ("  %s\n", e_source_group_peek_uid (l->data));
-      dprintf ("    sources:\n");
-
-      esources = e_source_group_peek_sources (l->data);
-      for (s = esources; s; s = s->next)
-	{
-	  ESource *esource = E_SOURCE (s->data);
-	  ECal    *client;
-
-	  dprintf ("      type = '%s' uid = '%s', name = '%s', relative uri = '%s': \n",
-                   source_data->source_type == E_CAL_SOURCE_TYPE_EVENT ? "appointment" : "task",
-		   e_source_peek_uid (esource),
-		   e_source_peek_name (esource),
-		   e_source_peek_relative_uri (esource));
-
-	  if (is_source_selected (esource, source_data->selected_sources) &&
-	      (client = get_ecal_from_source (esource, source_data->source_type, source_data->clients)))
-	    {
-	      clients = g_slist_prepend (clients, client);
-	    }
-	}
-    }
-  dprintf ("\n");
-
-  if (source_data->loaded && 
-      !compare_ecal_lists (source_data->clients, clients))
-    emit_signal = TRUE;
-
-  for (l = source_data->clients; l; l = l->next)
-    {
-      g_signal_handlers_disconnect_by_func (G_OBJECT (l->data),
-                                            G_CALLBACK (backend_died_cb),
-                                            source_data);
-
-      g_object_unref (l->data);
-    }
-  g_slist_free (source_data->clients);
-  source_data->clients = g_slist_reverse (clients);
-
-  /* connect to backend_died after we disconnected the previous signal
-   * handlers. If we do it before, we'll lose some handlers (for clients that
-   * were already there before) */
-  for (l = source_data->clients; l; l = l->next)
-    {
-      g_signal_connect (G_OBJECT (l->data), "backend_died",
-                        G_CALLBACK (backend_died_cb), source_data);
-    }
-
-  if (emit_signal) 
-    {
-      dprintf ("Emitting %s-sources-changed signal\n",
-	       source_data->source_type == E_CAL_SOURCE_TYPE_EVENT ? "appointment" : "task");
-      g_signal_emit (source_data->sources, source_data->changed_signal, 0);
-    }
-
-  debug_dump_ecal_list (source_data->clients);
-}
-
-static void
-calendar_sources_esource_list_changed (ESourceList        *source_list,
-				       CalendarSourceData *source_data)
-				       
-{
-  dprintf ("ESourceList changed, reloading\n");
-
-  calendar_sources_load_esource_list (source_data);
-}
-
-static void
-calendar_sources_selected_sources_notify (GConfClient        *client,
-					  guint               cnx_id,
-					  GConfEntry         *entry,
-					  CalendarSourceData *source_data)
-{
-  GSList *l;
-
-  if (!entry->value ||
-      entry->value->type != GCONF_VALUE_LIST ||
-      gconf_value_get_list_type (entry->value) != GCONF_VALUE_STRING)
-    return;
-
-  dprintf ("Selected sources key (%s) changed, reloading\n", entry->key);
-
-  for (l = source_data->selected_sources; l; l = l->next)
-    g_free (l->data);
-  source_data->selected_sources = NULL;
-
-  for (l = gconf_value_get_list (entry->value); l; l = l->next)
-    {
-      const char *source = gconf_value_get_string (l->data);
-
-      source_data->selected_sources = 
-	g_slist_prepend (source_data->selected_sources,
-			 g_strdup (source));
-    }
-  source_data->selected_sources =
-    g_slist_reverse (source_data->selected_sources);
-
-  calendar_sources_load_esource_list (source_data);
-}
-
-static void
-calendar_sources_load_sources (CalendarSources    *sources,
-			       CalendarSourceData *source_data,
-			       const char         *sources_key,
-			       const char         *selected_sources_key,
-			       const char         *selected_sources_dir)
-{
-  GConfClient *gconf_client;
-  GError      *error;
-
-  dprintf ("---------------------------\n");
-  dprintf ("Loading sources:\n");
-  dprintf ("  sources_key: %s\n", sources_key);
-  dprintf ("  selected_sources_key: %s\n", selected_sources_key);
-  dprintf ("  selected_sources_dir: %s\n", selected_sources_dir);
-
-  gconf_client = sources->priv->gconf_client;
-
-  error = NULL;
-  source_data->selected_sources = gconf_client_get_list (gconf_client,
-							 selected_sources_key,
-							 GCONF_VALUE_STRING,
-							 &error);
-  if (error)
-    {
-      g_warning ("Failed to get selected sources from '%s': %s\n",
-		 selected_sources_key,
-		 error->message);
-      g_error_free (error);
-      return;
-    }
-
-  gconf_client_add_dir (gconf_client,
-			selected_sources_dir,
-			GCONF_CLIENT_PRELOAD_NONE,
-			NULL);
-  source_data->selected_sources_dir = g_strdup (selected_sources_dir);
-
-  source_data->selected_sources_listener =
-    gconf_client_notify_add (gconf_client,
-			     selected_sources_dir,
-			     (GConfClientNotifyFunc) calendar_sources_selected_sources_notify,
-			     source_data, NULL, NULL);
-
-  source_data->esource_list = e_source_list_new_for_gconf (gconf_client, sources_key);
-  g_signal_connect (source_data->esource_list, "changed",
-		    G_CALLBACK (calendar_sources_esource_list_changed),
-		    source_data);
-
-  calendar_sources_load_esource_list (source_data);
-
-  source_data->loaded = TRUE;
-
-  dprintf ("---------------------------\n");
-}
-
-GSList *
-calendar_sources_get_appointment_sources (CalendarSources *sources)
-{
-  g_return_val_if_fail (CALENDAR_IS_SOURCES (sources), NULL);
-
-  if (!sources->priv->appointment_sources.loaded)
-    {
-      calendar_sources_load_sources (sources,
-				     &sources->priv->appointment_sources,
-				     CALENDAR_SOURCES_APPOINTMENT_SOURCES_KEY,
-				     CALENDAR_SOURCES_SELECTED_APPOINTMENT_SOURCES_KEY,
-				     CALENDAR_SOURCES_SELECTED_APPOINTMENT_SOURCES_DIR);
-    }
-  
-  return sources->priv->appointment_sources.clients;
-}
-
-GSList *
-calendar_sources_get_task_sources (CalendarSources *sources)
-{
-  g_return_val_if_fail (CALENDAR_IS_SOURCES (sources), NULL);
-
-  if (!sources->priv->task_sources.loaded)
-    {
-      calendar_sources_load_sources (sources,
-				     &sources->priv->task_sources,
-				     CALENDAR_SOURCES_TASK_SOURCES_KEY,
-				     CALENDAR_SOURCES_SELECTED_TASK_SOURCES_KEY,
-				     CALENDAR_SOURCES_SELECTED_TASK_SOURCES_DIR);
-    }
-
-  return sources->priv->task_sources.clients;
-}
--- a/src/calendar-client/calendar-sources.h
+++ b/src/calendar-client/calendar-sources.h
@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2004 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Authors:
- *     Mark McLoughlin  <mark@skynet.ie>
- *     William Jon McCann  <mccann@jhu.edu>
- *     Martin Grimme  <martin@pycage.de>
- *     Christian Kellner  <gicmo@xatom.net>
- */
-
-#ifndef __CALENDAR_SOURCES_H__
-#define __CALENDAR_SOURCES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define CALENDAR_TYPE_SOURCES        (calendar_sources_get_type ())
-#define CALENDAR_SOURCES(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), CALENDAR_TYPE_SOURCES, CalendarSources))
-#define CALENDAR_SOURCES_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), CALENDAR_TYPE_SOURCES, CalendarSourcesClass))
-#define CALENDAR_IS_SOURCES(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), CALENDAR_TYPE_SOURCES))
-#define CALENDAR_IS_SOURCES_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CALENDAR_TYPE_SOURCES))
-#define CALENDAR_SOURCES_GET_CLASS(o)(G_TYPE_INSTANCE_GET_CLASS ((o), CALENDAR_TYPE_SOURCES, CalendarSourcesClass))
-
-typedef struct _CalendarSources        CalendarSources;
-typedef struct _CalendarSourcesClass   CalendarSourcesClass;
-typedef struct _CalendarSourcesPrivate CalendarSourcesPrivate;
-
-struct _CalendarSources
-{
-  GObject                 parent;
-  CalendarSourcesPrivate *priv;
-};
-
-struct _CalendarSourcesClass
-{
-  GObjectClass    parent_class;
-
-  void         (* appointment_sources_changed) (CalendarSources *sources);
-  void         (* task_sources_changed)        (CalendarSources *sources);
-};
-
-
-GType            calendar_sources_get_type                (void) G_GNUC_CONST;
-CalendarSources *calendar_sources_get                     (void);
-GSList          *calendar_sources_get_appointment_sources (CalendarSources *sources);
-GSList          *calendar_sources_get_task_sources        (CalendarSources *sources);
-
-G_END_DECLS
-
-#endif /* __CALENDAR_SOURCES_H__ */
--- a/src/gdmuser/gdm-user-manager.c
+++ b/src/gdmuser/gdm-user-manager.c
@ -1020,10 +1020,13 @@ on_get_unix_user_finished (DBusGProxy               *proxy,
                           DBusGProxyCall           *call,
                           GdmUserManagerNewSession *new_session)
 {
+        GdmUserManager *manager;
        GError         *error;
        guint           uid;
        gboolean        res;

+        manager = new_session->manager;
+
        g_assert (new_session->get_unix_user_call == call);

        error = NULL;
@ -1196,8 +1199,6 @@ on_list_cached_users_finished (DBusGProxy     *proxy,
                return;
        }

-        maybe_set_is_loaded (manager);
-
        g_ptr_array_foreach (paths, (GFunc)add_new_user_for_object_path, manager);

        g_ptr_array_foreach (paths, (GFunc)g_free, NULL);
@ -1547,9 +1548,11 @@ static void
 get_accounts_proxy (GdmUserManager *manager)
 {
        DBusGProxy      *proxy;
+        GError          *error;

        g_assert (manager->priv->accounts_proxy == NULL);

+        error = NULL;
        proxy = dbus_g_proxy_new_for_name (manager->priv->connection,
                                           ACCOUNTS_NAME,
                                           ACCOUNTS_PATH,
@ -2549,6 +2552,8 @@ reload_shells (GdmUserManager *manager)
 static void
 load_users_manually (GdmUserManager *manager)
 {
+        gboolean res;
+
        manager->priv->shells = g_hash_table_new_full (g_str_hash,
                                                       g_str_equal,
                                                       g_free,
@ -2557,7 +2562,7 @@ load_users_manually (GdmUserManager *manager)

        load_sessions (manager);

-        load_ck_history (manager);
+        res = load_ck_history (manager);
        schedule_reload_passwd (manager);
 }

@ -2598,8 +2603,10 @@ load_seat_incrementally (GdmUserManager *manager)
        }

        if (manager->priv->seat.state == GDM_USER_MANAGER_SEAT_STATE_LOADED) {
+                gboolean res;
+
                load_sessions (manager);
-                load_ck_history (manager);
+                res = load_ck_history (manager);
        }

        maybe_set_is_loaded (manager);
@ -3050,6 +3057,15 @@ gdm_user_manager_finalize (GObject *object)
        G_OBJECT_CLASS (gdm_user_manager_parent_class)->finalize (object);
 }

+static void
+gdm_user_muted_debug_log_handler (const char     *log_domain,
+                                  GLogLevelFlags  log_level,
+                                  const char     *message,
+                                  gpointer        data)
+{
+        /* Intentionally empty to discard message */
+}
+
 /**
 * gdm_user_manager_ref_default:
 *
@ -3068,6 +3084,11 @@ gdm_user_manager_ref_default (void)
                user_manager_object = g_object_new (GDM_TYPE_USER_MANAGER, NULL);
                g_object_add_weak_pointer (user_manager_object,
                                           (gpointer *) &user_manager_object);
+
+                /* We don't normally care about user manager messages in the shell,
+                 * so mute them */
+                g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
+                                   gdm_user_muted_debug_log_handler, NULL);
        }

        return GDM_USER_MANAGER (user_manager_object);
--- a/Show More
+++ b/Show More
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