Merge branch 'master' into datetime

Simplify code for 'This week' / 'Next week' logic
Also make the calendar work when there are many all-day events shown. See http://people.freedesktop.org/~david/many-all-day-events.png for details. Signed-off-by: David Zeuthen <davidz@redhat.com>
2011-01-28 14:47:34 -05:00 · 2011-01-28 14:30:52 -05:00 · 2011-01-28 13:32:19 -05:00 · 2011-01-28 13:26:05 -05:00 · 2011-01-28 13:21:27 -05:00 · 2011-01-28 12:05:17 -05:00
135 changed files with 9148 additions and 18811 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,8 @@ data/gnome-shell.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
@@ -54,4 +56,3 @@ tests/run-test.sh
 xmldocs.make
 *~
 *.patch
-*.sw?
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[2.91.90],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[2.91.5],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -62,16 +62,14 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)

 CLUTTER_MIN_VERSION=1.5.15
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=0.7.11
-MUTTER_MIN_VERSION=2.91.90
-GTK_MIN_VERSION=3.0.0
+GJS_MIN_VERSION=0.7.8
+MUTTER_MIN_VERSION=2.91.4
+GTK_MIN_VERSION=2.91.7
 GIO_MIN_VERSION=2.25.9
 LIBECAL_REQUIRED=1.6.0
 LIBEDATASERVER_REQUIRED=1.2.0
-LIBEDATASERVERUI2_REQUIRED=1.2.0
-LIBEDATASERVERUI3_REQUIRED=2.91.6
-TELEPATHY_GLIB_MIN_VERSION=0.13.12
-POLKIT_MIN_VERSION=0.100
+LIBEDATASERVERUI_REQUIRED=1.2.0
+

 # Collect more than 20 libraries for a prize!
 PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION
@@ -85,9 +83,7 @@ PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION
 				 clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
                                 libstartup-notification-1.0
                                 gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
-				 libcanberra
-                                 telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
-                                 polkit-agent-1 >= $POLKIT_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])
@@ -107,7 +103,6 @@ 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)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)

 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0],
@@ -122,13 +117,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0],
 	 AC_SUBST([HAVE_BLUETOOTH],[0])
 	 AC_MSG_RESULT([no])])

-# Default to libedataserverui-3.0, but allow falling back to 1.2
-PKG_CHECK_EXISTS(libedataserverui-3.0,
-                 [EDS_API=3.0
-                  LIBEDATASERVERUI_REQUIRED=$LIBEDATASERVERUI3_REQUIRED],
-                 [EDS_API=1.2
-                  LIBEDATASERVERUI_REQUIRED=$LIBEDATASERVERUI2_REQUIRED])
-PKG_CHECK_MODULES(LIBECAL, libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-$EDS_API >= $LIBEDATASERVERUI_REQUIRED)
+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)

--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,11 +17,16 @@ dist_searchproviders_DATA =				\
 	search_providers/google.xml				\
 	search_providers/wikipedia.xml

+imagesdir = $(pkgdatadir)/images
+dist_images_DATA =				\
+	close-black.svg				\
+	magnifier.svg
+
 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
+	theme/add-workspace.svg			\
 	theme/calendar-arrow-left.svg		\
 	theme/calendar-arrow-right.svg		\
-	theme/calendar-today.svg		\
 	theme/close-window.svg			\
 	theme/close.svg				\
 	theme/corner-ripple.png			\
@@ -31,10 +36,8 @@ dist_theme_DATA =				\
 	theme/mosaic-view-active.svg		\
 	theme/mosaic-view.svg			\
 	theme/move-window-on-new.svg		\
-	theme/panel-button-border.svg		\
-	theme/panel-button-highlight-narrow.svg	\
-	theme/panel-button-highlight-wide.svg	\
 	theme/process-working.png		\
+	theme/remove-workspace.svg		\
 	theme/running-indicator.svg		\
 	theme/scroll-button-down-hover.png	\
 	theme/scroll-button-down.png		\
@@ -51,10 +54,12 @@ dist_theme_DATA =				\
 	theme/toggle-off-intl.svg		\
 	theme/toggle-on-us.svg			\
 	theme/toggle-on-intl.svg		\
-	theme/ws-switch-arrow-up.svg		\
-	theme/ws-switch-arrow-down.svg
+	theme/ws-switch-arrow-left.svg		\
+	theme/ws-switch-arrow-right.svg

-gsettings_SCHEMAS = org.gnome.shell.gschema.xml
+gsettings_SCHEMAS =					\
+	org.gnome.accessibility.magnifier.gschema.xml	\
+	org.gnome.shell.gschema.xml

@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
@@ -90,6 +95,7 @@ EXTRA_DIST =						\
 	$(menu_DATA)					\
 	$(gconfschema_DATA)				\
 	$(shaders_DATA)					\
+	org.gnome.accessibility.magnifier.gschema.xml.in \
 	org.gnome.shell.gschema.xml.in

 CLEANFILES =						\
--- a/data/close-black.svg
+++ b/data/close-black.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<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"
+   version="1.1"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel"
+   sodipodi:docname="close-black.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+   id="metadata2399"><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><defs
+   id="defs2397"><linearGradient
+     id="linearGradient3173"><stop
+       style="stop-color:#c4c4c4;stop-opacity:1;"
+       offset="0"
+       id="stop3175" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop3177" /></linearGradient><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 8 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="16 : 8 : 1"
+     inkscape:persp3d-origin="8 : 5.3333333 : 1"
+     id="perspective2401" /></defs><sodipodi:namedview
+   inkscape:window-height="811"
+   inkscape:window-width="1272"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="false"
+   inkscape:zoom="32.125"
+   inkscape:cx="8"
+   inkscape:cy="10.440056"
+   inkscape:window-x="40"
+   inkscape:window-y="40"
+   inkscape:current-layer="Foreground" />
+<path
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   d="M10.5,3.5l2,2L10,8l2.5,2.5l-2,2L8,10l-2.5,2.5l-2-2L6,8L3.5,5.5l2-2L8,6L10.5,3.5  z M0,8c0-4.418,3.582-8,8-8s8,3.582,8,8s-3.582,8-8,8S0,12.418,0,8z"
+   id="path2394"
+   style="fill-opacity:1;fill:#545454" />
+</svg>
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@@ -22,7 +22,7 @@
        <applyto>/desktop/gnome/shell/windows/button_layout</applyto>
        <owner>gnome-shell</owner>
        <type>string</type>
-        <default>:close</default>
+        <default>:minimize,maximize,close</default>
        <locale name="C">
           <short>Arrangement of buttons on the titlebar</short>
           <long>
--- a/data/magnifier.svg
+++ b/data/magnifier.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<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"
+   version="1.0"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="18"
+   height="18"
+   viewBox="0 0 18 18"
+   enable-background="new 0 0 29 18"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel"
+   sodipodi:docname="magnifier.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+   id="metadata16"><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><defs
+   id="defs14"><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 9 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="29 : 9 : 1"
+     inkscape:persp3d-origin="14.5 : 6 : 1"
+     id="perspective18" /></defs><sodipodi:namedview
+   inkscape:window-height="728"
+   inkscape:window-width="1103"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="1"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#000000"
+   id="base"
+   showgrid="true"
+   inkscape:zoom="27.260185"
+   inkscape:cx="9.5844061"
+   inkscape:cy="9.4435574"
+   inkscape:window-x="142"
+   inkscape:window-y="26"
+   inkscape:current-layer="Foreground"
+   inkscape:snap-global="true"
+   showguides="false"><inkscape:grid
+     type="xygrid"
+     id="grid2391"
+     empspacing="5"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+<g
+   id="g5"
+   style="fill:#ffffff;fill-opacity:1"
+   transform="translate(-4,-0.023114)">
+	<path
+   d="m 6.246,13.98 c -0.319,-0.319 -0.319,-0.837 0,-1.157 L 9.963,9.106 c 0.319,-0.319 0.837,-0.319 1.157,0 l 0.786,0.787 c 0.32,0.319 0.32,0.837 0,1.157 l -3.717,3.717 c -0.32,0.319 -0.838,0.319 -1.157,0 l -0.786,-0.787 0,0 z"
+   id="path7"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="M 9.076,11.937"
+   id="path9"
+   style="fill:#ffffff;fill-opacity:1" />
+</g>
+<path
+   clip-rule="evenodd"
+   d="m 7.25,7.476886 c 0,-1.243 1.007,-2.25 2.2499998,-2.25 1.2430002,0 2.2500002,1.007 2.2500002,2.25 0,1.243 -1.007,2.25 -2.2500002,2.25 C 8.257,9.726886 7.25,8.719886 7.25,7.476886 z m -2.25,0 c 0,-2.485 2.015,-4.5 4.4999998,-4.5 2.4850002,0 4.5000002,2.015 4.5000002,4.5 0,2.4849998 -2.015,4.5 -4.5000002,4.5 C 7.015,11.976886 5,9.9618858 5,7.476886 z"
+   id="path11"
+   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
+</svg>
--- a/data/org.gnome.accessibility.magnifier.gschema.xml.in
+++ b/data/org.gnome.accessibility.magnifier.gschema.xml.in
@@ -0,0 +1,133 @@
+<schemalist>
+
+  <enum id="MouseTrackingMode">
+    <value nick="none"         value="0"/>
+    <value nick="centered"     value="1"/>
+    <value nick="proportional" value="2"/>
+    <value nick="push"         value="3"/>
+  </enum>
+
+  <enum id="ScreenPosition">
+    <value nick="none"        value="0"/>
+    <value nick="full-screen" value="1"/>
+    <value nick="top-half"    value="2"/>
+    <value nick="bottom-half" value="3"/>
+    <value nick="left-half"   value="4"/>
+    <value nick="right-half"  value="5"/>
+  </enum>
+
+  <schema id="org.gnome.accessibility.magnifier"
+          path="/desktop/gnome/accessibility/magnifier/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="show-magnifier" type="b">
+      <default>false</default>
+      <_summary>Show or hide the magnifier</_summary>
+      <_description>
+        Show or hide the magnifier and all of its zoom regions.
+      </_description>
+    </key>
+    <key name="mouse-tracking" enum="MouseTrackingMode">
+      <default>'proportional'</default>
+      <_summary>Mouse Tracking Mode</_summary>
+      <_description>
+        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.
+      </_description>
+    </key>
+    <key name="screen-position" enum="ScreenPosition">
+      <default>'full-screen'</default>
+      <_summary>Screen position</_summary>
+      <_description>
+        The magnified view either fills the entire screen, or occupies the
+        top-half, bottom-half, left-half, or right-half of the screen.
+      </_description>
+    </key>
+    <key name="mag-factor" type="d">
+      <default>2.0</default>
+      <_summary>Magnification factor</_summary>
+      <_description>
+        The power of the magnification. A value of 1.0 means no magnification.
+        A value of 2.0 doubles the size.
+      </_description>
+    </key>
+    <key name="lens-mode" type="b">
+      <default>false</default>
+      <_summary>Enable lens mode</_summary>
+      <_description>
+        Whether the magnified view should be centered over the location of
+        the system mouse and move with it.
+      </_description>
+    </key>
+    <key name="scroll-at-edges" type="b">
+      <default>false</default>
+      <_summary>
+        Scroll magnified contents beyond the edges of the desktop
+      </_summary>
+      <_description>
+        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.
+      </_description>
+    </key>
+
+    <!-- Cross-hairs -->
+    <key name="show-cross-hairs" type="b">
+      <default>false</default>
+      <_summary>Show or hide crosshairs</_summary>
+      <_description>
+        Enables/disables display of crosshairs centered on the magnified
+        mouse sprite.
+      </_description>
+    </key>
+    <key name="cross-hairs-thickness" type="i">
+      <default>8</default>
+      <_summary>Thickness of the crosshairs</_summary>
+      <_description>
+        Width of the vertical and horizontal lines that make up the crosshairs.
+      </_description>
+    </key>
+    <key name="cross-hairs-color" type="s">
+      <default>'#ff0000'</default>
+      <_summary>Color of the crosshairs</_summary>
+      <_description>
+        The color of the the vertical and horizontal lines that make up
+        the crosshairs.
+      </_description>
+    </key>
+    <key name="cross-hairs-opacity" type="i">
+      <default>169</default>
+      <_summary>Opacity of the crosshairs</_summary>
+      <_description>
+        Determines the transparency of the crosshairs, from fully opaque
+        to fully transparent.
+      </_description>
+    </key>
+    <key name="cross-hairs-length" type="i">
+      <default>4096</default>
+      <_summary>Length of the crosshairs</_summary>
+      <_description>
+        Determines the length of the vertical and horizontal lines that
+        make up the crosshairs.
+      </_description>
+    </key>
+    <key name="cross-hairs-clip" type="b">
+      <default>false</default>
+      <_summary>Clip the crosshairs at the center</_summary>
+      <_description>
+        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.
+      </_description>
+    </key>
+  </schema>
+</schemalist>
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@@ -45,10 +45,6 @@
      <default>[]</default>
      <_summary>History for command (Alt-F2) dialog</_summary>
    </key>
-    <key name="looking-glass-history" type="as">
-      <default>[]</default>
-      <_summary>History for the looking glass dialog</_summary>
-    </key>
    <child name="clock" schema="org.gnome.shell.clock"/>
    <child name="calendar" schema="org.gnome.shell.calendar"/>
    <child name="recorder" schema="org.gnome.shell.recorder"/>
--- a/data/theme/add-workspace.svg
+++ b/data/theme/add-workspace.svg
@@ -0,0 +1,98 @@
+<?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="23"
+   height="15"
+   id="svg6375"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="New document 13">
+  <defs
+     id="defs6377">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective6383" />
+    <inkscape:perspective
+       id="perspective6366"
+       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="11.197802"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata6380">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-17)">
+    <g
+       style="display:inline"
+       id="g6243"
+       transform="translate(-986.28859,-658.2796)">
+      <rect
+         style="fill:#000000;fill-opacity:0.98770495;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect5318"
+         width="22"
+         height="14"
+         x="986.89801"
+         y="675.86743"
+         rx="0.49999979"
+         ry="0.5" />
+      <g
+         id="g5320"
+         transform="translate(402.77304,-12.882544)">
+        <path
+           id="path5322"
+           d="m 595.125,692.53048 0,6.43903"
+           style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           id="path5324"
+           d="m 598.34451,695.75 -6.43902,0"
+           style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+      </g>
+    </g>
+  </g>
+</svg>
--- a/data/theme/calendar-today.svg
+++ b/data/theme/calendar-today.svg
@@ -1,187 +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: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="28"
-   height="25"
-   id="svg10621"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="calendar-today.svg">
-  <defs
-     id="defs10623">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient99561-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34508-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop34510-1-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop34512-4-5" />
-    </linearGradient>
-    <radialGradient
-       r="42"
-       fy="30"
-       fx="51"
-       cy="30"
-       cx="51"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient10592"
-       xlink:href="#linearGradient34508-1-3"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3770"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3001"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3007"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient2997"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="8.3750933"
-     inkscape:cy="8.0837211"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata10626">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-469.08263,-536.99307)">
-    <g
-       id="g3003">
-      <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
-         transform="matrix(0.43692393,0,0,1.3783114,460.60467,517.48289)"
-         sodipodi:end="6.2831853"
-         sodipodi:start="3.1415927"
-         d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
-         sodipodi:ry="16"
-         sodipodi:rx="42"
-         sodipodi:cy="30"
-         sodipodi:cx="51"
-         id="path34506-3"
-         style="opacity:0.4625;color:#000000;fill:url(#radialGradient2997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <rect
-         y="558.85046"
-         x="468.96878"
-         height="3.1425927"
-         width="28.149134"
-         id="rect2996"
-         style="fill:#ffffff;fill-opacity:0.50196078;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none" />
-    </g>
-  </g>
-</svg>
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -140,10 +140,6 @@ StTooltip StLabel {
    height: 1em;
 }

-.popup-alternating-menu-item:alternate {
-    font-weight: bold;
-}
-
 .popup-slider-menu-item {
    height: 1em;
    min-width: 15em;
@@ -187,8 +183,6 @@ StTooltip StLabel {
 #panel {
    color: #ffffff;
    background-color: black;
-    border: 0px solid #536272;
-    border-bottom-width: 1px;
 }

 #panelLeft, #panelCenter, #panelRight {
@@ -200,45 +194,14 @@ StTooltip StLabel {
    padding-right: 4px;
 }

-#panelLeft:rtl {
-    padding-right: 0px;
-    padding-left: 4px;
-}
-
 #panelRight {
    padding-left: 4px;
 }

-#panelRight:rtl {
-    padding-left: 0px;
-    padding-right: 4px;
-}
-
-.panel-corner {
-    -panel-corner-radius: 10px;
-    -panel-corner-background-color: black;
-    -panel-corner-inner-border-width: 2px;
-    -panel-corner-inner-border-color: transparent;
-    -panel-corner-outer-border-width: 1px;
-    -panel-corner-outer-border-color: #536272;
-}
-
-.panel-corner:active,
-.panel-corner:checked,
-.panel-corner:focus {
-    -panel-corner-inner-border-color: rgba(255,255,255,0.8);
-}
-
 #appMenu {
    spacing: 4px;
 }

-.panel-button:active #appMenuIcon,
-.panel-button:checked #appMenuIcon,
-.panel-button:focus #appMenuIcon {
-    app-icon-bottom-clip: 2px;
-}
-
 .app-menu-icon {
    width: 24px;
    height: 24px;
@@ -246,43 +209,26 @@ StTooltip StLabel {

 .panel-button {
    padding: 0px 12px;
+    border-radius: 5px;
+    border-radius-bottomleft: 0px;
+    border-radius-bottomright: 0px;
    font-size: 14px;
    font-weight: bold;
-    color: #ccc;
    transition-duration: 100;
 }

-.panel-button:active,
-.panel-button:checked,
-.panel-button:focus {
-    border-image: url("panel-button-border.svg") 10 10 0 2;
-    background-image: url("panel-button-highlight-wide.svg");
-    color: white;
-    text-shadow: black 0px 2px 2px;
+.panel-button:active, .panel-button:checked, .panel-button:pressed, .panel-button:focus {
+    background-gradient-direction: vertical;
+    background-gradient-start: #3c3c3c;
+    background-gradient-end: #131313;
 }

-#statusTray > .panel-button:active,
-#statusTray > .panel-button:checked,
-#statusTray > .panel-button:focus {
-    background-image: url("panel-button-highlight-narrow.svg");
-}
-
-.panel-button:active > .system-status-icon,
-.panel-button:checked > .system-status-icon,
-.panel-button:focus > .system-status-icon {
-    icon-shadow: black 0px 2px 2px;
-}
-
-/* The rounded panel corners we draw don't
- * support transitions, so disable transitions
- * for the buttons at the left/right edges
- */
 #panelActivities {
-    transition-duration: 0;
+    border-radius-topleft: 0px;
 }

 #panelStatus {
-    transition-duration: 0;
+    border-radius-topright: 0px;
 }

 #panelStatusMenu {
@@ -314,30 +260,44 @@ StTooltip StLabel {
    spacing: 25px;
 }

-.workspace-controls {
-    visible-width: 32px; /* Amount visible before hovering */
+.workspace-indicator-panel {
+    spacing: 8px;
 }

-.workspace-thumbnails-background {
-    border: 1px solid rgba(128, 128, 128, 0.4);
+.workspace-indicator {
+    width: 24px;
+    height: 16px;
+    background: rgba(255,255,255,0.2);
+}
+
+.workspace-indicator.active {
+    background: rgba(255,255,255,0.8);
+}
+
+.workspace-controls {
+    width: 48px;
+    font-size: 32px;
+    font-weight: bold;
+    color: #ffffff;
+    border: 2px solid rgba(128, 128, 128, 0.4);
    border-right: 0px;
    border-radius: 9px 0px 0px 9px;
-    background-color: rgba(0, 0, 0, 0.5);
-    padding: 8px;
 }

-.workspace-thumbnails-background:rtl {
-    border-right: 1px;
-    border-left: 0px;
-    border-radius: 0px 9px 9px 0px;
+.add-workspace {
+    background-color: rgba(128, 128, 128, 0.4);
 }

-.workspace-thumbnails {
-    spacing: 7px;
+.add-workspace:hover {
+    background-color: rgba(128, 128, 128, 0.6);
 }

-.workspace-thumbnail-indicator {
-    outline: 2px solid white;
+.remove-workspace {
+    height: 48px;
+}
+
+.remove-workspace:hover {
+    background-color: rgba(128, 128, 128, 0.2);
 }

 .window-caption {
@@ -362,19 +322,13 @@ StTooltip StLabel {
 #dash {
    color: #5f5f5f;
    font-size: 12px;
-    padding: 4px 0px;
+    padding: 6px 0px;
    background-color: rgba(0, 0, 0, 0.5);
-    border: 1px solid rgba(128, 128, 128, 0.4);
+    border: 2px solid rgba(128, 128, 128, 0.4);
    border-left: 0px;
    border-radius: 0px 9px 9px 0px;
 }

-#dash:rtl {
-    border-left: 1px;
-    border-right: 0px;
-    border-radius: 9px 0px 0px 9px;
-}
-
 #dash:empty {
    height: 100px;
    width: 60px;
@@ -383,7 +337,6 @@ StTooltip StLabel {
 .dash-placeholder {
    background-image: url("dash-placeholder.svg");
    height: 27px;
-    width: 48px;
 }

 #viewSelector {
@@ -400,41 +353,35 @@ StTooltip StLabel {
 }

 #searchEntry {
-    padding: 4px 12px;
-    border-radius: 17px;
+    padding: 4px 8px;
+    border-radius: 12px;
    color: rgb(128, 128, 128);
-    border: 2px solid rgba(245,245,245,0.2);
-    background-gradient-start: rgba(5,5,6,0.1);
-    background-gradient-end: rgba(254,254,254,0.1);
+    border: 2px solid rgba(128, 128, 128, 0.4);
+    background-gradient-start: rgba(0, 0, 0, 0.2);
+    background-gradient-end: rgba(128, 128, 128, 0.2);
    background-gradient-direction: vertical;
    caret-color: rgb(128, 128, 128);
    caret-size: 1px;
+    height: 16px;
    width: 250px;
    transition-duration: 300;
-    box-shadow: inset 0px 2px 4px rgba(0,0,0,0.6);
-}
-
-#searchEntry:focus,
-#searchEntry:hover {
-    border: 2px solid rgb(136,138,133);
-    background-gradient-start: rgb(200,200,200);
-    background-gradient-end: white;
-    background-gradient-direction: vertical;
-}
-
-#searchEntry:hover {
-    transition-duration: 300;
 }

 #searchEntry:focus {
+    border: 2px solid #ffffff;
+    background-gradient-start: rgba(0, 0, 0, 0.2);
+    background-gradient-end: #ffffff;
+    background-gradient-direction: vertical;
    color: rgb(64, 64, 64);
    font-weight: bold;
+    box-shadow: 0px 0px 6px 2px rgba(255,255,255,0.9);
    transition-duration: 0;
 }

-.search-entry-icon {
-    icon-size: 1em;
-    color: #8d8f8a;
+#searchEntry:hover {
+    border: 2px solid #e8e8e8;
+    caret-color: #545454;
+    transition-duration: 500;
 }

 .view-tab-title {
@@ -539,15 +486,6 @@ StTooltip StLabel {
    spacing: 20px;
 }

-.all-app .icon-grid {
-    -shell-grid-item-size: 118px;
-}
-
-.all-app .overview-icon {
-    icon-size: 96px;
-}
-
-
 .app-filter {
    font-size: 14px;
    font-weight: bold;
@@ -562,8 +500,8 @@ StTooltip StLabel {
    background-position: 190px 10px;
 }

-.dash-item-container > .app-well-app {
-    padding: 4px 8px;
+#dash > .app-well-app {
+    padding: 6px 12px;
 }

 .remove-favorite-icon {
@@ -593,17 +531,22 @@ StTooltip StLabel {

 .app-well-app:selected > .overview-icon,
 .search-result-content:selected > .overview-icon {
-    background-color: rgba(255,255,255,0.33);
+    background: rgba(255,255,255,0.33);
 }

 .app-well-app:hover > .overview-icon,
 .remove-favorite:hover > .overview-icon,
 .search-result-content:hover > .overview-icon {
-    background-color: rgba(255,255,255,0.1);
+    background: rgba(255,255,255,0.33);
    text-shadow: black 0px 2px 2px;
    transition-duration: 100;
 }

+.app-well-app:active > .overview-icon {
+    background-color: #1e1e1e;
+    border: 1px solid #5f5f5f;
+}
+
 .app-well-menu {
    font-size: 12px
 }
@@ -763,7 +706,6 @@ StTooltip StLabel {
    color: #666666;
    font-size: 10px;
    padding: 2px;
-    font-weight: bold;
 }

 .calendar-change-month-back {
@@ -794,9 +736,8 @@ StTooltip StLabel {

 .datemenu-date-label {
    padding: .4em 1.75em;
-    font-size: 14px;
-    color: #cccccc;
-    font-weight: bold;
+    font-size: 16px;
+    color: #ffffff;
 }

 .calendar-day-base {
@@ -807,11 +748,11 @@ StTooltip StLabel {
 }

 .calendar-day-base:hover {
-    background-color: #777777;
+    background: #777777;
 }

 .calendar-day-base:active {
-    background-color: #555555;
+    background: #555555;
 }

 .calendar-day-heading {
@@ -826,7 +767,7 @@ StTooltip StLabel {
 /* Hack used in lieu of border-collapse - see calendar.js */
 .calendar-day {
    border: 1px solid #333333;
-    color: #888888;
+    color: #cccccc;
    border-top-width: 0;
    border-left-width: 0;
 }
@@ -845,10 +786,11 @@ StTooltip StLabel {
 }

 .calendar-today {
-    background-image: url("calendar-today.svg");
-    text-shadow: black 0px 2px 2px;
    color: #ffffff;
    font-weight: bold;
+    background-gradient-direction: vertical;
+    background-gradient-start: #3c3c3c;
+    background-gradient-end: #131313;
 }

 .calendar-other-month-day {
@@ -857,11 +799,10 @@ StTooltip StLabel {

 .calendar-day-with-events {
    font-weight: bold;
-    color: #cccccc;
 }

 .events-header-vbox {
-    spacing: 8px;
+    spacing: 10px;
 }

 .events-header {
@@ -869,14 +810,13 @@ StTooltip StLabel {
 }

 .events-header-hbox {
+    spacing: 8px;
    padding: 0.3em;
 }

 .events-day-header {
-    font-size: 12px;
-    font-weight: bold;
+    font-size: 14px;
    color: rgba(153, 153, 153, 1.0);
-    padding-left: 0.3em;
 }

 .events-day-dayname {
@@ -887,6 +827,7 @@ StTooltip StLabel {

 .events-day-time {
    font-size: 12px;
+    font-weight: bold;
    color: #fff;
    text-align: right;
 }
@@ -902,7 +843,6 @@ StTooltip StLabel {

 .events-time-box {
    width: 70px;
-    padding-right: 8px;
 }

 .events-event-box {
@@ -918,13 +858,13 @@ StTooltip StLabel {
    background-gradient-start: rgba(0,0,0,0.01);
    background-gradient-end: rgba(0,0,0,0.95);
    height: 36px;
-    color: white;
 }

 #notification {
    font-size: 16px;
    border-radius: 5px 5px 0px 0px;
    background: rgba(0,0,0,0.9);
+    color: white;
    padding: 8px 8px 4px 8px;
    spacing-rows: 10px;
    spacing-columns: 10px;
@@ -981,10 +921,6 @@ StTooltip StLabel {
    border: 1px solid #a1a1a1;
 }

-.notification-button:focus {
-    background-color: #666666;
-}
-
 .notification-button:active {
    border: 1px solid #a1a1a1;
    background-color: #2b2b2b;
@@ -997,10 +933,6 @@ StTooltip StLabel {
 }

 .notification-icon-button:hover {
-    border: 2px rgba(161,161,161,0.7);
-}
-
-.notification-icon-button:focus {
    background: rgba(192,192,192,0.7);
 }

@@ -1073,9 +1005,13 @@ StTooltip StLabel {
    height: 36px;
 }

+.summary-source {
+    color: white;
+}
+
 .summary-source-button {
-    padding-left: 4px;
-    padding-right: 16px;
+    padding-left: 3px;
+    padding-right: 3px;
 }

 .summary-source-button:last-child {
@@ -1192,19 +1128,19 @@ StTooltip StLabel {
    spacing: 8px;
 }

-.ws-switcher-active-up {
+.ws-switcher-active-left {
    height: 100px;
    border: 0px;
    background: rgba(255,255,255,0.5);
-    background-image: url("ws-switch-arrow-up.svg");
+    background-image: url("ws-switch-arrow-left.svg");
    border-radius: 8px;
 }

-.ws-switcher-active-down {
+.ws-switcher-active-right {
    height: 100px;
    border: 0px;
    background: rgba(255,255,255,0.5);
-    background-image: url("ws-switch-arrow-down.svg");
+    background-image: url("ws-switch-arrow-right.svg");
    border-radius: 8px;
 }

@@ -1355,78 +1291,6 @@ StTooltip StLabel {
    color: #444444;
 }

-/* PolicyKit Authentication Dialog */
-.polkit-dialog {
-    /* this is the width of the entire modal popup */
-    width: 500px;
-}
-
-.polkit-dialog-main-layout {
-    spacing: 10px;
-    padding: 10px;
-}
-
-.polkit-dialog-message-layout {
-    spacing: 10px;
-}
-
-.polkit-dialog-headline {
-    font-size: 12pt;
-    font-weight: bold;
-    color: #666666;
-}
-
-.polkit-dialog-description {
-    font-size: 10pt;
-    color: white;
-}
-
-.polkit-dialog-user-layout {
-    padding-left: 10px;
-    spacing: 10px;
-}
-
-.polkit-dialog-password-label {
-    padding-right: 0.5em;
-}
-
-.polkit-dialog-password-entry {
-    background-color: white;
-    color: black;
-    border-radius: 5px;
-}
-
-.polkit-dialog-error-label {
-    font-size: 12px;
-    color: white;
-}
-
-.polkit-dialog-error-box {
-    padding-top: 15px;
-    spacing: 5px;
-}
-
-.polkit-dialog-checking-label {
-    font-size: 12px;
-    color: white;
-}
-
-.polkit-dialog-checking-box {
-    padding-top: 15px;
-    spacing: 5px;
-}
-
-.polkit-dialog-info-label {
-    font-size: 12px;
-    color: white;
-}
-
-.polkit-dialog-info-box {
-    padding-top: 15px;
-    spacing: 5px;
-}
-
-
 /* Magnifier */

 .magnifier-zoom-region {
--- a/data/theme/panel-button-border.svg
+++ b/data/theme/panel-button-border.svg
@@ -1,74 +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="21"
-   height="10"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="panel-button-border.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.8"
-     inkscape:cx="8.6594891"
-     inkscape:cy="5.7029946"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     guidetolerance="10000"
-     objecttolerance="10000">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3792"
-       empspacing="10"
-       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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3796"
-       width="3"
-       height="2"
-       x="9"
-       y="8" />
-  </g>
-</svg>
--- a/data/theme/panel-button-highlight-narrow.svg
+++ b/data/theme/panel-button-highlight-narrow.svg
@@ -1,111 +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: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="30"
-   height="25"
-   id="svg10621"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="panel-button-highlight-narrow.svg">
-  <defs
-     id="defs10623">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient99561-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34508-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop34510-1-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop34512-4-5" />
-    </linearGradient>
-    <radialGradient
-       r="42"
-       fy="30"
-       fx="51"
-       cy="30"
-       cx="51"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient10592"
-       xlink:href="#linearGradient34508-1-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-171.36384"
-     inkscape:cy="-53.255157"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata10626">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-468.08632,-537.03477)">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4625;color:#000000;fill:url(#radialGradient10592);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path34506-3"
-       sodipodi:cx="51"
-       sodipodi:cy="30"
-       sodipodi:rx="42"
-       sodipodi:ry="16"
-       d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
-       sodipodi:start="3.1415927"
-       sodipodi:end="6.2831853"
-       transform="matrix(0.35714286,0,0,1.5625,464.87203,515.15977)"
-       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
--- a/data/theme/panel-button-highlight-wide.svg
+++ b/data/theme/panel-button-highlight-wide.svg
@@ -1,111 +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: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="84"
-   height="25"
-   id="svg10621"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="panel-button-highlight-wide.svg">
-  <defs
-     id="defs10623">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient99561-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34508-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop34510-1-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop34512-4-5" />
-    </linearGradient>
-    <radialGradient
-       r="42"
-       fy="30"
-       fx="51"
-       cy="30"
-       cx="51"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient10592"
-       xlink:href="#linearGradient34508-1-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-118.50071"
-     inkscape:cy="27.304508"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata10626">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-441.08632,-537.03477)">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4625;color:#000000;fill:url(#radialGradient10592);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path34506-3"
-       sodipodi:cx="51"
-       sodipodi:cy="30"
-       sodipodi:rx="42"
-       sodipodi:ry="16"
-       d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
-       sodipodi:start="3.1415927"
-       sodipodi:end="6.2831853"
-       transform="matrix(1,0,0,1.5625,432.08632,515.15977)"
-       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
--- a/data/theme/remove-workspace.svg
+++ b/data/theme/remove-workspace.svg
@@ -0,0 +1,92 @@
+<?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="23"
+   height="15"
+   id="svg5501"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="add-workspace.svg">
+  <defs
+     id="defs5503">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective5509" />
+    <inkscape:perspective
+       id="perspective5314"
+       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="11.197802"
+     inkscape:cx="-0.074583208"
+     inkscape:cy="16"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox="true" />
+  <metadata
+     id="metadata5506">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-17)">
+    <g
+       style="display:inline"
+       id="g6239"
+       transform="translate(-953.97989,-657.32287)">
+      <rect
+         style="fill:#000000;fill-opacity:0.98770495;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect5318-6"
+         width="22"
+         height="14"
+         x="954.5"
+         y="675"
+         rx="0.49999979"
+         ry="0.5" />
+      <path
+         style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         d="m 968.71951,682 -6.43902,0"
+         id="path5324-5" />
+    </g>
+  </g>
+</svg>
--- a/data/theme/running-indicator.svg
+++ b/data/theme/running-indicator.svg
@@ -5,8 +5,8 @@
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
-   width="119.97824"
-   height="119.97824"
+   width="74.01342"
+   height="74.006706"
   id="svg7355"
   version="1.1">
  <defs
@@ -66,7 +66,7 @@
  </defs>
  <g
     id="layer1"
-     transform="matrix(1.6213276,0,0,1.6213276,-431.6347,-272.5745)">
+     transform="translate(-266.21629,-168.11809)">
    <g
       style="display:inline"
       id="g30864"
@@ -83,8 +83,7 @@
      <path
         id="rect34520"
         d="m 84.506708,167.95508 c 6e-6,1.96759 -1.584022,3.55162 -3.551629,3.55163 l -65.910146,0 c -1.967608,-1e-5 -3.551648,-1.58402 -3.551643,-3.55164"
-         style="opacity:0.2;fill:none;stroke:url(#radialGradient7488);stroke-width:1;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.2;fill:none;stroke:url(#radialGradient7488);stroke-width:1;stroke-opacity:1" />
    </g>
  </g>
 </svg>
--- a/data/theme/ws-switch-arrow-left.svg
+++ b/data/theme/ws-switch-arrow-left.svg
@@ -0,0 +1,96 @@
+<?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="96" height="96" id="svg25070" version="1.1" inkscape:version="0.47 r22583" sodipodi:docname="dark-arrow-larger.svg">
+  <defs id="defs25072">
+    <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="perspective25078"/>
+    <inkscape:perspective id="perspective24985" 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"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4034-0-4" id="linearGradient24957" gradientUnits="userSpaceOnUse" gradientTransform="translate(6)" x1="-86.552246" y1="185.439" x2="-83.37072" y2="197.31261"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4034-0-4">
+      <stop style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" offset="0" id="stop4036-5-7"/>
+      <stop style="stop-color: rgb(186, 189, 182); stop-opacity: 1;" offset="1" id="stop4038-9-6"/>
+    </linearGradient>
+    <filter id="filter24765" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix24767" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix24769" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4632-1-3-9-3-2" id="linearGradient24955" gradientUnits="userSpaceOnUse" gradientTransform="translate(-5)" x1="-74.520325" y1="169.06032" x2="-74.520325" y2="205.94189"/>
+    <linearGradient id="linearGradient4632-1-3-9-3-2">
+      <stop style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" offset="0" id="stop4634-1-8-3-9-0"/>
+      <stop id="stop4636-1-9-9-8-8" offset="0.0274937" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"/>
+      <stop id="stop4638-8-3-9-6-6" offset="0.274937" style="stop-color: rgb(242, 242, 242); stop-opacity: 1;"/>
+      <stop id="stop4640-8-5-7-8-9" offset="0.38707438" style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"/>
+      <stop id="stop4642-5-41-9-6-9" offset="0.66528589" style="stop-color: rgb(217, 218, 216); stop-opacity: 1;"/>
+      <stop id="stop4644-5-2-7-9-2" offset="0.76745707" style="stop-color: rgb(223, 224, 221); stop-opacity: 1;"/>
+      <stop style="stop-color: rgb(240, 240, 240); stop-opacity: 1;" offset="1" id="stop4646-3-2-3-7-3"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4869-4-1" id="radialGradient24959" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)" cx="-33.412369" cy="185.74171" fx="-33.412369" fy="185.74171" r="2.3554697"/>
+    <linearGradient id="linearGradient4869-4-1">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4871-6-2"/>
+      <stop id="stop4879-7-4" offset="0.31807542" style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"/>
+      <stop id="stop4877-6-1" offset="0.74691135" style="stop-color: rgb(200, 201, 198); stop-opacity: 1;"/>
+      <stop style="stop-color: rgb(211, 215, 207); stop-opacity: 1;" offset="1" id="stop4873-1-0"/>
+    </linearGradient>
+    <filter id="filter25011" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25013" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25015" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4869-4-0" id="radialGradient24961" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)" cx="-33.412369" cy="185.74171" fx="-33.412369" fy="185.74171" r="2.3554697"/>
+    <linearGradient id="linearGradient4869-4-0">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4871-6-8"/>
+      <stop id="stop4879-7-5" offset="0.31807542" style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"/>
+      <stop id="stop4877-6-5" offset="0.74691135" style="stop-color: rgb(200, 201, 198); stop-opacity: 1;"/>
+      <stop style="stop-color: rgb(211, 215, 207); stop-opacity: 1;" offset="1" id="stop4873-1-4"/>
+    </linearGradient>
+    <filter id="filter25023" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25025" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25027" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4941" id="linearGradient24963" gradientUnits="userSpaceOnUse" x1="-39.858727" y1="184.61784" x2="-38.244785" y2="188.84898"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4941">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4943"/>
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1" id="stop4945"/>
+    </linearGradient>
+    <filter id="filter25033" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25035" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25037" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4941-7" id="linearGradient24965" gradientUnits="userSpaceOnUse" x1="-39.858727" y1="184.61784" x2="-38.244785" y2="188.84898"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4941-7">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4943-2"/>
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1" id="stop4945-5"/>
+    </linearGradient>
+    <filter id="filter25043" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25045" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25047" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <filter id="filter25049" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25051" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25053" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <filter id="filter25055" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25057" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25059" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.8284271" inkscape:cx="48.631638" inkscape:cy="57.536221" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="1200" inkscape:window-height="851" inkscape:window-x="0" inkscape:window-y="52" inkscape:window-maximized="0"/>
+  <metadata id="metadata25075">
+    <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, 48)">
+    <g id="g4030-1-8" transform="matrix(2, 0, 0, 2, 193.25, -374.967)" style="stroke: rgb(0, 0, 0); display: inline; stroke-opacity: 1;">
+      <path sodipodi:nodetypes="ccc" id="path3165-7-3" d="m -72.5,173.5 -14,14 14,14" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 7; stroke-linecap: round; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-dasharray: none; stroke-dashoffset: 0pt; visibility: visible; display: inline;"/>
+    </g>
+    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 0.523439; visibility: visible; display: inline;" id="path4050-2-7-9-4" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(3.34328, 0, 0, 3.34328, 185.28, -623.176)"/>
+    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 0.523439; visibility: visible; display: inline;" id="path4050-2-7-9-4-8" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(3.34328, 0, 0, 3.34328, 207.28, -623.176)"/>
+    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 0.697921; stroke-linecap: round; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-dasharray: none; stroke-dashoffset: 0pt; visibility: visible; display: inline;" id="path4050-2-7-9-4-0" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(2.86565, 0, 0, 2.86565, 166.846, -534.143)"/>
+    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 0.697921; stroke-linecap: round; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-dasharray: none; stroke-dashoffset: 0pt; visibility: visible; display: inline;" id="path4050-2-7-9-4-0-9" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(2.86565, 0, 0, 2.86565, 188.846, -534.143)"/>
+    <path style="overflow: visible; marker: none; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; font-stretch: normal; text-indent: 0pt; text-align: start; text-decoration: none; line-height: normal; letter-spacing: normal; word-spacing: normal; text-transform: none; direction: ltr; text-anchor: start; opacity: 0.35; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 1; stroke-miterlimit: 4; stroke-dasharray: none; visibility: visible; display: inline; font-family: Bitstream Vera Sans; stroke-opacity: 1;" d="m 317.06251,365.96875 c -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 l -16.125,16.125 16.125,16.125 c 1.11265,1.11265 3.13735,1.11265 4.25,0 1.11265,-1.11264 1.11265,-3.13735 0,-4.25 l -11.875,-11.875 11.875,-11.875 c 0.86584,-0.83655 1.1475,-2.22114 0.6773,-3.32947 -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 z" id="path3165-7-3-1" sodipodi:nodetypes="ccccscccsc" transform="matrix(2, 0, 0, 2, -586, -765.967)"/>
+    <path style="overflow: visible; marker: none; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; font-stretch: normal; text-indent: 0pt; text-align: start; text-decoration: none; line-height: normal; letter-spacing: normal; word-spacing: normal; text-transform: none; direction: ltr; text-anchor: start; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 1; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; visibility: visible; display: inline; font-family: Bitstream Vera Sans; stroke-opacity: 1;" d="m 320.08435,397.03059 c 0.007,-0.79449 -0.27079,-1.59203 -0.83434,-2.15559 L 307.37501,383 m 12.5523,-15.20447 c -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 L 298.87501,383" id="path3165-7-3-1-9" sodipodi:nodetypes="ccccccc" transform="matrix(2, 0, 0, 2, -586, -765.967)"/>
+  </g>
+</svg>
--- a/data/theme/ws-switch-arrow-right.svg
+++ b/data/theme/ws-switch-arrow-right.svg
@@ -2,51 +2,13 @@
 <!-- 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"
   version="1.1"
   width="96"
   height="96"
-   id="svg25070"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="ws-switch-arrow-down.svg">
-  <metadata
-     id="metadata3353">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="718"
-     inkscape:window-height="480"
-     id="namedview3351"
-     showgrid="false"
-     inkscape:zoom="2.6979167"
-     inkscape:cx="48"
-     inkscape:cy="48"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg25070" />
+   id="svg25070">
  <defs
     id="defs25072">
    <linearGradient
@@ -326,7 +288,7 @@
    </filter>
  </defs>
  <g
-     transform="matrix(0,1,-1,0,48.0003,4.1307112e-7)"
+     transform="translate(0,48)"
     id="layer1">
    <g
       transform="matrix(-2,0,0,2,-97.2497,-374.967)"
@@ -335,42 +297,35 @@
      <path
         d="m -72.5,173.5 -14,14 14,14"
         id="path3165-7-3"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         inkscape:connector-curvature="0" />
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
    </g>
    <path
       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
       transform="matrix(-3.34328,0,0,3.34328,-89.2797,-623.176)"
       id="path4050-2-7-9-4"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible" />
    <path
       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
       transform="matrix(-3.34328,0,0,3.34328,-111.2797,-623.176)"
       id="path4050-2-7-9-4-8"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible" />
    <path
       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
       transform="matrix(-2.86565,0,0,2.86565,-70.8457,-534.143)"
       id="path4050-2-7-9-4-0"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
    <path
       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
       transform="matrix(-2.86565,0,0,2.86565,-92.8457,-534.143)"
       id="path4050-2-7-9-4-0-9"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
    <path
       d="m 47.87528,-34.0295 c 1.53896,0.0448 3.0511,0.70928 4.125,1.8125 l 32.25,32.25 -32.25,32.25 c -2.2253,2.2253 -6.2747,2.2253 -8.5,0 -2.2253,-2.22528 -2.2253,-6.2747 0,-8.5 l 23.75,-23.75 -23.75,-23.75 c -1.73168,-1.6731 -2.295,-4.44228 -1.3546,-6.65894 0.94042,-2.21668 3.32312,-3.73604 5.7296,-3.65356 z"
       id="path3165-7-3-1"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       inkscape:connector-curvature="0" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
    <path
       d="m 41.8316,28.09418 c -0.014,-1.58898 0.54158,-3.18406 1.66868,-4.31118 l 23.75,-23.75 m -25.1046,-30.40894 c 0.94042,-2.21668 3.32312,-3.73604 5.7296,-3.65356 1.53896,0.0448 3.0511,0.70928 4.125,1.8125 l 32.25,32.25"
       id="path3165-7-3-1-9"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       inkscape:connector-curvature="0" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
  </g>
 </svg>
--- a/data/theme/ws-switch-arrow-up.svg
+++ b/data/theme/ws-switch-arrow-up.svg
@@ -1,447 +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: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="96"
-   height="96"
-   id="svg25070"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="ws-switch-arrow-up.svg">
-  <defs
-     id="defs25072">
-    <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="perspective25078" />
-    <inkscape:perspective
-       id="perspective24985"
-       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" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4034-0-4"
-       id="linearGradient24957"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6)"
-       x1="-86.552246"
-       y1="185.439"
-       x2="-83.37072"
-       y2="197.31261" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4034-0-4">
-      <stop
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
-         offset="0"
-         id="stop4036-5-7" />
-      <stop
-         style="stop-color: rgb(186, 189, 182); stop-opacity: 1;"
-         offset="1"
-         id="stop4038-9-6" />
-    </linearGradient>
-    <filter
-       id="filter24765"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix24767"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix24769"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4632-1-3-9-3-2"
-       id="linearGradient24955"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5)"
-       x1="-74.520325"
-       y1="169.06032"
-       x2="-74.520325"
-       y2="205.94189" />
-    <linearGradient
-       id="linearGradient4632-1-3-9-3-2">
-      <stop
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
-         offset="0"
-         id="stop4634-1-8-3-9-0" />
-      <stop
-         id="stop4636-1-9-9-8-8"
-         offset="0.0274937"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
-      <stop
-         id="stop4638-8-3-9-6-6"
-         offset="0.274937"
-         style="stop-color: rgb(242, 242, 242); stop-opacity: 1;" />
-      <stop
-         id="stop4640-8-5-7-8-9"
-         offset="0.38707438"
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
-      <stop
-         id="stop4642-5-41-9-6-9"
-         offset="0.66528589"
-         style="stop-color: rgb(217, 218, 216); stop-opacity: 1;" />
-      <stop
-         id="stop4644-5-2-7-9-2"
-         offset="0.76745707"
-         style="stop-color: rgb(223, 224, 221); stop-opacity: 1;" />
-      <stop
-         style="stop-color: rgb(240, 240, 240); stop-opacity: 1;"
-         offset="1"
-         id="stop4646-3-2-3-7-3" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4869-4-1"
-       id="radialGradient24959"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)"
-       cx="-33.412369"
-       cy="185.74171"
-       fx="-33.412369"
-       fy="185.74171"
-       r="2.3554697" />
-    <linearGradient
-       id="linearGradient4869-4-1">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4871-6-2" />
-      <stop
-         id="stop4879-7-4"
-         offset="0.31807542"
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
-      <stop
-         id="stop4877-6-1"
-         offset="0.74691135"
-         style="stop-color: rgb(200, 201, 198); stop-opacity: 1;" />
-      <stop
-         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
-         offset="1"
-         id="stop4873-1-0" />
-    </linearGradient>
-    <filter
-       id="filter25011"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25013"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25015"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4869-4-0"
-       id="radialGradient24961"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)"
-       cx="-33.412369"
-       cy="185.74171"
-       fx="-33.412369"
-       fy="185.74171"
-       r="2.3554697" />
-    <linearGradient
-       id="linearGradient4869-4-0">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4871-6-8" />
-      <stop
-         id="stop4879-7-5"
-         offset="0.31807542"
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
-      <stop
-         id="stop4877-6-5"
-         offset="0.74691135"
-         style="stop-color: rgb(200, 201, 198); stop-opacity: 1;" />
-      <stop
-         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
-         offset="1"
-         id="stop4873-1-4" />
-    </linearGradient>
-    <filter
-       id="filter25023"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25025"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25027"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4941"
-       id="linearGradient24963"
-       gradientUnits="userSpaceOnUse"
-       x1="-39.858727"
-       y1="184.61784"
-       x2="-38.244785"
-       y2="188.84898" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4941">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4943" />
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="1"
-         id="stop4945" />
-    </linearGradient>
-    <filter
-       id="filter25033"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25035"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25037"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4941-7"
-       id="linearGradient24965"
-       gradientUnits="userSpaceOnUse"
-       x1="-39.858727"
-       y1="184.61784"
-       x2="-38.244785"
-       y2="188.84898" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4941-7">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4943-2" />
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="1"
-         id="stop4945-5" />
-    </linearGradient>
-    <filter
-       id="filter25043"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25045"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25047"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <filter
-       id="filter25049"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25051"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25053"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <filter
-       id="filter25055"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25057"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25059"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="-12.356322"
-     inkscape:cy="57.536221"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1200"
-     inkscape:window-height="840"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata25075">
-    <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, 48)">
-    <g
-       id="g3181"
-       transform="matrix(0,1,-1,0,48.0003,-48)">
-      <g
-         style="stroke:#000000;stroke-opacity:1;display:inline"
-         transform="matrix(2,0,0,2,193.25,-374.967)"
-         id="g4030-1-8">
-        <path
-           style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-           d="m -72.5,173.5 -14,14 14,14"
-           id="path3165-7-3"
-           sodipodi:nodetypes="ccc"
-           inkscape:connector-curvature="0" />
-      </g>
-      <path
-         transform="matrix(3.34328,0,0,3.34328,185.28,-623.176)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(3.34328,0,0,3.34328,207.28,-623.176)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4-8"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(2.86565,0,0,2.86565,166.846,-534.143)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4-0"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;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
-         transform="matrix(2.86565,0,0,2.86565,188.846,-534.143)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4-0-9"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;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
-         transform="matrix(2,0,0,2,-586,-765.967)"
-         sodipodi:nodetypes="ccccscccsc"
-         id="path3165-7-3-1"
-         d="m 317.06251,365.96875 c -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 l -16.125,16.125 16.125,16.125 c 1.11265,1.11265 3.13735,1.11265 4.25,0 1.11265,-1.11264 1.11265,-3.13735 0,-4.25 l -11.875,-11.875 11.875,-11.875 c 0.86584,-0.83655 1.1475,-2.22114 0.6773,-3.32947 -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         transform="matrix(2,0,0,2,-586,-765.967)"
-         sodipodi:nodetypes="ccccccc"
-         id="path3165-7-3-1-9"
-         d="m 320.08435,397.03059 c 0.007,-0.79449 -0.27079,-1.59203 -0.83434,-2.15559 L 307.37501,383 m 12.5523,-15.20447 c -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 L 298.87501,383"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -7,8 +7,8 @@ nobase_dist_js_DATA = 	\
 	misc/fileUtils.js	\
 	misc/format.js		\
 	misc/gnomeSession.js	\
-	misc/history.js		\
 	misc/params.js		\
+	misc/telepathy.js	\
 	misc/util.js		\
 	perf/core.js		\
 	ui/altTab.js		\
@@ -39,7 +39,6 @@ nobase_dist_js_DATA = 	\
 	ui/panel.js		\
 	ui/panelMenu.js		\
 	ui/placeDisplay.js	\
-	ui/polkitAuthenticationAgent.js \
 	ui/popupMenu.js		\
 	ui/runDialog.js		\
 	ui/scripting.js		\
@@ -59,7 +58,6 @@ nobase_dist_js_DATA = 	\
 	ui/windowAttentionHandler.js	\
 	ui/windowManager.js	\
 	ui/workspace.js		\
-	ui/workspaceThumbnail.js	\
 	ui/workspacesView.js	\
 	ui/workspaceSwitcherPopup.js    \
 	ui/xdndHandler.js
--- a/js/misc/docInfo.js
+++ b/js/misc/docInfo.js
@@ -29,8 +29,8 @@ DocInfo.prototype = {
        return St.TextureCache.get_default().load_recent_thumbnail(size, this.recentInfo);
    },

-    launch : function(workspaceIndex) {
-        Shell.DocSystem.get_default().open(this.recentInfo, workspaceIndex);
+    launch : function() {
+        Shell.DocSystem.get_default().open(this.recentInfo);
    },

    matchTerms: function(terms) {
--- a/js/misc/history.js
+++ b/js/misc/history.js
@@ -1,72 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Lang = imports.lang;
-const Signals = imports.signals;
-
-const DEFAULT_LIMIT = 512;
-
-function HistoryManager(settings_key) {
-    this._init(settings_key);
-}
-
-HistoryManager.prototype = {
-    _init: function(settings_key, limit) {
-        this._limit = limit || DEFAULT_LIMIT;
-        this._key = settings_key;
-        this._history = global.settings.get_strv(settings_key);
-        this._historyIndex = -1;
-
-        global.settings.connect('changed::' + settings_key,
-                                Lang.bind(this, this._historyChanged));
-    },
-
-    _historyChanged: function() {
-        this._history = global.settings.get_strv(this._key);
-        this._historyIndex = this._history.length;
-    },
-
-    prevItem: function(text) {
-        this._setHistory(this._historyIndex--, text);
-        return this._indexChanged();
-    },
-
-    nextItem: function(text) {
-        this._setHistory(this._historyIndex++, text);
-        return this._indexChanged();
-    },
-
-    lastItem: function() {
-        this._historyIndex = this._history.length;
-        return this._indexChanged();
-    },
-
-    addItem: function(input) {
-        if (this._history.length == 0 ||
-            this._history[this._history.length - 1] != input) {
-
-            this._history.push(input);
-            this._save();
-        }   
-    },
-
-    _indexChanged: function() {
-        let current = this._history[this._historyIndex] || '';
-        this.emit('changed', current);
-        return current;
-    },
-
-    _setHistory: function(index, text) {
-        this._historyIndex = Math.max(this._historyIndex, 0);
-        this._historyIndex = Math.min(this._historyIndex, this._history.length);
-
-        if (text)
-            this._history[index] = text;
-    },
-
-    _save: function() {
-        if (this._history.length > this._limit)
-            this._history.splice(0, this._history.length - this._key);
-        global.settings.set_strv(this._key, this._history);
-    }
-};
-Signals.addSignalMethods(HistoryManager.prototype);
--- a/js/misc/telepathy.js
+++ b/js/misc/telepathy.js
@@ -0,0 +1,361 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+
+// D-Bus utils
+function nameToPath(name) {
+    return '/' + name.replace(/\./g, '/');
+};
+
+function pathToName(path) {
+    if (path[0] != '/')
+        throw new Error('not a D-Bus path: ' + path);
+    return path.substr(1).replace(/\//g, '.');
+};
+
+// This is tp_escape_as_identifier() from telepathy-glib
+function escapeAsIdentifier(name) {
+    if (!name)
+        return '_';
+
+    // first char is replaced with _XX if it's non-alpha,
+    // later chars are replaced with _XX if they're non-alphanumeric
+    if (name.length == 1) {
+        return name.replace(/[^a-zA-Z]/, _hexEscape);
+    } else {
+        return (name[0].replace(/[^a-zA-Z]/, _hexEscape) +
+                name.substring(1).replace(/[^a-zA-Z0-9]/g, _hexEscape));
+    }
+}
+
+function _hexEscape(ch) {
+    return '_' + ch.charCodeAt(0).toString(16);
+}
+
+// Telepathy D-Bus interface definitions. Note that most of these are
+// incomplete, and only cover the methods/properties/signals that
+// we're currently using.
+
+const TELEPATHY = 'org.freedesktop.Telepathy';
+
+const CLIENT_NAME = TELEPATHY + '.Client';
+const ClientIface = {
+    name: CLIENT_NAME,
+    properties: [
+        { name: 'Interfaces',
+          signature: 'as',
+          access: 'read' }
+    ]
+};
+
+const CLIENT_APPROVER_NAME = TELEPATHY + '.Client.Approver';
+const ClientApproverIface = {
+    name: CLIENT_APPROVER_NAME,
+    methods: [
+        { name: 'AddDispatchOperation',
+          inSignature: 'a(oa{sv})oa{sv}',
+          outSignature: '' }
+    ],
+    properties: [
+        { name: 'ApproverChannelFilter',
+          signature: 'aa{sv}',
+          access: 'read' }
+    ]
+};
+
+const CLIENT_HANDLER_NAME = TELEPATHY + '.Client.Handler';
+const ClientHandlerIface = {
+    name: CLIENT_HANDLER_NAME,
+    methods: [
+        { name: 'HandleChannels',
+          inSignature: 'ooa(oa{sv})aota{sv}',
+          outSignature: '' }
+    ],
+    properties: [
+        { name: 'HandlerChannelFilter',
+          signature: 'aa{sv}',
+          access: 'read' }
+    ]
+};
+
+const CLIENT_OBSERVER_NAME = TELEPATHY + '.Client.Observer';
+const ClientObserverIface = {
+    name: CLIENT_OBSERVER_NAME,
+    methods: [
+        { name: 'ObserveChannels',
+          inSignature: 'ooa(oa{sv})oaoa{sv}',
+          outSignature: '' }
+    ],
+    properties: [
+        { name: 'ObserverChannelFilter',
+          signature: 'aa{sv}',
+          access: 'read' }
+    ]
+};
+
+const CHANNEL_DISPATCH_OPERATION_NAME = TELEPATHY + '.ChannelDispatchOperation';
+const ChannelDispatchOperationIface = {
+    name: CHANNEL_DISPATCH_OPERATION_NAME,
+    methods: [
+        { name: 'HandleWith',
+          inSignature: 's',
+          outSignature: '' },
+        { name: 'Claim',
+          inSignature: '',
+          outSignature: '' }
+    ]
+};
+let ChannelDispatchOperation = DBus.makeProxyClass(ChannelDispatchOperationIface);
+
+const CONNECTION_NAME = TELEPATHY + '.Connection';
+const ConnectionIface = {
+    name: CONNECTION_NAME,
+    signals: [
+        { name: 'StatusChanged',
+          inSignature: 'uu' }
+    ]
+};
+let Connection = DBus.makeProxyClass(ConnectionIface);
+
+const ConnectionStatus = {
+    CONNECTED:    0,
+    CONNECTING:   1,
+    DISCONNECTED: 2
+};
+
+const CONNECTION_ALIASING_NAME = CONNECTION_NAME + '.Interface.Aliasing';
+const ConnectionAliasingIface = {
+    name: CONNECTION_ALIASING_NAME,
+    methods: [
+        { name: 'RequestAliases',
+          inSignature: 'au',
+          outSignature: 'as'
+        }
+    ],
+    signals: [
+        { name: 'AliasesChanged',
+          inSignature: 'a(us)' }
+    ]
+};
+let ConnectionAliasing = DBus.makeProxyClass(ConnectionAliasingIface);
+
+const CONNECTION_AVATARS_NAME = CONNECTION_NAME + '.Interface.Avatars';
+const ConnectionAvatarsIface = {
+    name: CONNECTION_AVATARS_NAME,
+    methods: [
+        { name: 'GetKnownAvatarTokens',
+          inSignature: 'au',
+          outSignature: 'a{us}'
+        },
+        { name: 'RequestAvatars',
+          inSignature: 'au',
+          outSignature: ''
+        }
+    ],
+    signals: [
+        { name: 'AvatarRetrieved',
+          inSignature: 'usays'
+        },
+        { name: 'AvatarUpdated',
+          inSignature: 'us'
+        }
+    ]
+};
+let ConnectionAvatars = DBus.makeProxyClass(ConnectionAvatarsIface);
+
+const CONNECTION_CONTACTS_NAME = CONNECTION_NAME + '.Interface.Contacts';
+const ConnectionContactsIface = {
+    name: CONNECTION_CONTACTS_NAME,
+    methods: [
+        { name: 'GetContactAttributes',
+          inSignature: 'auasb',
+          outSignature: 'a{ua{sv}}'
+        }
+    ]
+};
+let ConnectionContacts = DBus.makeProxyClass(ConnectionContactsIface);
+
+const CONNECTION_REQUESTS_NAME = CONNECTION_NAME + '.Interface.Requests';
+const ConnectionRequestsIface = {
+    name: CONNECTION_REQUESTS_NAME,
+    methods: [
+        { name: 'CreateChannel',
+          inSignature: 'a{sv}',
+          outSignature: 'oa{sv}'
+        },
+        { name: 'EnsureChannel',
+          inSignature: 'a{sv}',
+          outSignature: 'boa{sv}'
+        }
+    ],
+    properties: [
+        { name: 'Channels',
+          signature: 'a(oa{sv})',
+          access: 'read' }
+    ],
+    signals: [
+        { name: 'NewChannels',
+          inSignature: 'a(oa{sv})'
+        },
+        { name: 'ChannelClosed',
+          inSignature: 'o'
+        }
+    ]
+};
+let ConnectionRequests = DBus.makeProxyClass(ConnectionRequestsIface);
+
+const CONNECTION_SIMPLE_PRESENCE_NAME = CONNECTION_NAME + '.Interface.SimplePresence';
+const ConnectionSimplePresenceIface = {
+    name: CONNECTION_SIMPLE_PRESENCE_NAME,
+    methods: [
+        { name: 'SetPresence',
+          inSignature: 'ss'
+        },
+        { name: 'GetPresences',
+          inSignature: 'au',
+          outSignature: 'a{u(uss)}'
+        }
+    ],
+    signals: [
+        { name: 'PresencesChanged',
+          inSignature: 'a{u(uss)}' }
+    ]
+};
+let ConnectionSimplePresence = DBus.makeProxyClass(ConnectionSimplePresenceIface);
+
+const ConnectionPresenceType = {
+    UNSET:         0,
+    OFFLINE:       1,
+    AVAILABLE:     2,
+    AWAY:          3,
+    EXTENDED_AWAY: 4,
+    HIDDEN:        5,
+    BUSY:          6,
+    UNKNOWN:       7,
+    ERROR:         8
+};
+
+const HandleType = {
+    NONE:    0,
+    CONTACT: 1,
+    ROOM:    2,
+    LIST:    3,
+    GROUP:   4
+};
+
+const CHANNEL_NAME = TELEPATHY + '.Channel';
+const ChannelIface = {
+    name: CHANNEL_NAME,
+    signals: [
+        { name: 'Closed',
+          inSignature: '' }
+    ]
+};
+let Channel = DBus.makeProxyClass(ChannelIface);
+
+const CHANNEL_TEXT_NAME = CHANNEL_NAME + '.Type.Text';
+const ChannelTextIface = {
+    name: CHANNEL_TEXT_NAME,
+    methods: [
+        { name: 'ListPendingMessages',
+          inSignature: 'b',
+          outSignature: 'a(uuuuus)'
+        },
+        { name: 'AcknowledgePendingMessages',
+          inSignature: 'au',
+          outSignature: ''
+        },
+        { name: 'Send',
+          inSignature: 'us',
+          outSignature: ''
+        }
+    ],
+    signals: [
+        { name: 'Received',
+          inSignature: 'uuuuus' },
+        { name: 'Sent',
+          inSignature: 'uus' }
+    ]
+};
+let ChannelText = DBus.makeProxyClass(ChannelTextIface);
+
+const ChannelTextMessageType = {
+    NORMAL: 0,
+    ACTION: 1,
+    NOTICE: 2,
+    AUTO_REPLY: 3,
+    DELIVERY_REPORT: 4
+};
+
+const CHANNEL_CONTACT_LIST_NAME = CHANNEL_NAME + '.Type.ContactList';
+// There is no interface associated with ContactList; it's just a
+// special kind of Channel.Interface.Group
+
+const CHANNEL_GROUP_NAME = CHANNEL_NAME + '.Interface.Group';
+const ChannelGroupIface = {
+    name: CHANNEL_GROUP_NAME,
+    properties: [
+        { name: 'Members',
+          signature: 'au',
+          access: 'read' }
+    ],
+    signals: [
+        { name: 'MembersChanged',
+          inSignature: 'sauauauauuu' }
+    ]
+};
+let ChannelGroup = DBus.makeProxyClass(ChannelGroupIface);
+
+const ACCOUNT_MANAGER_NAME = TELEPATHY + '.AccountManager';
+const AccountManagerIface = {
+    name: ACCOUNT_MANAGER_NAME,
+    properties: [
+        { name: 'ValidAccounts',
+          signature: 'ao',
+          access: 'read' }
+    ],
+    signals: [
+        { name: 'AccountValidityChanged',
+          inSignature: 'ob' }
+    ]
+};
+let AccountManager = DBus.makeProxyClass(AccountManagerIface);
+
+const ACCOUNT_NAME = TELEPATHY + '.Account';
+const AccountIface = {
+    name: ACCOUNT_NAME,
+    properties: [
+        { name: 'Connection',
+          signature: 'o',
+          access: 'read' }
+    ]
+};
+let Account = DBus.makeProxyClass(AccountIface);
+
+const CHANNEL_DISPATCHER_NAME = TELEPATHY + '.ChannelDispatcher';
+const ChannelDispatcherIface = {
+    name: CHANNEL_DISPATCHER_NAME,
+    methods: [
+        { name: 'EnsureChannel',
+          inSignature: 'oa{sv}xs',
+          outSignature: 'o' }
+    ]
+};
+let ChannelDispatcher = DBus.makeProxyClass(ChannelDispatcherIface);
+
+const CHANNEL_REQUEST_NAME = TELEPATHY + '.ChannelRequest';
+const ChannelRequestIface = {
+    name: CHANNEL_REQUEST_NAME,
+    methods: [
+        { name: 'Proceed',
+          inSignature: '',
+          outSignature: '' }
+    ],
+    signals: [
+        { name: 'Failed',
+          signature: 'ss' },
+        { name: 'Succeeded',
+          signature: '' }
+    ]
+};
+let ChannelRequest = DBus.makeProxyClass(ChannelRequestIface);
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@@ -16,7 +15,7 @@ const POPUP_APPICON_SIZE = 96;
 const POPUP_SCROLL_TIME = 0.10; // seconds
 const POPUP_FADE_TIME = 0.1; // seconds

-const APP_ICON_HOVER_TIMEOUT = 200; // milliseconds
+const APP_ICON_HOVER_TIMEOUT = 750; // milliseconds

 const DISABLE_HOVER_TIMEOUT = 500; // milliseconds

@@ -121,7 +120,7 @@ AltTabPopup.prototype = {
        }
    },

-    show : function(backward, switch_group) {
+    show : function(backward) {
        let tracker = Shell.WindowTracker.get_default();
        let apps = tracker.get_running_apps ('');

@@ -146,16 +145,7 @@ AltTabPopup.prototype = {
        this._appIcons = this._appSwitcher.icons;

        // Make the initial selection
-        if (switch_group) {
-            if (backward) {
-                this._select(0, this._appIcons[0].cachedWindows.length - 1);
-            } else {
-                if (this._appIcons[0].cachedWindows.length > 1)
-                    this._select(0, 1);
-                else
-                    this._select(0, 0);
-            }
-        } else if (this._appIcons.length == 1) {
+        if (this._appIcons.length == 1) {
            if (!backward && this._appIcons[0].cachedWindows.length > 1) {
                // For compatibility with the multi-app case below
                this._select(0, 1, true);
@@ -227,38 +217,41 @@ AltTabPopup.prototype = {

    _keyPressEvent : function(actor, event) {
        let keysym = event.get_key_symbol();
-        let event_state = Shell.get_event_state(event);
-        let backwards = event_state & Clutter.ModifierType.SHIFT_MASK;
-        let action = global.screen.get_display().get_keybinding_action(event.get_key_code(), event_state);
+        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
+        // X allows servers to represent Shift+Tab in two different ways
+        if (shift && keysym == Clutter.Tab)
+            keysym = Clutter.ISO_Left_Tab;

        this._disableHover();

-        if (action == Meta.KeyBindingAction.SWITCH_GROUP)
-            this._select(this._currentApp, backwards ? this._previousWindow() : this._nextWindow());
+        if (keysym == Clutter.grave)
+            this._select(this._currentApp, this._nextWindow());
+        else if (keysym == Clutter.asciitilde)
+            this._select(this._currentApp, this._previousWindow());
        else if (keysym == Clutter.Escape)
            this.destroy();
        else if (this._thumbnailsFocused) {
-            if (action == Meta.KeyBindingAction.SWITCH_WINDOWS)
-                if (backwards) {
-                    if (this._currentWindow == 0 || this._currentWindow == -1)
-                        this._select(this._previousApp());
-                    else
-                        this._select(this._currentApp, this._previousWindow());
-                } else {
-                    if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
-                        this._select(this._nextApp());
-                    else
-                        this._select(this._currentApp, this._nextWindow());
-                }
-            else if (keysym == Clutter.Left)
+            if (keysym == Clutter.Tab) {
+                if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
+                    this._select(this._nextApp());
+                else
+                    this._select(this._currentApp, this._nextWindow());
+            } else if (keysym == Clutter.ISO_Left_Tab) {
+                if (this._currentWindow == 0 || this._currentWindow == -1)
+                    this._select(this._previousApp());
+                else
+                    this._select(this._currentApp, this._previousWindow());
+            } else if (keysym == Clutter.Left)
                this._select(this._currentApp, this._previousWindow());
            else if (keysym == Clutter.Right)
                this._select(this._currentApp, this._nextWindow());
            else if (keysym == Clutter.Up)
                this._select(this._currentApp, null, true);
        } else {
-            if (action == Meta.KeyBindingAction.SWITCH_WINDOWS)
-                this._select(backwards ? this._previousApp() : this._nextApp());
+            if (keysym == Clutter.Tab)
+                this._select(this._nextApp());
+            else if (keysym == Clutter.ISO_Left_Tab)
+                this._select(this._previousApp());
            else if (keysym == Clutter.Left)
                this._select(this._previousApp());
            else if (keysym == Clutter.Right)
@@ -534,11 +527,16 @@ SwitcherList.prototype = {
        this._leftArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
                                               pseudo_class: 'highlighted' });
        this._leftArrow.connect('repaint', Lang.bind(this,
-            function() { _drawArrow(this._leftArrow, St.Side.LEFT); }));
+                                            function (area) {
+                                                Shell.draw_box_pointer(area, Shell.PointerDirection.LEFT);
+                                            }));
+
        this._rightArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
                                                pseudo_class: 'highlighted' });
        this._rightArrow.connect('repaint', Lang.bind(this,
-            function() { _drawArrow(this._rightArrow, St.Side.RIGHT); }));
+                                            function (area) {
+                                                Shell.draw_box_pointer(area, Shell.PointerDirection.RIGHT);
+                                            }));

        this.actor.add_actor(this._leftArrow);
        this.actor.add_actor(this._rightArrow);
@@ -595,8 +593,8 @@ SwitcherList.prototype = {
    },

    addItem : function(item) {
-        let bbox = new St.Button({ style_class: 'item-box',
-                                   reactive: true });
+        let bbox = new St.Clickable({ style_class: 'item-box',
+                                      reactive: true });

        bbox.set_child(item);
        this._list.add_actor(bbox);
@@ -994,7 +992,10 @@ AppSwitcher.prototype = {

        let n = this._arrows.length;
        let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
-        arrow.connect('repaint', function() { _drawArrow(arrow, St.Side.BOTTOM); });
+        arrow.connect('repaint', Lang.bind(this,
+            function (area) {
+                Shell.draw_box_pointer(area, Shell.PointerDirection.DOWN);
+            }));
        this._list.add_actor(arrow);
        this._arrows.push(arrow);

@@ -1080,9 +1081,6 @@ ThumbnailList.prototype = {

        for (let i = 0; i < this._thumbnailBins.length; i++) {
            let mutterWindow = this._windows[i].get_compositor_private();
-            if (!mutterWindow)
-                continue;
-
            let windowTexture = mutterWindow.get_texture ();
            let [width, height] = windowTexture.get_size();
            let scale = Math.min(1.0, THUMBNAIL_DEFAULT_SIZE / width, availHeight / height);
@@ -1100,46 +1098,3 @@ ThumbnailList.prototype = {
        this._thumbnailBins = new Array();
    }
 };
-
-function _drawArrow(area, side) {
-    let themeNode = area.get_theme_node();
-    let borderColor = themeNode.get_border_color(side);
-    let bodyColor = themeNode.get_foreground_color();
-
-    let [width, height] = area.get_surface_size ();
-    let cr = area.get_context();
-
-    cr.setLineWidth(1.0);
-    Clutter.cairo_set_source_color(cr, borderColor);
-
-    switch (side) {
-    case St.Side.TOP:
-        cr.moveTo(0, height);
-        cr.lineTo(Math.floor(width * 0.5), 0);
-        cr.lineTo(width, height);
-        break;
-
-    case St.Side.BOTTOM:
-        cr.moveTo(width, 0);
-        cr.lineTo(Math.floor(width * 0.5), height);
-        cr.lineTo(0, 0);
-        break;
-
-    case St.Side.LEFT:
-        cr.moveTo(width, height);
-        cr.lineTo(0, Math.floor(height * 0.5));
-        cr.lineTo(width, 0);
-        break;
-
-    case St.Side.RIGHT:
-        cr.moveTo(0, 0);
-        cr.lineTo(width, Math.floor(height * 0.5));
-        cr.lineTo(0, height);
-        break;
-    }
-
-    cr.strokePreserve();
-
-    Clutter.cairo_set_source_color(cr, bodyColor);
-    cr.fill();
-}
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -51,9 +51,6 @@ AlphabeticalView.prototype = {
                let adjustment = this.actor.vscroll.adjustment;
                let direction = Overview.SwipeScrollDirection.VERTICAL;
                Main.overview.setScrollAdjustment(adjustment, direction);
-
-                // Reset scroll on mapping
-                adjustment.value = 0;
            }));
    },

@@ -112,13 +109,6 @@ ViewByCategories.prototype = {
        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 });

-        // Always select the "All" filter when switching to the app view
-        this.actor.connect('notify::mapped', Lang.bind(this,
-            function() {
-                if (this.actor.mapped && this._allFilter)
-                    this._selectCategory(-1);
-            }));
-
        this._sections = [];
    },

@@ -233,20 +223,14 @@ BaseAppSearchProvider.prototype = {
                 'icon': app.create_icon_texture(Search.RESULT_ICON_SIZE)};
    },

-    activateResult: function(id, params) {
-        params = Params.parse(params, { workspace: null,
-                                        timestamp: null });
-
+    activateResult: function(id) {
        let app = this._appSys.get_app(id);
-        app.activate(params.workspace ? params.workspace.index() : -1);
+        app.activate();
    },

-    dragActivateResult: function(id, params) {
-        params = Params.parse(params, { workspace: null,
-                                        timestamp: null });
-
+    dragActivateResult: function(id) {
        let app = this._appSys.get_app(id);
-        app.open_new_window(params.workspace ? params.workspace.get_index() : -1);
+        app.open_new_window();
    }
 };

@@ -335,17 +319,15 @@ function AppWellIcon(app, iconParams) {
 AppWellIcon.prototype = {
    _init : function(app, iconParams) {
        this.app = app;
-        this.actor = new St.Button({ style_class: 'app-well-app',
-                                     reactive: true,
-                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO,
-                                     x_fill: true,
-                                     y_fill: true });
+        this.actor = new St.Clickable({ style_class: 'app-well-app',
+                                         reactive: true,
+                                         x_fill: true,
+                                         y_fill: true });
        this.actor._delegate = this;

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

-        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
        this.actor.connect('clicked', Lang.bind(this, this._onClicked));

        this._menu = null;
@@ -362,6 +344,7 @@ AppWellIcon.prototype = {
               Main.overview.endItemDrag(this);
            }));

+        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        this._menuTimeoutId = 0;
@@ -400,25 +383,25 @@ AppWellIcon.prototype = {
                Lang.bind(this, function() {
                    this.popupMenu();
                }));
-        } else if (button == 3) {
-            this.popupMenu();
-            return true;
        }
-        return false;
    },

-    _onClicked: function(actor, button) {
+    _onClicked: function(actor, event) {
        this._removeMenuTimeout();

+        let button = event.get_button();
        if (button == 1) {
-            this._onActivate(Clutter.get_current_event());
+            this._onActivate(event);
        } else if (button == 2) {
-            // Last workspace is always empty
-            let launchWorkspace = global.screen.get_workspace_by_index(global.screen.n_workspaces - 1);
-            launchWorkspace.activate(global.get_current_time());
-            this.emit('launching');
-            this.app.open_new_window(-1);
-            Main.overview.hide();
+            let newWorkspace = Main.overview.workspaces.addWorkspace();
+            if (newWorkspace != null) {
+                newWorkspace.activate(global.get_current_time());
+                this.emit('launching');
+                this.app.open_new_window();
+                Main.overview.hide();
+            }
+        } else if (button == 3) {
+            this.popupMenu();
        }
        return false;
    },
@@ -433,12 +416,18 @@ AppWellIcon.prototype = {

        if (!this._menu) {
            this._menu = new AppIconMenu(this);
+            this._menu.connect('highlight-window', Lang.bind(this, function (menu, window) {
+                this.highlightWindow(window);
+            }));
            this._menu.connect('activate-window', Lang.bind(this, function (menu, window) {
                this.activateWindow(window);
            }));
            this._menu.connect('popup', Lang.bind(this, function (menu, isPoppedUp) {
-                if (!isPoppedUp)
+                if (isPoppedUp) {
+                    this._onMenuPoppedUp();
+                } else {
                    this._onMenuPoppedDown();
+                }
            }));

            this._menuManager.addMenu(this._menu);
@@ -449,16 +438,45 @@ AppWellIcon.prototype = {
        return false;
    },

+    highlightWindow: function(metaWindow) {
+        if (this._didActivateWindow)
+            return;
+        if (!this._getRunning())
+            return;
+        Main.overview.getWorkspacesForWindow(metaWindow).setHighlightWindow(metaWindow);
+    },
+
    activateWindow: function(metaWindow) {
        if (metaWindow) {
+            this._didActivateWindow = true;
            Main.activateWindow(metaWindow);
        } else {
            Main.overview.hide();
        }
    },

+    _onMenuPoppedUp: function() {
+        if (this._getRunning()) {
+            Main.overview.getWorkspacesForWindow(null).setApplicationWindowSelection(this.app.get_id());
+            this._setWindowSelection = true;
+            this._didActivateWindow = false;
+        }
+    },
+
    _onMenuPoppedDown: function() {
        this.actor.sync_hover();
+
+        if (this._didActivateWindow)
+            return;
+        if (!this._setWindowSelection)
+            return;
+
+        Main.overview.getWorkspacesForWindow(null).setApplicationWindowSelection(null);
+        this._setWindowSelection = false;
+    },
+
+    _getRunning: function() {
+        return this.app.state != Shell.AppState.STOPPED;
    },

    _onActivate: function (event) {
@@ -467,22 +485,24 @@ AppWellIcon.prototype = {

        if (modifiers & Clutter.ModifierType.CONTROL_MASK
            && this.app.state == Shell.AppState.RUNNING) {
-            this.app.open_new_window(-1);
+            this.app.open_new_window();
        } else {
-            this.app.activate(-1);
+            this.app.activate();
        }
        Main.overview.hide();
    },

-    shellWorkspaceLaunch : function(params) {
-        params = Params.parse(params, { workspace: null,
-                                        timestamp: null });
+    // called by this._menuManager when it has the grab
+    menuEventFilter: function(event) {
+        return this._menu.menuEventFilter(event);
+    },

-        this.app.open_new_window(params.workspace ? params.workspace.index() : -1);
+    shellWorkspaceLaunch : function() {
+        this.app.open_new_window();
    },

    getDragActor: function() {
-        return this.app.create_icon_texture(Main.overview.dash.iconSize);
+        return this.app.create_icon_texture(this.icon.iconSize);
    },

    // Returns the original actor that should align with the actor
@@ -505,10 +525,11 @@ AppIconMenu.prototype = {
        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
            side = St.Side.RIGHT;

-        PopupMenu.PopupMenu.prototype._init.call(this, source.actor, 0.5, side, 0);
+        PopupMenu.PopupMenu.prototype._init.call(this, source.actor, St.Align.MIDDLE, side, 0);

        this._source = source;

+        this.connect('active-changed', Lang.bind(this, this._onActiveChanged));
        this.connect('activate', Lang.bind(this, this._onActivate));
        this.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));

@@ -555,6 +576,7 @@ AppIconMenu.prototype = {
        this._toggleFavoriteMenuItem = this._appendMenuItem(isFavorite ? _("Remove from Favorites")
                                                                    : _("Add to Favorites"));

+        this._highlightedItem = null;
    },

    _appendSeparator: function () {
@@ -578,16 +600,74 @@ AppIconMenu.prototype = {
        if (open) {
            this.emit('popup', true);
        } else {
+            this._updateHighlight(null);
            this.emit('popup', false);
        }
    },

+    // called by this._menuManager when it has the grab
+    menuEventFilter: function(event) {
+        let eventType = event.type();
+
+        // Check if the user is interacting with a window representation
+        // rather than interacting with the menu
+
+        if (eventType == Clutter.EventType.BUTTON_RELEASE) {
+            let metaWindow = this._findMetaWindowForActor(event.get_source());
+            if (metaWindow)
+                this.emit('activate-window', metaWindow);
+        } else if (eventType == Clutter.EventType.ENTER) {
+            let metaWindow = this._findMetaWindowForActor(event.get_source());
+            if (metaWindow)
+                this._selectMenuItemForWindow(metaWindow, true);
+        } else if (eventType == Clutter.EventType.LEAVE) {
+            let metaWindow = this._findMetaWindowForActor(event.get_source());
+            if (metaWindow)
+                this._selectMenuItemForWindow(metaWindow, false);
+        }
+
+        return false;
+    },
+
+    _findMetaWindowForActor: function (actor) {
+        if (actor._delegate instanceof Workspace.WindowClone)
+            return actor._delegate.metaWindow;
+        else if (actor.get_meta_window)
+            return actor.get_meta_window();
+        return null;
+    },
+
+    _updateHighlight: function (item) {
+        if (this._highlightedItem)
+            this.emit('highlight-window', null);
+        this._highlightedItem = item;
+        if (this._highlightedItem) {
+            let window = this._highlightedItem._window;
+            if (window)
+                this.emit('highlight-window', window);
+        }
+    },
+
+    _selectMenuItemForWindow: function (metaWindow, selected) {
+        let items = this.getMenuItems();
+        for (let i = 0; i < items.length; i++) {
+            let item = items[i];
+            let menuMetaWindow = item._window;
+            if (menuMetaWindow == metaWindow)
+                item.setActive(selected);
+        }
+    },
+
+    _onActiveChanged: function (menu, child) {
+        this._updateHighlight(child);
+    },
+
    _onActivate: function (actor, child) {
        if (child._window) {
            let metaWindow = child._window;
            this.emit('activate-window', metaWindow);
        } else if (child == this._newWindowMenuItem) {
-            this._source.app.open_new_window(-1);
+            this._source.app.open_new_window();
            this.emit('activate-window', null);
        } else if (child == this._toggleFavoriteMenuItem) {
            let favs = AppFavorites.getAppFavorites();
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -189,8 +189,10 @@ BoxPointer.prototype = {
        let halfBorder = borderWidth / 2;
        let halfBase = Math.floor(base/2);

-        let borderColor = themeNode.get_color('-arrow-border-color');
-        let backgroundColor = themeNode.get_color('-arrow-background-color');
+        let borderColor = new Clutter.Color();
+        themeNode.get_color('-arrow-border-color', borderColor);
+        let backgroundColor = new Clutter.Color();
+        themeNode.get_color('-arrow-background-color', backgroundColor);

        let [width, height] = area.get_surface_size();
        let [boxWidth, boxHeight] = [width, height];
@@ -210,88 +212,46 @@ BoxPointer.prototype = {
            cr.translate(rise, 0);
        }

-        let [x1, y1] = [halfBorder, halfBorder];
-        let [x2, y2] = [boxWidth - halfBorder, boxHeight - halfBorder];
+        cr.moveTo(borderRadius, halfBorder);

-        cr.moveTo(x1 + borderRadius, y1);
        if (this._arrowSide == St.Side.TOP) {
-            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
-                cr.lineTo(this._arrowOrigin, y1 - rise);
-                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y1);
-            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
-                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y1);
-                cr.lineTo(this._arrowOrigin, y1 - rise);
-            } else {
-                cr.lineTo(this._arrowOrigin - halfBase, y1);
-                cr.lineTo(this._arrowOrigin, y1 - rise);
-                cr.lineTo(this._arrowOrigin + halfBase, y1);
-            }
+            cr.lineTo(this._arrowOrigin - halfBase, halfBorder);
+            cr.lineTo(this._arrowOrigin, halfBorder - rise);
+            cr.lineTo(this._arrowOrigin + halfBase, halfBorder);
        }
+        cr.lineTo(boxWidth - borderRadius, halfBorder);

-        cr.lineTo(x2 - borderRadius, y1);
-
-        // top-right corner
-        cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
+        cr.arc(boxWidth - borderRadius - halfBorder, borderRadius + halfBorder, borderRadius,
               3*Math.PI/2, Math.PI*2);

        if (this._arrowSide == St.Side.RIGHT) {
-            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
-                cr.lineTo(x2 + rise, this._arrowOrigin);
-                cr.lineTo(x2, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
-            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
-                cr.lineTo(x2, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
-                cr.lineTo(x2 + rise, this._arrowOrigin);
-            } else {
-                cr.lineTo(x2, this._arrowOrigin - halfBase);
-                cr.lineTo(x2 + rise, this._arrowOrigin);
-                cr.lineTo(x2, this._arrowOrigin + halfBase);
-            }
+            cr.lineTo(boxWidth - halfBorder, this._arrowOrigin - halfBase);
+            cr.lineTo(boxWidth - halfBorder + rise, this._arrowOrigin);
+            cr.lineTo(boxWidth - halfBorder, this._arrowOrigin + halfBase);
        }
+        cr.lineTo(boxWidth - halfBorder, boxHeight - borderRadius);

-        cr.lineTo(x2, y2 - borderRadius);
-
-        // bottom-right corner
-        cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
+        cr.arc(boxWidth - borderRadius - halfBorder, boxHeight - borderRadius - halfBorder, borderRadius,
               0, Math.PI/2);

        if (this._arrowSide == St.Side.BOTTOM) {
-            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
-                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y2);
-                cr.lineTo(this._arrowOrigin, y2 + rise);
-            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
-                cr.lineTo(this._arrowOrigin, y2 + rise);
-                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y2);
-            } else {
-                cr.lineTo(this._arrowOrigin + halfBase, y2);
-                cr.lineTo(this._arrowOrigin, y2 + rise);
-                cr.lineTo(this._arrowOrigin - halfBase, y2);
-            }
+            cr.lineTo(this._arrowOrigin + halfBase, boxHeight - halfBorder);
+            cr.lineTo(this._arrowOrigin, boxHeight - halfBorder + rise);
+            cr.lineTo(this._arrowOrigin - halfBase, boxHeight - halfBorder);
        }
+        cr.lineTo(borderRadius, boxHeight - halfBorder);

-        cr.lineTo(x1 + borderRadius, y2);
-
-        // bottom-left corner
-        cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
+        cr.arc(borderRadius + halfBorder, boxHeight - borderRadius - halfBorder, borderRadius,
               Math.PI/2, Math.PI);

        if (this._arrowSide == St.Side.LEFT) {
-            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
-                cr.lineTo(x1, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
-                cr.lineTo(x1 - rise, this._arrowOrigin);
-            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
-                cr.lineTo(x1 - rise, this._arrowOrigin);
-                cr.lineTo(x1, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
-            } else {
-                cr.lineTo(x1, this._arrowOrigin + halfBase);
-                cr.lineTo(x1 - rise, this._arrowOrigin);
-                cr.lineTo(x1, this._arrowOrigin - halfBase);
-            }
+            cr.lineTo(halfBorder, this._arrowOrigin + halfBase);
+            cr.lineTo(halfBorder - rise, this._arrowOrigin);
+            cr.lineTo(halfBorder, this._arrowOrigin - halfBase);
        }
+        cr.lineTo(halfBorder, borderRadius);

-        cr.lineTo(x1, y1 + borderRadius);
-
-        // top-left corner
-        cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
+        cr.arc(borderRadius + halfBorder, borderRadius + halfBorder, borderRadius,
               Math.PI, 3*Math.PI/2);

        Clutter.cairo_set_source_color(cr, backgroundColor);
@@ -307,12 +267,9 @@ BoxPointer.prototype = {
        this.actor.show();

        // Position correctly relative to the sourceActor
-        let sourceNode = sourceActor.get_theme_node();
-        let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
        let [sourceX, sourceY] = sourceActor.get_transformed_position();
        let [sourceWidth, sourceHeight] = sourceActor.get_transformed_size();
-        let sourceCenterX = sourceX + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) / 2;
-        let sourceCenterY = sourceY + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) / 2;
+
        let [minWidth, minHeight, natWidth, natHeight] = this.actor.get_preferred_size();

        // We also want to keep it onscreen, and separated from the
@@ -320,11 +277,8 @@ BoxPointer.prototype = {
        // separated from its sourceActor
        let primary = global.get_primary_monitor();
        let themeNode = this.actor.get_theme_node();
-        let borderWidth = themeNode.get_length('-arrow-border-width');
-        let arrowBase = themeNode.get_length('-arrow-base');
+        let arrowRise = themeNode.get_length('-arrow-rise');
        let borderRadius = themeNode.get_length('-arrow-border-radius');
-        let margin = (4 * borderRadius + borderWidth + arrowBase);
-        let halfMargin = margin / 2;

        let resX, resY;

@@ -348,21 +302,42 @@ BoxPointer.prototype = {
        switch (this._arrowSide) {
        case St.Side.TOP:
        case St.Side.BOTTOM:
-            resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
+            switch (alignment) {
+            case St.Align.START:
+                resX = sourceX - 2 * borderRadius;
+                break;
+            case St.Align.MIDDLE:
+                resX = sourceX - Math.floor((natWidth - sourceWidth) / 2);
+                break;
+            case St.Align.END:
+                resX = sourceX - (natWidth - sourceWidth) + 2 * borderRadius;
+                break;
+            }

-            resX = Math.max(resX, primary.x + 10);
-            resX = Math.min(resX, primary.x + primary.width - (10 + natWidth));
-            this.setArrowOrigin(sourceCenterX - resX);
+            resX = Math.min(resX, primary.x + primary.width - natWidth - arrowRise - gap);
+            resX = Math.max(resX, primary.x);
+
+            this.setArrowOrigin((sourceX - resX) + Math.floor(sourceWidth / 2));
            break;

        case St.Side.LEFT:
        case St.Side.RIGHT:
-            resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
+            switch (alignment) {
+            case St.Align.START:
+                resY = sourceY - 2 * borderRadius;
+                break;
+            case St.Align.MIDDLE:
+                resY = sourceY - Math.floor((natHeight - sourceHeight) / 2);
+                break;
+            case St.Align.END:
+                resY = sourceY - (natHeight - sourceHeight) + 2 * borderRadius;
+                break;
+            }

-            resY = Math.max(resY, primary.y + 10);
-            resY = Math.min(resY, primary.y + primary.height - (10 + natHeight));
+            resY = Math.min(resY, primary.y + primary.height - natHeight - arrowRise - gap);
+            resY = Math.max(resY, primary.y);

-            this.setArrowOrigin(sourceCenterY - resY);
+            this.setArrowOrigin((sourceY - resY) + Math.floor(sourceHeight / 2));
            break;
        }

--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -9,7 +9,6 @@ const Pango = imports.gi.Pango;
 const Gettext_gtk30 = imports.gettext.domain('gtk30');
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
-const C_ = Gettext.pgettext;
 const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;

@@ -59,22 +58,18 @@ function _getEndOfDay(date) {
 function _formatEventTime(event, clockFormat) {
    let ret;
    if (event.allDay) {
-        /* Translators: Shown in calendar event list for all day events
-         * Keep it short, best if you can use less then 10 characters
-         */
-        ret = C_("event list time", "All Day");
+        /* Translators: Shown in calendar event list for all day events */
+        ret = _("All Day");
    } else {
        switch (clockFormat) {
        case '24h':
-            /* Translators: Shown in calendar event list, if 24h format */
-            ret = event.date.toLocaleFormat(C_("event list time", "%H:%M"));
+            ret = event.date.toLocaleFormat('%H:%M');
            break;

        default:
            /* explicit fall-through */
        case '12h':
-            /* Transators: Shown in calendar event list, if 12h format */
-            ret = event.date.toLocaleFormat(C_("event list time", "%l:%M %p"));
+            ret = event.date.toLocaleFormat('%l:%M %p');
            break;
        }
    }
@@ -111,22 +106,22 @@ function _getCalendarDayAbbreviation(dayNumber) {
    let abbreviations = [
        /* Translators: Calendar grid abbreviation for Sunday.
         *
-         * NOTE: These grid abbreviations are always shown together
-         * and in order, e.g. "S M T W T F S".
+         * NOTE: These abbreviations are always shown together and in
+         * order, e.g. "S M T W T F S".
         */
-        C_("grid sunday", "S"),
+        _("S"),
        /* Translators: Calendar grid abbreviation for Monday */
-        C_("grid monday", "M"),
+        _("M"),
        /* Translators: Calendar grid abbreviation for Tuesday */
-        C_("grid tuesday", "T"),
+        _("T"),
        /* Translators: Calendar grid abbreviation for Wednesday */
-        C_("grid wednesday", "W"),
+        _("W"),
        /* Translators: Calendar grid abbreviation for Thursday */
-        C_("grid thursday", "T"),
+        _("T"),
        /* Translators: Calendar grid abbreviation for Friday */
-        C_("grid friday", "F"),
+        _("F"),
        /* Translators: Calendar grid abbreviation for Saturday */
-        C_("grid saturday", "S")
+        _("S")
    ];
    return abbreviations[dayNumber];
 }
@@ -135,23 +130,23 @@ function _getEventDayAbbreviation(dayNumber) {
    let abbreviations = [
        /* Translators: Event list abbreviation for Sunday.
         *
-         * NOTE: These list abbreviations are normally not shown together
+         * NOTE: These abbreviations are normally not shown together
         * so they need to be unique (e.g. Tuesday and Thursday cannot
         * both be 'T').
         */
-        C_("list sunday", "Su"),
+        _("Su"),
        /* Translators: Event list abbreviation for Monday */
-        C_("list monday", "M"),
+        _("M"),
        /* Translators: Event list abbreviation for Tuesday */
-        C_("list tuesday", "T"),
+        _("T"),
        /* Translators: Event list abbreviation for Wednesday */
-        C_("list wednesday", "W"),
+        _("W"),
        /* Translators: Event list abbreviation for Thursday */
-        C_("list thursday", "Th"),
+        _("Th"),
        /* Translators: Event list abbreviation for Friday */
-        C_("list friday", "F"),
+        _("F"),
        /* Translators: Event list abbreviation for Saturday */
-        C_("list saturday", "S")
+        _("S")
    ];
    return abbreviations[dayNumber];
 }
@@ -493,45 +488,23 @@ Calendar.prototype = {

    _onPrevMonthButtonClicked: function() {
        let newDate = new Date(this._selectedDate);
-        let oldMonth = newDate.getMonth();
-        if (oldMonth == 0) {
+        if (newDate.getMonth() == 0) {
            newDate.setMonth(11);
            newDate.setFullYear(newDate.getFullYear() - 1);
-            if (newDate.getMonth() != 11) {
-                let day = 32 - new Date(newDate.getFullYear() - 1, 11, 32).getDate();
-                newDate = new Date(newDate.getFullYear() - 1, 11, day);
-            }
+        } else {
+            newDate.setMonth(newDate.getMonth() - 1);
        }
-        else {
-            newDate.setMonth(oldMonth - 1);
-            if (newDate.getMonth() != oldMonth - 1) {
-                let day = 32 - new Date(newDate.getFullYear(), oldMonth - 1, 32).getDate();
-                newDate = new Date(newDate.getFullYear(), oldMonth - 1, day);
-            }
-        }
-
        this.setDate(newDate);
   },

-   _onNextMonthButtonClicked: function() {
+    _onNextMonthButtonClicked: function() {
        let newDate = new Date(this._selectedDate);
-        let oldMonth = newDate.getMonth();
-        if (oldMonth == 11) {
+        if (newDate.getMonth() == 11) {
            newDate.setMonth(0);
            newDate.setFullYear(newDate.getFullYear() + 1);
-            if (newDate.getMonth() != 0) {
-                let day = 32 - new Date(newDate.getFullYear() + 1, 0, 32).getDate();
-                newDate = new Date(newDate.getFullYear() + 1, 0, day);
-            }
+        } else {
+            newDate.setMonth(newDate.getMonth() + 1);
        }
-        else {
-            newDate.setMonth(oldMonth + 1);
-            if (newDate.getMonth() != oldMonth + 1) {
-                let day = 32 - new Date(newDate.getFullYear(), oldMonth + 1, 32).getDate();
-                newDate = new Date(newDate.getFullYear(), oldMonth + 1, day);
-            }
-        }
-
        this.setDate(newDate);
    },

@@ -583,7 +556,7 @@ Calendar.prototype = {
            // Hack used in lieu of border-collapse - see gnome-shell.css
            if (row == 2)
                styleClass = 'calendar-day-top ' + styleClass;
-            if (iter.getDay() == this._weekStart)
+            if (iter.getDay() == 0)
                styleClass = 'calendar-day-left ' + styleClass;

            if (_sameDay(now, iter))
@@ -638,18 +611,6 @@ EventsList.prototype = {
        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));
-        let weekStartString = Gettext_gtk30.gettext('calendar:week_start:0');
-        if (weekStartString.indexOf('calendar:week_start:') == 0) {
-            this._weekStart = parseInt(weekStartString.substring(20));
-        }
-
-        if (isNaN(this._weekStart) ||
-                  this._weekStart < 0 ||
-                  this._weekStart > 6) {
-            log('Translation of "calendar:week_start:0" in GTK+ is not correct');
-            this._weekStart = 0;
-        }
-
        this._update();
    },

@@ -713,11 +674,9 @@ EventsList.prototype = {
        let dayString;
        let now = new Date();
        if (_sameYear(day, now))
-            /* Translators: Shown on calendar heading when selected day occurs on current year */
-            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d"));
+            dayString = day.toLocaleFormat('%A, %B %d');
        else
-            /* Translators: Shown on calendar heading when selected day occurs on different year */
-            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
+            dayString = day.toLocaleFormat('%A, %B %d, %Y');
        this._addPeriod(dayString, dayBegin, dayEnd, false, true);
    },

@@ -733,21 +692,19 @@ EventsList.prototype = {
        let tomorrowEnd = new Date(dayEnd.getTime() + 86400 * 1000);
        this._addPeriod(_("Tomorrow"), tomorrowBegin, tomorrowEnd, false, true);

-        if (dayEnd.getDay() <= 4 + this._weekStart) {
-            /* If now is within the first 5 days we show "This week" and
-             * include events up until and including Saturday/Sunday
-             * (depending on whether a week starts on Sunday/Monday).
+        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 + this._weekStart - dayEnd.getDay()) * 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 one of the two last days of the week ... show
-             * "Next week" and include events up until and including *next*
-             * Saturday/Sunday
+            /* 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 + this._weekStart - dayEnd.getDay()) * 86400 * 1000);
+            let nextWeekEnd = new Date(dayEnd.getTime() + (13 - dayEnd.getDay()) * 86400 * 1000);
            this._addPeriod(_("Next week"), nextWeekBegin, nextWeekEnd, true, false);
        }
    },
--- a/js/ui/chrome.js
+++ b/js/ui/chrome.js
@@ -233,7 +233,7 @@ Chrome.prototype = {
    },

    _windowsRestacked: function() {
-        let windows = Main.getWindowActorsForWorkspace(global.screen.get_active_workspace_index());
+        let windows = global.get_window_actors();
        let primary = global.get_primary_monitor();

        // The chrome layer should be visible unless there is a window
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Clutter = imports.gi.Clutter;
 const Signals = imports.signals;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
@@ -14,177 +13,22 @@ const AppFavorites = imports.ui.appFavorites;
 const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;

-const DASH_ANIMATION_TIME = 0.2;
-
-// A container like StBin, but taking the child's scale into account
-// when requesting a size
-function DashItemContainer() {
-    this._init();
-}
-
-DashItemContainer.prototype = {
-    _init: function() {
-        this.actor = new Shell.GenericContainer({ style_class: 'dash-item-container' });
-        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.actor._delegate = this;
-
-        this.child = null;
-        this._childScale = 1;
-        this._childOpacity = 255;
-    },
-
-    _allocate: function(actor, box, flags) {
-        if (this.child == null)
-            return;
-
-        let availWidth = box.x2 - box.x1;
-        let availHeight = box.y2 - box.y1;
-        let [minChildWidth, minChildHeight, natChildWidth, natChildHeight] =
-            this.child.get_preferred_size();
-        let [childScaleX, childScaleY] = this.child.get_scale();
-
-        let childWidth = Math.min(natChildWidth * childScaleX, availWidth);
-        let childHeight = Math.min(natChildHeight * childScaleY, availHeight);
-
-        let childBox = new Clutter.ActorBox();
-        childBox.x1 = (availWidth - childWidth) / 2;
-        childBox.y1 = (availHeight - childHeight) / 2;
-        childBox.x2 = childBox.x1 + childWidth;
-        childBox.y2 = childBox.y1 + childHeight;
-
-        this.child.allocate(childBox, flags);
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        alloc.min_size = 0;
-        alloc.natural_size = 0;
-
-        if (this.child == null)
-            return;
-
-        let [minHeight, natHeight] = this.child.get_preferred_height(forWidth);
-        alloc.min_size += minHeight * this.child.scale_y;
-        alloc.natural_size += natHeight * this.child.scale_y;
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        alloc.min_size = 0;
-        alloc.natural_size = 0;
-
-        if (this.child == null)
-            return;
-
-        let [minWidth, natWidth] = this.child.get_preferred_width(forHeight);
-        alloc.min_size = minWidth * this.child.scale_y;
-        alloc.natural_size = natWidth * this.child.scale_y;
-    },
-
-    setChild: function(actor) {
-        if (this.child == actor)
-            return;
-
-        this.actor.destroy_children();
-
-        this.child = actor;
-        this.actor.add_actor(this.child);
-    },
-
-    animateIn: function() {
-        if (this.child == null)
-            return;
-
-        this.childScale = 0;
-        this.childOpacity = 0;
-        Tweener.addTween(this,
-                         { childScale: 1.0,
-                           childOpacity: 255,
-                           time: DASH_ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
-    },
-
-    animateOutAndDestroy: function() {
-        if (this.child == null) {
-            this.actor.destroy();
-            return;
-        }
-
-        this.childScale = 1.0;
-        Tweener.addTween(this,
-                         { childScale: 0.0,
-                           childOpacity: 0,
-                           time: DASH_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                               this.actor.destroy();
-                           })
-                         });
-    },
-
-    set childScale(scale) {
-        this._childScale = scale;
-
-        if (this.child == null)
-            return;
-
-        this.child.set_scale_with_gravity(scale, scale,
-                                          Clutter.Gravity.CENTER);
-        this.actor.queue_relayout();
-    },
-
-    get childScale() {
-        return this._childScale;
-    },
-
-    set childOpacity(opacity) {
-        this._childOpacity = opacity;
-
-        if (this.child == null)
-            return;
-
-        this.child.set_opacity(opacity);
-        this.actor.queue_redraw();
-    },
-
-    get childOpacity() {
-        return this._childOpacity;
-    }
-};

 function RemoveFavoriteIcon() {
    this._init();
 }

 RemoveFavoriteIcon.prototype = {
-    __proto__: DashItemContainer.prototype,
-
    _init: function() {
-        DashItemContainer.prototype._init.call(this);
-
-        this._iconBin = new St.Bin({ style_class: 'remove-favorite' });
+        this.actor = new St.Bin({ style_class: 'remove-favorite' });
        this._iconActor = null;
        this.icon = new IconGrid.BaseIcon(_("Remove"),
                                           { setSizeManually: true,
-                                             showLabel: false,
                                             createIcon: Lang.bind(this, this._createIcon) });
-        this._iconBin.set_child(this.icon.actor);
-        this._iconBin._delegate = this;
-
-        this.setChild(this._iconBin);
-        this.hiding = false;
-    },
-
-    animateOutAndDestroy: function() {
-        DashItemContainer.prototype.animateOutAndDestroy.call(this);
-        this.hiding = true;
+        this.actor.set_child(this.icon.actor);
+        this.actor._delegate = this;
    },

    _createIcon: function(size) {
@@ -195,7 +39,7 @@ RemoveFavoriteIcon.prototype = {
    },

    setHover: function(hovered) {
-        this._iconBin.set_hover(hovered);
+        this.actor.set_hover(hovered);
        if (this._iconActor)
            this._iconActor.set_hover(hovered);
    },
@@ -210,7 +54,7 @@ RemoveFavoriteIcon.prototype = {
        if (source instanceof AppDisplay.AppWellIcon) {
            let appSystem = Shell.AppSystem.get_default();
            app = appSystem.get_app(source.getId());
-        } else if (source.metaWindow) {
+        } else if (source instanceof Workspace.WindowClone) {
            let tracker = Shell.WindowTracker.get_default();
            app = tracker.get_window_app(source.metaWindow);
        }
@@ -228,20 +72,6 @@ RemoveFavoriteIcon.prototype = {
 };


-function DragPlaceholderItem() {
-    this._init();
-}
-
-DragPlaceholderItem.prototype = {
-    __proto__: DashItemContainer.prototype,
-
-    _init: function() {
-        DashItemContainer.prototype._init.call(this);
-        this.setChild(new St.Bin({ style_class: 'dash-placeholder' }));
-    }
-};
-
-
 function Dash() {
    this._init();
 }
@@ -249,24 +79,19 @@ function Dash() {
 Dash.prototype = {
    _init : function() {
        this._maxHeight = -1;
-        this.iconSize = 64;
-        this._shownInitially = false;
+        this._iconSize = 48;

        this._dragPlaceholder = null;
        this._dragPlaceholderPos = -1;
-        this._animatingPlaceholdersCount = 0;
        this._favRemoveTarget = null;

+        this._favorites = [];
+
        this._box = new St.BoxLayout({ name: 'dash',
                                       vertical: true,
                                       clip_to_allocation: true });
        this._box._delegate = this;

-        // This will eventually be automatic, see
-        // https://bugzilla.gnome.org/show_bug.cgi?id=584662
-        if (St.Widget.get_default_direction () == St.TextDirection.RTL)
-            this._box.add_style_pseudo_class('rtl');
-
        this.actor = new St.Bin({ y_align: St.Align.START, child: this._box });
        this.actor.connect('notify::height', Lang.bind(this,
            function() {
@@ -283,15 +108,24 @@ Dash.prototype = {
        this._appSystem.connect('installed-changed', Lang.bind(this, this._queueRedisplay));
        AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._queueRedisplay));
        this._tracker.connect('app-state-changed', Lang.bind(this, this._queueRedisplay));
+    },

-        Main.overview.connect('item-drag-begin',
-                              Lang.bind(this, this._onDragBegin));
-        Main.overview.connect('item-drag-end',
-                              Lang.bind(this, this._onDragEnd));
-        Main.overview.connect('window-drag-begin',
-                              Lang.bind(this, this._onDragBegin));
-        Main.overview.connect('window-drag-end',
-                              Lang.bind(this, this._onDragEnd));
+    show: function() {
+        this._itemDragBeginId = Main.overview.connect('item-drag-begin',
+            Lang.bind(this, this._onDragBegin));
+        this._itemDragEndId = Main.overview.connect('item-drag-end',
+            Lang.bind(this, this._onDragEnd));
+        this._windowDragBeginId = Main.overview.connect('window-drag-begin',
+            Lang.bind(this, this._onDragBegin));
+        this._windowDragEndId = Main.overview.connect('window-drag-end',
+            Lang.bind(this, this._onDragEnd));
+    },
+
+    hide: function() {
+        Main.overview.disconnect(this._itemDragBeginId);
+        Main.overview.disconnect(this._itemDragEndId);
+        Main.overview.disconnect(this._windowDragBeginId);
+        Main.overview.disconnect(this._windowDragEndId);
    },

    _onDragBegin: function() {
@@ -304,15 +138,8 @@ Dash.prototype = {
    _onDragEnd: function() {
        this._clearDragPlaceholder();
        if (this._favRemoveTarget) {
-            this._favRemoveTarget.actor.hide();
-            this._adjustIconSize();
-            this._favRemoveTarget.actor.show();
-
-            this._favRemoveTarget.animateOutAndDestroy();
-            this._favRemoveTarget.actor.connect('destroy', Lang.bind(this,
-                function() {
-                    this._favRemoveTarget = null;
-                }));
+            this._favRemoveTarget.actor.destroy();
+            this._favRemoveTarget = null;
        }
        DND.removeMonitor(this._dragMonitor);
    },
@@ -321,7 +148,7 @@ Dash.prototype = {
        let app = null;
        if (dragEvent.source instanceof AppDisplay.AppWellIcon)
            app = this._appSystem.get_app(dragEvent.source.getId());
-        else if (dragEvent.source.metaWindow)
+        else if (dragEvent.source instanceof Workspace.WindowClone)
            app = this._tracker.get_window_app(dragEvent.source.metaWindow);
        else
            return DND.DragMotionResult.CONTINUE;
@@ -334,10 +161,8 @@ Dash.prototype = {

        if (srcIsFavorite && this._favRemoveTarget == null) {
                this._favRemoveTarget = new RemoveFavoriteIcon();
-                this._favRemoveTarget.icon.setIconSize(this.iconSize);
+                this._favRemoveTarget.icon.setIconSize(this._iconSize);
                this._box.add(this._favRemoveTarget.actor);
-                this._adjustIconSize();
-                this._favRemoveTarget.animateIn();
        }

        let favRemoveHovered = false;
@@ -365,10 +190,9 @@ Dash.prototype = {
        Main.queueDeferredWork(this._workId);
    },

-    _createAppItem: function(app) {
+    _addApp: function(app) {
        let display = new AppDisplay.AppWellIcon(app,
-                                                 { setSizeManually: true,
-                                                   showLabel: false });
+                                                 { setSizeManually: true });
        display._draggable.connect('drag-begin',
                                   Lang.bind(this, function() {
                                       display.actor.opacity = 50;
@@ -377,82 +201,13 @@ Dash.prototype = {
                                   Lang.bind(this, function() {
                                       display.actor.opacity = 255;
                                   }));
-        let item = new DashItemContainer();
-        item.setChild(display.actor);
-
-        display.icon.setIconSize(this.iconSize);
-
-        return item;
-    },
-
-    _adjustIconSize: function() {
-        let children = this._box.get_children();
-        if (children.length == 0) {
-            this._box.add_style_pseudo_class('empty');
-            return;
-        }
-
-        this._box.remove_style_pseudo_class('empty');
-
-        if (this._maxHeight == -1)
-            return;
-
-        let iconChildren = children.filter(function(actor) {
-            return actor.visible &&
-                   actor._delegate.child &&
-                   actor._delegate.child._delegate &&
-                   actor._delegate.child._delegate.icon;
-        });
-
-        // Compute the amount of extra space (or missing space) we have
-        // per icon with the current icon size
-        let [minHeight, natHeight] = this.actor.get_preferred_height(-1);
-        let diff = (this._maxHeight - natHeight) / iconChildren.length;
-
-        let iconSizes = [ 16, 22, 24, 32, 48, 64 ];
-
-        let newIconSize = 16;
-        for (let i = 0; i < iconSizes.length; i++) {
-            if (iconSizes[i] < this.iconSize + diff)
-                newIconSize = iconSizes[i];
-        }
-
-        if (newIconSize == this.iconSize)
-            return;
-
-        let oldIconSize = this.iconSize;
-        this.iconSize = newIconSize;
-
-        let scale = oldIconSize / newIconSize;
-        for (let i = 0; i < iconChildren.length; i++) {
-            let icon = iconChildren[i]._delegate.child._delegate.icon;
-
-            // Set the new size immediately, to keep the icons' sizes
-            // in sync with this.iconSize
-            icon.setIconSize(this.iconSize);
-
-            // Don't animate the icon size change when the overview
-            // is not visible or when initially filling the dash
-            if (!Main.overview.visible || !this._shownInitially)
-                continue;
-
-            let [targetWidth, targetHeight] = icon.icon.get_size();
-
-            // Scale the icon's texture to the previous size and
-            // tween to the new size
-            icon.icon.set_size(icon.icon.width * scale,
-                               icon.icon.height * scale);
-
-            Tweener.addTween(icon.icon,
-                             { width: targetWidth,
-                               height: targetHeight,
-                               time: DASH_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
-        }
+        this._box.add(display.actor);
    },

    _redisplay: function () {
+        this._box.hide();
+        this._box.remove_all();
+
        let favorites = AppFavorites.getAppFavorites().getFavoriteMap();

        /* hardcode here pending some design about how exactly desktop contexts behave */
@@ -460,142 +215,47 @@ Dash.prototype = {

        let running = this._tracker.get_running_apps(contextId);

-        let children = this._box.get_children().filter(function(actor) {
-                return actor._delegate.child &&
-                       actor._delegate.child._delegate &&
-                       actor._delegate.child._delegate.app;
-            });
-        // Apps currently in the dash
-        let oldApps = children.map(function(actor) {
-                return actor._delegate.child._delegate.app;
-            });
-        // Apps supposed to be in the dash
-        let newApps = [];
-
-        for (let id in favorites)
-            newApps.push(favorites[id]);
+        for (let id in favorites) {
+            let app = favorites[id];
+            this._addApp(app);
+        }

        for (let i = 0; i < running.length; i++) {
            let app = running[i];
            if (app.get_id() in favorites)
                continue;
-            newApps.push(app);
+            this._addApp(app);
        }

-        // Figure out the actual changes to the list of items; we iterate
-        // over both the list of items currently in the dash and the list
-        // of items expected there, and collect additions and removals.
-        // Moves are both an addition and a removal, where the order of
-        // the operations depends on whether we encounter the position
-        // where the item has been added first or the one from where it
-        // was removed.
-        // There is an assumption that only one item is moved at a given
-        // time; when moving several items at once, everything will still
-        // end up at the right position, but there might be additional
-        // additions/removals (e.g. it might remove all the launchers
-        // and add them back in the new order even if a smaller set of
-        // additions and removals is possible).
-        // If above assumptions turns out to be a problem, we might need
-        // to use a more sophisticated algorithm, e.g. Longest Common
-        // Subsequence as used by diff.
-        let addedItems = [];
-        let removedActors = [];
+        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');

-        let newIndex = 0;
-        let oldIndex = 0;
-        while (newIndex < newApps.length || oldIndex < oldApps.length) {
-            // No change at oldIndex/newIndex
-            if (oldApps[oldIndex] == newApps[newIndex]) {
-                oldIndex++;
-                newIndex++;
-                continue;
-            }
+            if (this._maxHeight > -1) {
+                let iconSizes = [ 48, 32, 24, 22, 16 ];

-            // App removed at oldIndex
-            if (oldApps[oldIndex] &&
-                newApps.indexOf(oldApps[oldIndex]) == -1) {
-                removedActors.push(children[oldIndex]);
-                oldIndex++;
-                continue;
-            }
+                for (let i = 0; i < iconSizes.length; i++) {
+                    let minHeight, natHeight;

-            // App added at newIndex
-            if (newApps[newIndex] &&
-                oldApps.indexOf(newApps[newIndex]) == -1) {
-                addedItems.push({ app: newApps[newIndex],
-                                  item: this._createAppItem(newApps[newIndex]),
-                                  pos: newIndex });
-                newIndex++;
-                continue;
-            }
+                    this._iconSize = iconSizes[i];
+                    for (let j = 0; j < children.length; j++)
+                        children[j]._delegate.icon.setIconSize(this._iconSize);

-            // App moved
-            let insertHere = newApps[newIndex + 1] &&
-                             newApps[newIndex + 1] == oldApps[oldIndex];
-            let alreadyRemoved = removedActors.reduce(function(result, actor) {
-                let removedApp = actor._delegate.child._delegate.app;
-                return result || removedApp == newApps[newIndex];
-            }, false);
+                    [minHeight, natHeight] = this.actor.get_preferred_height(-1);

-            if (insertHere || alreadyRemoved) {
-                let newItem = this._createAppItem(newApps[newIndex]);
-                addedItems.push({ app: newApps[newIndex],
-                                  item: newItem,
-                                  pos: newIndex + removedActors.length });
-                newIndex++;
-            } else {
-                removedActors.push(children[oldIndex]);
-                oldIndex++;
+                    if (natHeight <= this._maxHeight)
+                        break;
+                }
            }
        }
-
-        for (let i = 0; i < addedItems.length; i++)
-            this._box.insert_actor(addedItems[i].item.actor,
-                                   addedItems[i].pos);
-
-        // Hide removed actors to not take them into account
-        // when adjusting the icon size ...
-        for (let i = 0; i < removedActors.length; i++)
-            removedActors[i].hide();
-
-        // ... and do the same for the remove target if necessary
-        if (this._favRemoveTarget && this._favRemoveTarget.hiding)
-            this._favRemoveTarget.actor.hide();
-
-        this._adjustIconSize();
-
-        if (this._favRemoveTarget && this._favRemoveTarget.hiding)
-            this._favRemoveTarget.actor.show();
-
-        // Skip animations on first run when adding the initial set
-        // of items, to avoid all items zooming in at once
-        if (!this._shownInitially) {
-            this._shownInitially = true;
-            return;
-        }
-
-        for (let i = 0; i < removedActors.length; i++) {
-            removedActors[i].show();
-            let item = removedActors[i]._delegate;
-
-            // Don't animate item removal when the overview is hidden
-            if (Main.overview.visible)
-                item.animateOutAndDestroy();
-            else
-                item.actor.destroy();
-        }
-
-        // Don't animate item addition when the overview is hidden
-        if (!Main.overview.visible)
-            return;
-
-        for (let i = 0; i < addedItems.length; i++)
-            addedItems[i].item.animateIn();
+        this._box.show();
    },

    _clearDragPlaceholder: function() {
        if (this._dragPlaceholder) {
-            this._dragPlaceholder.animateOutAndDestroy();
+            this._dragPlaceholder.destroy();
            this._dragPlaceholder = null;
            this._dragPlaceholderPos = -1;
        }
@@ -605,7 +265,7 @@ Dash.prototype = {
        let app = null;
        if (source instanceof AppDisplay.AppWellIcon)
            app = this._appSystem.get_app(source.getId());
-        else if (source.metaWindow)
+        else if (source instanceof Workspace.WindowClone)
            app = this._tracker.get_window_app(source.metaWindow);

        // Don't allow favoriting of transient apps
@@ -617,64 +277,30 @@ Dash.prototype = {

        let favPos = favorites.indexOf(app);

-        let children = this._box.get_children();
-        let numChildren = children.length;
+        let numChildren = this._box.get_children().length;
        let boxHeight = this._box.height;

        // Keep the placeholder out of the index calculation; assuming that
        // the remove target has the same size as "normal" items, we don't
        // need to do the same adjustment there.
        if (this._dragPlaceholder) {
-            boxHeight -= this._dragPlaceholder.actor.height;
+            boxHeight -= this._dragPlaceholder.height;
            numChildren--;
        }

        let pos = Math.round(y * numChildren / boxHeight);

        if (pos != this._dragPlaceholderPos && pos <= numFavorites) {
-            if (this._animatingPlaceholdersCount > 0) {
-                let appChildren = children.filter(function(actor) {
-                    return actor._delegate &&
-                           actor._delegate.child &&
-                           actor._delegate.child._delegate &&
-                           actor._delegate.child._delegate.app;
-                });
-                this._dragPlaceholderPos = children.indexOf(appChildren[pos]);
-            } else {
-                this._dragPlaceholderPos = pos;
-            }
+            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)) {
-                if (this._dragPlaceholder) {
-                    this._dragPlaceholder.animateOutAndDestroy();
-                    this._animatingPlaceholdersCount++;
-                    this._dragPlaceholder.actor.connect('destroy',
-                        Lang.bind(this, function() {
-                            this._animatingPlaceholdersCount--;
-                        }));
-                }
-                this._dragPlaceholder = null;
-
+            if (favPos != -1 && (pos == favPos || pos == favPos + 1))
                return DND.DragMotionResult.CONTINUE;
-            }

-            // If the placeholder already exists, we just move
-            // it, but if we are adding it, expand its size in
-            // an animation
-            let fadeIn;
-            if (this._dragPlaceholder) {
-                this._dragPlaceholder.actor.destroy();
-                fadeIn = false;
-            } else {
-                fadeIn = true;
-            }
-
-            this._dragPlaceholder = new DragPlaceholderItem();
-            this._box.insert_actor(this._dragPlaceholder.actor,
-                                   this._dragPlaceholderPos);
-            if (fadeIn)
-                this._dragPlaceholder.animateIn();
+            this._dragPlaceholder = new St.Bin({ style_class: 'dash-placeholder' });
+            this._box.insert_actor(this._dragPlaceholder, pos);
        }

        let srcIsFavorite = (favPos != -1);
@@ -690,7 +316,7 @@ Dash.prototype = {
        let app = null;
        if (source instanceof AppDisplay.AppWellIcon) {
            app = this._appSystem.get_app(source.getId());
-        } else if (source.metaWindow) {
+        } else if (source instanceof Workspace.WindowClone) {
            app = this._tracker.get_window_app(source.metaWindow);
        }

@@ -708,11 +334,7 @@ Dash.prototype = {
        let favPos = 0;
        let children = this._box.get_children();
        for (let i = 0; i < this._dragPlaceholderPos; i++) {
-            if (this._dragPlaceholder &&
-                children[i] == this._dragPlaceholder.actor)
-                continue;
-
-            let childId = children[i]._delegate.child._delegate.app.get_id();
+            let childId = children[i]._delegate.app.get_id();
            if (childId == id)
                continue;
            if (childId in favorites)
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -29,9 +29,10 @@ function _onVertSepRepaint (area)
    let cr = area.get_context();
    let themeNode = area.get_theme_node();
    let [width, height] = area.get_surface_size();
-    let stippleColor = themeNode.get_color('-stipple-color');
+    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);
@@ -56,10 +57,7 @@ DateMenuButton.prototype = {
        //this._eventSource = new Calendar.FakeEventSource();
        this._eventSource = new Calendar.EvolutionEventSource();

-        let menuAlignment = 0.25;
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
-            menuAlignment = 1.0 - menuAlignment;
-        PanelMenu.Button.prototype._init.call(this, menuAlignment);
+        PanelMenu.Button.prototype._init.call(this, St.Align.START);

        this._clock = new St.Label();
        this.actor.set_child(this._clock);
@@ -102,7 +100,7 @@ DateMenuButton.prototype = {
        hbox.add(item);

        // Fill up the second column
-
+        //
        vbox = new St.BoxLayout({vertical: true});
        hbox.add(vbox);

--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -112,11 +112,11 @@ _Draggable.prototype = {
            return false;

        this._buttonDown = true;
-        // special case St.Button: grabbing the pointer would mess up the
+        // special case St.Clickable: grabbing the pointer would mess up the
        // internal state, so we start the drag manually on hover change
-        if (this.actor instanceof St.Button)
+        if (this.actor instanceof St.Clickable)
            this.actor.connect('notify::hover',
-                               Lang.bind(this, this._onButtonHoverChanged));
+                               Lang.bind(this, this._onClickableHoverChanged));
        else
            this._grabActor();

@@ -127,8 +127,8 @@ _Draggable.prototype = {
        return false;
    },

-    _onButtonHoverChanged: function(button) {
-        if (button.hover || !button.pressed)
+    _onClickableHoverChanged: function(button) {
+        if (button.hover || !button.held)
            return;

        button.fake_release();
@@ -461,12 +461,12 @@ _Draggable.prototype = {
            // 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;
-
-            x = parentX + parentScale * this._dragOrigX;
-            y = parentY + parentScale * this._dragOrigY;
            scale = this._dragOrigScale * parentScale;
        } else {
            // Snap back actor to its original stage position
--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@@ -4,7 +4,6 @@ const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

 const DocInfo = imports.misc.docInfo;
-const Params = imports.misc.params;
 const Search = imports.ui.search;


@@ -29,12 +28,9 @@ DocSearchProvider.prototype = {
                 'icon': docInfo.createIcon(Search.RESULT_ICON_SIZE)};
    },

-    activateResult: function(id, params) {
-        params = Params.parse(params, { workspace: null,
-                                        timestamp: null });
-
+    activateResult: function(id) {
        let docInfo = this._docManager.lookupByUri(id);
-        docInfo.launch(params.workspace ? params.workspace.index() : -1);
+        docInfo.launch();
    },

    getInitialResultSet: function(terms) {
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -137,12 +137,12 @@ ListItem.prototype = {

        let layout = new St.BoxLayout({ vertical: false});

-        this.actor = new St.Button({ style_class: 'end-session-dialog-app-list-item',
-                                     can_focus:   true,
-                                     child:       layout,
-                                     reactive:    true,
-                                     x_align:     St.Align.START,
-                                     x_fill:      true });
+        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);

@@ -171,7 +171,7 @@ ListItem.prototype = {

    _onClicked: function() {
        this.emit('activate');
-        this._app.activate(-1);
+        this._app.activate();
    }
 };
 Signals.addSignalMethods(ListItem.prototype);
@@ -470,7 +470,7 @@ EndSessionDialog.prototype = {
    OpenAsync: function(type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths, callback) {
        this._totalSecondsToStayOpen = totalSecondsToStayOpen;
        this._inhibitors = [];
-        this._applicationList.destroy_children();
+        this._applicationList.remove_all();
        this._type = type;

        if (!(this._type in DialogContent))
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -150,7 +150,7 @@ function loadExtension(dir, enabled, type) {
        return;
    }
    try {
-        extensionModule.main(meta);
+        extensionModule.main();
    } catch (e) {
        if (stylesheetPath != null)
            theme.unload_stylesheet(stylesheetPath);
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -17,8 +17,7 @@ function BaseIcon(label, createIcon) {
 BaseIcon.prototype = {
    _init : function(label, params) {
        params = Params.parse(params, { createIcon: null,
-                                        setSizeManually: false,
-                                        showLabel: true });
+                                        setSizeManually: false });
        this.actor = new St.Bin({ style_class: 'overview-icon',
                                  x_fill: true,
                                  y_fill: true });
@@ -41,12 +40,8 @@ BaseIcon.prototype = {

        box.add_actor(this._iconBin);

-        if (params.showLabel) {
-            this._name = new St.Label({ text: label });
-            box.add_actor(this._name);
-        } else {
-            this._name = null;
-        }
+        this._name = new St.Label({ text: label });
+        box.add_actor(this._name);

        if (params.createIcon)
            this.createIcon = params.createIcon;
@@ -60,34 +55,27 @@ BaseIcon.prototype = {
        let availWidth = box.x2 - box.x1;
        let availHeight = box.y2 - box.y1;

-        let iconSize = availHeight;
-
+        let [labelMinHeight, labelNatHeight] = this._name.get_preferred_height(-1);
        let [iconMinHeight, iconNatHeight] = this._iconBin.get_preferred_height(-1);
-        let [iconMinWidth, iconNatWidth] = this._iconBin.get_preferred_width(-1);
-        let preferredHeight = iconNatHeight;
+        let preferredHeight = labelNatHeight + this._spacing + iconNatHeight;
+        let labelHeight = availHeight >= preferredHeight ? labelNatHeight
+                                                         : labelMinHeight;
+        let iconSize = availHeight - this._spacing - labelHeight;
+        let iconPadding = (availWidth - iconSize) / 2;

        let childBox = new Clutter.ActorBox();

-        if (this._name) {
-            let [labelMinHeight, labelNatHeight] = this._name.get_preferred_height(-1);
-            preferredHeight += this._spacing + labelNatHeight;
-
-            let labelHeight = availHeight >= preferredHeight ? labelNatHeight
-                                                             : labelMinHeight;
-            iconSize -= this._spacing + labelHeight;
-
-            childBox.x1 = 0;
-            childBox.x2 = availWidth;
-            childBox.y1 = iconSize + this._spacing;
-            childBox.y2 = childBox.y1 + labelHeight;
-            this._name.allocate(childBox, flags);
-        }
-
-        childBox.x1 = Math.floor((availWidth - iconNatWidth) / 2);
-        childBox.y1 = Math.floor((iconSize - iconNatHeight) / 2);
-        childBox.x2 = childBox.x1 + iconNatWidth;
-        childBox.y2 = childBox.y1 + iconNatHeight;
+        childBox.x1 = iconPadding;
+        childBox.y1 = 0;
+        childBox.x2 = availWidth - iconPadding;
+        childBox.y2 = iconSize;
        this._iconBin.allocate(childBox, flags);
+
+        childBox.x1 = 0;
+        childBox.x2 = availWidth;
+        childBox.y1 = iconSize + this._spacing;
+        childBox.y2 = childBox.y1 + labelHeight;
+        this._name.allocate(childBox, flags);
    },

    _getPreferredWidth: function(actor, forHeight, alloc) {
@@ -96,14 +84,9 @@ BaseIcon.prototype = {

    _getPreferredHeight: function(actor, forWidth, alloc) {
        let [iconMinHeight, iconNatHeight] = this._iconBin.get_preferred_height(forWidth);
-        alloc.min_size = iconMinHeight;
-        alloc.natural_size = iconNatHeight;
-
-        if (this._name) {
-            let [labelMinHeight, labelNatHeight] = this._name.get_preferred_height(forWidth);
-            alloc.min_size += this._spacing + labelMinHeight;
-            alloc.natural_size += this._spacing + labelNatHeight;
-        }
+        let [labelMinHeight, labelNatHeight] = this._name.get_preferred_height(forWidth);
+        alloc.min_size = iconMinHeight + this._spacing + labelMinHeight;
+        alloc.natural_size = iconNatHeight + this._spacing + labelNatHeight;
    },

    // This can be overridden by a subclass, or by the createIcon
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -1,7 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
-const Cogl = imports.gi.Cogl;
 const GConf = imports.gi.GConf;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
@@ -14,7 +13,6 @@ const Mainloop = imports.mainloop;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

-const History = imports.misc.history;
 const ExtensionSystem = imports.ui.extensionSystem;
 const Link = imports.ui.link;
 const Tweener = imports.ui.tweener;
@@ -38,8 +36,6 @@ var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                       'const it = Main.lookingGlass.getIt(); ' +
                    'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ';

-const HISTORY_KEY = 'looking-glass-history';
-
 function Notebook() {
    this._init();
 }
@@ -363,30 +359,6 @@ ObjInspector.prototype = {
    }
 };

-function addBorderPaintHook(actor) {
-    let signalId = actor.connect_after('paint',
-        function () {
-            let color = new Cogl.Color();
-            color.init_from_4ub(0xff, 0, 0, 0xc4);
-            Cogl.set_source_color(color);
-
-            let geom = actor.get_allocation_geometry();
-            let width = 2;
-
-            // clockwise order
-            Cogl.rectangle(0, 0, geom.width, width);
-            Cogl.rectangle(geom.width - width, width,
-                           geom.width, geom.height);
-            Cogl.rectangle(0, geom.height,
-                           geom.width - width, geom.height - width);
-            Cogl.rectangle(0, geom.height - width,
-                           width, width);
-        });
-
-    actor.queue_redraw();
-    return signalId;
-}
-
 function Inspector() {
    this._init();
 }
@@ -522,13 +494,10 @@ Inspector.prototype = {
        let position = '[inspect x: ' + stageX + ' y: ' + stageY + ']';
        this._displayText.text = '';
        this._displayText.text = position + ' ' + this._target;
-
-        if (this._borderPaintTarget != this._target) {
-            if (this._borderPaintTarget != null)
-                this._borderPaintTarget.disconnect(this._borderPaintId);
-            this._borderPaintTarget = this._target;
-            this._borderPaintId = addBorderPaintHook(this._target);
-        }
+        if (this._borderPaintTarget != null)
+            this._borderPaintTarget.disconnect(this._borderPaintId);
+        this._borderPaintTarget = this._target;
+        this._borderPaintId = Shell.add_hook_paint_red_border(this._target);
    }
 };

@@ -674,10 +643,18 @@ function LookingGlass() {

 LookingGlass.prototype = {
    _init : function() {
+        this._idleHistorySaveId = 0;
+        let historyPath = global.userdatadir + '/lookingglass-history.txt';
+        this._historyFile = Gio.file_new_for_path(historyPath);
+        this._savedText = null;
+        this._historyNavIndex = -1;
+        this._history = [];
        this._borderPaintTarget = null;
        this._borderPaintId = 0;
        this._borderDestroyId = 0;

+        this._readHistory();
+
        this._open = false;

        this._offset = 0;
@@ -774,23 +751,31 @@ LookingGlass.prototype = {
            if (text == '')
                return true;
            this._evaluate(text);
+            this._historyNavIndex = -1;
            return true;
        }));
-
-        this._history = new History.HistoryManager(HISTORY_KEY);
-        this._history.connect('changed', Lang.bind(this, function(history, text) {
-            this._entry.text = text;
-        }));
-
        this._entry.clutter_text.connect('key-press-event', Lang.bind(this, function(o, e) {
            let symbol = e.get_key_symbol();
            if (symbol == Clutter.Up) {
-                this._history.prevItem(o.get_text());
+                if (this._historyNavIndex >= this._history.length - 1)
+                    return true;
+                this._historyNavIndex++;
+                if (this._historyNavIndex == 0)
+                    this._savedText = this._entry.text;
+                this._entry.text = this._history[this._history.length - this._historyNavIndex - 1];
                return true;
            } else if (symbol == Clutter.Down) {
-                this._history.nextItem(o.get_text());
+                if (this._historyNavIndex <= 0)
+                    return true;
+                this._historyNavIndex--;
+                if (this._historyNavIndex < 0)
+                    this._entry.text = this._savedText;
+                else
+                    this._entry.text = this._history[this._history.length - this._historyNavIndex - 1];
                return true;
            } else {
+                this._historyNavIndex = -1;
+                this._savedText = null;
                return false;
            }
        }));
@@ -808,6 +793,29 @@ LookingGlass.prototype = {
            + 'font-family: "' + fontDesc.get_family() + '";';
    },

+    _readHistory: function () {
+        if (!this._historyFile.query_exists(null))
+            return;
+        let [result, contents, length, etag] = this._historyFile.load_contents(null);
+        this._history = contents.split('\n').filter(function (e) { return e != ''; });
+    },
+
+    _queueHistorySave: function() {
+        if (this._idleHistorySaveId > 0)
+            return;
+        this._idleHistorySaveId = Mainloop.timeout_add_seconds(5, Lang.bind(this, this._doSaveHistory));
+    },
+
+    _doSaveHistory: function () {
+        this._idleHistorySaveId = false;
+        let output = this._historyFile.replace(null, true, Gio.FileCreateFlags.NONE, null);
+        let dataOut = new Gio.DataOutputStream({ base_stream: output });
+        dataOut.put_string(this._history.join('\n'), null);
+        dataOut.put_string('\n', null);
+        dataOut.close(null);
+        return false;
+    },
+
    _pushResult: function(command, obj) {
        let index = this._results.length + this._offset;
        let result = new Result('>>> ' + command, obj, index);
@@ -819,7 +827,7 @@ LookingGlass.prototype = {
        }
        if (obj instanceof Clutter.Actor) {
            this._borderPaintTarget = obj;
-            this._borderPaintId = addBorderPaintHook(obj);
+            this._borderPaintId = Shell.add_hook_paint_red_border(obj);
            this._borderDestroyId = obj.connect('destroy', Lang.bind(this, function () {
                this._borderDestroyId = 0;
                this._borderPaintTarget = null;
@@ -838,7 +846,8 @@ LookingGlass.prototype = {
    },

    _evaluate : function(command) {
-        this._history.addItem(command);
+        this._history.push(command);
+        this._queueHistorySave();

        let fullCmd = commandHeader + command;

@@ -925,7 +934,6 @@ LookingGlass.prototype = {
        this.actor.show();
        this.actor.lower(Main.chrome.actor);
        this._open = true;
-        this._history.lastItem();

        Tweener.removeTweens(this.actor);

@@ -943,6 +951,7 @@ LookingGlass.prototype = {

        this._objInspector.actor.hide();

+        this._historyNavIndex = -1;
        this._open = false;
        Tweener.removeTweens(this.actor);

--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -33,10 +33,7 @@ const MOUSE_POLL_FREQUENCY = 50;
 const CROSSHAIRS_CLIP_SIZE = [100, 100];

 // Settings
-const APPLICATIONS_SCHEMA       = 'org.gnome.desktop.a11y.applications';
-const SHOW_KEY                  = 'screen-magnifier-enabled';
-
-const MAGNIFIER_SCHEMA          = 'org.gnome.desktop.a11y.magnifier';
+const SHOW_KEY                  = 'show-magnifier';
 const SCREEN_POSITION_KEY       = 'screen-position';
 const MAG_FACTOR_KEY            = 'mag-factor';
 const LENS_MODE_KEY             = 'lens-mode';
@@ -271,7 +268,7 @@ Magnifier.prototype = {

        let thickness = this._settings.get_int(CROSS_HAIRS_THICKNESS_KEY);
        let color = this._settings.get_string(CROSS_HAIRS_COLOR_KEY);
-        let opacity = this._settings.get_double(CROSS_HAIRS_OPACITY_KEY);
+        let opacity = this._settings.get_int(CROSS_HAIRS_OPACITY_KEY);
        let length = this._settings.get_int(CROSS_HAIRS_LENGTH_KEY);
        let clip = this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY);

@@ -357,22 +354,22 @@ Magnifier.prototype = {

    /**
     * setCrosshairsOpacity:
-     * @opacity:    Value between 0.0 (transparent) and 1.0 (fully opaque).
+     * @opacity:    Value between 0 (transparent) and 255 (fully opaque).
     */
    setCrosshairsOpacity: function(opacity) {
        if (this._crossHairs)
-            this._crossHairs.setOpacity(opacity * 255);
+            this._crossHairs.setOpacity(opacity);
    },

    /**
     * getCrosshairsOpacity:
-     * @return:     Value between 0.0 (transparent) and 1.0 (fully opaque).
+     * @return:     Value between 0 (transparent) and 255 (fully opaque).
     */
    getCrosshairsOpacity: function() {
        if (this._crossHairs)
-            return this._crossHairs.getOpacity() / 255.0;
+            return this._crossHairs.getOpacity();
        else
-            return 0.0;
+            return 0;
    },

    /**
@@ -441,8 +438,7 @@ Magnifier.prototype = {
    },

    _settingsInit: function(zoomRegion) {
-        this._appSettings = new Gio.Settings({ schema: APPLICATIONS_SCHEMA });
-        this._settings = new Gio.Settings({ schema: MAGNIFIER_SCHEMA });
+        this._settings = new Gio.Settings({ schema: 'org.gnome.accessibility.magnifier' });

        if (zoomRegion) {
            // Mag factor is accurate to two decimal places.
@@ -466,9 +462,9 @@ Magnifier.prototype = {
        this.addCrosshairs();
        this.setCrosshairsVisible(showCrosshairs);

-        this._appSettings.connect('changed::' + SHOW_KEY,
-                                  Lang.bind(this, function() {
-            this.setActive(this._appSettings.get_boolean(SHOW_KEY));
+        this._settings.connect('changed::' + SHOW_KEY,
+                               Lang.bind(this, function() {
+            this.setActive(this._settings.get_boolean(SHOW_KEY));
        }));

        this._settings.connect('changed::' + SCREEN_POSITION_KEY,
@@ -499,7 +495,7 @@ Magnifier.prototype = {

        this._settings.connect('changed::' + CROSS_HAIRS_OPACITY_KEY,
                               Lang.bind(this, function() {
-            this.setCrosshairsOpacity(this._settings.get_double(CROSS_HAIRS_OPACITY_KEY));
+            this.setCrosshairsOpacity(this._settings.get_int(CROSS_HAIRS_OPACITY_KEY));
        }));

        this._settings.connect('changed::' + CROSS_HAIRS_LENGTH_KEY,
@@ -512,7 +508,7 @@ Magnifier.prototype = {
            this.setCrosshairsClip(this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY));
        }));

-        return this._appSettings.get_boolean(SHOW_KEY);
+        return this._settings.get_boolean(SHOW_KEY);
   },

    _updateScreenPosition: function() {
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -23,7 +23,6 @@ const _ = Gettext.gettext;
 const Chrome = imports.ui.chrome;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const EndSessionDialog = imports.ui.endSessionDialog;
-const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
 const Environment = imports.ui.environment;
 const ExtensionSystem = imports.ui.extensionSystem;
 const MessageTray = imports.ui.messageTray;
@@ -68,8 +67,6 @@ let xdndHandler = null;
 let statusIconDispatcher = null;
 let _errorLogStack = [];
 let _startDate;
-let _defaultCssStylesheet = null;
-let _cssStylesheet = null;

 let background = null;

@@ -114,7 +111,6 @@ function start() {
    global.stage.color = DEFAULT_BACKGROUND_COLOR;
    global.stage.no_clear_hint = true;

-    _defaultCssStylesheet = global.datadir + '/theme/gnome-shell.css';
    loadTheme();

    let shellwm = global.window_manager;
@@ -145,9 +141,7 @@ function start() {
    notificationDaemon = new NotificationDaemon.NotificationDaemon();
    windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
    telepathyClient = new TelepathyClient.Client();
-
-    overview.init();
-    statusIconDispatcher.start(messageTray.actor);
+    panel.startStatusArea();

    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
    ctrlAltTabManager.addGroup(panel.actor, _("Panel"), 'gnome-panel');
@@ -178,21 +172,15 @@ function start() {
        }
    });

-    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT, false, -1, 1);
-
    // Provide the bus object for gnome-session to
    // initiate logouts.
    EndSessionDialog.init();

-    // Attempt to become a PolicyKit authentication agent
-    PolkitAuthenticationAgent.init()
-
    global.gdk_screen.connect('monitors-changed', _relayout);

    ExtensionSystem.init();
    ExtensionSystem.loadExtensions();

-    panel.startStatusArea();
    panel.startupAnimation();

    let display = global.screen.get_display();
@@ -206,143 +194,25 @@ function start() {
    _log('info', 'loaded at ' + _startDate);
    log('GNOME Shell started at ' + _startDate);

+    Mainloop.idle_add(_removeUnusedWorkspaces);
+
    let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
    if (perfModuleName) {
        let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
        let module = eval('imports.perf.' + perfModuleName + ';');
        Scripting.runPerfScript(module, perfOutput);
    }
-
-    global.screen.connect('notify::n-workspaces', _nWorkspacesChanged);
-    Mainloop.idle_add(_nWorkspacesChanged);
-}
-
-let _workspaces = [];
-let _checkWorkspacesId = 0;
-
-function _checkWorkspaces() {
-    let i;
-    let emptyWorkspaces = [];
-
-    for (i = 0; i < _workspaces.length; i++)
-        emptyWorkspaces[i] = true;
-
-    let windows = global.get_window_actors();
-    for (i = 0; i < windows.length; i++) {
-        let win = windows[i];
-
-        if (win.get_meta_window().is_on_all_workspaces())
-            continue;
-
-        let workspaceIndex = win.get_workspace();
-        emptyWorkspaces[workspaceIndex] = false;
-    }
-
-    // If we don't have an empty workspace at the end, add one
-    if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
-        global.screen.append_new_workspace(false, global.get_current_time());
-        emptyWorkspaces.push(false);
-    }
-
-    // Delete other empty workspaces; do it from the end to avoid index changes
-    for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
-        if (emptyWorkspaces[i])
-            global.screen.remove_workspace(_workspaces[i], global.get_current_time());
-    }
-
-    _checkWorkspacesId = 0;
-    return false;
-}
-
-function _queueCheckWorkspaces() {
-    if (_checkWorkspacesId == 0)
-        _checkWorkspacesId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, _checkWorkspaces);
-}
-
-function _nWorkspacesChanged() {
-    let oldNumWorkspaces = _workspaces.length;
-    let newNumWorkspaces = global.screen.n_workspaces;
-
-    if (oldNumWorkspaces == newNumWorkspaces)
-        return false;
-
-    let lostWorkspaces = [];
-    if (newNumWorkspaces > oldNumWorkspaces) {
-        let w;
-
-        // Assume workspaces are only added at the end
-        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++)
-            _workspaces[w] = global.screen.get_workspace_by_index(w);
-
-        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-            let workspace = _workspaces[w];
-            workspace._windowAddedId = workspace.connect('window-added', _queueCheckWorkspaces);
-            workspace._windowRemovedId = workspace.connect('window-removed', _queueCheckWorkspaces);
-        }
-
-    } else {
-        // Assume workspaces are only removed sequentially
-        // (e.g. 2,3,4 - not 2,4,7)
-        let removedIndex;
-        let removedNum = oldNumWorkspaces - newNumWorkspaces;
-        for (let w = 0; w < oldNumWorkspaces; w++) {
-            let workspace = global.screen.get_workspace_by_index(w);
-            if (_workspaces[w] != workspace) {
-                removedIndex = w;
-                break;
-            }
-        }
-
-        let lostWorkspaces = _workspaces.splice(removedIndex, removedNum);
-        lostWorkspaces.forEach(function(workspace) {
-                                   workspace.disconnect(workspace._windowAddedId);
-                                   workspace.disconnect(workspace._windowRemovedId);
-                               });
-    }
-
-    _queueCheckWorkspaces();
-
-    return false;
-}
-
-/**
- * getThemeStylesheet:
- *
- * Get the theme CSS file that the shell will load
- *
- * Returns: A file path that contains the theme CSS,
- *          null if using the default
- */
-function getThemeStylesheet()
-{
-    return _cssStylesheet;
-}
-
-/**
- * setThemeStylesheet:
- * @cssStylesheet: A file path that contains the theme CSS,
- *                  set it to null to use the default
- *
- * Set the theme CSS file that the shell will load
- */
-function setThemeStylesheet(cssStylesheet)
-{
-    _cssStylesheet = cssStylesheet;
 }

 /**
 * loadTheme:
 *
- * Reloads the theme CSS file
+ * Reloads the theme CSS file from the default theme.
 */
 function loadTheme() {
    let themeContext = St.ThemeContext.get_for_stage (global.stage);
-
-    let cssStylesheet = _defaultCssStylesheet;
-    if (_cssStylesheet != null)
-        cssStylesheet = _cssStylesheet;
-
-    let theme = new St.Theme ({ application_stylesheet: cssStylesheet });
+    let stylesheetPath = global.datadir + '/theme/gnome-shell.css';
+    let theme = new St.Theme ({ application_stylesheet: stylesheetPath });
    themeContext.set_theme (theme);
 }

@@ -399,15 +269,32 @@ function _relayout() {
    overview.hide();
 }

-function isWindowActorDisplayedOnWorkspace(win, workspaceIndex) {
-    return win.get_workspace() == workspaceIndex ||
-        (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
-}
+// metacity-clutter currently uses the same prefs as plain metacity,
+// which probably means we'll be starting out with multiple workspaces;
+// remove any unused ones. (We do this from an idle handler, because
+// global.get_window_actors() still returns NULL at the point when start()
+// is called.)
+function _removeUnusedWorkspaces() {

-function getWindowActorsForWorkspace(workspaceIndex) {
-    return global.get_window_actors().filter(function (win) {
-        return isWindowActorDisplayedOnWorkspace(win, workspaceIndex);
-    });
+    let windows = global.get_window_actors();
+    let maxWorkspace = 0;
+    for (let i = 0; i < windows.length; i++) {
+        let win = windows[i];
+
+        if (!win.get_meta_window().is_on_all_workspaces() &&
+            win.get_workspace() > maxWorkspace) {
+            maxWorkspace = win.get_workspace();
+        }
+    }
+    let screen = global.screen;
+    if (screen.n_workspaces > maxWorkspace) {
+        for (let w = screen.n_workspaces - 1; w > maxWorkspace; w--) {
+            let workspace = screen.get_workspace_by_index(w);
+            screen.remove_workspace(workspace, 0);
+        }
+    }
+
+    return false;
 }

 // This function encapsulates hacks to make certain global keybindings
@@ -451,20 +338,11 @@ function _globalKeyPressHandler(actor, event) {
    }

    switch (action) {
-        // left/right would effectively act as synonyms for up/down if we enabled them;
-        // but that could be considered confusing; we also disable them in the main view.
-        //
-        // case Meta.KeyBindingAction.WORKSPACE_LEFT:
-        //     wm.actionMoveWorkspaceLeft();
-        //     return true;
-        // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
-        //     wm.actionMoveWorkspaceRight();
-        //     return true;
-        case Meta.KeyBindingAction.WORKSPACE_UP:
-            wm.actionMoveWorkspaceUp();
+        case Meta.KeyBindingAction.WORKSPACE_LEFT:
+            wm.actionMoveWorkspaceLeft();
            return true;
-        case Meta.KeyBindingAction.WORKSPACE_DOWN:
-            wm.actionMoveWorkspaceDown();
+        case Meta.KeyBindingAction.WORKSPACE_RIGHT:
+            wm.actionMoveWorkspaceRight();
            return true;
        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
        case Meta.KeyBindingAction.COMMAND_2:
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -11,12 +11,11 @@ const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
-
-const BoxPointer = imports.ui.boxpointer;
-const GnomeSession = imports.misc.gnomeSession;
-const Main = imports.ui.main;
-const Params = imports.misc.params;
 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');
@@ -25,7 +24,6 @@ const _ = Gettext.gettext;
 const ANIMATION_TIME = 0.2;
 const NOTIFICATION_TIMEOUT = 4;
 const SUMMARY_TIMEOUT = 1;
-const LONGER_SUMMARY_TIMEOUT = 4;

 const HIDE_TIMEOUT = 0.2;
 const LONGER_HIDE_TIMEOUT = 0.6;
@@ -91,7 +89,8 @@ URLHighlighter.prototype = {
        this.actor = new St.Label({ reactive: true, style_class: 'url-highlighter' });
        this._linkColor = '#ccccff';
        this.actor.connect('style-changed', Lang.bind(this, function() {
-            let [hasColor, color] = this.actor.get_theme_node().lookup_color('link-color', false);
+            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) {
@@ -189,149 +188,6 @@ URLHighlighter.prototype = {
    }
 };

-function FocusGrabber() {
-    this._init();
-}
-
-FocusGrabber.prototype = {
-    _init: function() {
-        this.actor = null;
-
-        this._hasFocus = false;
-        // We use this._prevFocusedWindow and this._prevKeyFocusActor to return the
-        // focus where it previously belonged after a focus grab, unless the user
-        // has explicitly changed that.
-        this._prevFocusedWindow = null;
-        this._prevKeyFocusActor = null;
-
-        this._focusActorChangedId = 0;
-        this._stageInputModeChangedId = 0;
-        this._capturedEventId = 0;
-        this._togglingFocusGrabMode = false;
-
-        Main.overview.connect('showing', Lang.bind(this,
-            function() {
-                this._toggleFocusGrabMode();
-            }));
-        Main.overview.connect('hidden', Lang.bind(this,
-            function() {
-                this._toggleFocusGrabMode();
-            }));
-    },
-
-    grabFocus: function(actor) {
-        if (this._hasFocus)
-            return;
-
-        this.actor = actor;
-
-        let metaDisplay = global.screen.get_display();
-
-        this._prevFocusedWindow = metaDisplay.focus_window;
-        this._prevKeyFocusActor = global.stage.get_key_focus();
-
-        if (!Main.overview.visible)
-            global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
-
-        // Use captured-event to notice clicks outside the focused actor
-        // without consuming them.
-        this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
-
-        this._stageInputModeChangedId = global.connect('notify::stage-input-mode', Lang.bind(this, this._stageInputModeChanged));
-        this._focusActorChangedId = global.stage.connect('notify::key-focus', Lang.bind(this, this._focusActorChanged));
-
-        this._hasFocus = true;
-
-        this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-        this.emit('focus-grabbed');
-    },
-
-    _focusActorChanged: function() {
-        let focusedActor = global.stage.get_key_focus();
-        if (!focusedActor || !this.actor.contains(focusedActor)) {
-            this._prevKeyFocusActor = null;
-            this.ungrabFocus();
-        }
-    },
-
-    _stageInputModeChanged: function() {
-        this.ungrabFocus();
-    },
-
-    _onCapturedEvent: function(actor, event) {
-        let source = event.get_source();
-        switch (event.type()) {
-            case Clutter.EventType.BUTTON_PRESS:
-                if (!this.actor.contains(source))
-                    this.emit('button-pressed', source);
-                break;
-            case Clutter.EventType.KEY_PRESS:
-                let symbol = event.get_key_symbol();
-                if (symbol == Clutter.Escape) {
-                    this.emit('escape-pressed');
-                    return true;
-                }
-                break;
-        }
-
-        return false;
-    },
-
-    ungrabFocus: function() {
-        if (!this._hasFocus)
-            return;
-
-        let metaDisplay = global.screen.get_display();
-
-        if (this._focusActorChangedId > 0) {
-            global.stage.disconnect(this._focusActorChangedId);
-            this._focusActorChangedId = 0;
-        }
-
-        if (this._stageInputModeChangedId) {
-            global.disconnect(this._stageInputModeChangedId);
-            this._stageInputModeChangedId = 0;
-        }
-
-        if (this._capturedEventId > 0) {
-            global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
-
-        this._hasFocus = false;
-        this.emit('focus-ungrabbed');
-
-        if (this._prevFocusedWindow && !metaDisplay.focus_window) {
-            metaDisplay.set_input_focus_window(this._prevFocusedWindow, false, global.get_current_time());
-            this._prevFocusedWindow = null;
-        }
-        if (this._prevKeyFocusActor) {
-            global.stage.set_key_focus(this._prevKeyFocusActor);
-            this._prevKeyFocusActor = null;
-        } else {
-            // We don't want to keep any actor inside the previously focused actor focused.
-            let focusedActor = global.stage.get_key_focus();
-            if (focusedActor && this.actor.contains(focusedActor))
-                global.stage.set_key_focus(null);
-        }
-        if (!this._togglingFocusGrabMode)
-            this.actor = null;
-    },
-
-    // Because we grab focus differently in the overview
-    // and in the main view, we need to change how it is
-    // done when we move between the two.
-    _toggleFocusGrabMode: function() {
-        if (this._hasFocus) {
-            this._togglingFocusGrabMode = true;
-            this.ungrabFocus();
-            this.grabFocus(this.actor);
-            this._togglingFocusGrabMode = false;
-        }
-    }
-}
-Signals.addSignalMethods(FocusGrabber.prototype);
-
 // Notification:
 // @source: the notification's Source
 // @title: the title
@@ -398,7 +254,6 @@ Notification.prototype = {
        // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
        this.isTransient = false;
        this.expanded = false;
-        this._destroyed = false;
        this._useActionIcons = false;
        this._customContent = false;
        this._bannerBodyText = null;
@@ -406,11 +261,20 @@ Notification.prototype = {
        this._titleFitsInBannerMode = true;
        this._spacing = 0;

-        source.connect('destroy', Lang.bind(this,
-            // Avoid passing 'source' as an argument to this.destroy()
-            function () {
-                this.destroy();
-            }));
+        this._hasFocus = false;
+        this._lockTrayOnFocusGrab = false;
+        // We use this._prevFocusedWindow and this._prevKeyFocusActor to return the
+        // focus where it previously belonged after a focus grab, unless the user
+        // has explicitly changed that.
+        this._prevFocusedWindow = null;
+        this._prevKeyFocusActor = null;
+
+        this._focusActorChangedId = 0;
+        this._stageInputModeChangedId = 0;
+        this._capturedEventId = 0;
+        this._keyPressId = 0;
+
+        source.connect('destroy', Lang.bind(this, this.destroy));

        this.actor = new St.Table({ name: 'notification',
                                    reactive: true });
@@ -422,8 +286,6 @@ Notification.prototype = {
                    this._onClicked();
            }));

-        this._buttonFocusManager = St.FocusManager.get_for_stage(global.stage);
-
        // The first line should have the title, followed by the
        // banner text, but ellipsized if they won't both fit. We can't
        // make St.Table or St.BoxLayout do this the way we want (don't
@@ -445,6 +307,15 @@ Notification.prototype = {
        this._bannerBox.add_actor(this._bannerLabel);

        this.update(title, banner, params);
+
+        Main.overview.connect('showing', Lang.bind(this,
+            function() {
+                this._toggleFocusGrabMode();
+            }));
+        Main.overview.connect('hidden', Lang.bind(this,
+            function() {
+                this._toggleFocusGrabMode();
+            }));
    },

    // update:
@@ -628,7 +499,7 @@ Notification.prototype = {
            this._buttonBox = box;
        }

-        let button = new St.Button({ can_focus: true });
+        let button = new St.Button();

        if (this._useActionIcons && Gtk.IconTheme.get_default().has_icon(id)) {
            button.add_style_class_name('notification-icon-button');
@@ -638,13 +509,8 @@ Notification.prototype = {
            button.label = label;
        }

-        if (this._buttonBox.get_children().length > 0)
-            this._buttonFocusManager.remove_group(this._buttonBox);
-
        this._buttonBox.add(button);
-        this._buttonFocusManager.add_group(this._buttonBox);
        button.connect('clicked', Lang.bind(this, this._onActionInvoked, id));
-
        this._updated();
    },

@@ -772,7 +638,64 @@ Notification.prototype = {
        this._bannerLabel.opacity = 255;
    },

-    _onActionInvoked: function(actor, mouseButtonClicked, id) {
+    grabFocus: function(lockTray) {
+        if (this._hasFocus)
+            return;
+
+        this._lockTrayOnFocusGrab = lockTray;
+
+        let metaDisplay = global.screen.get_display();
+
+        this._prevFocusedWindow = metaDisplay.focus_window;
+        this._prevKeyFocusActor = global.stage.get_key_focus();
+
+        if (!Main.overview.visible)
+            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._stageInputModeChangedId = global.connect('notify::stage-input-mode', Lang.bind(this, this._stageInputModeChanged));
+        this._focusActorChangedId = global.stage.connect('notify::key-focus', Lang.bind(this, this._focusActorChanged));
+
+        this._hasFocus = true;
+        if (lockTray)
+            Main.messageTray.lock();
+    },
+
+    _focusActorChanged: function() {
+        let focusedActor = global.stage.get_key_focus();
+        if (!focusedActor || !this.actor.contains(focusedActor)) {
+            this._prevKeyFocusActor = null;
+            this.ungrabFocus();
+        }
+    },
+
+    _stageInputModeChanged: function() {
+        this.ungrabFocus();
+    },
+
+    _onCapturedEvent: function(actor, event) {
+        let source = event.get_source();
+        switch (event.type()) {
+            case Clutter.EventType.BUTTON_PRESS:
+                if (!this.actor.contains(source))
+                    this.ungrabFocus();
+                break;
+            case Clutter.EventType.KEY_PRESS:
+                let symbol = event.get_key_symbol();
+                if (symbol == Clutter.Escape) {
+                    Main.messageTray.escapeTray();
+                    return true;
+                }
+                break;
+        }
+
+        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,
@@ -794,10 +717,56 @@ Notification.prototype = {
            this.destroy();
    },

-    destroy: function(reason) {
-        if (this._destroyed)
+    ungrabFocus: function() {
+        if (!this._hasFocus)
            return;
-        this._destroyed = true;
+
+        let metaDisplay = global.screen.get_display();
+
+        if (this._focusActorChangedId > 0) {
+            global.stage.disconnect(this._focusActorChangedId);
+            this._focusActorChangedId = 0;
+        }
+
+        if (this._stageInputModeChangedId) {
+            global.disconnect(this._stageInputModeChangedId);
+            this._stageInputModeChangedId = 0;
+        }
+
+        if (this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+        }
+
+        this._hasFocus = false;
+        Main.messageTray.unlock();
+
+        if (this._prevFocusedWindow && !metaDisplay.focus_window) {
+            metaDisplay.set_input_focus_window(this._prevFocusedWindow, false, global.get_current_time());
+            this._prevFocusedWindow = null;
+        }
+        if (this._prevKeyFocusActor) {
+            global.stage.set_key_focus(this._prevKeyFocusActor);
+            this._prevKeyFocusActor = null;
+        } else {
+            // We don't want to keep the actor inside the notification focused.
+            let focusedActor = global.stage.get_key_focus();
+            if (focusedActor && this.actor.contains(focusedActor))
+                global.stage.set_key_focus(null);
+        }
+    },
+
+    // Because we grab focus differently in the overview
+    // and in the main view, we need to change how it is
+    // done when we move between the two.
+    _toggleFocusGrabMode: function() {
+        if (this._hasFocus) {
+            this.ungrabFocus();
+            this.grabFocus(this._lockTrayOnFocusGrab);
+        }
+    },
+
+    destroy: function(reason) {
        if (!reason)
            reason = NotificationDestroyedReason.DISMISSED;
        this.emit('destroy', reason);
@@ -817,7 +786,6 @@ Source.prototype = {
        this._iconBin = new St.Bin({ width: this.ICON_SIZE,
                                     height: this.ICON_SIZE });
        this.isTransient = false;
-        this.isChat = false;
    },

    setTransient: function(isTransient) {
@@ -942,13 +910,6 @@ function MessageTray() {

 MessageTray.prototype = {
    _init: function() {
-        this._presence = new GnomeSession.Presence();
-        this._userStatus = GnomeSession.PresenceStatus.AVAILABLE;
-        this._busy = false;
-        this._backFromAway = false;
-        this._presence.connect('StatusChanged', Lang.bind(this, this._onStatusChanged));
-        this._presence.getStatus(Lang.bind(this, this._onStatusChanged));
-
        this.actor = new St.Group({ name: 'message-tray',
                                    reactive: true,
                                    track_hover: true });
@@ -993,21 +954,6 @@ MessageTray.prototype = {
        // of the other items are collapsed.
        this._imaginarySummaryItemTitleWidth = 0;

-        this._focusGrabber = new FocusGrabber();
-        this._focusGrabber.connect('focus-grabbed', Lang.bind(this,
-            function() {
-                if (this._summaryNotification)
-                    this._lock();
-            }));
-        this._focusGrabber.connect('focus-ungrabbed', Lang.bind(this, this._unlock));
-        this._focusGrabber.connect('button-pressed', Lang.bind(this,
-           function(focusGrabber, source) {
-               if (this._clickedSummaryItem && !this._clickedSummaryItem.actor.contains(source))
-                   this._unsetClickedSummaryItem();
-               this._focusGrabber.ungrabFocus();
-           }));
-        this._focusGrabber.connect('escape-pressed', Lang.bind(this, this._escapeTray));
-
        this._trayState = State.HIDDEN;
        this._locked = false;
        this._useLongerTrayLeftTimeout = false;
@@ -1038,22 +984,18 @@ MessageTray.prototype = {
        Main.overview.connect('showing', Lang.bind(this,
            function() {
                this._overviewVisible = true;
-                if (this._locked) {
-                    this._unsetClickedSummaryItem();
-                    this._unlock();
-                } else {
+                if (this._locked)
+                    this.unlock();
+                else
                    this._updateState();
-                }
            }));
        Main.overview.connect('hiding', Lang.bind(this,
            function() {
                this._overviewVisible = false;
-                if (this._locked) {
-                    this._unsetClickedSummaryItem();
-                    this._unlock();
-                } else {
+                if (this._locked)
+                    this.unlock();
+                else
                    this._updateState();
-                }
            }));

        this._summaryItems = [];
@@ -1063,7 +1005,6 @@ MessageTray.prototype = {
        // added to the summary without a notification being shown.
        this._newSummaryItems = [];
        this._longestSummaryItem = null;
-        this._chatSummaryItemsCount = 0;
    },

    _setSizePosition: function() {
@@ -1097,12 +1038,7 @@ MessageTray.prototype = {

        let summaryItem = new SummaryItem(source);

-        if (source.isChat) {
-            this._summary.insert_actor(summaryItem.actor, 0);
-            this._chatSummaryItemsCount++;
-        } else {
-            this._summary.insert_actor(summaryItem.actor, this._chatSummaryItemsCount);
-        }
+        this._summary.insert_actor(summaryItem.actor, 0);

        let titleWidth = summaryItem.getTitleNaturalWidth();
        if (titleWidth > this._summaryItemTitleWidth) {
@@ -1167,10 +1103,6 @@ MessageTray.prototype = {
            this._newSummaryItems.splice(newSummaryItemsIndex, 1);

        this._summaryItems.splice(index, 1);
-
-        if (source.isChat)
-            this._chatSummaryItemsCount--;
-
        if (this._longestSummaryItem.source == source) {
            let newTitleWidth = 0;
            this._longestSummaryItem = null;
@@ -1217,14 +1149,15 @@ MessageTray.prototype = {
            this._notificationQueue.splice(index, 1);
    },

-    _lock: function() {
+    lock: function() {
        this._locked = true;
    },

-    _unlock: function() {
+    unlock: function() {
        if (!this._locked)
            return;
        this._locked = false;
+        this._unsetClickedSummaryItem();
        this._updateState();
    },

@@ -1258,29 +1191,26 @@ MessageTray.prototype = {
    },

    _onSummaryItemHoverChanged: function(summaryItem) {
-        if (summaryItem.actor.hover)
-            this._setExpandedSummaryItem(summaryItem);
-    },
-
-    _setExpandedSummaryItem: function(summaryItem) {
-        if (summaryItem == this._expandedSummaryItem)
-            return;
-
        // We can't just animate individual summary items as the
        // pointer moves in and out of them, because if they don't
        // move in sync you get weird-looking wobbling. So whenever
        // there's a change, we have to re-tween the entire summary
        // area.

-        // Turn off ellipsization for the previously expanded item that is
-        // collapsing and for the item that is expanding because it looks
-        // better that way.
-        if (this._expandedSummaryItem)
-            this._expandedSummaryItem.setEllipsization(Pango.EllipsizeMode.NONE);
+        if (summaryItem.actor.hover) {
+            if (summaryItem == this._expandedSummaryItem)
+                return;

-        this._expandedSummaryItem = summaryItem;
-        if (this._expandedSummaryItem)
-            this._expandedSummaryItem.setEllipsization(Pango.EllipsizeMode.NONE);
+            this._expandedSummaryItem = summaryItem;
+        } else {
+            if (summaryItem != this._expandedSummaryItem)
+                return;
+
+            this._expandedSummaryItem = null;
+
+            // Turn off ellipsization while collapsing; it looks better
+            summaryItem.setEllipsization(Pango.EllipsizeMode.NONE);
+        }

        // We tween on a "_expandedSummaryItemTitleWidth" pseudo-property
        // that represents the current title width of the
@@ -1371,13 +1301,6 @@ MessageTray.prototype = {
            if (this._useLongerTrayLeftTimeout && !this._trayLeftTimeoutId)
                return;

-            // Don't do anything if the mouse is over the summary notification as this should be considered as
-            // leaving the tray. The tray is locked when the summary notification is visible anyway, but we
-            // should treat the mouse being over the summary notification as the tray being left for collapsing
-            // any expanded summary item other than the one related to the notification.
-            if (this._summaryNotificationBoxPointer.bin.hover)
-                return;
-
            this._useLongerTrayLeftTimeout = false;
            if (this._trayLeftTimeoutId) {
                Mainloop.source_remove(this._trayLeftTimeoutId);
@@ -1421,28 +1344,6 @@ MessageTray.prototype = {
        }
    },

-    _onStatusChanged: function(presence, status) {
-        this._backFromAway = (this._userStatus == GnomeSession.PresenceStatus.IDLE && this._userStatus != status);
-        this._userStatus = status;
-
-        if (status == GnomeSession.PresenceStatus.BUSY) {
-            // remove notification and allow the summary to be closed now
-            this._updateNotificationTimeout(0);
-            if (this._summaryTimeoutId) {
-                Mainloop.source_remove(this._summaryTimeoutId);
-                this._summaryTimeoutId = 0;
-            }
-            this._busy = true;
-        } else if (status != GnomeSession.PresenceStatus.IDLE) {
-            // We preserve the previous value of this._busy if the status turns to IDLE
-            // so that we don't start showing notifications queued during the BUSY state
-            // as the screensaver gets activated.
-            this._busy = false;
-        }
-
-        this._updateState();
-    },
-
    _onTrayLeftTimeout: function() {
        let [x, y, mods] = global.get_pointer();
        // We extend the timeout once if the mouse moved no further than MOUSE_LEFT_ACTOR_THRESHOLD to either side or up.
@@ -1466,8 +1367,8 @@ MessageTray.prototype = {
        return false;
    },

-    _escapeTray: function() {
-        this._unlock();
+    escapeTray: function() {
+        this.unlock();
        this._pointerInTray = false;
        this._pointerInSummary = false;
        this._updateNotificationTimeout(0);
@@ -1481,8 +1382,7 @@ MessageTray.prototype = {
    // at the present time.
    _updateState: function() {
        // Notifications
-        let notificationsPending = this._notificationQueue.length > 0 &&
-                                   (!this._busy || this._notificationQueue[0].urgency == Urgency.CRITICAL);
+        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;
@@ -1502,34 +1402,19 @@ MessageTray.prototype = {
        // Summary
        let summarySummoned = this._pointerInSummary || this._overviewVisible;
        let summaryPinned = this._summaryTimeoutId != 0 || this._pointerInTray || summarySummoned || this._locked;
-        let summaryHovered = this._pointerInTray || this._pointerInSummary;
-        let summaryVisibleWithNoHover = (this._overviewVisible || this._locked) && !summaryHovered;
-        let summaryNotificationIsForExpandedSummaryItem = (this._clickedSummaryItem == this._expandedSummaryItem);

        let notificationsVisible = (this._notificationState == State.SHOWING ||
                                    this._notificationState == State.SHOWN);
        let notificationsDone = !notificationsVisible && !notificationsPending;

        if (this._summaryState == State.HIDDEN) {
-            if (this._backFromAway) {
-                // Immediately set this to false, so that we don't schedule a timeout later
-                this._backFromAway = false;
-                if (!this._busy)
-                    this._showSummary(LONGER_SUMMARY_TIMEOUT);
-            } else if (notificationsDone && this._newSummaryItems.length > 0 && !this._busy) {
-                this._showSummary(SUMMARY_TIMEOUT);
-            } else if (summarySummoned) {
-                this._showSummary(0);
-            }
+            if (notificationsDone && this._newSummaryItems.length > 0)
+                this._showSummary(true);
+            else if (summarySummoned)
+                this._showSummary(false);
        } else if (this._summaryState == State.SHOWN) {
            if (!summaryPinned)
                this._hideSummary();
-            else if (summaryVisibleWithNoHover && !summaryNotificationIsForExpandedSummaryItem)
-                // If we are hiding the summary, we'll collapse the expanded summary item when we are done
-                // so that there is no animation. However, we should collapse the expanded summary item
-                // if the summary is visible, but not hovered over, and the summary notification for the
-                // expanded summary item is not being shown.
-                this._setExpandedSummaryItem(null);
        }

        // Summary notification
@@ -1603,7 +1488,7 @@ MessageTray.prototype = {
    _showNotification: function() {
        this._notification = this._notificationQueue.shift();
        this._notificationClickedId = this._notification.connect('done-displaying',
-                                                                 Lang.bind(this, this._escapeTray));
+                                                                 Lang.bind(this, this.escapeTray));
        this._notificationBin.child = this._notification.actor;

        this._notificationBin.opacity = 0;
@@ -1698,7 +1583,7 @@ MessageTray.prototype = {
    },

    _hideNotification: function() {
-        this._focusGrabber.ungrabFocus();
+        this._notification.ungrabFocus();
        if (this._notificationExpandedId) {
            this._notification.disconnect(this._notificationExpandedId);
            this._notificationExpandedId = 0;
@@ -1730,7 +1615,7 @@ MessageTray.prototype = {
    _expandNotification: function(autoExpanding) {
        // Don't grab focus in notifications that are auto-expanded.
        if (!autoExpanding)
-            this._focusGrabber.grabFocus(this._notification.actor);
+            this._notification.grabFocus(false);

        if (!this._notificationExpandedId)
            this._notificationExpandedId =
@@ -1753,10 +1638,10 @@ 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.
    _ensureNotificationFocused: function() {
-        this._focusGrabber.grabFocus(this._notification.actor);
+        this._notification.grabFocus(false);
    },

-    _showSummary: function(timeout) {
+    _showSummary: function(withTimeout) {
        let primary = global.get_primary_monitor();
        this._summaryBin.opacity = 0;
        this._summaryBin.y = this.actor.height;
@@ -1767,16 +1652,16 @@ MessageTray.prototype = {
                      transition: 'easeOutQuad',
                      onComplete: this._showSummaryCompleted,
                      onCompleteScope: this,
-                      onCompleteParams: [timeout]
+                      onCompleteParams: [withTimeout]
                    });
    },

-    _showSummaryCompleted: function(timeout) {
+    _showSummaryCompleted: function(withTimeout) {
        this._newSummaryItems = [];

-        if (timeout != 0) {
+        if (withTimeout) {
            this._summaryTimeoutId =
-                Mainloop.timeout_add(timeout * 1000,
+                Mainloop.timeout_add(SUMMARY_TIMEOUT * 1000,
                                     Lang.bind(this, this._summaryTimeout));
        }
    },
@@ -1791,28 +1676,21 @@ MessageTray.prototype = {
        this._tween(this._summaryBin, '_summaryState', State.HIDDEN,
                    { opacity: 0,
                      time: ANIMATION_TIME,
-                      transition: 'easeOutQuad',
-                      onComplete: this._hideSummaryCompleted,
-                      onCompleteScope: this,
+                      transition: 'easeOutQuad'
                    });
        this._newSummaryItems = [];
    },

-    _hideSummaryCompleted: function() {
-        this._expandedSummaryItem = null;
-        this._expandedSummaryItemTitleWidth = this._summaryItemTitleWidth;
-    },
-
    _showSummaryNotification: function() {
        this._summaryNotification = this._clickedSummaryItem.source.notification;
        this._summaryNotificationClickedId = this._summaryNotification.connect('done-displaying',
-                                                                               Lang.bind(this, this._escapeTray));
+                                                                               Lang.bind(this, this.escapeTray));
        let index = this._notificationQueue.indexOf(this._summaryNotification);
        if (index != -1)
            this._notificationQueue.splice(index, 1);

        this._summaryNotificationBoxPointer.bin.child = this._summaryNotification.actor;
-        this._focusGrabber.grabFocus(this._summaryNotification.actor);
+        this._summaryNotification.grabFocus(true);

        if (!this._summaryNotificationExpandedId)
            this._summaryNotificationExpandedId = this._summaryNotification.connect('expanded', Lang.bind(this, this._onSummaryNotificationExpanded));
@@ -1840,7 +1718,7 @@ MessageTray.prototype = {
        if (!this._clickedSummaryItem)
            return;

-        this._summaryNotificationBoxPointer.setPosition(this._clickedSummaryItem.actor, 0, 0.5);
+        this._summaryNotificationBoxPointer.setPosition(this._clickedSummaryItem.actor, 0, St.Align.MIDDLE);
    },

    _unsetClickedSummaryItem: function() {
@@ -1867,7 +1745,7 @@ MessageTray.prototype = {
        if (this._summaryState != State.SHOWN)
            this._unsetClickedSummaryItem();

-        this._focusGrabber.ungrabFocus();
+        this._summaryNotification.ungrabFocus();
        this._summaryNotificationState = State.HIDING;
        this._summaryNotificationBoxPointer.hide(true, Lang.bind(this, this._hideSummaryNotificationCompleted));
    },
@@ -1886,8 +1764,6 @@ MessageTray.prototype = {
            this._onNotify(summaryNotification.source, summaryNotification);
            this._reNotifyWithSummaryNotificationAfterHide = false;
        }
-        if (this._clickedSummaryItem)
-            this._updateState();
    }
 };

--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -83,9 +83,7 @@ ModalDialog.prototype = {
    },

    setButtons: function(buttons) {
-        this._buttonLayout.destroy_children();
-        this._actionKeys = {};
-
+        this._buttonLayout.remove_all();
        let i = 0;
        for (let index in buttons) {
            let buttonInfo = buttons[index];
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -129,6 +129,8 @@ Overview.prototype = {
        this._capturedEventId = 0;
        this._buttonPressId = 0;

+        this.shellInfo = new ShellInfo();
+
        this._workspacesDisplay = null;

        this.visible = false;           // animating to overview, in overview, animating out
@@ -150,6 +152,27 @@ Overview.prototype = {
        this._group.hide();
        global.overlay_group.add_actor(this._group);

+        this.viewSelector = new ViewSelector.ViewSelector();
+        this._group.add_actor(this.viewSelector.actor);
+
+        this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay();
+        this.viewSelector.addViewTab(_("Windows"), this._workspacesDisplay.actor);
+
+        let appView = new AppDisplay.AllAppDisplay();
+        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());
+
+        // TODO - recalculate everything when desktop size changes
+        this._dash = new Dash.Dash();
+        this._group.add_actor(this._dash.actor);
+        this._dash.actor.add_constraint(this.viewSelector.constrainY);
+        this._dash.actor.add_constraint(this.viewSelector.constrainHeight);
+
        this._coverPane.hide();

        // XDND
@@ -169,36 +192,6 @@ Overview.prototype = {
        this.workspaces = null;
    },

-    // The members we construct that are implemented in JS might
-    // want to access the overview as Main.overview to connect
-    // signal handlers and so forth. So we create them after
-    // construction in this init() method.
-    init: function() {
-        this.shellInfo = new ShellInfo();
-
-        this.viewSelector = new ViewSelector.ViewSelector();
-        this._group.add_actor(this.viewSelector.actor);
-
-        this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay();
-        this.viewSelector.addViewTab(_("Windows"), this._workspacesDisplay.actor);
-
-        let appView = new AppDisplay.AllAppDisplay();
-        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());
-
-        // TODO - recalculate everything when desktop size changes
-        this.dash = new Dash.Dash();
-        this._group.add_actor(this.dash.actor);
-        this.dash.actor.add_constraint(this.viewSelector.constrainY);
-        this.dash.actor.add_constraint(this.viewSelector.constrainHeight);
-
-    },
-
    _onDragBegin: function() {
        DND.addDragMonitor(this._dragMonitor);
        // Remember the workspace we started from
@@ -437,21 +430,21 @@ Overview.prototype = {
        this._coverPane.set_position(0, contentY);
        this._coverPane.set_size(primary.width, contentHeight);

-        let dashWidth = Math.round(DASH_SPLIT_FRACTION * primary.width);
-        let viewWidth = primary.width - dashWidth - this._spacing;
+        let viewWidth = (1.0 - DASH_SPLIT_FRACTION) * primary.width - this._spacing;
        let viewHeight = contentHeight - 2 * this._spacing;
        let viewY = contentY + this._spacing;
-        let viewX = rtl ? 0 : dashWidth + this._spacing;
+        let viewX = rtl ? 0
+                        : Math.floor(DASH_SPLIT_FRACTION * primary.width) + this._spacing;

        // Set the dash's x position - y is handled by a constraint
        let dashX;
        if (rtl) {
-            this.dash.actor.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
+            this._dash.actor.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
            dashX = primary.width;
        } else {
            dashX = 0;
        }
-        this.dash.actor.set_x(dashX);
+        this._dash.actor.set_x(dashX);

        this.viewSelector.actor.set_position(viewX, viewY);
        this.viewSelector.actor.set_size(viewWidth, viewHeight);
@@ -535,7 +528,9 @@ Overview.prototype = {
        this._group.show();
        this._background.show();

+        this.viewSelector.show();
        this._workspacesDisplay.show();
+        this._dash.show();

        this.workspaces = this._workspacesDisplay.workspacesView;
        global.overlay_group.add_actor(this.workspaces.actor);
@@ -661,20 +656,20 @@ Overview.prototype = {

        if (this._shown) {
            if (!this._modal) {
-                if (Main.pushModal(this.dash.actor))
+                if (Main.pushModal(this._dash.actor))
                    this._modal = true;
                else
                    this.hide();
            }
        } else if (this._shownTemporarily) {
            if (this._modal) {
-                Main.popModal(this.dash.actor);
+                Main.popModal(this._dash.actor);
                this._modal = false;
            }
            global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
        } else {
            if (this._modal) {
-                Main.popModal(this.dash.actor);
+                Main.popModal(this._dash.actor);
                this._modal = false;
            }
            else if (global.stage_input_mode == Shell.StageInputMode.FULLSCREEN)
@@ -748,6 +743,8 @@ Overview.prototype = {
        this.workspaces = null;

        this._workspacesDisplay.hide();
+        this.viewSelector.hide();
+        this._dash.hide();

        this._desktopFade.hide();
        this._background.hide();
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
@@ -12,6 +11,7 @@ const Signals = imports.signals;
 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;
@@ -44,6 +44,10 @@ const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION = {
 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';

@@ -51,51 +55,6 @@ const CLOCK_FORMAT_KEY        = 'clock-format';
 const CLOCK_SHOW_DATE_KEY     = 'show-date';
 const CLOCK_SHOW_SECONDS_KEY  = 'show-seconds';

-
-// To make sure the panel corners blend nicely with the panel,
-// we draw background and borders the same way, e.g. drawing
-// them as filled shapes from the outside inwards instead of
-// using cairo stroke(). So in order to give the border the
-// appearance of being drawn on top of the background, we need
-// to blend border and background color together.
-// For that purpose we use the following helper methods, taken
-// from st-theme-node-drawing.c
-function _norm(x) {
-    return Math.round(x / 255);
-}
-
-function _over(srcColor, dstColor) {
-    let src = _premultiply(srcColor);
-    let dst = _premultiply(dstColor);
-    let result = new Clutter.Color();
-
-    result.alpha = src.alpha + _norm((255 - src.alpha) * dst.alpha);
-    result.red = src.red + _norm((255 - src.alpha) * dst.red);
-    result.green = src.green + _norm((255 - src.alpha) * dst.green);
-    result.blue = src.blue + _norm((255 - src.alpha) * dst.blue);
-
-    return _unpremultiply(result);
-}
-
-function _premultiply(color) {
-    return new Clutter.Color({ red: _norm(color.red * color.alpha),
-                               green: _norm(color.green * color.alpha),
-                               blue: _norm(color.blue * color.alpha),
-                               alpha: color.alpha });
-};
-
-function _unpremultiply(color) {
-    if (color.alpha == 0)
-        return new Clutter.Color();
-
-    let red = Math.min((color.red * 255 + 127) / color.alpha, 255);
-    let green = Math.min((color.green * 255 + 127) / color.alpha, 255);
-    let blue = Math.min((color.blue * 255 + 127) / color.alpha, 255);
-    return new Clutter.Color({ red: red, green: green,
-                               blue: blue, alpha: color.alpha });
-};
-
-
 function AnimatedIcon(name, size) {
    this._init(name, size);
 }
@@ -241,7 +200,7 @@ AppMenuButton.prototype = {
    __proto__: PanelMenu.Button.prototype,

    _init: function() {
-        PanelMenu.Button.prototype._init.call(this, 0.0);
+        PanelMenu.Button.prototype._init.call(this, St.Align.START);
        this._metaDisplay = global.screen.get_display();
        this._startingApps = [];

@@ -256,8 +215,6 @@ AppMenuButton.prototype = {
        this._container.connect('allocate', Lang.bind(this, this._contentAllocate));

        this._iconBox = new Shell.Slicer({ name: 'appMenuIcon' });
-        this._iconBox.connect('style-changed',
-                              Lang.bind(this, this._onIconBoxStyleChanged));
        this._container.add_actor(this._iconBox);
        this._label = new TextShadower();
        this._container.add_actor(this._label.actor);
@@ -268,7 +225,7 @@ AppMenuButton.prototype = {

        this._visible = !Main.overview.visible;
        if (!this._visible)
-            this.actor.hide();
+            this.hide();
        Main.overview.connect('hiding', Lang.bind(this, function () {
            this.show();
        }));
@@ -303,42 +260,32 @@ AppMenuButton.prototype = {
        if (this._visible)
            return;

-        this._visible = true;
        this.actor.show();
-        Tweener.removeTweens(this.actor);
        Tweener.addTween(this.actor,
                         { opacity: 255,
                           time: Overview.ANIMATION_TIME,
-                           transition: 'easeOutQuad' });
+                           transition: 'easeOutQuad',
+                           onComplete: function() {
+                               this._visible = true;
+                           },
+                           onCompleteScope: this });
    },

    hide: function() {
        if (!this._visible)
            return;

-        this._visible = false;
-        Tweener.removeTweens(this.actor);
        Tweener.addTween(this.actor,
                         { opacity: 0,
                           time: Overview.ANIMATION_TIME,
                           transition: 'easeOutQuad',
                           onComplete: function() {
                               this.actor.hide();
+                               this._visible = false;
                           },
                           onCompleteScope: this });
    },

-    _onIconBoxStyleChanged: function() {
-        let node = this._iconBox.get_theme_node();
-        let bottomClip = node.get_length('app-icon-bottom-clip');
-        if (bottomClip > 0)
-            this._iconBox.set_clip(0, 0,
-                                   this._iconBox.width,
-                                   this._iconBox.height - bottomClip);
-        else
-            this._iconBox.remove_clip();
-    },
-
    _stopAnimation: function(animate) {
        this._label.actor.remove_clip();
        if (this._updateId) {
@@ -550,97 +497,6 @@ AppMenuButton.prototype = {

 Signals.addSignalMethods(AppMenuButton.prototype);

-
-function PanelCorner(side) {
-    this._init(side);
-}
-
-PanelCorner.prototype = {
-    _init: function(side) {
-        this._side = side;
-        this.actor = new St.DrawingArea({ style_class: 'panel-corner' });
-        this.actor.connect('repaint', Lang.bind(this, this._repaint));
-        this.actor.connect('style-changed', Lang.bind(this, this._reposition));
-    },
-
-    _repaint: function() {
-        let node = this.actor.get_theme_node();
-
-        let cornerRadius = node.get_length("-panel-corner-radius");
-        let innerBorderWidth = node.get_length('-panel-corner-inner-border-width');
-        let outerBorderWidth = node.get_length('-panel-corner-outer-border-width');
-
-        let backgroundColor = node.get_color('-panel-corner-background-color');
-        let innerBorderColor = node.get_color('-panel-corner-inner-border-color');
-        let outerBorderColor = node.get_color('-panel-corner-outer-border-color');
-
-        let cr = this.actor.get_context();
-        cr.setOperator(Cairo.Operator.SOURCE);
-
-        cr.moveTo(0, 0);
-        if (this._side == St.Side.LEFT)
-            cr.arc(cornerRadius,
-                   innerBorderWidth + outerBorderWidth + cornerRadius,
-                   cornerRadius, Math.PI, 3 * Math.PI / 2);
-        else
-            cr.arc(0,
-                   innerBorderWidth + outerBorderWidth + cornerRadius,
-                   cornerRadius, 3 * Math.PI / 2, 2 * Math.PI);
-        cr.lineTo(cornerRadius, 0);
-        cr.closePath();
-
-        let savedPath = cr.copyPath();
-
-        let over = _over(outerBorderColor, backgroundColor);
-        Clutter.cairo_set_source_color(cr, over);
-        cr.fill();
-
-        let xOffsetDirection = this._side == St.Side.LEFT ? -1 : 1;
-        let offset = outerBorderWidth;
-        over = _over(innerBorderColor, backgroundColor);
-        Clutter.cairo_set_source_color(cr, over);
-
-        cr.save();
-        cr.translate(xOffsetDirection * offset, - offset);
-        cr.appendPath(savedPath);
-        cr.fill();
-        cr.restore();
-
-        if (this._side == St.Side.LEFT)
-            cr.rectangle(cornerRadius - offset, 0, offset, innerBorderWidth);
-        else
-            cr.rectangle(0, 0, offset, innerBorderWidth);
-        cr.fill();
-
-        offset = innerBorderWidth + outerBorderWidth;
-        Clutter.cairo_set_source_color(cr, backgroundColor);
-
-        cr.save();
-        cr.translate(xOffsetDirection * offset, - offset);
-        cr.appendPath(savedPath);
-        cr.fill();
-        cr.restore();
-    },
-
-    _reposition: function() {
-        let node = this.actor.get_theme_node();
-
-        let cornerRadius = node.get_length("-panel-corner-radius");
-        let innerBorderWidth = node.get_length('-panel-corner-inner-border-width');
-        let outerBorderWidth = node.get_length('-panel-corner-outer-border-width');
-
-        this.actor.set_size(cornerRadius,
-                            innerBorderWidth + outerBorderWidth + cornerRadius);
-        if (this._side == St.Side.LEFT)
-            this.actor.set_position(Main.panel.actor.x,
-                                    Main.panel.actor.y + Main.panel.actor.height - innerBorderWidth - outerBorderWidth);
-        else
-            this.actor.set_position(Main.panel.actor.x + Main.panel.actor.width - cornerRadius,
-                                    Main.panel.actor.y + Main.panel.actor.height - innerBorderWidth - outerBorderWidth);
-    }
-};
-
-
 function Panel() {
    this._init();
 }
@@ -665,16 +521,6 @@ Panel.prototype = {
        this._centerBox = new St.BoxLayout({ name: 'panelCenter' });
        this._rightBox = new St.BoxLayout({ name: 'panelRight' });

-        // This will eventually be automatic, see
-        // https://bugzilla.gnome.org/show_bug.cgi?id=584662
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL) {
-            this._leftBox.add_style_pseudo_class('rtl');
-            this._rightBox.add_style_pseudo_class('rtl');
-        }
-
-        this._leftCorner = new PanelCorner(St.Side.LEFT);
-        this._rightCorner = new PanelCorner(St.Side.RIGHT);
-
        /* This box container ensures that the centerBox is positioned in the *absolute*
         * center, but can be pushed aside if necessary. */
        this._boxContainer = new Shell.GenericContainer();
@@ -770,10 +616,10 @@ Panel.prototype = {
        /* 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". */
        let label = new St.Label({ text: _("Activities") });
-        this.button = new St.Button({ name: 'panelActivities',
-                                      style_class: 'panel-button',
-                                      reactive: true,
-                                      can_focus: true });
+        this.button = new St.Clickable({ name: 'panelActivities',
+                                         style_class: 'panel-button',
+                                         reactive: true,
+                                         can_focus: true });
        this.button.set_child(label);
        this.button._delegate = this.button;
        this.button._xdndTimeOut = 0;
@@ -791,15 +637,6 @@ Panel.prototype = {
            });
        this._leftBox.add(this.button);

-        // Synchronize the buttons pseudo classes with its corner
-        this.button.connect('style-changed', Lang.bind(this,
-            function(actor) {
-                let rtl = actor.get_direction() == St.TextDirection.RTL;
-                let corner = rtl ? this._rightCorner : this._leftCorner;
-                let pseudoClass = actor.get_style_pseudo_class();
-                corner.actor.set_style_pseudo_class(pseudoClass);
-            }));
-
        // We use this flag to mark the case where the user has entered the
        // hot corner and has not left both the hot corner and a surrounding
        // guard area (the "environs"). This avoids triggering the hot corner
@@ -862,29 +699,19 @@ Panel.prototype = {

        /* right */

-        // System status applets live in statusBox, while legacy tray icons
+        // On-off indicators (for keyboard leds and accessx) are in indicatorBox
+        // System status applets live in statusBox, and 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' });

        this._trayBox.hide();
+        this._rightBox.add(this._indicatorBox);
        this._rightBox.add(this._trayBox);
        this._rightBox.add(this._statusBox);

-        this._statusmenu = new StatusMenu.StatusMenuButton();
-        this._statusmenu.actor.name = 'panelStatus';
-        this._rightBox.add(this._statusmenu.actor);
-
-        // Synchronize the buttons pseudo classes with its corner
-        this._statusmenu.actor.connect('style-changed', Lang.bind(this,
-            function(actor) {
-                let rtl = actor.get_direction() == St.TextDirection.RTL;
-                let corner = rtl ? this._leftCorner : this._rightCorner;
-                let pseudoClass = actor.get_style_pseudo_class();
-                corner.actor.set_style_pseudo_class(pseudoClass);
-            }));
-
        Main.statusIconDispatcher.connect('status-icon-added', Lang.bind(this, this._onTrayIconAdded));
        Main.statusIconDispatcher.connect('status-icon-removed', Lang.bind(this, this._onTrayIconRemoved));

@@ -892,7 +719,7 @@ Panel.prototype = {
        // 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
        // to switch to.
-        this.button.connect('clicked', Lang.bind(this, function(b) {
+        this.button.connect('clicked', Lang.bind(this, function(b, event) {
            if (!Main.overview.animationInProgress) {
                this._maybeToggleOverviewOnClick();
                return true;
@@ -904,19 +731,13 @@ Panel.prototype = {
        // pressing the System key, Alt+F1 or Esc. We want the button to be pressed in when the Overview is entered
        // and to be released when it is exited regardless of how it was triggered.
        Main.overview.connect('showing', Lang.bind(this, function() {
-            this.button.checked = true;
+            this.button.active = true;
        }));
        Main.overview.connect('hiding', Lang.bind(this, function() {
-            this.button.checked = false;
+            this.button.active = false;
        }));

        Main.chrome.addActor(this.actor, { visibleInOverview: true });
-        Main.chrome.addActor(this._leftCorner.actor, { visibleInOverview: true,
-                                                 affectsStruts: false,
-                                                 affectsInputRegion: false });
-        Main.chrome.addActor(this._rightCorner.actor, { visibleInOverview: true,
-                                                  affectsStruts: false,
-                                                  affectsInputRegion: false });
    },

    _xdndShowOverview: function (actor) {
@@ -939,6 +760,13 @@ Panel.prototype = {
    },

    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];
@@ -951,9 +779,9 @@ Panel.prototype = {
            this._menus.addMenu(indicator.menu);
        }

-        // PopupMenuManager depends on menus being added in order for
-        // keyboard navigation
+        this._statusmenu = new StatusMenu.StatusMenuButton();
        this._menus.addMenu(this._statusmenu.menu);
+        this._rightBox.add(this._statusmenu.actor);
    },

    startupAnimation: function() {
@@ -1086,3 +914,63 @@ Panel.prototype = {
        this._hotCornerActivationTime = 0;
    }
 };
+
+function CalendarPopup() {
+    this._init();
+}
+
+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' });
+
+        this.calendar = new Calendar.Calendar();
+        this.actor.set_child(this.calendar.actor);
+
+        this.isOpen = false;
+
+        Main.chrome.addActor(this.actor, { visibleInOverview: true,
+                                           affectsStruts: false });
+        this.actor.y = (panelActor.y + panelActor.height - this.actor.height);
+        this.actor.add_constraint(alignConstraint);
+    },
+
+    show: function() {
+        let panelActor = Main.panel.actor;
+
+        if (this.isOpen)
+            return;
+        this.isOpen = true;
+
+        // Reset the calendar to today's date
+        this.calendar.setDate(new Date());
+
+        this.actor.lower(panelActor);
+        this.actor.show();
+        Tweener.addTween(this.actor,
+                         { y: panelActor.y + panelActor.height,
+                           time: 0.2,
+                           transition: 'easeOutQuad'
+                         });
+    },
+
+    hide: function() {
+        let panelActor = Main.panel.actor;
+
+        if (!this.isOpen)
+            return;
+        this.isOpen = false;
+
+        Tweener.addTween(this.actor,
+                         { y: panelActor.y + panelActor.height - this.actor.height,
+                           time: 0.2,
+                           transition: 'easeOutQuad',
+                           onComplete: function() { this.actor.hide(); },
+                           onCompleteScope: this
+                         });
+    }
+};
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -48,9 +48,9 @@ Button.prototype = {

    _onOpenStateChanged: function(menu, open) {
        if (open)
-            this.actor.add_style_pseudo_class('active');
+            this.actor.add_style_pseudo_class('pressed');
        else
-            this.actor.remove_style_pseudo_class('active');
+            this.actor.remove_style_pseudo_class('pressed');
    }
 };

@@ -68,7 +68,7 @@ SystemStatusButton.prototype = {
    __proto__: Button.prototype,

    _init: function(iconName,tooltipText) {
-        Button.prototype._init.call(this, 0.0);
+        Button.prototype._init.call(this, St.Align.START);
        this._iconActor = new St.Icon({ icon_name: iconName,
                                        icon_type: St.IconType.SYMBOLIC,
                                        style_class: 'system-status-icon' });
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@@ -12,7 +12,6 @@ const _ = Gettext.gettext;

 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
-const Params = imports.misc.params;
 const Search = imports.ui.search;
 const Util = imports.misc.util;

@@ -59,21 +58,6 @@ PlaceInfo.prototype = {
    }
 };

-// Helper function to translate launch parameters into a GAppLaunchContext
-function _makeLaunchContext(params)
-{
-    params = Params.parse(params, { workspace: null,
-                                    timestamp: null });
-
-    let launchContext = global.create_app_launch_context();
-    if (params.workspace != null)
-        launchContext.set_desktop(params.workspace.index());
-    if (params.timestamp != null)
-        launchContext.set_timestamp(params.timestamp);
-
-    return launchContext;
-}
-
 function PlaceDeviceInfo(mount) {
    this._init(mount);
 }
@@ -93,9 +77,9 @@ PlaceDeviceInfo.prototype = {
        return St.TextureCache.get_default().load_gicon(null, icon, size);
    },

-    launch: function(params) {
+    launch: function() {
        Gio.app_info_launch_default_for_uri(this._mount.get_root().get_uri(),
-                                            _makeLaunchContext(params));
+                                            global.create_app_launch_context());
    },

    isRemovable: function() {
@@ -127,6 +111,7 @@ PlaceDeviceInfo.prototype = {
    }
 };

+
 function PlacesManager() {
    this._init();
 }
@@ -145,8 +130,8 @@ PlacesManager.prototype = {
            function(size) {
                return St.TextureCache.get_default().load_gicon(null, homeIcon, size);
            },
-            function(params) {
-                Gio.app_info_launch_default_for_uri(homeUri, _makeLaunchContext(params));
+            function() {
+                Gio.app_info_launch_default_for_uri(homeUri, global.create_app_launch_context());
            });

        let desktopPath = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP);
@@ -158,8 +143,8 @@ PlacesManager.prototype = {
            function(size) {
                return St.TextureCache.get_default().load_gicon(null, desktopIcon, size);
            },
-            function(params) {
-                Gio.app_info_launch_default_for_uri(desktopUri, _makeLaunchContext(params));
+            function() {
+                Gio.app_info_launch_default_for_uri(desktopUri, global.create_app_launch_context());
            });

        this._connect = new PlaceInfo('special:connect', _("Connect to..."),
@@ -168,11 +153,7 @@ PlacesManager.prototype = {
                                     icon_type: St.IconType.FULLCOLOR,
                                     icon_size: size });
            },
-            function (params) {
-                // BUG: nautilus-connect-server doesn't have a desktop file, so we can't
-                // launch it with the workspace from params. It's probably pretty rare
-                // and odd to drag this place onto a workspace in any case
-
+            function () {
                Util.spawn(['nautilus-connect-server']);
            });

@@ -192,12 +173,8 @@ PlacesManager.prototype = {
                function(size) {
                    return networkApp.create_icon_texture(size);
                },
-                function (params) {
-                    params = Params.parse(params, { workspace: null,
-                                                    timestamp: 0 });
-
-                    networkApp.launch_full(params.timestamp, [],
-                                           params.workspace ? params.workspace.index() : -1);
+                function () {
+                    networkApp.launch();
                });
        }

@@ -337,8 +314,8 @@ PlacesManager.prototype = {
                function(size) {
                    return St.TextureCache.get_default().load_gicon(null, icon, size);
                },
-                function(params) {
-                    Gio.app_info_launch_default_for_uri(bookmark, _makeLaunchContext(params));
+                function() {
+                    Gio.app_info_launch_default_for_uri(bookmark, global.create_app_launch_context());
                });
            this._bookmarks.push(item);
        }
@@ -418,9 +395,9 @@ PlaceSearchProvider.prototype = {
                 'icon': placeInfo.iconFactory(Search.RESULT_ICON_SIZE) };
    },

-    activateResult: function(id, params) {
+    activateResult: function(id) {
        let placeInfo = Main.placesManager.lookupPlaceById(id);
-        placeInfo.launch(params);
+        placeInfo.launch();
    },

    _compareResultMeta: function (idA, idB) {
--- a/js/ui/polkitAuthenticationAgent.js
+++ b/js/ui/polkitAuthenticationAgent.js
@@ -1,350 +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.
-*
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-const Lang = imports.lang;
-const Signals = imports.signals;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-const Shell = imports.gi.Shell;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Pango = imports.gi.Pango;
-const Gdm = imports.gi.Gdm;
-const Gio = imports.gi.Gio;
-const Mainloop = imports.mainloop;
-const Polkit = imports.gi.Polkit;
-const PolkitAgent = imports.gi.PolkitAgent;
-
-const ModalDialog = imports.ui.modalDialog;
-
-function AuthenticationDialog(message, cookie, userNames) {
-    this._init(message, cookie, userNames);
-}
-
-AuthenticationDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
-
-    _init: function(message, cookie, userNames) {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'polkit-dialog' });
-
-        this.message = message;
-        this.userNames = userNames;
-
-        let mainContentBox = new St.BoxLayout({ style_class: 'polkit-dialog-main-layout',
-                                                vertical: false });
-        this.contentLayout.add(mainContentBox,
-                               { x_fill: true,
-                                 y_fill: true });
-
-        let icon = new St.Icon({ icon_name: 'dialog-password-symbolic' });
-        mainContentBox.add(icon,
-                           { x_fill:  true,
-                             y_fill:  false,
-                             x_align: St.Align.END,
-                             y_align: St.Align.START });
-
-        let messageBox = new St.BoxLayout({ style_class: 'polkit-dialog-message-layout',
-                                            vertical: true });
-        mainContentBox.add(messageBox,
-                           { y_align: St.Align.START });
-
-        this._subjectLabel = new St.Label({ style_class: 'polkit-dialog-headline',
-                                            text: _('Authentication Required') });
-
-        messageBox.add(this._subjectLabel,
-                       { y_fill:  false,
-                         y_align: St.Align.START });
-
-        this._descriptionLabel = new St.Label({ style_class: 'polkit-dialog-description',
-                                                text: message });
-        this._descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._descriptionLabel.clutter_text.line_wrap = true;
-
-        messageBox.add(this._descriptionLabel,
-                       { y_fill:  true,
-                         y_align: St.Align.START });
-
-        if (userNames.length > 1) {
-            log('polkitAuthenticationAgent: Received ' + userNames.length +
-                ' identities that can be used for authentication. Only ' +
-                'considering the first one.');
-        }
-
-        let userName = userNames[0];
-
-        this._user = Gdm.UserManager.ref_default().get_user(userName);
-        let userRealName = this._user.get_real_name()
-        this._userLoadedId = this._user.connect('notify::is_loaded',
-                                                Lang.bind(this, this._onUserChanged));
-        this._userChangedId = this._user.connect('changed',
-                                                 Lang.bind(this, this._onUserChanged));
-
-        // Special case 'root'
-        if (userName == 'root')
-            userRealName = _('Administrator');
-
-        // Work around Gdm.UserManager returning an empty string for the real name
-        if (userRealName.length == 0)
-            userRealName = userName;
-
-        let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout',
-                                         vertical: false });
-        messageBox.add(userBox);
-
-        this._userIcon = new St.Icon();
-        this._userIcon.hide();
-        userBox.add(this._userIcon,
-                    { x_fill:  true,
-                      y_fill:  false,
-                      x_align: St.Align.END,
-                      y_align: St.Align.START });
-
-        let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-label',
-                                        text: userRealName }));
-        userBox.add(userLabel,
-                    { x_fill:  true,
-                      y_fill:  false,
-                      x_align: St.Align.END,
-                      y_align: St.Align.MIDDLE });
-
-        this._onUserChanged();
-
-        this._passwordBox = new St.BoxLayout({ vertical: false });
-        messageBox.add(this._passwordBox);
-        this._passwordLabel = new St.Label(({ style_class: 'polkit-dialog-password-label' }));
-        this._passwordBox.add(this._passwordLabel);
-        this._passwordEntry = new St.Entry({ style_class: 'polkit-dialog-password-entry',
-                                             text: _(''),
-                                             can_focus: true});
-        this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivate));
-        this._passwordBox.add(this._passwordEntry,
-                              {expand: true });
-        this._passwordBox.hide();
-
-        this._errorBox = new St.BoxLayout({ style_class: 'polkit-dialog-error-box' });
-        messageBox.add(this._errorBox);
-        let errorIcon = new St.Icon({ icon_name: 'dialog-error',
-                                      icon_size: 24,
-                                      style_class: 'polkit-dialog-error-icon' });
-        this._errorBox.add(errorIcon, { y_align: St.Align.MIDDLE });
-        this._errorMessage = new St.Label({ style_class: 'polkit-dialog-error-label' });
-        this._errorMessage.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._errorMessage.clutter_text.line_wrap = true;
-        this._errorBox.add(this._errorMessage, { expand: true,
-                                                 y_align: St.Align.MIDDLE,
-                                                 y_fill: true });
-        this._errorBox.hide();
-
-        this._infoBox = new St.BoxLayout({ style_class: 'polkit-dialog-info-box' });
-        messageBox.add(this._infoBox);
-        let infoIcon = new St.Icon({ icon_name: 'dialog-information',
-                                     icon_size: 24,
-                                     style_class: 'polkit-dialog-info-icon' });
-        this._infoBox.add(infoIcon, { y_align: St.Align.MIDDLE });
-        this._infoMessage = new St.Label({ style_class: 'polkit-dialog-info-label'});
-        this._infoMessage.clutter_text.line_wrap = true;
-        this._infoBox.add(this._infoMessage, { expand: true,
-                                               y_align: St.Align.MIDDLE,
-                                               y_fill: true });
-        this._infoBox.hide();
-
-        this.setButtons([{ label: _('Cancel'),
-                           action: Lang.bind(this, this.cancel),
-                           key:    Clutter.Escape
-                         },
-                         { label:  _('Authenticate'),
-                           action: Lang.bind(this, this._onAuthenticateButtonPressed)
-                         }]);
-
-        this._doneEmitted = false;
-
-        this._identityToAuth = Polkit.UnixUser.new_for_name(userName);
-        this._cookie = cookie;
-
-        this._session = new PolkitAgent.Session({ identity: this._identityToAuth,
-                                                  cookie: this._cookie });
-        this._session.connect('completed', Lang.bind(this, this._onSessionCompleted));
-        this._session.connect('request', Lang.bind(this, this._onSessionRequest));
-        this._session.connect('show-error', Lang.bind(this, this._onSessionShowError));
-        this._session.connect('show-info', Lang.bind(this, this._onSessionShowInfo));
-        this.connect('opened',
-                     Lang.bind(this, function() {
-                         this._session.initiate();
-                     }));
-    },
-
-    _emitDone: function(keepVisible) {
-        if (!this._doneEmitted) {
-            this._doneEmitted = true;
-            this.emit('done', keepVisible);
-        }
-    },
-
-    _onEntryActivate: function() {
-        let response = this._passwordEntry.get_text();
-        this._session.response(response);
-        // When the user responds, dismiss already shown info and
-        // error texts (if any)
-        this._errorBox.hide();
-        this._infoBox.hide();
-    },
-
-    _onAuthenticateButtonPressed: function() {
-        this._onEntryActivate();
-    },
-
-    _onSessionCompleted: function(session, gainedAuthorization) {
-        this._passwordBox.hide();
-        this._emitDone(!gainedAuthorization);
-    },
-
-    _onSessionRequest: function(session, request, echo_on) {
-        // Cheap localization trick
-        if (request == 'Password:')
-            this._passwordLabel.set_text(_('Password:'));
-        else
-            this._passwordLabel.set_text(request);
-
-        if (echo_on)
-            this._passwordEntry.clutter_text.set_password_char('');
-        else
-            this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
-
-        this._passwordBox.show();
-        this._passwordEntry.set_text('');
-        this._passwordEntry.grab_key_focus();
-    },
-
-    _onSessionShowError: function(session, text) {
-        this._passwordEntry.set_text('');
-        this._errorMessage.set_text(text);
-        this._errorBox.show();
-    },
-
-    _onSessionShowInfo: function(session, text) {
-        this._passwordEntry.set_text('');
-        this._infoMessage.set_text(text);
-        this._infoBox.show();
-    },
-
-    destroySession: function() {
-        if (this._session) {
-            this._session.cancel();
-            this._session = null;
-        }
-    },
-
-    _onUserChanged: function() {
-        if (this._user.is_loaded) {
-            let iconFileName = this._user.get_icon_file();
-            let iconFile = Gio.file_new_for_path(iconFileName);
-            let icon;
-            if (iconFile.query_exists(null)) {
-                icon = new Gio.FileIcon({file: iconFile});
-            } else {
-                icon = new Gio.ThemedIcon({name: 'avatar-default'});
-            }
-            this._userIcon.set_gicon (icon);
-            this._userIcon.show();
-        }
-    },
-
-    cancel: function() {
-        this.close(global.get_current_time());
-        this._emitDone(false);
-    },
-
-};
-Signals.addSignalMethods(AuthenticationDialog.prototype);
-
-function AuthenticationAgent() {
-    this._init();
-}
-
-AuthenticationAgent.prototype = {
-    _init: function() {
-        this._native = new Shell.PolkitAuthenticationAgent();
-        this._native.connect('initiate', Lang.bind(this, this._onInitiate));
-        this._native.connect('cancel', Lang.bind(this, this._onCancel));
-        this._currentDialog = null;
-        this._isCompleting = false;
-    },
-
-    _onInitiate: function(nativeAgent, actionId, message, iconName, cookie, userNames) {
-        this._currentDialog = new AuthenticationDialog(message, cookie, userNames);
-        if (!this._currentDialog.open(global.get_current_time())) {
-            // This can fail if e.g. unable to get input grab
-            //
-            // In an ideal world this wouldn't happen (because the
-            // Shell is in complete control of the session) but that's
-            // just not how things work right now.
-            //
-            // We could add retrying if this turns out to be a problem
-            log('polkitAuthenticationAgent: Failed to show modal dialog');
-            this._currentDialog.destroySession();
-            this._currentDialog = null;
-            this._native.complete()
-        } else {
-            this._currentDialog.connect('done', Lang.bind(this, this._onDialogDone));
-        }
-    },
-
-    _onCancel: function(nativeAgent) {
-        this._completeRequest(false);
-    },
-
-    _onDialogDone: function(dialog, keepVisible) {
-        this._completeRequest(keepVisible);
-    },
-
-    _reallyCompleteRequest: function() {
-        this._currentDialog.close();
-        this._currentDialog.destroySession();
-        this._currentDialog = null;
-        this._isCompleting = false;
-
-        this._native.complete()
-    },
-
-    _completeRequest: function(keepVisible) {
-        if (this._isCompleting)
-            return;
-
-        this._isCompleting = true;
-
-        if (keepVisible) {
-            // Give the user 2 seconds to read 'Authentication Failure' before
-            // dismissing the dialog
-            Mainloop.timeout_add(2000,
-                                 Lang.bind(this,
-                                           function() {
-                                               this._reallyCompleteRequest();
-                                           }));
-        } else {
-            this._reallyCompleteRequest();
-        }
-    }
-}
-
-function init() {
-    let agent = new AuthenticationAgent();
-}
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -18,6 +18,35 @@ const _ = Gettext.gettext;

 const SLIDER_SCROLL_STEP = 0.05; /* Slider scrolling step in % */

+function Switch() {
+    this._init.apply(this, arguments);
+}
+
+Switch.prototype = {
+    _init: function(state) {
+        this.actor = new St.Bin({ style_class: 'toggle-switch' });
+        // 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.
+        this.actor.add_style_class_name(_("toggle-switch-us"));
+        this.setToggleState(state);
+    },
+
+    setToggleState: function(state) {
+        if (state)
+            this.actor.add_style_pseudo_class('checked');
+        else
+            this.actor.remove_style_pseudo_class('checked');
+        this.state = state;
+    },
+
+    toggle: function() {
+        this.setToggleState(!this.state);
+    }
+};
+
 function PopupBaseMenuItem(params) {
    this._init(params);
 }
@@ -26,9 +55,7 @@ PopupBaseMenuItem.prototype = {
    _init: function (params) {
        params = Params.parse (params, { reactive: true,
                                         activate: true,
-                                         hover: true,
-                                         style_class: null
-                                       });
+                                         hover: true });
        this.actor = new Shell.GenericContainer({ style_class: 'popup-menu-item',
                                                  reactive: params.reactive,
                                                  track_hover: params.reactive,
@@ -45,9 +72,6 @@ PopupBaseMenuItem.prototype = {
        this._spacing = 0;
        this.active = false;

-        if (params.style_class)
-            this.actor.add_style_class_name(params.style_class);
-
        if (params.reactive && params.activate) {
            this.actor.connect('button-release-event', Lang.bind(this, this._onButtonReleaseEvent));
            this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
@@ -156,7 +180,8 @@ PopupBaseMenuItem.prototype = {
    _onRepaintDot: function(area) {
        let cr = area.get_context();
        let [width, height] = area.get_surface_size();
-        let color = area.get_theme_node().get_foreground_color();
+        let color = new Clutter.Color();
+        area.get_theme_node().get_foreground_color(color);

        cr.setSourceRGBA (
            color.red / 255,
@@ -313,8 +338,10 @@ PopupSeparatorMenuItem.prototype = {
        let [width, height] = area.get_surface_size();
        let margin = themeNode.get_length('-margin-horizontal');
        let gradientHeight = themeNode.get_length('-gradient-height');
-        let startColor = themeNode.get_color('-gradient-start');
-        let endColor = themeNode.get_color('-gradient-end');
+        let startColor = new Clutter.Color();
+        themeNode.get_color('-gradient-start', startColor);
+        let endColor = new Clutter.Color();
+        themeNode.get_color('-gradient-end', endColor);

        let gradientWidth = (width - margin * 2);
        let gradientOffset = (height - gradientHeight) / 2;
@@ -328,107 +355,6 @@ PopupSeparatorMenuItem.prototype = {
    }
 };

-const PopupAlternatingMenuItemState = {
-    DEFAULT: 0,
-    ALTERNATIVE: 1
-}
-
-function PopupAlternatingMenuItem() {
-    this._init.apply(this, arguments);
-}
-
-PopupAlternatingMenuItem.prototype = {
-    __proto__: PopupBaseMenuItem.prototype,
-
-    _init: function(text, alternateText, params) {
-        PopupBaseMenuItem.prototype._init.call(this, params);
-        this.actor.add_style_class_name('popup-alternating-menu-item');
-
-        this._text = text;
-        this._alternateText = alternateText;
-        this.label = new St.Label({ text: text });
-        this.state = PopupAlternatingMenuItemState.DEFAULT;
-        this.addActor(this.label);
-
-        this.actor.connect('notify::mapped', Lang.bind(this, this._onMapped));
-    },
-
-    _onMapped: function() {
-        if (this.actor.mapped) {
-            this._capturedEventId = global.stage.connect('captured-event',
-                                                         Lang.bind(this, this._onCapturedEvent));
-            this._updateStateFromModifiers();
-        } else {
-            if (this._capturedEventId != 0) {
-                global.stage.disconnect(this._capturedEventId);
-                this._capturedEventId = 0;
-            }
-        }
-    },
-
-    _setState: function(state) {
-        if (this.state != state) {
-            if (state == PopupAlternatingMenuItemState.ALTERNATIVE && !this._canAlternate())
-                return;
-
-            this.state = state;
-            this._updateLabel();
-        }
-    },
-
-    _updateStateFromModifiers: function() {
-        let [x, y, mods] = global.get_pointer();
-        let state;
-
-        if ((mods & Clutter.ModifierType.MOD1_MASK) == 0) {
-            state = PopupAlternatingMenuItemState.DEFAULT;
-        } else {
-            state = PopupAlternatingMenuItemState.ALTERNATIVE;
-        }
-
-        this._setState(state);
-    },
-
-    _onCapturedEvent: function(actor, event) {
-        if (event.type() != Clutter.EventType.KEY_PRESS &&
-            event.type() != Clutter.EventType.KEY_RELEASE)
-            return false;
-
-        let key = event.get_key_symbol();
-
-        if (key == Clutter.KEY_Alt_L || key == Clutter.KEY_Alt_R)
-            this._updateStateFromModifiers();
-
-        return false;
-    },
-
-    _updateLabel: function() {
-        if (this.state == PopupAlternatingMenuItemState.ALTERNATIVE) {
-            this.actor.add_style_pseudo_class('alternate');
-            this.label.set_text(this._alternateText);
-        } else {
-            this.actor.remove_style_pseudo_class('alternate');
-            this.label.set_text(this._text);
-        }
-    },
-
-    _canAlternate: function() {
-        if (this.state == PopupAlternatingMenuItemState.DEFAULT && !this._alternateText)
-            return false;
-        return true;
-    },
-
-    updateText: function(text, alternateText) {
-        this._text = text;
-        this._alternateText = alternateText;
-
-        if (!this._canAlternate())
-            this._setState(PopupAlternatingMenuItemState.DEFAULT);
-
-        this._updateLabel();
-    }
-};
-
 function PopupSliderMenuItem() {
    this._init.apply(this, arguments);
 }
@@ -476,8 +402,10 @@ PopupSliderMenuItem.prototype = {

        let sliderBorderWidth = themeNode.get_length('-slider-border-width');

-        let sliderBorderColor = themeNode.get_color('-slider-border-color');
-        let sliderColor = themeNode.get_color('-slider-background-color');
+        let sliderBorderColor = new Clutter.Color();
+        themeNode.get_color('-slider-border-color', sliderBorderColor);
+        let sliderColor = new Clutter.Color();
+        themeNode.get_color('-slider-background-color', sliderColor);

        cr.setSourceRGBA (
            sliderColor.red / 255,
@@ -497,7 +425,8 @@ PopupSliderMenuItem.prototype = {
        let handleY = height / 2;
        let handleX = handleRadius + (width - 2 * handleRadius) * this._value;

-        let color = themeNode.get_foreground_color();
+        let color = new Clutter.Color();
+        themeNode.get_foreground_color(color);
        cr.setSourceRGBA (
            color.red / 255,
            color.green / 255,
@@ -554,7 +483,7 @@ PopupSliderMenuItem.prototype = {
    _motionEvent: function(actor, event) {
        let absX, absY;
        [absX, absY] = event.get_coords();
-        this._moveHandle(absX, absY);
+        this._moveHandle(absX, absY)
        return true;
    },

@@ -595,37 +524,8 @@ PopupSliderMenuItem.prototype = {
        }
        return false;
    }
-};
-
-function Switch() {
-    this._init.apply(this, arguments);
 }

-Switch.prototype = {
-    _init: function(state) {
-        this.actor = new St.Bin({ style_class: 'toggle-switch' });
-        // 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.
-        this.actor.add_style_class_name(_("toggle-switch-us"));
-        this.setToggleState(state);
-    },
-
-    setToggleState: function(state) {
-        if (state)
-            this.actor.add_style_pseudo_class('checked');
-        else
-            this.actor.remove_style_pseudo_class('checked');
-        this.state = state;
-    },
-
-    toggle: function() {
-        this.setToggleState(!this.state);
-    }
-};
-
 function PopupSwitchMenuItem() {
    this._init.apply(this, arguments);
 }
@@ -633,8 +533,8 @@ function PopupSwitchMenuItem() {
 PopupSwitchMenuItem.prototype = {
    __proto__: PopupBaseMenuItem.prototype,

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

        this.label = new St.Label({ text: text });
        this._switch = new Switch(active);
@@ -659,17 +559,18 @@ PopupSwitchMenuItem.prototype = {
    setToggleState: function(state) {
        this._switch.setToggleState(state);
    }
-};
+}

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

 PopupImageMenuItem.prototype = {
    __proto__: PopupBaseMenuItem.prototype,

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

        this.label = new St.Label({ text: text });
        this.addActor(this.label);
@@ -714,12 +615,8 @@ PopupMenuBase.prototype = {
    _init: function(sourceActor, styleClass) {
        this.sourceActor = sourceActor;

-        if (styleClass !== undefined) {
-            this.box = new St.BoxLayout({ style_class: styleClass,
-                                          vertical: true });
-        } else {
-            this.box = new St.BoxLayout({ vertical: true });
-        }
+        this.box = new St.BoxLayout({ style_class: styleClass,
+                                      vertical: true });

        this.isOpen = false;
        this._activeMenuItem = null;
@@ -733,28 +630,38 @@ PopupMenuBase.prototype = {
        }));
    },

-    /**
-     * _connectSubMenuSignals:
-     * @object: a menu item, or a menu section
-     * @menu: a sub menu, or a menu section
-     *
-     * Connects to signals on @menu that are necessary for
-     * operating the submenu, and stores the ids on @object.
-     */
-    _connectSubMenuSignals: function(object, menu) {
-        object._subMenuActivateId = menu.connect('activate', Lang.bind(this, function() {
-            this.emit('activate');
-            this.close(true);
-        }));
-        object._subMenuActiveChangeId = 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);
-        }));
-    },
-
-    _connectItemSignals: function(menuItem) {
+    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);
+            });
+        }
        menuItem._activeChangeId = menuItem.connect('active-changed', Lang.bind(this, function (menuItem, active) {
            if (active && this._activeMenuItem != menuItem) {
                if (this._activeMenuItem)
@@ -783,41 +690,6 @@ 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 PopupMenuSection) {
-            this._connectSubMenuSignals(menuItem, menuItem);
-            menuItem.connect('destroy', Lang.bind(this, function() {
-                menuItem.disconnect(menuItem._subMenuActivateId);
-                menuItem.disconnect(menuItem._subMenuActiveChangeId);
-            }));
-        } else if (menuItem instanceof PopupSubMenuMenuItem) {
-            if (before_item == null)
-                this.box.add(menuItem.menu.actor);
-            else
-                this.box.insert_before(menuItem.menu.actor, before_item);
-            this._connectSubMenuSignals(menuItem, menuItem.menu);
-            this._connectItemSignals(menuItem);
-            menuItem._closingId = this.connect('open-state-changed', function(self, open) {
-                if (!open)
-                    menuItem.menu.close(false);
-            });
-        } else if (menuItem instanceof PopupBaseMenuItem)
-            this._connectItemSignals(menuItem);
-        else
-            throw TypeError("Invalid argument to PopupMenuBase.addMenuItem()");
-    },
-
    getColumnWidths: function() {
        let columnWidths = [];
        let items = this.box.get_children();
@@ -845,16 +717,12 @@ PopupMenuBase.prototype = {
        this.box.add(actor);
    },

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

    removeAll: function() {
-        let children = this._getMenuItems();
+        let children = this.getMenuItems();
        for (let i = 0; i < children.length; i++) {
            let item = children[i];
            item.destroy();
@@ -1065,34 +933,6 @@ PopupSubMenu.prototype = {
    }
 };

-/**
- * PopupMenuSection:
- *
- * A section of a PopupMenu which is handled like a submenu
- * (you can add and remove items, you can destroy it, you
- * can add it to another menu), but is completely transparent
- * to the user
- */
-function PopupMenuSection() {
-    this._init.apply(this, arguments);
-}
-
-PopupMenuSection.prototype = {
-    __proto__: PopupMenuBase.prototype,
-
-    _init: function() {
-        PopupMenuBase.prototype._init.call(this);
-
-        this.actor = this.box;
-        this.actor._delegate = this;
-        this.isOpen = true;
-    },
-
-    // deliberately ignore any attempt to open() or close()
-    open: function(animate) { },
-    close: function() { },
-}
-
 function PopupSubMenuMenuItem() {
    this._init.apply(this, arguments);
 }
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -16,11 +16,11 @@ const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
 const Util = imports.misc.util;
-const History = imports.misc.history;

 const MAX_FILE_DELETED_BEFORE_INVALID = 10;

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

 const DIALOG_GROW_TIME = 0.1;

@@ -172,6 +172,14 @@ __proto__: ModalDialog.ModalDialog.prototype,
        }));
        this._enableInternalCommands = global.settings.get_boolean('development-tools');

+        this._history = global.settings.get_strv(HISTORY_KEY);
+        this._historyIndex = -1;
+
+        global.settings.connect('changed::' + HISTORY_KEY, Lang.bind(this, function() {
+            this._history = global.settings.get_strv(HISTORY_KEY);
+            this._historyIndex = this._history.length;
+        }));
+
        this._internalCommands = { 'lg':
                                   Lang.bind(this, function() {
                                       Main.createLookingGlass().open();
@@ -233,20 +241,14 @@ __proto__: ModalDialog.ModalDialog.prototype,
        this._pathCompleter = new Gio.FilenameCompleter();
        this._commandCompleter = new CommandCompleter();
        this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
-
-        this._history = new History.HistoryManager(HISTORY_KEY);
-        this._history.connect('changed', Lang.bind(this, function(history, text) {
-            this._entryText.set_text(text);
-        }));
-
        this._entryText.connect('key-press-event', Lang.bind(this, function(o, e) {
            let symbol = e.get_key_symbol();
            if (symbol == Clutter.Down) {
-                this._history.nextItem(o.get_text());
+                this._setCommandFromHistory(this._historyIndex++);
                return true;
            }
            if (symbol == Clutter.Up) {
-                this._history.prevItem(o.get_text());
+                this._setCommandFromHistory(this._historyIndex--);
                return true;
            }
            if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
@@ -301,10 +303,22 @@ __proto__: ModalDialog.ModalDialog.prototype,
        }
    },

+    _saveHistory : function() {
+        if (this._history.length > HISTORY_LIMIT) {
+            this._history.splice(0, this._history.length - HISTORY_LIMIT);
+        }
+        global.settings.set_strv(HISTORY_KEY, this._history);
+    },
+
    _run : function(input, inTerminal) {
        let command = input;

-        this._history.addItem(input);
+        if (this._history.length == 0 ||
+            this._history[this._history.length - 1] != input) {
+            this._history.push(input);
+            this._saveHistory();
+        }
+
        this._commandError = false;
        let f;
        if (this._enableInternalCommands)
@@ -358,8 +372,24 @@ __proto__: ModalDialog.ModalDialog.prototype,
        }
    },

+    _setCommandFromHistory: function(lastI) {
+        if (this._historyIndex < 0)
+            this._historyIndex = 0;
+        if (this._historyIndex > this._history.length)
+            this._historyIndex = this._history.length;
+
+        let text = this._entryText.get_text();
+        if (text) {
+            this._history[lastI] = text;
+        }
+        if (this._history[this._historyIndex]) {
+            this._entryText.set_text(this._history[this._historyIndex]);
+        } else
+            this._entryText.set_text('');
+    },
+
    open: function() {
-        this._history.lastItem();
+        this._historyIndex = this._history.length;
        this._errorBox.hide();
        this._entryText.set_text('');
        this._commandError = false;
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -267,7 +267,7 @@ OpenSearchSystem.prototype = {
        return lang != null;
    },

-    activateResult: function(id, params) {
+    activateResult: function(id) {
        let searchTerms = this._terms.join(' ');

        let url = this._providers[id].url.replace('{searchTerms}', encodeURIComponent(searchTerms));
@@ -355,7 +355,7 @@ SearchSystem.prototype = {
    updateSearch: function(searchString) {
        searchString = searchString.replace(/^\s+/g, '').replace(/\s+$/g, '');
        if (searchString == '')
-            return [];
+            return null;

        let terms = searchString.split(/\s+/);
        let isSubSearch = terms.length == this._previousTerms.length;
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -24,10 +24,10 @@ SearchResult.prototype = {
    _init: function(provider, metaInfo, terms) {
        this.provider = provider;
        this.metaInfo = metaInfo;
-        this.actor = new St.Button({ style_class: 'search-result',
-                                     reactive: true,
-                                     x_align: St.Align.START,
-                                     y_fill: true });
+        this.actor = new St.Clickable({ style_class: 'search-result',
+                                        reactive: true,
+                                        x_align: St.Align.START,
+                                        y_fill: true });
        this.actor._delegate = this;

        let content = provider.createResultActor(metaInfo, terms);
@@ -69,7 +69,7 @@ SearchResult.prototype = {
        Main.overview.toggle();
    },

-    _onResultClicked: function(actor) {
+    _onResultClicked: function(actor, event) {
        this.activate();
    },

@@ -81,11 +81,11 @@ SearchResult.prototype = {
        return new Clutter.Clone({ source: this.metaInfo['icon'] });
    },

-    shellWorkspaceLaunch: function(params) {
+    shellWorkspaceLaunch: function() {
        if (this.provider.dragActivateResult)
-            this.provider.dragActivateResult(this.metaInfo.id, params);
+            this.provider.dragActivateResult(this.metaInfo.id);
        else
-            this.provider.activateResult(this.metaInfo.id, params);
+            this.provider.activateResult(this.metaInfo.id);
    }
 };

@@ -221,23 +221,23 @@ SearchResults.prototype = {
    },

    _createOpenSearchProviderButton: function(provider) {
-        let button = new St.Button({ style_class: 'dash-search-button',
-                                     reactive: true,
-                                     x_fill: true,
-                                     y_align: St.Align.MIDDLE });
+        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 });
-        button.connect('clicked', Lang.bind(this, function() {
+        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);
-        button.set_child(bin);
-        provider.actor = button;
+        clickable.set_child(bin);
+        provider.actor = clickable;

-        this._searchProvidersBox.add(button);
+        this._searchProvidersBox.add(clickable);
    },

    createProviderMeta: function(provider) {
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -23,7 +23,9 @@ const KEY_BOUNCE_KEYS_ENABLED = 'bouncekeys-enable';
 const KEY_SLOW_KEYS_ENABLED   = 'slowkeys-enable';
 const KEY_MOUSE_KEYS_ENABLED  = 'mousekeys-enable';

-const APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
+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 XSETTINGS_SCHEMA = 'org.gnome.settings-daemon.plugins.xsettings';
 const KEY_DPI = 'dpi';
@@ -78,19 +80,16 @@ ATIndicator.prototype = {
        let highContrast = this._buildHCItem();
        this.menu.addMenuItem(highContrast);

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

        let textZoom = this._buildFontItem();
        this.menu.addMenuItem(textZoom);

-        let screenReader = this._buildItem(_("Screen Reader"), APPLICATIONS_SCHEMA,
-                                                               'screen-reader-enabled');
+        let screenReader = this._buildItem(_("Screen Reader"), AT_SCREEN_READER_SCHEMA, 'startup');
        this.menu.addMenuItem(screenReader);

-        let screenKeyboard = this._buildItem(_("Screen Keyboard"), APPLICATIONS_SCHEMA,
-                                                                   'screen-keyboard-enabled');
+        let screenKeyboard = this._buildItem(_("Screen Keyboard"), AT_SCREEN_KEYBOARD_SCHEMA, 'startup');
        this.menu.addMenuItem(screenKeyboard);

        let visualBell = this._buildItemGConf(_("Visual Alerts"), client, KEY_VISUAL_BELL);
@@ -168,12 +167,9 @@ ATIndicator.prototype = {
                if (enabled) {
                    settings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
                    settings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
-                } else if(!hasHC) {
+                } else {
                    settings.set_string(KEY_GTK_THEME, gtkTheme);
                    settings.set_string(KEY_ICON_THEME, iconTheme);
-                } else {
-                    settings.reset(KEY_GTK_THEME);
-                    settings.reset(KEY_ICON_THEME);
                }
            });
        settings.connect('changed::' + KEY_GTK_THEME, function() {
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -334,7 +334,7 @@ Source.prototype = {
    __proto__: MessageTray.Source.prototype,

    _init: function() {
-        MessageTray.Source.prototype._init.call(this, _("Bluetooth"));
+        MessageTray.Source.prototype._init.call(this, _("Bluetooth Agent"));

        this._setSummaryIcon(this.createNotificationIcon());
    },
@@ -368,7 +368,7 @@ AuthNotification.prototype = {
    _init: function(source, applet, device_path, name, long_name, uuid) {
        MessageTray.Notification.prototype._init.call(this,
                                                      source,
-                                                      _("Bluetooth"),
+                                                      _("Bluetooth Agent"),
                                                      _("Authorization request from %s").format(name),
                                                      { customContent: true });
        this.setResident(true);
@@ -408,7 +408,7 @@ ConfirmNotification.prototype = {
    _init: function(source, applet, device_path, name, long_name, pin) {
        MessageTray.Notification.prototype._init.call(this,
                                                      source,
-                                                      _("Bluetooth"),
+                                                      _("Bluetooth Agent"),
                                                      _("Pairing confirmation for %s").format(name),
                                                      { customContent: true });
        this.setResident(true);
@@ -441,7 +441,7 @@ PinNotification.prototype = {
    _init: function(source, applet, device_path, name, long_name, numeric) {
        MessageTray.Notification.prototype._init.call(this,
                                                      source,
-                                                      _("Bluetooth"),
+                                                      _("Bluetooth Agent"),
                                                      _("Pairing request for %s").format(name),
                                                      { customContent: true });
        this.setResident(true);
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -11,11 +11,12 @@ const St = imports.gi.St;

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

 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);
 }
@@ -61,6 +62,10 @@ XKBIndicator.prototype = {
        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));
@@ -70,15 +75,14 @@ XKBIndicator.prototype = {
        this._sync_config();

        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addAction(_("Show Keyboard Layout..."), Lang.bind(this, function() {
-            Util.spawn(['gkbd-keyboard-display', '-g', this._config.get_current_group() + 1]);
-        }));
        this.menu.addAction(_("Localization Settings"), function() {
-            Util.spawn(['gnome-control-center', 'region']);
+            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);
@@ -87,7 +91,7 @@ XKBIndicator.prototype = {
        }

        let groups = this._config.get_group_names();
-        if (groups.length > 1) {
+        if (groups.length > 1 && !this._disableIndicator) {
            this.actor.show();
        } else {
            this.menu.close();
@@ -200,3 +204,52 @@ XKBIndicator.prototype = {
            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/volume.js
+++ b/js/ui/status/volume.js
@@ -19,8 +19,6 @@ const _ = Gettext.gettext;
 const VOLUME_MAX = 65536.0; /* PA_VOLUME_NORM */
 const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */

-const VOLUME_NOTIFY_ID = 1;
-
 function Indicator() {
    this._init.apply(this, arguments);
 }
@@ -70,21 +68,13 @@ Indicator.prototype = {
        this._control.open();
    },

-    _getMaxVolume: function(property) {
-        if (this[property].get_can_decibel())
-            return (VOLUME_MAX * 1.5);
-        else
-            return VOLUME_MAX;
-    },
-
    _onScrollEvent: function(actor, event) {
        let direction = event.get_scroll_direction();
        let currentVolume = this._output.volume;
-        let maxVolume = this._getMaxVolume('_output');

        if (direction == Clutter.ScrollDirection.DOWN) {
            let prev_muted = this._output.is_muted;
-            this._output.volume = Math.max(0, currentVolume - maxVolume * VOLUME_ADJUSTMENT_STEP);
+            this._output.volume = Math.max(0, currentVolume - VOLUME_MAX * VOLUME_ADJUSTMENT_STEP);
            if (this._output.volume < 1) {
                this._output.volume = 0;
                if (!prev_muted)
@@ -93,12 +83,10 @@ Indicator.prototype = {
            this._output.push_volume();
        }
        else if (direction == Clutter.ScrollDirection.UP) {
-            this._output.volume = Math.min(maxVolume, currentVolume + maxVolume * VOLUME_ADJUSTMENT_STEP);
+            this._output.volume = Math.min(VOLUME_MAX, currentVolume + VOLUME_MAX * VOLUME_ADJUSTMENT_STEP);
            this._output.change_is_muted(false);
            this._output.push_volume();
        }
-
-        this._notifyVolumeChange();
    },

    _onControlReady: function() {
@@ -173,14 +161,13 @@ Indicator.prototype = {
    },

    _volumeToIcon: function(volume) {
-        let maxVolume = this._getMaxVolume('_output');
        if (volume <= 0) {
            return 'audio-volume-muted';
        } else {
-            let n = Math.floor(3 * volume / maxVolume) + 1;
-            if (n < 2)
+            let v = volume / VOLUME_MAX;
+            if (v < 0.33)
                return 'audio-volume-low';
-            if (n >= 3)
+            if (v > 0.8)
                return 'audio-volume-high';
            return 'audio-volume-medium';
        }
@@ -191,7 +178,7 @@ Indicator.prototype = {
            log ('Volume slider changed for %s, but %s does not exist'.format(property, property));
            return;
        }
-        let volume = value * this._getMaxVolume(property);
+        let volume = value * VOLUME_MAX;
        let prev_muted = this[property].is_muted;
        if (volume < 1) {
            this[property].volume = 0;
@@ -206,15 +193,13 @@ Indicator.prototype = {
    },

    _notifyVolumeChange: function() {
-        global.cancel_theme_sound(VOLUME_NOTIFY_ID);
-        global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change');
+        global.play_theme_sound('audio-volume-change');
    },

    _mutedChanged: function(object, param_spec, property) {
        let muted = this[property].is_muted;
        let slider = this[property+'Slider'];
-        let maxVolume = this._getMaxVolume(property);
-        slider.setValue(muted ? 0 : (this[property].volume / maxVolume));
+        slider.setValue(muted ? 0 : (this[property].volume / VOLUME_MAX));
        if (property == '_output') {
            if (muted)
                this.setIcon('audio-volume-muted');
@@ -224,8 +209,7 @@ Indicator.prototype = {
    },

    _volumeChanged: function(object, param_spec, property) {
-        let maxVolume = this._getMaxVolume(property);
-        this[property+'Slider'].setValue(this[property].volume / maxVolume);
+        this[property+'Slider'].setValue(this[property].volume / VOLUME_MAX);
        if (property == '_output' && !this._output.is_muted)
            this.setIcon(this._volumeToIcon(this._output.volume));
    }
--- a/js/ui/statusIconDispatcher.js
+++ b/js/ui/statusIconDispatcher.js
@@ -31,6 +31,7 @@ StatusIconDispatcher.prototype = {
        this._traymanager = new Shell.TrayManager();
        this._traymanager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
        this._traymanager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
+        this._traymanager.manage_stage(global.stage);

        // Yet-another-Ubuntu-workaround - we have to kill their
        // app-indicators, so that applications fall back to normal
@@ -39,10 +40,6 @@ StatusIconDispatcher.prototype = {
        Util.killall('indicator-application-service');
    },

-    start: function(themeWidget) {
-        this._traymanager.manage_stage(global.stage, themeWidget);
-    },
-
    _onTrayIconAdded: function(o, icon) {
        let wmClass = (icon.wm_class || 'unknown').toLowerCase();
        let role = STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass];
--- a/js/ui/statusMenu.js
+++ b/js/ui/statusMenu.js
@@ -5,7 +5,6 @@ const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const UPowerGlib = imports.gi.UPowerGlib;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

@@ -28,7 +27,7 @@ StatusMenuButton.prototype = {
    __proto__: PanelMenu.Button.prototype,

    _init: function() {
-        PanelMenu.Button.prototype._init.call(this, 0.0);
+        PanelMenu.Button.prototype._init.call(this, St.Align.START);
        let box = new St.BoxLayout({ name: 'panelStatusMenu' });
        this.actor.set_child(box);

@@ -39,8 +38,6 @@ StatusMenuButton.prototype = {
        this._presence = new GnomeSession.Presence();
        this._presenceItems = {};

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

        this._iconBox = new St.Bin();
@@ -64,8 +61,6 @@ StatusMenuButton.prototype = {
        this._gdm.connect('notify::is-loaded', Lang.bind(this, this._updateSwitchUser));
        this._gdm.connect('user-added', Lang.bind(this, this._updateSwitchUser));
        this._gdm.connect('user-removed', Lang.bind(this, this._updateSwitchUser));
-
-        this._upClient.connect('notify::can-suspend', Lang.bind(this, this._updateSuspendOrPowerOff));
    },

    _onDestroy: function() {
@@ -87,21 +82,6 @@ StatusMenuButton.prototype = {
            this._loginScreenItem.actor.hide();
    },

-    _updateSuspendOrPowerOff: function() {
-        this._haveSuspend = this._upClient.get_can_suspend();
-
-        if (!this._suspendOrPowerOffItem)
-            return;
-
-        // If we can't suspend show Power Off... instead
-        // and disable the alt key
-        if (!this._haveSuspend) {
-            this._suspendOrPowerOffItem.updateText(_("Power Off..."), null);
-        } else {
-            this._suspendOrPowerOffItem.updateText(_("Suspend"), ("Power Off..."));
-        }
-    },
-
    _updatePresenceIcon: function(presence, status) {
        if (status == GnomeSession.PresenceStatus.AVAILABLE)
            this._iconBox.child = this._availableIcon;
@@ -119,12 +99,12 @@ StatusMenuButton.prototype = {
    _createSubMenu: function() {
        let item;

-        item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available');
+        item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available', true);
        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.AVAILABLE));
        this.menu.addMenuItem(item);
        this._presenceItems[GnomeSession.PresenceStatus.AVAILABLE] = item;

-        item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy');
+        item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy', true);
        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.BUSY));
        this.menu.addMenuItem(item);
        this._presenceItems[GnomeSession.PresenceStatus.BUSY] = item;
@@ -159,12 +139,13 @@ StatusMenuButton.prototype = {
        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);

-        item = new PopupMenu.PopupAlternatingMenuItem(_("Suspend"),
-                                                      _("Power Off..."));
+        item = new PopupMenu.PopupMenuItem(_("Suspend..."));
+        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupMenuItem(_("Shut Down..."));
+        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
        this.menu.addMenuItem(item);
-        this._suspendOrPowerOffItem = item;
-        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
-        this._updateSuspendOrPowerOff();
    },

    _setPresenceStatus: function(item, event, status) {
@@ -197,14 +178,8 @@ StatusMenuButton.prototype = {
        Util.spawn(['gnome-session-save', '--logout-dialog']);
    },

-    _onSuspendOrPowerOffActivate: function() {
+    _onShutDownActivate: function() {
        Main.overview.hide();
-
-        if (this._haveSuspend &&
-            this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
-            this._upClient.suspend_sync(null);
-        } else {
-            Util.spawn(['gnome-session-save', '--shutdown-dialog']);
-        }
+        Util.spawn(['gnome-session-save', '--shutdown-dialog']);
    }
 };
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -4,16 +4,17 @@ const DBus = imports.dbus;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
-const Tp = imports.gi.TelepathyGLib;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
+const Telepathy = imports.misc.telepathy;

+let contactManager;
+let channelDispatcher;

 // See Notification.appendMessage
 const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute
@@ -21,15 +22,33 @@ const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes
 const SCROLLBACK_RECENT_LENGTH = 20;
 const SCROLLBACK_IDLE_LENGTH = 5;

+// A 'Qualified_Property_Value_Map' that represents a single-user
+// text-based chat.
+let singleUserTextChannel = {};
+singleUserTextChannel[Telepathy.CHANNEL_NAME + '.ChannelType'] = Telepathy.CHANNEL_TEXT_NAME;
+singleUserTextChannel[Telepathy.CHANNEL_NAME + '.TargetHandleType'] = Telepathy.HandleType.CONTACT;
+
+// Some protocols only support 'multi-user' chats, and single-user
+// chats are just treated as multi-user chats with only one other
+// participant. Telepathy uses HandleType.NONE for all chats in these
+// protocols; there's no good way for us to tell if the channel is
+// single- or multi-user.
+let oneOrMoreUserTextChannel = {};
+oneOrMoreUserTextChannel[Telepathy.CHANNEL_NAME + '.ChannelType'] = Telepathy.CHANNEL_TEXT_NAME;
+oneOrMoreUserTextChannel[Telepathy.CHANNEL_NAME + '.TargetHandleType'] = Telepathy.HandleType.NONE;
+
+// The (non-chat) channel indicating the users whose presence
+// information we subscribe to
+let subscribedContactsChannel = {};
+subscribedContactsChannel[Telepathy.CHANNEL_NAME + '.ChannelType'] = Telepathy.CHANNEL_CONTACT_LIST_NAME;
+subscribedContactsChannel[Telepathy.CHANNEL_NAME + '.TargetHandleType'] = Telepathy.HandleType.LIST;
+subscribedContactsChannel[Telepathy.CHANNEL_NAME + '.TargetID'] = 'subscribe';
+
 const NotificationDirection = {
    SENT: 'chat-sent',
    RECEIVED: 'chat-received'
 };

-let contactFeatures = [Tp.ContactFeature.ALIAS,
-                        Tp.ContactFeature.AVATAR_DATA,
-                        Tp.ContactFeature.PRESENCE];
-
 // This is GNOME Shell's implementation of the Telepathy 'Client'
 // interface. Specifically, the shell is a Telepathy 'Observer', which
 // lets us see messages even if they belong to another app (eg,
@@ -41,179 +60,487 @@ function Client() {

 Client.prototype = {
    _init : function() {
+        let name = Telepathy.CLIENT_NAME + '.GnomeShell';
+        DBus.session.exportObject(Telepathy.nameToPath(name), this);
+        DBus.session.acquire_name(name, DBus.SINGLE_INSTANCE,
+                                  function (name) { /* FIXME: acquired */ },
+                                  function (name) { /* FIXME: lost */ });
+
        this._accounts = {};
-        // channel path -> Source
        this._sources = {};

-        // Set up a SimpleObserver, which will call _observeChannels whenever a
-        // channel matching its filters is detected.
-        // The second argument, recover, means _observeChannels will be run
-        // for any existing channel as well.
-        let dbus = Tp.DBusDaemon.dup();
-        this._observer = Tp.SimpleObserver.new(dbus, true, 'GnomeShell', true,
-                                              Lang.bind(this, this._observeChannels));
+        contactManager = new ContactManager();
+        contactManager.connect('presence-changed', Lang.bind(this, this._presenceChanged));

-        // We only care about single-user text-based chats
-        let props = {};
-        props[Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE] = Tp.IFACE_CHANNEL_TYPE_TEXT;
-        props[Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE] = Tp.HandleType.CONTACT;
-        this._observer.add_observer_filter(props);
+        channelDispatcher = new Telepathy.ChannelDispatcher(DBus.session,
+                                                            Telepathy.CHANNEL_DISPATCHER_NAME,
+                                                            Telepathy.nameToPath(Telepathy.CHANNEL_DISPATCHER_NAME));

-        try {
-            this._observer.register();
-        } catch (e) {
-            throw new Error('Couldn\'t register SimpleObserver. Error: \n' + e);
-        }
+        // Acquire existing connections. (Needed to make things work
+        // through a restart.)
+        let accountManager = new Telepathy.AccountManager(DBus.session,
+                                                          Telepathy.ACCOUNT_MANAGER_NAME,
+                                                          Telepathy.nameToPath(Telepathy.ACCOUNT_MANAGER_NAME));
+        accountManager.GetRemote('ValidAccounts', Lang.bind(this,
+            function (accounts, err) {
+                if (!accounts)
+                    return;
+
+                for (let i = 0; i < accounts.length; i++)
+                    this._gotAccount(accounts[i]);
+            }));
+        accountManager.connect('AccountValidityChanged', Lang.bind(this, this._accountValidityChanged));
    },

-    _observeChannels: function(observer, account, conn, channels,
-                               dispatchOp, requests, context) {
-        let connPath = conn.get_object_path();
-        let len = channels.length;
-        for (let i = 0; i < len; i++) {
-            let channel = channels[i];
-            let [targetHandle, targetHandleType] = channel.get_handle();
+    _accountValidityChanged: function(accountManager, accountPath, valid) {
+        if (!valid) {
+            delete this._accounts[accountPath];
+            // We don't need to clean up connections, sources, etc; they'll
+            // get Closed and cleaned up independently.
+        } else
+            this._gotAccount(accountPath);
+    },

-            /* Only observe contact text channels */
-            if ((!(channel instanceof Tp.TextChannel)) ||
-               targetHandleType != Tp.HandleType.CONTACT)
-               continue;
+    _gotAccount: function(accountPath) {
+        let account = new Telepathy.Account(DBus.session,
+                                            Telepathy.ACCOUNT_MANAGER_NAME,
+                                            accountPath);
+        this._accounts[accountPath] = account;
+        account.GetRemote('Connection', Lang.bind(this,
+            function (connPath, err) {
+                if (!connPath || connPath == '/')
+                    return;

-            /* Request a TpContact */
-            Shell.get_tp_contacts(conn, 1, [targetHandle],
-                    contactFeatures.length, contactFeatures,
-                    Lang.bind(this,  function (connection, contacts, failed) {
-                        if (contacts.length < 1)
+                let connReq = new Telepathy.ConnectionRequests(DBus.session,
+                                                               Telepathy.pathToName(connPath),
+                                                               connPath);
+                connReq.GetRemote('Channels', Lang.bind(this,
+                    function(channels, err) {
+                        if (!channels)
                            return;

-                        /* We got the TpContact */
-                        this._createSource(account, conn, channel, contacts[0]);
-                    }), null);
-        }
+                        this._addChannels(accountPath, connPath, channels);
+                    }));

-        // Allow dbus method to return
-        context.accept();
+                contactManager.addConnection(connPath);
+            }));
    },

-    _createSource: function(account, conn, channel, contact) {
-        if (this._sources[channel.get_object_path()])
+    get Interfaces() {
+        return [ Telepathy.CLIENT_OBSERVER_NAME ];
+    },
+
+    get ObserverChannelFilter() {
+        return [ singleUserTextChannel, oneOrMoreUserTextChannel ];
+    },
+
+    ObserveChannels: function(accountPath, connPath, channels,
+                              dispatchOperation, requestsSatisfied,
+                              observerInfo) {
+        this._addChannels(accountPath, connPath, channels);
+    },
+
+    _addChannels: function(accountPath, connPath, channelDetailsList) {
+        for (let i = 0; i < channelDetailsList.length; i++) {
+            let [channelPath, props] = channelDetailsList[i];
+
+            // If this is being called from the startup code then it
+            // won't have passed through our filters, so we need to
+            // check the channel/targetHandle type ourselves.
+
+            let channelType = props[Telepathy.CHANNEL_NAME + '.ChannelType'];
+            if (channelType != Telepathy.CHANNEL_TEXT_NAME)
+                continue;
+
+            let targetHandleType = props[Telepathy.CHANNEL_NAME + '.TargetHandleType'];
+            if (targetHandleType != Telepathy.HandleType.CONTACT &&
+                targetHandleType != Telepathy.HandleType.NONE)
+                continue;
+
+            let targetHandle = props[Telepathy.CHANNEL_NAME + '.TargetHandle'];
+            let targetId = props[Telepathy.CHANNEL_NAME + '.TargetID'];
+
+            if (this._sources[connPath + ':' + targetHandle])
+                continue;
+
+            let source = new Source(accountPath, connPath, channelPath,
+                                    targetHandle, targetHandleType, targetId);
+            this._sources[connPath + ':' + targetHandle] = source;
+            source.connect('destroy', Lang.bind(this,
+                function() {
+                    delete this._sources[connPath + ':' + targetHandle];
+                }));
+        }
+    },
+
+    _presenceChanged: function(contactManager, connPath, handle,
+                               type, message) {
+        let source = this._sources[connPath + ':' + handle];
+        if (!source)
            return;

-        let source = new Source(account, conn, channel, contact);
-
-        this._sources[channel.get_object_path()] = source;
-        source.connect('destroy', Lang.bind(this,
-                       function() {
-                           delete this._sources[channel.get_object_path()];
-                       }));
+        source.setPresence(type, message);
    }
 };
+DBus.conformExport(Client.prototype, Telepathy.ClientIface);
+DBus.conformExport(Client.prototype, Telepathy.ClientObserverIface);

-function Source(account, conn, channel, contact) {
-    this._init(account, conn, channel, contact);
+
+function ContactManager() {
+    this._init();
+};
+
+ContactManager.prototype = {
+    _init: function() {
+        this._connections = {};
+        // Note that if we changed this to '/telepathy/avatars' then
+        // we would share cache files with empathy. But since this is
+        // not documented/guaranteed, it seems a little sketchy
+        this._cacheDir = GLib.get_user_cache_dir() + '/gnome-shell/avatars';
+    },
+
+    addConnection: function(connPath) {
+        let info = this._connections[connPath];
+        if (info)
+            return info;
+
+        info = {};
+
+        // Figure out the cache subdirectory for this connection by
+        // parsing the connection manager name (eg, 'gabble') and
+        // protocol name (eg, 'jabber') from the Connection's path.
+        // Telepathy requires the D-Bus path for a connection to have
+        // a specific form, and explicitly says that clients are
+        // allowed to parse it.
+        let match = connPath.match(/\/org\/freedesktop\/Telepathy\/Connection\/([^\/]*\/[^\/]*)\/.*/);
+        if (!match)
+            throw new Error('Could not parse connection path ' + connPath);
+
+        info.cacheDir = this._cacheDir + '/' + match[1];
+        GLib.mkdir_with_parents(info.cacheDir, 0x1c0); // 0x1c0 = octal 0700
+
+        // info.names[handle] is @handle's real name
+        // info.tokens[handle] is the token for @handle's avatar
+        info.names = {};
+        info.tokens = {};
+
+        // info.icons[handle] is an array of the icon actors currently
+        // being displayed for @handle. These will be updated
+        // automatically if @handle's avatar changes.
+        info.icons = {};
+
+        let connName = Telepathy.pathToName(connPath);
+
+        info.connectionAvatars = new Telepathy.ConnectionAvatars(DBus.session, connName, connPath);
+        info.updatedId = info.connectionAvatars.connect(
+            'AvatarUpdated', Lang.bind(this, this._avatarUpdated));
+        info.retrievedId = info.connectionAvatars.connect(
+            'AvatarRetrieved', Lang.bind(this, this._avatarRetrieved));
+
+        info.connectionContacts = new Telepathy.ConnectionContacts(DBus.session, connName, connPath);
+
+        info.connectionPresence = new Telepathy.ConnectionSimplePresence(DBus.session, connName, connPath);
+        info.presenceChangedId = info.connectionPresence.connect(
+            'PresencesChanged', Lang.bind(this, this._presencesChanged));
+
+        let conn = new Telepathy.Connection(DBus.session, connName, connPath);
+        info.statusChangedId = conn.connect('StatusChanged', Lang.bind(this,
+            function (status, reason) {
+                if (status == Telepathy.ConnectionStatus.DISCONNECTED)
+                    this._removeConnection(conn);
+            }));
+
+        let connReq = new Telepathy.ConnectionRequests(DBus.session,
+                                                       connName, connPath);
+        connReq.EnsureChannelRemote(subscribedContactsChannel, Lang.bind(this,
+            function (result, err) {
+                if (!result)
+                    return;
+
+                let [mine, channelPath, props] = result;
+                this._gotContactsChannel(connPath, channelPath, props);
+            }));
+
+        this._connections[connPath] = info;
+        return info;
+    },
+
+    _gotContactsChannel: function(connPath, channelPath, props) {
+        let info = this._connections[connPath];
+        if (!info)
+            return;
+
+        info.contactsGroup = new Telepathy.ChannelGroup(DBus.session,
+                                                        Telepathy.pathToName(connPath),
+                                                        channelPath);
+        info.contactsListChangedId =
+            info.contactsGroup.connect('MembersChanged', Lang.bind(this, this._contactsListChanged, info));
+
+        info.contactsGroup.GetRemote('Members', Lang.bind(this,
+            function(contacts, err) {
+                if (!contacts)
+                    return;
+
+                info.connectionContacts.GetContactAttributesRemote(
+                    contacts, [Telepathy.CONNECTION_ALIASING_NAME], false,
+                    Lang.bind(this, this._gotContactAttributes, info));
+            }));
+    },
+
+    _contactsListChanged: function(group, message, added, removed,
+                                   local_pending, remote_pending,
+                                   actor, reason, info) {
+        for (let i = 0; i < removed.length; i++)
+            delete info.names[removed[i]];
+
+        info.connectionContacts.GetContactAttributesRemote(
+            added, [Telepathy.CONNECTION_ALIASING_NAME], false,
+            Lang.bind(this, this._gotContactAttributes, info));
+    },
+
+    _gotContactAttributes: function(attrs, err, info) {
+        if (!attrs)
+            return;
+
+        for (let handle in attrs)
+            info.names[handle] = attrs[handle][Telepathy.CONNECTION_ALIASING_NAME + '/alias'];
+    },
+
+    _presencesChanged: function(conn, presences, err) {
+        if (!presences)
+            return;
+
+        let info = this._connections[conn.getPath()];
+        if (!info)
+            return;
+
+        for (let handle in presences) {
+            let [type, status, message] = presences[handle];
+            this.emit('presence-changed', conn.getPath(), handle, type, message);
+        }
+    },
+
+    _removeConnection: function(conn) {
+        let info = this._connections[conn.getPath()];
+        if (!info)
+            return;
+
+        conn.disconnect(info.statusChangedId);
+        info.connectionAvatars.disconnect(info.updatedId);
+        info.connectionAvatars.disconnect(info.retrievedId);
+        info.connectionPresence.disconnect(info.presenceChangedId);
+        info.contactsGroup.disconnect(info.contactsListChangedId);
+
+        delete this._connections[conn.getPath()];
+    },
+
+    _getFileForToken: function(info, token) {
+        return info.cacheDir + '/' + Telepathy.escapeAsIdentifier(token);
+    },
+
+    _setIcon: function(iconBox, info, handle) {
+        let textureCache = St.TextureCache.get_default();
+        let token = info.tokens[handle];
+        let file;
+
+        if (token) {
+            file = this._getFileForToken(info, token);
+            if (!GLib.file_test(file, GLib.FileTest.EXISTS))
+                file = null;
+        }
+
+        if (file) {
+            let uri = GLib.filename_to_uri(file, null);
+            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size);
+        } else {
+            iconBox.child = new St.Icon({ icon_name: 'stock_person',
+                                          icon_type: St.IconType.FULLCOLOR,
+                                          icon_size: iconBox._size });
+        }
+    },
+
+    _updateIcons: function(info, handle) {
+        if (!info.icons[handle])
+            return;
+
+        for (let i = 0; i < info.icons[handle].length; i++) {
+            let iconBox = info.icons[handle][i];
+            this._setIcon(iconBox, info, handle);
+        }
+    },
+
+    _avatarUpdated: function(conn, handle, token) {
+        let info = this._connections[conn.getPath()];
+        if (!info)
+            return;
+
+        if (info.tokens[handle] == token)
+            return;
+
+        info.tokens[handle] = token;
+        if (token != '') {
+            let file = this._getFileForToken(info, token);
+            if (!GLib.file_test(file, GLib.FileTest.EXISTS)) {
+                info.connectionAvatars.RequestAvatarsRemote([handle]);
+                return;
+            }
+        }
+
+        this._updateIcons(info, handle);
+    },
+
+    _avatarRetrieved: function(conn, handle, token, avatarData, mimeType) {
+        let info = this._connections[conn.getPath()];
+        if (!info)
+            return;
+
+        let file = this._getFileForToken(info, token);
+        let success = false;
+        try {
+            success = GLib.file_set_contents(file, avatarData, avatarData.length);
+        } catch (e) {
+            logError(e, 'Error caching avatar data');
+        }
+
+        if (success)
+            this._updateIcons(info, handle);
+    },
+
+    createAvatar: function(conn, handle, size) {
+        let iconBox = new St.Bin({ style_class: 'avatar-box' });
+        iconBox._size = size;
+
+        let info = this._connections[conn.getPath()];
+        if (!info)
+            info = this.addConnection(conn.getPath());
+
+        if (!info.icons[handle])
+            info.icons[handle] = [];
+        info.icons[handle].push(iconBox);
+
+        iconBox.connect('destroy', Lang.bind(this,
+            function() {
+                let i = info.icons[handle].indexOf(iconBox);
+                if (i != -1)
+                    info.icons[handle].splice(i, 1);
+            }));
+
+        // If we already have the icon cached and know its token, this
+        // will fill it in. Otherwise it will fill in the default
+        // icon.
+        this._setIcon(iconBox, info, handle);
+
+        // Asynchronously load the real avatar if we don't have it yet.
+        if (info.tokens[handle] == null) {
+            info.connectionAvatars.GetKnownAvatarTokensRemote([handle], Lang.bind(this,
+                function (tokens, err) {
+                    let token = tokens && tokens[handle] ? tokens[handle] : '';
+                    this._avatarUpdated(conn, handle, token);
+                }));
+        }
+
+        return iconBox;
+    }
+};
+Signals.addSignalMethods(ContactManager.prototype);
+
+
+function Source(accountPath, connPath, channelPath, targetHandle, targetHandleType, targetId) {
+    this._init(accountPath, connPath, channelPath, targetHandle, targetHandleType, targetId);
 }

 Source.prototype = {
    __proto__:  MessageTray.Source.prototype,

-    _init: function(account, conn, channel, contact) {
-        MessageTray.Source.prototype._init.call(this, channel.get_identifier());
+    _init: function(accountPath, connPath, channelPath, targetHandle, targetHandleType, targetId) {
+        MessageTray.Source.prototype._init.call(this, targetId);

-        this.isChat = true;
+        this._accountPath = accountPath;

-        this._account = account;
-        this._contact = contact;
+        let connName = Telepathy.pathToName(connPath);
+        this._conn = new Telepathy.Connection(DBus.session, connName, connPath);
+        this._channel = new Telepathy.Channel(DBus.session, connName, channelPath);
+        this._closedId = this._channel.connect('Closed', Lang.bind(this, this._channelClosed));

-        this._conn = conn;
-        this._channel = channel;
-        this._closedId = this._channel.connect('invalidated', Lang.bind(this, this._channelClosed));
+        this._targetHandle = targetHandle;
+        this._targetHandleType = targetHandleType;
+        this._targetId = targetId;

-        this._updateAlias();
+        if (targetHandleType == Telepathy.HandleType.CONTACT) {
+            let aliasing = new Telepathy.ConnectionAliasing(DBus.session, connName, connPath);
+            aliasing.RequestAliasesRemote([this._targetHandle], Lang.bind(this,
+                function (aliases, err) {
+                    if (aliases && aliases.length)
+                        this.title = aliases[0];
+                }));
+        }

        this._notification = new Notification(this);
        this._notification.setUrgency(MessageTray.Urgency.HIGH);

-        this._presence = contact.get_presence_type();
+        // Since we only create sources when receiving a message, this
+        // is a plausible default
+        this._presence = Telepathy.ConnectionPresenceType.AVAILABLE;

-        this._sentId = this._channel.connect('message-sent', Lang.bind(this, this._messageSent));
-        this._receivedId = this._channel.connect('message-received', Lang.bind(this, this._messageReceived));
+        this._channelText = new Telepathy.ChannelText(DBus.session, connName, channelPath);
+        this._sentId = this._channelText.connect('Sent', Lang.bind(this, this._messageSent));
+        this._receivedId = this._channelText.connect('Received', Lang.bind(this, this._messageReceived));
+
+        this._channelText.ListPendingMessagesRemote(false, Lang.bind(this, this._gotPendingMessages));

        this._setSummaryIcon(this.createNotificationIcon());
-
-        this._notifyAliasId = this._contact.connect('notify::alias', Lang.bind(this, this._updateAlias));
-        this._notifyAvatarId = this._contact.connect('notify::avatar-file', Lang.bind(this, this._updateAvatarIcon));
-        this._presenceChangedId = this._contact.connect('presence-changed', Lang.bind(this, this._presenceChanged));
-
-        this._displayPendingMessages();
-    },
-
-    _updateAlias: function() {
-        this.title = this._contact.get_alias();
    },

    createNotificationIcon: function() {
-        this._iconBox = new St.Bin({ style_class: 'avatar-box' });
-        this._iconBox._size = this.ICON_SIZE;
-
-        this._updateAvatarIcon();
-
-        return this._iconBox;
-    },
-
-    _updateAvatarIcon: function() {
-        let textureCache = St.TextureCache.get_default();
-        let file = this._contact.get_avatar_file();
-
-        if (file) {
-            let uri = file.get_uri();
-            this._iconBox.child = textureCache.load_uri_async(uri, this._iconBox._size, this._iconBox._size);
-        } else {
-            this._iconBox.child = new St.Icon({ icon_name: 'avatar-default',
-                                                icon_type: St.IconType.FULLCOLOR,
-                                                icon_size: this._iconBox._size });
-        }
+        return contactManager.createAvatar(this._conn, this._targetHandle,
+                                           this.ICON_SIZE);
    },

    _notificationClicked: function(notification) {
-        let props = {};
-        props[Tp.PROP_CHANNEL_CHANNEL_TYPE] = Tp.IFACE_CHANNEL_TYPE_TEXT;
-        [props[Tp.PROP_CHANNEL_TARGET_HANDLE], props[Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE]] = this._channel.get_handle();
-
-        let req = Tp.AccountChannelRequest.new(this._account, props, global.get_current_time());
-
-        req.ensure_channel_async('', null, null);
+        channelDispatcher.EnsureChannelRemote(this._accountPath,
+                                              { 'org.freedesktop.Telepathy.Channel.ChannelType': Telepathy.CHANNEL_TEXT_NAME,
+                                                'org.freedesktop.Telepathy.Channel.TargetHandle': this._targetHandle,
+                                                'org.freedesktop.Telepathy.Channel.TargetHandleType': this._targetHandleType },
+                                              global.get_current_time(),
+                                              '',
+                                              Lang.bind(this, this._gotChannelRequest));
    },

-    _displayPendingMessages: function() {
-        let msgs = this._channel.get_pending_messages();
-
-        for (let i = 0; i < msgs.length; i++) {
-            let msg = msgs[i];
-            this._messageReceived(this._channel, msg);
+    _gotChannelRequest: function (chanReqPath, ex) {
+        if (ex) {
+            log ('EnsureChannelRemote failed? ' + ex);
+            return;
        }
+
+        let chanReq = new Telepathy.ChannelRequest(DBus.session, Telepathy.CHANNEL_DISPATCHER_NAME, chanReqPath);
+        chanReq.ProceedRemote();
+    },
+
+    _gotPendingMessages: function(msgs, err) {
+        if (!msgs)
+            return;
+
+        for (let i = 0; i < msgs.length; i++)
+            this._messageReceived.apply(this, [this._channel].concat(msgs[i]));
    },

    _channelClosed: function() {
        this._channel.disconnect(this._closedId);
-        this._channel.disconnect(this._receivedId);
-        this._channel.disconnect(this._sentId);
-
-        this._contact.disconnect(this._notifyAliasId);
-        this._contact.disconnect(this._notifyAvatarId);
-        this._contact.disconnect(this._presenceChangedId);
-
+        this._channelText.disconnect(this._receivedId);
+        this._channelText.disconnect(this._sentId);
        this.destroy();
    },

-    _messageReceived: function(channel, message) {
-        this._notification.appendMessage(message, NotificationDirection.RECEIVED);
+    _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, message, flags, token) {
-        this._notification.appendMessage(message, NotificationDirection.SENT);
+    _messageSent: function(channel, timestamp, type, text) {
+        this._notification.appendMessage(text, timestamp, NotificationDirection.SENT);
    },

    notify: function() {
@@ -224,31 +551,25 @@ Source.prototype = {
    },

    respond: function(text) {
-        let msg = Tp.ClientMessage.new_text(Tp.ChannelTextMessageType.NORMAL, text);
-        this._channel.send_message_async(msg, 0, null);
+        this._channelText.SendRemote(Telepathy.ChannelTextMessageType.NORMAL, text);
    },

-    _presenceChanged: function (contact, presence, type, status, message) {
-        let msg, shouldNotify, title;
+    setPresence: function(presence, message) {
+        let msg, shouldNotify;

-        if (this._presence == presence)
-          return;
-
-        title = GLib.markup_escape_text(this.title, -1);
-
-        if (presence == Tp.ConnectionPresenceType.AVAILABLE) {
-            msg = _("%s is online.").format(title);
-            shouldNotify = (this._presence == Tp.ConnectionPresenceType.OFFLINE);
-        } else if (presence == Tp.ConnectionPresenceType.OFFLINE ||
-                   presence == Tp.ConnectionPresenceType.EXTENDED_AWAY) {
-            presence = Tp.ConnectionPresenceType.OFFLINE;
-            msg = _("%s is offline.").format(title);
-            shouldNotify = (this._presence != Tp.ConnectionPresenceType.OFFLINE);
-        } else if (presence == Tp.ConnectionPresenceType.AWAY) {
-            msg = _("%s is away.").format(title);
+        if (presence == Telepathy.ConnectionPresenceType.AVAILABLE) {
+            msg = _("%s is online.").format(this.title);
+            shouldNotify = (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);
+        } else if (presence == Telepathy.ConnectionPresenceType.AWAY) {
+            msg = _("%s is away.").format(this.title);
            shouldNotify = false;
-        } else if (presence == Tp.ConnectionPresenceType.BUSY) {
-            msg = _("%s is busy.").format(title);
+        } else if (presence == Telepathy.ConnectionPresenceType.BUSY) {
+            msg = _("%s is busy.").format(this.title);
            shouldNotify = false;
        } else
            return;
@@ -275,8 +596,7 @@ Notification.prototype = {
        MessageTray.Notification.prototype._init.call(this, source, source.title, null, { customContent: true });
        this.setResident(true);

-        this._responseEntry = new St.Entry({ style_class: 'chat-response',
-                                             can_focus: 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);

@@ -284,10 +604,7 @@ Notification.prototype = {
        this._timestampTimeoutId = 0;
    },

-    appendMessage: function(message, direction) {
-        let [text, flags] = message.to_text();
-        let timestamp = message.get_received_timestamp();
-
+    appendMessage: function(text, timestamp, direction) {
        this.update(this.source.title, text, { customContent: true });
        this._append(text, direction, timestamp);
    },
@@ -356,14 +673,21 @@ Notification.prototype = {

    appendPresence: function(text, asTitle) {
        if (asTitle)
-            this.update(text, null, { customContent: true, titleMarkup: true });
+            this.update(text, null, { customContent: true });
        else
            this.update(this.source.title, null, { customContent: true });
-        let label = this.addBody(text, 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.
+        MessageTray.Notification.prototype.grabFocus.call(this, lockTray);
+        global.stage.set_key_focus(this._responseEntry.clutter_text);
+    },
+
    _onEntryActivated: function() {
        let text = this._responseEntry.get_text();
        if (text == '')
--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@@ -62,16 +62,9 @@ function addTween(target, tweeningParameters) {
 function _wrapTweening(target, tweeningParameters) {
    let state = _getTweenState(target);

-    if (!state.destroyedId) {
-        if (target instanceof Clutter.Actor) {
-            state.actor = target;
-            state.destroyedId = target.connect('destroy', _actorDestroyed);
-        } else if (target.actor && target.actor instanceof Clutter.Actor) {
-            state.actor = target.actor;
-            state.destroyedId = target.actor.connect('destroy', function() { _actorDestroyed(target); });
-        }
-    }
-
+    if (target instanceof Clutter.Actor && !state.destroyedId)
+        state.destroyedId = target.connect('destroy', _actorDestroyed);
+    
    _addHandler(target, tweeningParameters, 'onStart', _tweenStarted);
    _addHandler(target, tweeningParameters, 'onComplete', _tweenCompleted);
 }
@@ -89,7 +82,7 @@ function _resetTweenState(target) {

    if (state) {
        if (state.destroyedId)
-            state.actor.disconnect(state.destroyedId);
+            target.disconnect(state.destroyedId);
        if (state.idleCompletedId)
            Mainloop.source_remove(state.idleCompletedId);
    }
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -23,28 +23,22 @@ function SearchEntry(focusBase) {
 SearchEntry.prototype = {
    _init : function(focusBase) {
        this.actor = new St.Entry({ name: 'searchEntry',
-                                    /* Translators: this is the text displayed
-                                       in the search entry when no search is
-                                       active; it should not exceed ~30
-                                       characters */
-                                    hint_text: _("Type to search..."),
-                                    track_hover: true });
+                                    hint_text: _("Search your computer") });
        this.entry = this.actor.clutter_text;

-        this._inactiveIcon = new St.Icon({ style_class: 'search-entry-icon',
-                                           icon_name: 'edit-find',
-                                           icon_type: St.IconType.SYMBOLIC });
-        this._activeIcon = new St.Icon({ style_class: 'search-entry-icon',
-                                         icon_name: 'edit-clear',
-                                         icon_type: St.IconType.SYMBOLIC });
-        this.actor.set_secondary_icon(this._inactiveIcon);
-
-        this._iconClickedId = 0;
-
-        this.actor.clutter_text.connect('text-changed',
-                                        Lang.bind(this, this._onTextChanged));
+        this.actor.clutter_text.connect('text-changed', Lang.bind(this,
+            function() {
+                if (this.isActive())
+                    this.actor.set_secondary_icon_from_file(global.imagedir +
+                                                            'close-black.svg');
+                else
+                    this.actor.set_secondary_icon_from_file(null);
+            }));
+        this.actor.connect('secondary-icon-clicked', Lang.bind(this,
+            function() {
+                this.reset();
+            }));
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this.actor.connect('notify::mapped', Lang.bind(this, this._onMapped));

        global.stage.connect('notify::key-focus', Lang.bind(this, this._updateCursorVisibility));

@@ -62,23 +56,29 @@ SearchEntry.prototype = {
            this.entry.set_cursor_visible(false);
    },

-    _onMapped: function() {
-        if (this.actor.mapped) {
-            // Enable 'find-as-you-type'
+    show: function() {
+        if (this._capturedEventId == 0)
            this._capturedEventId = global.stage.connect('captured-event',
                                 Lang.bind(this, this._onCapturedEvent));
-            this.entry.set_cursor_visible(true);
-            this.entry.set_selection(0, 0);
-        } else {
-            // Disable 'find-as-you-type'
-            if (this._capturedEventId > 0)
-                global.stage.disconnect(this._capturedEventId);
+        this.entry.set_cursor_visible(true);
+        this.entry.set_selection(0, 0);
+    },
+
+    hide: function() {
+        if (this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
            this._capturedEventId = 0;
        }
    },

    reset: function () {
-        this.actor.sync_hover();
+        let [x, y, mask] = global.get_pointer();
+        let actor = global.stage.get_actor_at_pos (Clutter.PickMode.REACTIVE,
+                                                   x, y);
+        // this.actor is never hovered directly, only its clutter_text and icon
+        let hovered = this.actor == actor.get_parent();
+
+        this.actor.set_hover(hovered);

        this.entry.text = '';

@@ -157,32 +157,11 @@ SearchEntry.prototype = {
        }
    },

-    _onTextChanged: function() {
-        if (this.isActive()) {
-            this.actor.set_secondary_icon(this._activeIcon);
-
-            if (this._iconClickedId == 0)
-            this._iconClickedId = this.actor.connect('secondary-icon-clicked',
-                Lang.bind(this, function() {
-                    this.reset();
-                }));
-        } else {
-            if (this._iconClickedId > 0)
-                this.actor.disconnect(this._iconClickedId);
-            this._iconClickedId = 0;
-
-            this.actor.set_secondary_icon(this._inactiveIcon);
-        }
-    },
-
    _onDestroy: function() {
        if (this._capturedEventId > 0) {
            global.stage.disconnect(this._capturedEventId);
            this._capturedEventId = 0;
        }
-
-        this._activeIcon = null;
-        this._inactiveIcon = null;
    }
 };
 Signals.addSignalMethods(SearchEntry.prototype);
@@ -287,6 +266,13 @@ SearchTab.prototype = {
        }));
    },

+    setFindAsYouType: function(enabled) {
+        if (enabled)
+            this._searchEntry.show();
+        else
+            this._searchEntry.hide();
+    },
+
    show: function() {
        BaseTab.prototype.show.call(this);

@@ -370,8 +356,6 @@ ViewSelector.prototype = {
    _init : function() {
        this.actor = new St.BoxLayout({ name: 'viewSelector',
                                        vertical: true });
-        this.actor.connect('key-press-event',
-                           Lang.bind(this, this._onKeyPress));

        // The tab bar is located at the top of the view selector and
        // holds both "normal" tab labels and the search entry. The former
@@ -414,12 +398,9 @@ ViewSelector.prototype = {
                this._switchTab(this._activeTab);
            }));

-        Main.overview.connect('item-drag-begin',
-                              Lang.bind(this, this._switchDefaultTab));
-        Main.overview.connect('showing',
-                              Lang.bind(this, this._switchDefaultTab));
-        Main.overview.connect('hiding',
-                              Lang.bind(this, this._switchDefaultTab));
+        this._keyPressId = 0;
+        this._itemDragBeginId = 0;
+        this._overviewHidingId = 0;

        // Public constraints which may be used to tie actors' height or
        // vertical position to the current tab's content; as the content's
@@ -596,6 +577,41 @@ ViewSelector.prototype = {

    addSearchProvider: function(provider) {
        this._searchTab.addSearchProvider(provider);
+    },
+
+    show: function() {
+        this._searchTab.setFindAsYouType(true);
+
+        if (this._itemDragBeginId == 0)
+            this._itemDragBeginId = Main.overview.connect('item-drag-begin',
+                                                          Lang.bind(this, this._switchDefaultTab));
+        if (this._overviewHidingId == 0)
+            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._switchDefaultTab();
+    },
+
+    hide: function() {
+        this._searchTab.setFindAsYouType(false);
+
+        if (this._keyPressId > 0) {
+            this.actor.disconnect(this._keyPressId);
+            this._keyPressId = 0;
+        }
+
+        if (this._itemDragBeginId > 0) {
+            Main.overview.disconnect(this._itemDragBeginId);
+            this._itemDragBeginId = 0;
+        }
+
+        if (this._overviewHidingId > 0) {
+            Main.overview.disconnect(this._overviewHidingId);
+            this._overviewHidingId = 0;
+        }
    }
 };
 Signals.addSignalMethods(ViewSelector.prototype);
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -116,7 +116,6 @@ WindowManager.prototype = {
        this.setKeybindingHandler('switch_to_workspace_up', Lang.bind(this, this._showWorkspaceSwitcher));
        this.setKeybindingHandler('switch_to_workspace_down', Lang.bind(this, this._showWorkspaceSwitcher));
        this.setKeybindingHandler('switch_windows', Lang.bind(this, this._startAppSwitcher));
-        this.setKeybindingHandler('switch_group', Lang.bind(this, this._startAppSwitcher));

        Main.overview.connect('showing', Lang.bind(this, function() {
            for (let i = 0; i < this._dimmedWindows.length; i++)
@@ -521,27 +520,28 @@ WindowManager.prototype = {

        let tabPopup = new AltTab.AltTabPopup();

-        if (!tabPopup.show(backwards, binding == 'switch_group'))
+        if (!tabPopup.show(backwards))
            tabPopup.destroy();
    },

    _showWorkspaceSwitcher : function(shellwm, binding, window, backwards) {
+        /* We don't support this kind of layout */
+        if (binding == 'switch_to_workspace_up' || binding == 'switch_to_workspace_down')
+            return;
+
        if (global.screen.n_workspaces == 1)
            return;

        if (this._workspaceSwitcherPopup == null)
            this._workspaceSwitcherPopup = new WorkspaceSwitcherPopup.WorkspaceSwitcherPopup();

-        if (binding == 'switch_to_workspace_up')
-            this.actionMoveWorkspaceUp();
-        else if (binding == 'switch_to_workspace_down')
-            this.actionMoveWorkspaceDown();
-        // left/right would effectively act as synonyms for up/down if we enabled them;
-        // but that could be considered confusing.
-        // else if (binding == 'switch_to_workspace_left')
-        //   this.actionMoveWorkspaceLeft();
-        // else if (binding == 'switch_to_workspace_right')
-        //   this.actionMoveWorkspaceRight();
+        if (binding == 'switch_to_workspace_left') {
+            this.actionMoveWorkspaceLeft();
+        }
+
+        if (binding == 'switch_to_workspace_right') {
+            this.actionMoveWorkspaceRight();
+        }
    },

    actionMoveWorkspaceLeft: function() {
@@ -557,7 +557,7 @@ WindowManager.prototype = {
            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());

        if (!Main.overview.visible)
-            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.UP, indexToActivate);
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, indexToActivate);
    },

    actionMoveWorkspaceRight: function() {
@@ -573,32 +573,6 @@ WindowManager.prototype = {
            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());

        if (!Main.overview.visible)
-            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.DOWN, indexToActivate);
-    },
-
-    actionMoveWorkspaceUp: function() {
-        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        let indexToActivate = activeWorkspaceIndex;
-        if (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.UP, indexToActivate);
-    },
-
-    actionMoveWorkspaceDown: function() {
-        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-        let indexToActivate = activeWorkspaceIndex;
-        if (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.DOWN, indexToActivate);
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, indexToActivate);
    }
 };
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -104,12 +104,6 @@ WindowClone.prototype = {

        this._stackAbove = null;

-        this._sizeChangedId = this.realWindow.connect('size-changed', Lang.bind(this, function() {
-            this.emit('size-changed');
-        }));
-        this._realWindowDestroyId = this.realWindow.connect('destroy',
-            Lang.bind(this, this._disconnectRealWindowSignals));
-
        this.actor.connect('button-release-event',
                           Lang.bind(this, this._onButtonRelease));

@@ -162,19 +156,7 @@ WindowClone.prototype = {
        }
    },

-    _disconnectRealWindowSignals: function() {
-        if (this._sizeChangedId > 0)
-            this.realWindow.disconnect(this._sizeChangedId);
-        this._sizeChangedId = 0;
-
-        if (this._realWindowDestroyId > 0)
-            this.realWindow.disconnect(this._realWindowDestroyId);
-        this._realWindowDestroyId = 0;
-    },
-
    _onDestroy: function() {
-        this._disconnectRealWindowSignals();
-
        this.metaWindow._delegate = null;
        this.actor._delegate = null;
        if (this._zoomLightbox)
@@ -552,9 +534,9 @@ Workspace.prototype = {
        this.actor.height = global.screen_height;
        this.scale = 1.0;

-        let windows = Main.getWindowActorsForWorkspace(this.metaWorkspace.index());
+        let windows = global.get_window_actors().filter(this._isMyWindow, this);

-        // Create clones for windows that should be
+        // Create clones for remaining windows that should be
        // visible in the Overview
        this._windows = [];
        this._windowOverlays = [];
@@ -564,6 +546,9 @@ Workspace.prototype = {
            }
        }

+        // A filter for what windows we display
+        this._showOnlyWindows = null;
+
        // Track window changes
        this._windowAddedId = this.metaWorkspace.connect('window-added',
                                                          Lang.bind(this, this._windowAdded));
@@ -594,6 +579,18 @@ Workspace.prototype = {
            new_parent.add_actor(this._windowOverlaysGroup);
    },

+    /**
+     * lookupCloneForMetaWindow:
+     * @metaWindow: A #MetaWindow
+     *
+     * Given a #MetaWindow instance, find the WindowClone object
+     * which represents it in the workspaces display.
+     */
+    lookupCloneForMetaWindow: function (metaWindow) {
+        let index = this._lookupIndex (metaWindow);
+        return index < 0 ? null : this._windows[index];
+    },
+
    containsMetaWindow: function (metaWindow) {
        return this._lookupIndex(metaWindow) >= 0;
    },
@@ -602,6 +599,48 @@ Workspace.prototype = {
        return this._windows.length == 0;
    },

+    setShowOnlyWindows: function(showOnlyWindows, reposition) {
+        this._showOnlyWindows = showOnlyWindows;
+        this._resetCloneVisibility();
+        if (reposition)
+            this.positionWindows(WindowPositionFlags.ANIMATE);
+    },
+
+    /**
+     * setLightboxMode:
+     * @showLightbox: If true, dim background and allow highlighting a specific window
+     *
+     * This function also resets the highlighted window state.
+     */
+    setLightboxMode: function (showLightbox) {
+        if (!this._lightbox)
+            this._lightbox = new Lightbox.Lightbox(this.actor,
+                                                   { fadeTime: LIGHTBOX_FADE_TIME });
+
+        if (showLightbox)
+            this._lightbox.show();
+        else
+            this._lightbox.hide();
+    },
+
+    /**
+     * setHighlightWindow:
+     * @metaWindow: A #MetaWindow
+     *
+     * Draw the user's attention to the given window @metaWindow.
+     */
+    setHighlightWindow: function (metaWindow) {
+        if (!this._lightbox)
+            return;
+
+        let actor;
+        if (metaWindow != null) {
+            let clone = this.lookupCloneForMetaWindow(metaWindow);
+            actor = clone.actor;
+        }
+        this._lightbox.highlight(actor);
+    },
+
    /**
     * setReactive:
     * @reactive: %true iff the workspace should be reactive
@@ -612,6 +651,47 @@ Workspace.prototype = {
        this.actor.reactive = reactive;
    },

+    _isCloneVisible: function(clone) {
+        return this._showOnlyWindows == null || (clone.metaWindow in this._showOnlyWindows);
+    },
+
+    /**
+     * _getVisibleClones:
+     *
+     * Returns a list WindowClone objects where the clone isn't filtered
+     * out by any application filter.
+     * The returned array will always be newly allocated; it is not in any
+     * defined order, and thus it's convenient to call .sort() with your
+     * choice of sorting function.
+     */
+    _getVisibleClones: function() {
+        let visible = [];
+
+        for (let i = 0; i < this._windows.length; i++) {
+            let clone = this._windows[i];
+
+            if (!this._isCloneVisible(clone))
+                continue;
+
+            visible.push(clone);
+        }
+        return visible;
+    },
+
+    _resetCloneVisibility: function () {
+        for (let i = 0; i < this._windows.length; i++) {
+            let clone = this._windows[i];
+            let overlay = this._windowOverlays[i];
+
+            if (!this._isCloneVisible(clone)) {
+                clone.actor.hide();
+                overlay.hide();
+            } else {
+                clone.actor.show();
+            }
+        }
+    },
+
    // Only use this for n <= 20 say
    _factorial: function(n) {
        let result = 1;
@@ -823,9 +903,6 @@ Workspace.prototype = {
    },

    setReservedSlot: function(clone) {
-        if (this._reservedSlot == clone)
-            return;
-
        if (clone && this.containsMetaWindow(clone.metaWindow)) {
            this._reservedSlot = null;
            this.positionWindows(WindowPositionFlags.ANIMATE);
@@ -850,23 +927,25 @@ Workspace.prototype = {
            this._repositionWindowsId = 0;
        }

-        let clones = this._windows.slice();
+        let totalVisible = 0;
+
+        let visibleClones = this._getVisibleClones();
        if (this._reservedSlot)
-            clones.push(this._reservedSlot);
+            visibleClones.push(this._reservedSlot);

        let workspaceZooming = flags & WindowPositionFlags.ZOOM;
        let animate = flags & WindowPositionFlags.ANIMATE;

        // Start the animations
-        let slots = this._computeAllWindowSlots(clones.length);
-        clones = this._orderWindowsByMotionAndStartup(clones, slots);
+        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 < clones.length; i++) {
+        for (let i = 0; i < visibleClones.length; i++) {
            let slot = slots[i];
-            let clone = clones[i];
+            let clone = visibleClones[i];
            let metaWindow = clone.metaWindow;
            let mainIndex = this._lookupIndex(metaWindow);
            let overlay = this._windowOverlays[mainIndex];
@@ -922,16 +1001,16 @@ Workspace.prototype = {
    },

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

-        for (let i = 0; i < clones.length; i++) {
-            let clone = clones[i];
+        for (let i = 0; i < visibleClones.length; i++) {
+            let clone = visibleClones[i];
            let metaWindow = clone.metaWindow;
            if (i == 0) {
                clone.setStackAbove(null);
            } else {
-                let previousClone = clones[i - 1];
+                let previousClone = visibleClones[i - 1];
                clone.setStackAbove(previousClone.actor);
            }
        }
@@ -954,6 +1033,9 @@ Workspace.prototype = {
        cloneWidth = this.scale * clone.actor.scale_x * cloneWidth;
        cloneHeight = this.scale * clone.actor.scale_y * cloneHeight;

+        if (!this._windowOverlaysGroup.visible)
+            this._windowOverlaysGroup.show();
+
        if (overlay) {
            overlay.updatePositions(cloneX, cloneY, cloneWidth, cloneHeight);
            if (fade)
@@ -968,10 +1050,19 @@ Workspace.prototype = {
        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);
        }
    },

+    _hideAllOverlays: function() {
+        for (let i = 0; i < this._windows.length; i++) {
+            let overlay = this._windowOverlays[i];
+            overlay.hide();
+        }
+    },
+
    _delayedWindowRepositioning: function() {
        if (this._windowIsZooming)
            return true;
@@ -996,9 +1087,6 @@ Workspace.prototype = {
    },

    showWindowsOverlays: function() {
-        if (this.leavingOverview)
-            return;
-
        this._windowOverlaysGroup.show();
        this._showAllOverlays();
    },
@@ -1125,7 +1213,7 @@ Workspace.prototype = {

        this.leavingOverview = true;

-        this.hideWindowsOverlays();
+        this._hideAllOverlays();

        if (this._repositionWindowsId > 0) {
            Mainloop.source_remove(this._repositionWindowsId);
@@ -1202,7 +1290,8 @@ Workspace.prototype = {

    // Tests if @win belongs to this workspaces
    _isMyWindow : function (win) {
-        return Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index());
+        return win.get_workspace() == this.metaWorkspace.index() ||
+            (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
    },

    // Tests if @win should be shown in the Overview
@@ -1236,10 +1325,10 @@ Workspace.prototype = {
                      Lang.bind(this, function() {
                          this._windowIsZooming = false;
                      }));
-        clone.connect('size-changed',
-                      Lang.bind(this, function() {
-                          this.positionWindows(0);
-                      }));
+        win.connect('size-changed',
+                    Lang.bind(this, function() {
+                        this.positionWindows(0);
+                    }));

        this.actor.add_actor(clone.actor);

@@ -1290,9 +1379,14 @@ Workspace.prototype = {
                            this.metaWorkspace.index());
    },

+    _removeSelf : function(actor, event) {
+        screen.remove_workspace(this.metaWorkspace, event.get_time());
+        return true;
+    },
+
    // Draggable target interface
    handleDragOver : function(source, actor, x, y, time) {
-        if (source.realWindow && !this._isMyWindow(source.realWindow))
+        if (source instanceof WindowClone)
            return DND.DragMotionResult.MOVE_DROP;
        if (source.shellWorkspaceLaunch)
            return DND.DragMotionResult.COPY_DROP;
@@ -1301,7 +1395,7 @@ Workspace.prototype = {
    },

    acceptDrop : function(source, actor, x, y, time) {
-        if (source.realWindow) {
+        if (source instanceof WindowClone) {
            let win = source.realWindow;
            if (this._isMyWindow(win))
                return false;
@@ -1320,8 +1414,8 @@ Workspace.prototype = {
                                                 time);
            return true;
        } else if (source.shellWorkspaceLaunch) {
-            source.shellWorkspaceLaunch({ workspace: this.metaWorkspace,
-                                          timestamp: time });
+            this.metaWorkspace.activate(time);
+            source.shellWorkspaceLaunch();
            return true;
        }

--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@@ -12,8 +12,8 @@ const Tweener = imports.ui.tweener;
 const ANIMATION_TIME = 0.1;
 const DISPLAY_TIMEOUT = 600;

-const UP = -1;
-const DOWN = 1;
+const LEFT = -1;
+const RIGHT = 1;

 function WorkspaceSwitcherPopup() {
    this._init();
@@ -32,8 +32,6 @@ WorkspaceSwitcherPopup.prototype = {
        this._container = new St.BoxLayout({ style_class: 'workspace-switcher-container' });
        this._list = new Shell.GenericContainer({ style_class: 'workspace-switcher' });
        this._itemSpacing = 0;
-        this._childHeight = 0;
-        this._childWidth = 0;
        this._list.connect('style-changed', Lang.bind(this, function() {
                                                        this._itemSpacing = this._list.get_theme_node().get_length('spacing');
                                                     }));
@@ -49,59 +47,63 @@ WorkspaceSwitcherPopup.prototype = {

        this._position();

-        this.actor.hide();
-
+        this.actor.show();
        this._timeoutId = Mainloop.timeout_add(DISPLAY_TIMEOUT, Lang.bind(this, this._onTimeout));
    },

-    _getPreferredHeight : function (actor, forWidth, alloc) {
+    _getPreferredWidth : function (actor, forHeight, alloc) {
        let children = this._list.get_children();
        let primary = global.get_primary_monitor();

-        let availHeight = primary.height;
-        availHeight -= Main.panel.actor.height;
-        availHeight -= this.actor.get_theme_node().get_vertical_padding();
-        availHeight -= this._container.get_theme_node().get_vertical_padding();
-        availHeight -= this._list.get_theme_node().get_vertical_padding();
+        let availwidth = primary.width;
+        availwidth -= this.actor.get_theme_node().get_horizontal_padding();
+        availwidth -= this._container.get_theme_node().get_horizontal_padding();
+        availwidth -= this._list.get_theme_node().get_horizontal_padding();

-        let height = 0;
+        let width = 0;
        for (let i = 0; i < children.length; i++) {
-            let [childMinHeight, childNaturalHeight] = children[i].get_preferred_height(-1);
-            let [childMinWidth, childNaturalWidth] = children[i].get_preferred_width(childNaturalHeight);
-            height += childNaturalHeight * primary.width / primary.height;
+            let [childMinWidth, childNaturalWidth] = children[i].get_preferred_width(-1);
+            let [childMinHeight, childNaturalHeight] = children[i].get_preferred_height(childNaturalWidth);
+            width += childNaturalHeight * primary.width / primary.height;
        }

        let spacing = this._itemSpacing * (global.screen.n_workspaces - 1);
-        height += spacing;
-        height = Math.min(height, availHeight);
+        width += spacing;
+        width = Math.min(width, availwidth);

-        this._childHeight = (height - spacing) / global.screen.n_workspaces;
+        this._childWidth = (width - spacing) / global.screen.n_workspaces;

-        alloc.min_size = height;
-        alloc.natural_size = height;
+        alloc.min_size = width;
+        alloc.natural_size = width;
    },

-    _getPreferredWidth : function (actor, forHeight, alloc) {
+    _getPreferredHeight : function (actor, forWidth, alloc) {
        let primary = global.get_primary_monitor();
-        this._childWidth = Math.round(this._childHeight * primary.width / primary.height);
+        this._childHeight = Math.round(this._childWidth * primary.height / primary.width);

-        alloc.min_size = this._childWidth;
-        alloc.natural_size = this._childWidth;
+        alloc.min_size = this._childHeight;
+        alloc.natural_size = this._childHeight;
    },

    _allocate : function (actor, box, flags) {
        let children = this._list.get_children();
        let childBox = new Clutter.ActorBox();

-        let y = box.y1;
-        let prevChildBoxY2 = box.y1 - this._itemSpacing;
+        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++) {
-            childBox.x1 = box.x1;
-            childBox.x2 = box.x1 + this._childWidth;
-            childBox.y1 = prevChildBoxY2 + this._itemSpacing;
-            childBox.y2 = Math.round(y + this._childHeight);
-            y += this._childHeight + this._itemSpacing;
-            prevChildBoxY2 = childBox.y2;
+            childBox.x1 = prevChildBoxX2 + this._itemSpacing;
+            childBox.x2 = Math.round(x + this._childWidth);
+            childBox.y1 = box.y1;
+            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);
        }
    },
@@ -112,10 +114,10 @@ WorkspaceSwitcherPopup.prototype = {
        for (let i = 0; i < global.screen.n_workspaces; i++) {
            let indicator = null;

-           if (i == activeWorkspaceIndex && direction == UP)
-               indicator = new St.Bin({ style_class: 'ws-switcher-active-up' });
-           else if(i == activeWorkspaceIndex && direction == DOWN)
-               indicator = new St.Bin({ style_class: 'ws-switcher-active-down' });
+           if (i == activeWorkspaceIndex && direction == LEFT)
+               indicator = new St.Bin({ style_class: 'ws-switcher-active-left' });
+           else if(i == activeWorkspaceIndex && direction == RIGHT)
+               indicator = new St.Bin({ style_class: 'ws-switcher-active-right' });
           else
               indicator = new St.Bin({ style_class: 'ws-switcher-box' });

@@ -127,8 +129,7 @@ WorkspaceSwitcherPopup.prototype = {
    _position: function() {
        let primary = global.get_primary_monitor();
        this._container.x = primary.x + Math.floor((primary.width - this._container.width) / 2);
-        this._container.y = primary.y + Main.panel.actor.height +
-                            Math.floor(((primary.height - Main.panel.actor.height) - this._container.height) / 2);
+        this._container.y = primary.y + Math.floor((primary.height - this._container.height) / 2);
    },

    _show : function() {
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -1,837 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const DND = imports.ui.dnd;
-const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-const Workspace = imports.ui.workspace;
-const WorkspacesView = imports.ui.workspacesView;
-
-// The maximum size of a thumbnail is 1/8 the width and height of the screen
-let MAX_THUMBNAIL_SCALE = 1/8.;
-
-const RESCALE_ANIMATION_TIME = 0.2;
-const SLIDE_ANIMATION_TIME = 0.2;
-
-function WindowClone(realWindow) {
-    this._init(realWindow);
-}
-
-WindowClone.prototype = {
-    _init : function(realWindow) {
-        this.actor = new Clutter.Clone({ source: realWindow.get_texture(),
-                                         reactive: true });
-        this.actor._delegate = this;
-        this.realWindow = realWindow;
-        this.metaWindow = realWindow.meta_window;
-
-        this._positionChangedId = this.realWindow.connect('position-changed',
-                                                          Lang.bind(this, this._onPositionChanged));
-        this._realWindowDestroyedId = this.realWindow.connect('destroy',
-                                                              Lang.bind(this, this._disconnectRealWindowSignals));
-        this._onPositionChanged();
-
-        this.actor.connect('button-release-event',
-                           Lang.bind(this, this._onButtonRelease));
-
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this._draggable = DND.makeDraggable(this.actor,
-                                            { restoreOnSuccess: true,
-                                              dragActorMaxSize: Workspace.WINDOW_DND_SIZE,
-                                              dragActorOpacity: Workspace.DRAGGING_WINDOW_OPACITY });
-        this._draggable.connect('drag-begin', Lang.bind(this, this._onDragBegin));
-        this._draggable.connect('drag-end', Lang.bind(this, this._onDragEnd));
-        this.inDrag = false;
-    },
-
-    setStackAbove: function (actor) {
-        this._stackAbove = actor;
-        if (this._stackAbove == null)
-            this.actor.lower_bottom();
-        else
-            this.actor.raise(this._stackAbove);
-    },
-
-    destroy: function () {
-        this.actor.destroy();
-    },
-
-    _onPositionChanged: function() {
-        let rect = this.metaWindow.get_outer_rect();
-        this.actor.set_position(this.realWindow.x, this.realWindow.y);
-    },
-
-    _disconnectRealWindowSignals: function() {
-        if (this._positionChangedId != 0) {
-            this.realWindow.disconnect(this._positionChangedId);
-            this._positionChangedId = 0;
-        }
-
-        if (this._realWindowDestroyedId != 0) {
-            this.realWindow.disconnect(this._realWindowDestroyedId);
-            this._realWindowDestroyedId = 0;
-        }
-    },
-
-    _onDestroy: function() {
-        this._disconnectRealWindowSignals();
-
-        this.actor._delegate = null;
-
-        if (this.inDrag) {
-            this.emit('drag-end');
-            this.inDrag = false;
-        }
-
-        this.disconnectAll();
-    },
-
-    _onButtonRelease : function (actor, event) {
-        this.emit('selected', event.get_time());
-
-        return true;
-    },
-
-    _onDragBegin : function (draggable, time) {
-        this.inDrag = true;
-        this.emit('drag-begin');
-    },
-
-    _onDragEnd : function (draggable, time, snapback) {
-        this.inDrag = false;
-
-        // 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);
-        }
-
-
-        this.emit('drag-end');
-    }
-};
-Signals.addSignalMethods(WindowClone.prototype);
-
-
-const ThumbnailState = {
-    NEW   :         0,
-    ANIMATING_IN :  1,
-    NORMAL:         2,
-    REMOVING :      3,
-    ANIMATING_OUT : 4,
-    ANIMATED_OUT :  5,
-    COLLAPSING :    6,
-    DESTROYED :     7
-};
-
-/**
- * @metaWorkspace: a #Meta.Workspace
- */
-function WorkspaceThumbnail(metaWorkspace) {
-    this._init(metaWorkspace);
-}
-
-WorkspaceThumbnail.prototype = {
-    _init : function(metaWorkspace) {
-        this.metaWorkspace = metaWorkspace;
-
-        this.actor = new St.Group({ reactive: true,
-                                    clip_to_allocation: true,
-                                    style_class: 'workspace-thumbnail' });
-        this.actor._delegate = this;
-
-        this._contents = new Clutter.Group();
-        this.actor.add_actor(this._contents);
-
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this.actor.connect('button-press-event', Lang.bind(this,
-            function(actor, event) {
-                return true;
-            }));
-        this.actor.connect('button-release-event', Lang.bind(this,
-            function(actor, event) {
-                this._activate();
-                return true;
-            }));
-
-        this._background = new Clutter.Clone({ source: global.background_actor });
-        this._contents.add_actor(this._background);
-
-        this.setPorthole(0, 0, global.screen_width, global.screen_height);
-
-        let windows = global.get_window_actors().filter(this._isMyWindow, this);
-
-        // Create clones for windows that should be visible in the Overview
-        this._windows = [];
-        for (let i = 0; i < windows.length; i++) {
-            if (this._isOverviewWindow(windows[i])) {
-                this._addWindowClone(windows[i]);
-            }
-        }
-
-        // Track window changes
-        this._windowAddedId = this.metaWorkspace.connect('window-added',
-                                                          Lang.bind(this, this._windowAdded));
-        this._windowRemovedId = this.metaWorkspace.connect('window-removed',
-                                                           Lang.bind(this, this._windowRemoved));
-
-        this.state = ThumbnailState.NORMAL;
-        this._slidePosition = 0; // Fully slid in
-        this._collapseFraction = 0; // Not collapsed
-    },
-
-    setPorthole: function(x, y, width, height) {
-        this.actor.set_size(width, height);
-        this._contents.set_position(-x, -y);
-    },
-
-    _lookupIndex: function (metaWindow) {
-        for (let i = 0; i < this._windows.length; i++) {
-            if (this._windows[i].metaWindow == metaWindow) {
-                return i;
-            }
-        }
-        return -1;
-    },
-
-    syncStacking: function(stackIndices) {
-        this._windows.sort(function (a, b) { return stackIndices[a.metaWindow.get_stable_sequence()] - stackIndices[b.metaWindow.get_stable_sequence()]; });
-
-        for (let i = 0; i < this._windows.length; i++) {
-            let clone = this._windows[i];
-            let metaWindow = clone.metaWindow;
-            if (i == 0) {
-                clone.setStackAbove(this._background);
-            } else {
-                let previousClone = this._windows[i - 1];
-                clone.setStackAbove(previousClone.actor);
-            }
-        }
-    },
-
-    set slidePosition(slidePosition) {
-        this._slidePosition = slidePosition;
-        this.actor.queue_relayout();
-    },
-
-    get slidePosition() {
-        return this._slidePosition;
-    },
-
-    set collapseFraction(collapseFraction) {
-        this._collapseFraction = collapseFraction;
-        this.actor.queue_relayout();
-    },
-
-    get collapseFraction() {
-        return this._collapseFraction;
-    },
-
-    _windowRemoved : function(metaWorkspace, metaWin) {
-        let win = metaWin.get_compositor_private();
-
-        // find the position of the window in our list
-        let index = this._lookupIndex (metaWin);
-
-        if (index == -1)
-            return;
-
-        let clone = this._windows[index];
-        this._windows.splice(index, 1);
-        clone.destroy();
-    },
-
-    _windowAdded : function(metaWorkspace, metaWin) {
-        if (this.leavingOverview)
-            return;
-
-        let win = metaWin.get_compositor_private();
-
-        if (!win) {
-            // Newly-created windows are added to a workspace before
-            // the compositor finds out about them...
-            Mainloop.idle_add(Lang.bind(this,
-                                        function () {
-                                            if (this.actor && metaWin.get_compositor_private())
-                                                this._windowAdded(metaWorkspace, metaWin);
-                                            return false;
-                                        }));
-            return;
-        }
-
-        if (!this._isOverviewWindow(win))
-            return;
-
-        let clone = this._addWindowClone(win);
-    },
-
-    destroy : function() {
-        this.actor.destroy();
-    },
-
-    _onDestroy: function(actor) {
-        this.metaWorkspace.disconnect(this._windowAddedId);
-        this.metaWorkspace.disconnect(this._windowRemovedId);
-
-        this._windows = [];
-        this.actor = null;
-    },
-
-    // Tests if @win belongs to this workspaces
-    _isMyWindow : function (win) {
-        return win.get_workspace() == this.metaWorkspace.index() ||
-            (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
-    },
-
-    // Tests if @win should be shown in the Overview
-    _isOverviewWindow : function (win) {
-        let tracker = Shell.WindowTracker.get_default();
-        return tracker.is_window_interesting(win.get_meta_window());
-    },
-
-    // Create a clone of a (non-desktop) window and add it to the window list
-    _addWindowClone : function(win) {
-        let clone = new WindowClone(win);
-
-        clone.connect('selected',
-                      Lang.bind(this, this._activate));
-        clone.connect('drag-begin',
-                      Lang.bind(this, function(clone) {
-                          Main.overview.beginWindowDrag();
-                      }));
-        clone.connect('drag-end',
-                      Lang.bind(this, function(clone) {
-                          Main.overview.endWindowDrag();
-                      }));
-        this._contents.add_actor(clone.actor);
-
-        if (this._windows.length == 0)
-            clone.setStackAbove(this._background);
-        else
-            clone.setStackAbove(this._windows[this._windows.length - 1].actor);
-
-        this._windows.push(clone);
-
-        return clone;
-    },
-
-    _activate : function (clone, time) {
-        if (this.state > ThumbnailState.NORMAL)
-            return;
-
-        // a click on the already current workspace should go back to the main view
-        if (this.metaWorkspace == global.screen.get_active_workspace())
-            Main.overview.hide();
-        else
-            this.metaWorkspace.activate(time);
-    },
-
-    // Draggable target interface
-    handleDragOver : function(source, actor, x, y, time) {
-        if (this.state > ThumbnailState.NORMAL)
-            return DND.DragMotionResult.CONTINUE;
-
-        if (source.realWindow && !this._isMyWindow(source.realWindow))
-            return DND.DragMotionResult.MOVE_DROP;
-        if (source.shellWorkspaceLaunch)
-            return DND.DragMotionResult.COPY_DROP;
-
-        return DND.DragMotionResult.CONTINUE;
-    },
-
-    acceptDrop : function(source, actor, x, y, time) {
-        if (this.state > ThumbnailState.NORMAL)
-            return false;
-
-        if (source.realWindow) {
-            let win = source.realWindow;
-            if (this._isMyWindow(win))
-                return false;
-
-            let metaWindow = win.get_meta_window();
-            metaWindow.change_workspace_by_index(this.metaWorkspace.index(),
-                                                 false, // don't create workspace
-                                                 time);
-            return true;
-        } else if (source.shellWorkspaceLaunch) {
-            source.shellWorkspaceLaunch({ workspace: this.metaWorkspace,
-                                          timestamp: time });
-            return true;
-        }
-
-        return false;
-    }
-};
-
-Signals.addSignalMethods(WorkspaceThumbnail.prototype);
-
-
-function ThumbnailsBox() {
-    this._init();
-}
-
-ThumbnailsBox.prototype = {
-    _init: function() {
-        this.actor = new Shell.GenericContainer({ style_class: 'workspace-thumbnails',
-                                                  request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT });
-        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));
-
-        // When we animate the scale, we don't animate the requested size of the thumbnails, rather
-        // we ask for our final size and then animate within that size. This slightly simplifies the
-        // interaction with the main workspace windows (instead of constantly reallocating them
-        // to a new size, they get a new size once, then use the standard window animation code
-        // allocate the windows to their new positions), however it causes problems for drawing
-        // the background and border wrapped around the thumbnail as we animate - we can't just pack
-        // the container into a box and set style properties on the box since that box would wrap
-        // around the final size not the animating size. So instead we fake the background with
-        // an actor underneath the content and adjust the allocation of our children to leave space
-        // for the border and padding of the background actor.
-        this._background = new St.Bin({ style_class: 'workspace-thumbnails-background' });
-
-        // This will eventually be automatic, see https://bugzilla.gnome.org/show_bug.cgi?id=584662
-        if (St.Widget.get_default_direction () == St.TextDirection.RTL)
-            this._background.add_style_pseudo_class('rtl');
-
-        this.actor.add_actor(this._background);
-
-        let indicator = new St.Bin({ style_class: 'workspace-thumbnail-indicator' });
-
-        // We don't want the indicator to affect drag-and-drop
-        Shell.util_set_hidden_from_pick(indicator, true);
-
-        this._indicator = indicator;
-        this.actor.add_actor(indicator);
-
-        this._targetScale = 0;
-        this._scale = 0;
-        this._pendingScaleUpdate = false;
-        this._stateUpdateQueued = false;
-        this._animatingIndicator = false;
-        this._indicatorY = 0; // only used when _animatingIndicator is true
-
-        this._stateCounts = {};
-        for (key in ThumbnailState)
-            this._stateCounts[ThumbnailState[key]] = 0;
-
-        this._thumbnails = [];
-    },
-
-    show: function() {
-        this._switchWorkspaceNotifyId =
-            global.window_manager.connect('switch-workspace',
-                                          Lang.bind(this, this._activeWorkspaceChanged));
-
-        this._targetScale = 0;
-        this._scale = 0;
-        this._pendingScaleUpdate = false;
-        this._stateUpdateQueued = false;
-
-        this._stateCounts = {};
-        for (key in ThumbnailState)
-            this._stateCounts[ThumbnailState[key]] = 0;
-
-        // The "porthole" is the portion of the screen that we show in the workspaces
-        let panelHeight = Main.panel.actor.height;
-        this._porthole = {
-            x: 0,
-            y: panelHeight,
-            width: global.screen_width,
-            height: global.screen_height - panelHeight
-        };
-
-        this.addThumbnails(0, global.screen.n_workspaces);
-    },
-
-    hide: function() {
-        if (this._switchWorkspaceNotifyId > 0) {
-            global.window_manager.disconnect(this._switchWorkspaceNotifyId);
-            this._switchWorkspaceNotifyId = 0;
-        }
-
-        for (let w = 0; w < this._thumbnails.length; w++)
-            this._thumbnails[w].destroy();
-        this._thumbnails = [];
-    },
-
-    addThumbnails: function(start, count) {
-        for (let k = start; k < start + count; k++) {
-            let metaWorkspace = global.screen.get_workspace_by_index(k);
-            let thumbnail = new WorkspaceThumbnail(metaWorkspace);
-            thumbnail.setPorthole(this._porthole.x, this._porthole.y,
-                                  this._porthole.width, this._porthole.height);
-            this._thumbnails.push(thumbnail);
-            this.actor.add_actor(thumbnail.actor);
-
-            if (start > 0) { // not the initial fill
-                thumbnail.state = ThumbnailState.NEW;
-                thumbnail.slidePosition = 1; // start slid out
-                this._haveNewThumbnails = true;
-            } else {
-                thumbnail.state = ThumbnailState.NORMAL;
-            }
-
-            this._stateCounts[thumbnail.state]++;
-        }
-
-        this._queueUpdateStates();
-
-        // The thumbnails indicator actually needs to be on top of the thumbnails
-        this._indicator.raise_top();
-    },
-
-    removeThumbmails: function(start, count) {
-        let currentPos = 0;
-        for (let k = 0; k < this._thumbnails.length; k++) {
-            let thumbnail = this._thumbnails[k];
-
-            if (thumbnail.state > ThumbnailState.NORMAL)
-                continue;
-
-            if (currentPos >= start && currentPos < start + count)
-                this._setThumbnailState(thumbnail, ThumbnailState.REMOVING);
-
-            currentPos++;
-        }
-
-        this._queueUpdateStates();
-    },
-
-    syncStacking: function(stackIndices) {
-        for (let i = 0; i < this._thumbnails.length; i++)
-            this._thumbnails[i].syncStacking(stackIndices);
-    },
-
-    set scale(scale) {
-        this._scale = scale;
-        this.actor.queue_relayout();
-    },
-
-    get scale() {
-        return this._scale;
-    },
-
-    set indicatorY(indicatorY) {
-        this._indicatorY = indicatorY;
-        this.actor.queue_relayout();
-    },
-
-    get indicatorY() {
-        return this._indicatorY;
-    },
-
-    _setThumbnailState: function(thumbnail, state) {
-        this._stateCounts[thumbnail.state]--;
-        thumbnail.state = state;
-        this._stateCounts[thumbnail.state]++;
-    },
-
-    _iterateStateThumbnails: function(state, callback) {
-        if (this._stateCounts[state] == 0)
-            return;
-
-        for (let i = 0; i < this._thumbnails.length; i++) {
-            if (this._thumbnails[i].state == state)
-                callback.call(this, this._thumbnails[i]);
-        }
-    },
-
-    _tweenScale: function() {
-        Tweener.addTween(this,
-                         { scale: this._targetScale,
-                           time: RESCALE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: this._queueUpdateStates,
-                           onCompleteScope: this });
-    },
-
-    _updateStates: function() {
-        this._stateUpdateQueued = false;
-
-        // If we are animating the indicator, wait
-        if (this._animatingIndicator)
-            return;
-
-        // Then slide out any thumbnails that have been destroyed
-        this._iterateStateThumbnails(ThumbnailState.REMOVING,
-            function(thumbnail) {
-                this._setThumbnailState(thumbnail, ThumbnailState.ANIMATING_OUT);
-
-                Tweener.addTween(thumbnail,
-                                 { slidePosition: 1,
-                                   time: SLIDE_ANIMATION_TIME,
-                                   transition: 'linear',
-                                   onComplete: function() {
-                                       this._setThumbnailState(thumbnail, ThumbnailState.ANIMATED_OUT);
-                                       this._queueUpdateStates();
-                                   },
-                                   onCompleteScope: this
-                                 });
-            });
-
-        // As long as things are sliding out, don't proceed
-        if (this._stateCounts[ThumbnailState.ANIMATING_OUT] > 0)
-            return;
-
-        // Once that's complete, we can start scaling to the new size and collapse any removed thumbnails
-        this._iterateStateThumbnails(ThumbnailState.ANIMATED_OUT,
-            function(thumbnail) {
-                this.actor.set_skip_paint(thumbnail.actor, true);
-                this._setThumbnailState(thumbnail, ThumbnailState.COLLAPSING);
-                Tweener.addTween(thumbnail,
-                                 { collapseFraction: 1,
-                                   time: RESCALE_ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
-                                   onComplete: function() {
-                                       this._stateCounts[thumbnail.state]--;
-                                       thumbnail.state = ThumbnailState.DESTROYED;
-
-                                       let index = this._thumbnails.indexOf(thumbnail);
-                                       this._thumbnails.splice(index, 1);
-                                       thumbnail.destroy();
-
-                                       this._queueUpdateStates();
-                                   },
-                                   onCompleteScope: this
-                                 });
-                });
-
-        if (this._pendingScaleUpdate) {
-            this._tweenScale();
-            this._pendingScaleUpdate = false;
-        }
-
-        // Wait until that's done
-        if (this._scale != this._targetScale || this._stateCounts[ThumbnailState.COLLAPSING] > 0)
-            return;
-
-        // And then slide in any new thumbnails
-        this._iterateStateThumbnails(ThumbnailState.NEW,
-            function(thumbnail) {
-                this._setThumbnailState(thumbnail, ThumbnailState.ANIMATING_IN);
-                Tweener.addTween(thumbnail,
-                                 { slidePosition: 0,
-                                   time: SLIDE_ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
-                                   onComplete: function() {
-                                       this._setThumbnailState(thumbnail, ThumbnailState.NORMAL);
-                                   },
-                                   onCompleteScope: this
-                                 });
-            });
-    },
-
-    _queueUpdateStates: function() {
-        if (this._stateUpdateQueued)
-            return;
-
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                       Lang.bind(this, this._updateStates));
-
-        this._stateUpdateQueued = true;
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        // See comment about this._background in _init()
-        let themeNode = this._background.get_theme_node();
-
-        forWidth = themeNode.adjust_for_width(forWidth);
-
-        // Note that for getPreferredWidth/Height we cheat a bit and skip propagating
-        // the size request to our children because we know how big they are and know
-        // that the actors aren't depending on the virtual functions being called.
-
-        if (this._thumbnails.length == 0)
-            return;
-
-        let spacing = this.actor.get_theme_node().get_length('spacing');
-        let nWorkspaces = global.screen.n_workspaces;
-        let totalSpacing = (nWorkspaces - 1) * spacing;
-
-        [alloc.min_size, alloc.natural_size] =
-            themeNode.adjust_preferred_height(totalSpacing,
-                                              totalSpacing + nWorkspaces * this._porthole.height * MAX_THUMBNAIL_SCALE);
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        // See comment about this._background in _init()
-        let themeNode = this._background.get_theme_node();
-
-        if (this._thumbnails.length == 0)
-            return;
-
-        // We don't animate our preferred width, which is always reported according
-        // to the actual number of current workspaces, we just animate within that
-
-        let spacing = this.actor.get_theme_node().get_length('spacing');
-        let nWorkspaces = global.screen.n_workspaces;
-        let totalSpacing = (nWorkspaces - 1) * spacing;
-
-        let avail = forHeight - totalSpacing;
-
-        let scale = (avail / nWorkspaces) / this._porthole.height;
-        scale = Math.min(scale, MAX_THUMBNAIL_SCALE);
-
-        let width = Math.round(this._porthole.width * scale);
-        [alloc.min_size, alloc.natural_size] =
-            themeNode.adjust_preferred_width(width, width);
-    },
-
-    _allocate: function(actor, box, flags) {
-        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
-
-        // See comment about this._background in _init()
-        let themeNode = this._background.get_theme_node();
-        let contentBox = themeNode.get_content_box(box);
-
-        if (this._thumbnails.length == 0) // not visible
-            return;
-
-        let portholeWidth = this._porthole.width;
-        let portholeHeight = this._porthole.height;
-        let spacing = this.actor.get_theme_node().get_length('spacing');
-
-        // Compute the scale we'll need once everything is updated
-        let nWorkspaces = global.screen.n_workspaces;
-        let totalSpacing = (nWorkspaces - 1) * spacing;
-        let avail = (contentBox.y2 - contentBox.y1) - totalSpacing;
-
-        let newScale = (avail / nWorkspaces) / portholeHeight;
-        newScale = Math.min(newScale, MAX_THUMBNAIL_SCALE);
-
-        if (newScale != this._targetScale) {
-            if (this._targetScale > 0) {
-                // We don't do the tween immediately because we need to observe the ordering
-                // in queueUpdateStates - if workspaces have been removed we need to slide them
-                // out as the first thing.
-                this._targetScale = newScale;
-                this._pendingScaleUpdate = true;
-            } else {
-                this._targetScale = this._scale = newScale;
-            }
-
-            this._queueUpdateStates();
-        }
-
-        let thumbnailHeight = portholeHeight * this._scale;
-        let thumbnailWidth = Math.round(portholeWidth * this._scale);
-        let roundedHScale = thumbnailWidth / portholeWidth;
-
-        let slideOffset; // X offset when thumbnail is fully slid offscreen
-        if (rtl)
-            slideOffset = - (thumbnailWidth + themeNode.get_padding(St.Side.LEFT));
-        else
-            slideOffset = thumbnailWidth + themeNode.get_padding(St.Side.RIGHT);
-
-        let childBox = new Clutter.ActorBox();
-
-        // The background is horizontally restricted to correspond to the current thumbnail size
-        // but otherwise covers the entire allocation
-        if (rtl) {
-            childBox.x1 = box.x1;
-            childBox.x2 = box.x2 - ((contentBox.x2 - contentBox.x1) - thumbnailWidth);
-        } else {
-            childBox.x1 = box.x1 + ((contentBox.x2 - contentBox.x1) - thumbnailWidth);
-            childBox.x2 = box.x2;
-        }
-        childBox.y1 = box.y1;
-        childBox.y2 = box.y2;
-        this._background.allocate(childBox, flags);
-
-        let indicatorY = this._indicatorY;
-        // when not animating, the workspace position overrides this._indicatorY
-        let indicatorWorkspace = !this._animatingIndicator ? global.screen.get_active_workspace() : null;
-
-        let y = contentBox.y1;
-
-        for (let i = 0; i < this._thumbnails.length; i++) {
-            let thumbnail = this._thumbnails[i];
-
-            if (i > 0)
-                y += spacing - Math.round(thumbnail.collapseFraction * spacing);
-
-            // We might end up with thumbnailHeight being something like 99.33
-            // pixels. To make this work and not end up with a gap at the bottom,
-            // we need some thumbnails to be 99 pixels and some 100 pixels height;
-            // we compute an actual scale separately for each thumbnail.
-            let y1 = Math.round(y);
-            let y2 = Math.round(y + thumbnailHeight);
-            let roundedVScale = (y2 - y1) / portholeHeight;
-
-            let x1, x2;
-            if (rtl) {
-                x1 = contentBox.x1 + slideOffset * thumbnail.slidePosition;
-                x2 = x1 + thumbnailWidth;
-            } else {
-                x1 = contentBox.x2 - thumbnailWidth + slideOffset * thumbnail.slidePosition;
-                x2 = x1 + thumbnailWidth;
-            }
-
-            if (thumbnail.metaWorkspace == indicatorWorkspace)
-                indicatorY = y1;
-
-            // Allocating a scaled actor is funny - x1/y1 correspond to the origin
-            // of the actor, but x2/y2 are increased by the *unscaled* size.
-            childBox.x1 = x1;
-            childBox.x2 = x1 + portholeWidth;
-            childBox.y1 = y1;
-            childBox.y2 = y1 + portholeHeight;
-
-            thumbnail.actor.set_scale(roundedHScale, roundedVScale);
-            thumbnail.actor.allocate(childBox, flags);
-
-            // We round the collapsing portion so that we don't get thumbnails resizing
-            // during an animation due to differences in rounded, but leave the uncollapsed
-            // portion unrounded so that non-animating we end up with the right total
-            y += thumbnailHeight - Math.round(thumbnailHeight * thumbnail.collapseFraction);
-        }
-
-        if (rtl) {
-            childBox.x1 = contentBox.x1;
-            childBox.x2 = contentBox.x1 + thumbnailWidth;
-        } else {
-            childBox.x1 = contentBox.x2 - thumbnailWidth;
-            childBox.x2 = contentBox.x2;
-        }
-        childBox.y1 = indicatorY;
-        childBox.y2 = childBox.y1 + thumbnailHeight;
-        this._indicator.allocate(childBox, flags);
-    },
-
-    _activeWorkspaceChanged: function(wm, from, to, direction) {
-        let thumbnail;
-        let activeWorkspace = global.screen.get_active_workspace();
-        for (let i = 0; i < this._thumbnails.length; i++) {
-            if (this._thumbnails[i].metaWorkspace == activeWorkspace) {
-                thumbnail = this._thumbnails[i];
-                break;
-            }
-        }
-
-        this._animatingIndicator = true;
-        this.indicatorY = this._indicator.allocation.y1;
-        Tweener.addTween(this,
-                         { indicatorY: thumbnail.actor.allocation.y1,
-                           time: WorkspacesView.WORKSPACE_SWITCH_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: function() {
-                               this._animatingIndicator = false;
-                               this._queueUpdateStates();
-                           },
-                           onCompleteScope: this
-                         });
-    }
-};
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -13,14 +13,12 @@ fi
 fr
 ga
 gl
-gu
 he
 hu
 id
 it
 ja
 ko
-kn
 lt
 nb
 nl
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,10 @@
 data/gnome-shell.desktop.in.in
 data/org.gnome.shell.gschema.xml.in
+data/org.gnome.accessibility.magnifier.gschema.xml.in
 js/misc/util.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js
-js/ui/calendar.js
 js/ui/dash.js
-js/ui/dateMenu.js
 js/ui/docDisplay.js
 js/ui/endSessionDialog.js
 js/ui/lookingGlass.js
@@ -15,7 +14,6 @@ js/ui/panel.js
 js/ui/placeDisplay.js
 js/ui/popupMenu.js
 js/ui/runDialog.js
-js/ui/searchDisplay.js
 js/ui/statusMenu.js
 js/ui/status/accessibility.js
 js/ui/status/bluetooth.js
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-21 23:39+0200\n"
-"PO-Revision-Date: 2011-02-21 23:39+0300\n"
+"POT-Creation-Date: 2011-01-23 13:29+0200\n"
+"PO-Revision-Date: 2011-01-23 13:29+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "MIME-Version: 1.0\n"
@@ -55,26 +55,22 @@ msgid "History for command (Alt-F2) dialog"
 msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.h:7
-msgid "History for the looking glass dialog"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:8
 msgid "If true, display date in the clock, in addition to time."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:9
+#: ../data/org.gnome.shell.gschema.xml.in.h:8
 msgid "If true, display seconds in time."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:10
+#: ../data/org.gnome.shell.gschema.xml.in.h:9
 msgid "If true, display the ISO week date in the calendar."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.shell.gschema.xml.in.h:10
 msgid "List of desktop file IDs for favorite applications"
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -89,42 +85,42 @@ msgid ""
 "at the optimal thread count on the system."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Show date in clock"
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 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:15
 msgid "Show time with seconds"
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 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:17
 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:18
 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:19
 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:20
 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 "
@@ -132,59 +128,180 @@ msgid ""
 "remove already saved data."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "Uuids of extensions to disable"
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "Whether to collect stats about applications usage"
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid "disabled OpenSearch providers"
 msgstr ""

-#: ../js/misc/util.js:86
-msgid "Command not found"
-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 ""
+
+#: ../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 ""

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:113
+#: ../js/misc/util.js:108
 msgid "Could not parse command:"
 msgstr "تعذّر تحليل الأمر:"

-#: ../js/misc/util.js:135
+#: ../js/misc/util.js:130
 msgid "No such application"
 msgstr "لا تطبيق بهذا الاسم"

-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:143 ../js/ui/runDialog.js:351
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "فشل تنفيذ '%s':‏"

 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:174
+#: ../js/ui/appDisplay.js:155
 msgid "All"
 msgstr "الكل"

-#: ../js/ui/appDisplay.js:261
+#: ../js/ui/appDisplay.js:236
 msgid "APPLICATIONS"
 msgstr "التطبيقات"

-#: ../js/ui/appDisplay.js:291
+#: ../js/ui/appDisplay.js:266
 msgid "PREFERENCES"
 msgstr "التفضيلات"

-#: ../js/ui/appDisplay.js:551
+#: ../js/ui/appDisplay.js:563
 msgid "New Window"
 msgstr "نافذة جديدة"

-#: ../js/ui/appDisplay.js:555
+#: ../js/ui/appDisplay.js:567
 msgid "Remove from Favorites"
 msgstr "أزِل من المفضّلة"

-#: ../js/ui/appDisplay.js:556
+#: ../js/ui/appDisplay.js:568
 msgid "Add to Favorites"
 msgstr "أضِف إلى المفضّلة"

@@ -198,212 +315,11 @@ msgstr "أضيف %s إلى مفضلتك."
 msgid "%s has been removed from your favorites."
 msgstr "أزيل %s من مفضّلتك."

-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: ../js/ui/calendar.js:65
-msgctxt "event list time"
-msgid "All Day"
-msgstr "طوال اليوم"
-
-#. Translators: Shown in calendar event list, if 24h format
-#: ../js/ui/calendar.js:70
-msgctxt "event list time"
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Transators: Shown in calendar event list, if 12h format
-#: ../js/ui/calendar.js:77
-msgctxt "event list time"
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. Translators: Calendar grid abbreviation for Sunday.
-#. *
-#. * NOTE: These grid abbreviations are always shown together
-#. * and in order, e.g. "S M T W T F S".
-#.
-#: ../js/ui/calendar.js:117
-msgctxt "grid sunday"
-msgid "S"
-msgstr "أ"
-
-#. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:119
-msgctxt "grid monday"
-msgid "M"
-msgstr "ث"
-
-#. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:121
-msgctxt "grid tuesday"
-msgid "T"
-msgstr "ث"
-
-#. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:123
-msgctxt "grid wednesday"
-msgid "W"
-msgstr "أ"
-
-#. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:125
-msgctxt "grid thursday"
-msgid "T"
-msgstr "خ"
-
-#. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:127
-msgctxt "grid friday"
-msgid "F"
-msgstr "ج"
-
-#. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:129
-msgctxt "grid saturday"
-msgid "S"
-msgstr "س"
-
-#. Translators: Event list abbreviation for Sunday.
-#. *
-#. * NOTE: These list abbreviations are normally not shown together
-#. * so they need to be unique (e.g. Tuesday and Thursday cannot
-#. * both be 'T').
-#.
-#: ../js/ui/calendar.js:142
-msgctxt "list sunday"
-msgid "Su"
-msgstr "أحد"
-
-#. Translators: Event list abbreviation for Monday
-#: ../js/ui/calendar.js:144
-msgctxt "list monday"
-msgid "M"
-msgstr "اثنين"
-
-#. Translators: Event list abbreviation for Tuesday
-#: ../js/ui/calendar.js:146
-msgctxt "list tuesday"
-msgid "T"
-msgstr "ثلاثاء"
-
-#. Translators: Event list abbreviation for Wednesday
-#: ../js/ui/calendar.js:148
-msgctxt "list wednesday"
-msgid "W"
-msgstr "أربعاء"
-
-#. Translators: Event list abbreviation for Thursday
-#: ../js/ui/calendar.js:150
-msgctxt "list thursday"
-msgid "Th"
-msgstr "خميس"
-
-#. Translators: Event list abbreviation for Friday
-#: ../js/ui/calendar.js:152
-msgctxt "list friday"
-msgid "F"
-msgstr "جمعة"
-
-#. Translators: Event list abbreviation for Saturday
-#: ../js/ui/calendar.js:154
-msgctxt "list saturday"
-msgid "S"
-msgstr "سبت"
-
-#. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:701
-msgid "Nothing Scheduled"
-msgstr "الجدول خال"
-
-#. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:717
-msgctxt "calendar heading"
-msgid "%A, %B %d"
-msgstr "%A، %d %B"
-
-#. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:720
-msgctxt "calendar heading"
-msgid "%A, %B %d, %Y"
-msgstr "%A، %d %B، %Y"
-
-#: ../js/ui/calendar.js:730
-msgid "Today"
-msgstr "اليوم"
-
-#: ../js/ui/calendar.js:734
-msgid "Tomorrow"
-msgstr "غدا"
-
-#: ../js/ui/calendar.js:743
-msgid "This week"
-msgstr "هذا الأسبوع"
-
-#: ../js/ui/calendar.js:751
-msgid "Next week"
-msgstr "الأسبوع القادم"
-
-#: ../js/ui/dash.js:174
+#: ../js/ui/dash.js:27
 msgid "Remove"
 msgstr "أزِل"

-#: ../js/ui/dateMenu.js:93
-msgid "Date and Time Settings"
-msgstr "إعدادات الوقت و التّأريخ"
-
-#: ../js/ui/dateMenu.js:112
-msgid "Open Calendar"
-msgstr "افتح التقويم"
-
-#. Translators: This is the time format with date used
-#. in 24-hour mode.
-#: ../js/ui/dateMenu.js:151
-msgid "%a %b %e, %R:%S"
-msgstr "%A %e %B، %R:%S"
-
-#: ../js/ui/dateMenu.js:152
-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/dateMenu.js:156
-msgid "%a %R:%S"
-msgstr "%A %R:%S"
-
-#: ../js/ui/dateMenu.js:157
-msgid "%a %R"
-msgstr "%A %R"
-
-#. Translators: This is a time format with date used
-#. for AM/PM.
-#: ../js/ui/dateMenu.js:164
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%A %e %B، %l:%M:%S %p"
-
-#: ../js/ui/dateMenu.js:165
-msgid "%a %b %e, %l:%M %p"
-msgstr "%A %e %B، %l:%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../js/ui/dateMenu.js:169
-msgid "%a %l:%M:%S %p"
-msgstr "%A %l:%M:%S %p"
-
-#: ../js/ui/dateMenu.js:170
-msgid "%a %l:%M %p"
-msgstr "%A %Ol:%OM %p"
-
-#. Translators: This is the date format to use when the calendar popup is
-#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-#.
-#: ../js/ui/dateMenu.js:196
-msgid "%A %B %e, %Y"
-msgstr "%A %e %B، %Y"
-
-#: ../js/ui/docDisplay.js:19
+#: ../js/ui/docDisplay.js:18
 msgid "RECENT ITEMS"
 msgstr "العناصر الحديثة"

@@ -476,78 +392,118 @@ msgstr "أكّد"
 msgid "Cancel"
 msgstr "ألغِ"

-#: ../js/ui/lookingGlass.js:587
+#: ../js/ui/lookingGlass.js:556
 msgid "No extensions installed"
 msgstr "لم تثبّت أية امتدادات"

-#: ../js/ui/lookingGlass.js:624
+#: ../js/ui/lookingGlass.js:593
 msgid "Enabled"
 msgstr "مفعّل"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:626 ../src/gvc/gvc-mixer-control.c:1087
+#: ../js/ui/lookingGlass.js:595 ../src/gvc/gvc-mixer-control.c:1087
 msgid "Disabled"
 msgstr "معطّل"

-#: ../js/ui/lookingGlass.js:628
+#: ../js/ui/lookingGlass.js:597
 msgid "Error"
 msgstr "خطأ"

-#: ../js/ui/lookingGlass.js:630
+#: ../js/ui/lookingGlass.js:599
 msgid "Out of date"
 msgstr "غير محدث"

-#: ../js/ui/lookingGlass.js:655
+#: ../js/ui/lookingGlass.js:624
 msgid "View Source"
 msgstr "اعرض المصدر"

-#: ../js/ui/lookingGlass.js:661
+#: ../js/ui/lookingGlass.js:630
 msgid "Web Page"
 msgstr "صفحة الوب"

-#: ../js/ui/messageTray.js:1864
+#: ../js/ui/messageTray.js:1765
 msgid "System Information"
 msgstr "معلومات النظام"

-#: ../js/ui/overview.js:88
+#: ../js/ui/overview.js:75
 msgid "Undo"
 msgstr "تراجع"

-#: ../js/ui/overview.js:183
+#: ../js/ui/overview.js:140
 msgid "Windows"
 msgstr "النوافذ"

-#: ../js/ui/overview.js:186
+#: ../js/ui/overview.js:143
 msgid "Applications"
 msgstr "التطبيقات"

 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:537
+#: ../js/ui/panel.js:483
 #, c-format
 msgid "Quit %s"
 msgstr "أغلق %s"

+#. Translators: This is the time format with date used
+#. in 24-hour mode.
+#: ../js/ui/panel.js:568
+msgid "%a %b %e, %R:%S"
+msgstr "%A %e %B، %R:%S"
+
+#: ../js/ui/panel.js:569
+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:573
+msgid "%a %R:%S"
+msgstr "%A %R:%S"
+
+#: ../js/ui/panel.js:574
+msgid "%a %R"
+msgstr "%A %R"
+
+#. Translators: This is a time format with date used
+#. for AM/PM.
+#: ../js/ui/panel.js:581
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%A %e %B، %l:%M:%S %p"
+
+#: ../js/ui/panel.js:582
+msgid "%a %b %e, %l:%M %p"
+msgstr "%A %e %B، %l:%M %p"
+
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#: ../js/ui/panel.js:586
+msgid "%a %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#: ../js/ui/panel.js:587
+msgid "%a %l:%M %p"
+msgstr "%A %Ol:%OM %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:770
+#: ../js/ui/panel.js:732
 msgid "Activities"
 msgstr "الأنشطة"

-#: ../js/ui/placeDisplay.js:122
+#: ../js/ui/placeDisplay.js:106
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "فشل فصْل '%s'"

-#: ../js/ui/placeDisplay.js:125
+#: ../js/ui/placeDisplay.js:109
 msgid "Retry"
 msgstr "أعد المحاولة"

-#: ../js/ui/placeDisplay.js:165
+#: ../js/ui/placeDisplay.js:150
 msgid "Connect to..."
 msgstr "اتّصل ب‍..."

-#: ../js/ui/placeDisplay.js:409
+#: ../js/ui/placeDisplay.js:386
 msgid "PLACES & DEVICES"
 msgstr "الأماكن والأجهزة"

@@ -556,22 +512,14 @@ msgstr "الأماكن والأجهزة"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:511
+#: ../js/ui/popupMenu.js:33
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:201
+#: ../js/ui/runDialog.js:209
 msgid "Please enter a command:"
 msgstr "من فضلك اكتب أمرا:"

-#: ../js/ui/searchDisplay.js:295
-msgid "Searching..."
-msgstr "يبحث..."
-
-#: ../js/ui/searchDisplay.js:309
-msgid "No matching results."
-msgstr "لا نتائج مطابقة."
-
 #: ../js/ui/statusMenu.js:102
 msgid "Available"
 msgstr "متاح"
@@ -600,21 +548,19 @@ msgstr "بدّل المستخدم"
 msgid "Log Out..."
 msgstr "اخرج..."

-#. This is temporarily removed, see
-#. http://bugzilla.gnome.org/show_bug.cgi?id=636680
-#. for details.
-#. item = new PopupMenu.PopupMenuItem(_("Suspend..."));
-#. item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-#. this.menu.addMenuItem(item);
-#: ../js/ui/statusMenu.js:149
+#: ../js/ui/statusMenu.js:142
+msgid "Suspend..."
+msgstr "علّق..."
+
+#: ../js/ui/statusMenu.js:146
 msgid "Shut Down..."
 msgstr "أطفئ..."

-#: ../js/ui/status/accessibility.js:81
+#: ../js/ui/status/accessibility.js:83
 msgid "Zoom"
 msgstr "تقريب"

-#: ../js/ui/status/accessibility.js:88
+#: ../js/ui/status/accessibility.js:89
 msgid "Screen Reader"
 msgstr "قارئ الشاشة"

@@ -622,41 +568,39 @@ msgstr "قارئ الشاشة"
 msgid "Screen Keyboard"
 msgstr "لوحة مفاتيح على الشاشة"

-#: ../js/ui/status/accessibility.js:96
+#: ../js/ui/status/accessibility.js:95
 msgid "Visual Alerts"
 msgstr "تنبيهات بصرية"

-#: ../js/ui/status/accessibility.js:99
+#: ../js/ui/status/accessibility.js:98
 msgid "Sticky Keys"
 msgstr "مفاتيح لاصقة"

-#: ../js/ui/status/accessibility.js:102
+#: ../js/ui/status/accessibility.js:101
 msgid "Slow Keys"
 msgstr "مفاتيح بطيئة"

-#: ../js/ui/status/accessibility.js:105
+#: ../js/ui/status/accessibility.js:104
 msgid "Bounce Keys"
 msgstr "مفاتيح لها صوت"

-#: ../js/ui/status/accessibility.js:108
+#: ../js/ui/status/accessibility.js:107
 msgid "Mouse Keys"
 msgstr "مفاتيح الفأرة"

-#: ../js/ui/status/accessibility.js:112
+#: ../js/ui/status/accessibility.js:111
 msgid "Universal Access Settings"
 msgstr "إعدادات الإتاحة"

-#: ../js/ui/status/accessibility.js:164
+#: ../js/ui/status/accessibility.js:163
 msgid "High Contrast"
 msgstr "تباين عال"

-#: ../js/ui/status/accessibility.js:209
+#: ../js/ui/status/accessibility.js:205
 msgid "Large Text"
 msgstr "نص كبير"

 #: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241
-#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
-#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
 msgid "Bluetooth"
 msgstr "بلوتوث"

@@ -705,10 +649,15 @@ msgstr "إعدادات لوحة المفاتيح"
 msgid "Mouse Settings"
 msgstr "إعدادات الفأرة"

-#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:65
+#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:63
 msgid "Sound Settings"
 msgstr "إعدادات الصوت"

+#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
+msgid "Bluetooth Agent"
+msgstr "عميل بلوتوث"
+
 #: ../js/ui/status/bluetooth.js:372
 #, c-format
 msgid "Authorization request from %s"
@@ -767,11 +716,7 @@ msgstr "من فضلك أدخل الرقم المذكور على الجهاز."
 msgid "OK"
 msgstr "حسنا"

-#: ../js/ui/status/keyboard.js:73
-msgid "Show Keyboard Layout..."
-msgstr "أظهر تخطيط لوحة المفاتيح..."
-
-#: ../js/ui/status/keyboard.js:76
+#: ../js/ui/status/keyboard.js:78
 msgid "Localization Settings"
 msgstr "إعدادات اللغة"

@@ -871,34 +816,34 @@ msgstr "لوحة"
 msgid "Computer"
 msgstr "حاسوب"

-#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1013
+#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1012
 msgid "Unknown"
 msgstr "مجهول"

-#: ../js/ui/status/volume.js:44
+#: ../js/ui/status/volume.js:42
 msgid "Volume"
 msgstr "جزء"

-#: ../js/ui/status/volume.js:57
+#: ../js/ui/status/volume.js:55
 msgid "Microphone"
 msgstr "ميكروفون"

-#: ../js/ui/telepathyClient.js:240
+#: ../js/ui/telepathyClient.js:561
 #, c-format
 msgid "%s is online."
 msgstr "‏%s متّصل."

-#: ../js/ui/telepathyClient.js:245
+#: ../js/ui/telepathyClient.js:566
 #, c-format
 msgid "%s is offline."
 msgstr "‏%s غير متّصل."

-#: ../js/ui/telepathyClient.js:248
+#: ../js/ui/telepathyClient.js:569
 #, c-format
 msgid "%s is away."
 msgstr "‏%s غائب."

-#: ../js/ui/telepathyClient.js:251
+#: ../js/ui/telepathyClient.js:572
 #, c-format
 msgid "%s is busy."
 msgstr "‏%s مشغول."
@@ -906,18 +851,14 @@ 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:349
+#: ../js/ui/telepathyClient.js:666
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "أُرسلت الساعة %l:%M:%S في %A"

-#. Translators: this is the text displayed
-#. in the search entry when no search is
-#. active; it should not exceed ~30
-#. characters
-#: ../js/ui/viewSelector.js:30
-msgid "Type to search..."
-msgstr "اكتب نصا للبحث عنه..."
+#: ../js/ui/viewSelector.js:26
+msgid "Search your computer"
+msgstr "ابحث في حاسوبك"

 #: ../js/ui/windowAttentionHandler.js:43
 #, c-format
@@ -929,6 +870,15 @@ msgstr "انتهى %s من البدء"
 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
@@ -959,11 +909,11 @@ msgstr[5] "%u مدخل"
 msgid "System Sounds"
 msgstr "أصوات النظام"

-#: ../src/shell-global.c:1363
+#: ../src/shell-global.c:1366
 msgid "Less than a minute ago"
 msgstr "منذ أقل من دقيقة"

-#: ../src/shell-global.c:1367
+#: ../src/shell-global.c:1370
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -974,7 +924,7 @@ msgstr[3] "منذ %d دقائق"
 msgstr[4] "منذ %d دقيقة"
 msgstr[5] "منذ %d دقيقة"

-#: ../src/shell-global.c:1372
+#: ../src/shell-global.c:1375
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -985,7 +935,7 @@ msgstr[3] "منذ %d ساعات"
 msgstr[4] "منذ %d ساعة"
 msgstr[5] "منذ %d ساعة"

-#: ../src/shell-global.c:1377
+#: ../src/shell-global.c:1380
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -996,7 +946,7 @@ msgstr[3] "منذ %d أيام"
 msgstr[4] "منذ %d يوما"
 msgstr[5] "منذ %d يوم"

-#: ../src/shell-global.c:1382
+#: ../src/shell-global.c:1385
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -1031,23 +981,6 @@ msgstr "ابحث"
 msgid "%1$s: %2$s"
 msgstr "‏%1$s:‏ %2$s"

-#~ msgid "Search your computer"
-#~ msgstr "ابحث في حاسوبك"
-
-#~ msgid "Bluetooth Agent"
-#~ msgstr "عميل بلوتوث"
-
-#~ msgid ""
-#~ "Can't add a new workspace because maximum workspaces limit has been "
-#~ "reached."
-#~ msgstr "تعذّر إضافة مساحة عمل جديدة، لتجاوز أقصى عدد من مساحات العمل."
-
-#~ msgid "Can't remove the first workspace."
-#~ msgstr "لا يمكن حذف مساحة العمل الأولى."
-
-#~ msgid "Suspend..."
-#~ msgstr "علّق..."
-
 #~ msgid "Clock"
 #~ msgstr "الساعة"

@@ -1081,6 +1014,12 @@ msgstr "‏%1$s:‏ %2$s"
 #~ msgid "Find"
 #~ msgstr "ابحث"

+#~ msgid "Searching..."
+#~ msgstr "يبحث..."
+
+#~ msgid "No matching results."
+#~ msgstr "لا نتائج مطابقة."
+
 #~ msgid "Preferences"
 #~ msgstr "التفضيلات"

@@ -1090,6 +1029,9 @@ msgstr "‏%1$s:‏ %2$s"
 #~ msgid "System Preferences..."
 #~ msgstr "تفضيلات النظام..."

+#~ msgid "%H:%M"
+#~ msgstr "%OH:%OM"
+
 #~ msgid "Recent Documents"
 #~ msgstr "المستندات الحديثة"

--- a/po/cs.po
+++ b/po/cs.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/et.po
+++ b/po/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2011-02-04 22:28+0000\n"
-"PO-Revision-Date: 2011-02-06 08:43+0200\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"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -242,9 +242,6 @@ msgstr ""
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr "Niitristi moodustavate püst- ja rõhtjoone laius"

-msgid "Command not found"
-msgstr "Käsku ei leitud"
-
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
 msgid "Could not parse command:"
@@ -284,175 +281,9 @@ msgstr "%s lisati lemmikutesse."
 msgid "%s has been removed from your favorites."
 msgstr "%s eemaldati lemmikutest."

-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-msgctxt "event list time"
-msgid "All Day"
-msgstr "Kogu päeva"
-
-#. Translators: Shown in calendar event list, if 24h format
-msgctxt "event list time"
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Transators: Shown in calendar event list, if 12h format
-msgctxt "event list time"
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. Translators: Calendar grid abbreviation for Sunday.
-#. *
-#. * NOTE: These grid abbreviations are always shown together
-#. * and in order, e.g. "S M T W T F S".
-#.
-msgctxt "grid sunday"
-msgid "S"
-msgstr "P"
-
-#. Translators: Calendar grid abbreviation for Monday
-msgctxt "grid monday"
-msgid "M"
-msgstr "E"
-
-#. Translators: Calendar grid abbreviation for Tuesday
-msgctxt "grid tuesday"
-msgid "T"
-msgstr "T"
-
-#. Translators: Calendar grid abbreviation for Wednesday
-msgctxt "grid wednesday"
-msgid "W"
-msgstr "K"
-
-#. Translators: Calendar grid abbreviation for Thursday
-msgctxt "grid thursday"
-msgid "T"
-msgstr "N"
-
-#. Translators: Calendar grid abbreviation for Friday
-msgctxt "grid friday"
-msgid "F"
-msgstr "R"
-
-#. Translators: Calendar grid abbreviation for Saturday
-msgctxt "grid saturday"
-msgid "S"
-msgstr "L"
-
-#. Translators: Event list abbreviation for Sunday.
-#. *
-#. * NOTE: These list abbreviations are normally not shown together
-#. * so they need to be unique (e.g. Tuesday and Thursday cannot
-#. * both be 'T').
-#.
-msgctxt "list sunday"
-msgid "Su"
-msgstr "P"
-
-#. Translators: Event list abbreviation for Monday
-msgctxt "list monday"
-msgid "M"
-msgstr "E"
-
-#. Translators: Event list abbreviation for Tuesday
-msgctxt "list tuesday"
-msgid "T"
-msgstr "T"
-
-#. Translators: Event list abbreviation for Wednesday
-msgctxt "list wednesday"
-msgid "W"
-msgstr "K"
-
-#. Translators: Event list abbreviation for Thursday
-msgctxt "list thursday"
-msgid "Th"
-msgstr "N"
-
-#. Translators: Event list abbreviation for Friday
-msgctxt "list friday"
-msgid "F"
-msgstr "R"
-
-#. Translators: Event list abbreviation for Saturday
-msgctxt "list saturday"
-msgid "S"
-msgstr "L"
-
-#. Translators: Text to show if there are no events
-msgid "Nothing Scheduled"
-msgstr ""
-
-#. Translators: Shown on calendar heading when selected day occurs on current year
-msgctxt "calendar heading"
-msgid "%A, %B %d"
-msgstr "%A, %d. %B"
-
-#. Translators: Shown on calendar heading when selected day occurs on different year
-msgctxt "calendar heading"
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B %Y"
-
-msgid "Today"
-msgstr "Täna"
-
-msgid "Tomorrow"
-msgstr "Homme"
-
-msgid "This week"
-msgstr "Käesolev nädal"
-
-msgid "Next week"
-msgstr "Järgmine nädal"
-
 msgid "Remove"
 msgstr "Eemalda"

-msgid "Date and Time Settings"
-msgstr "Kuupäeva ja kellaaja sätted"
-
-msgid "Open Calendar"
-msgstr "Ava kalender"
-
-#. Translators: This is the time format with date used
-#. in 24-hour mode.
-msgid "%a %b %e, %R:%S"
-msgstr "%a, %e. %b, %R:%S"
-
-msgid "%a %b %e, %R"
-msgstr "%a, %e. %b, %R"
-
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-msgid "%a %R:%S"
-msgstr "%A %R:%S"
-
-msgid "%a %R"
-msgstr "%A %R"
-
-#. Translators: This is a time format with date used
-#. for AM/PM.
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a, %e. %b, %l:%M:%S %p"
-
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a, %e. %b, %l:%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-msgid "%a %l:%M:%S %p"
-msgstr "%A, %l:%M:%S %p"
-
-msgid "%a %l:%M %p"
-msgstr "%a, %l:%M %p"
-
-#. 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").
-#.
-msgid "%A %B %e, %Y"
-msgstr "%A, %d. %B %Y"
-
 msgid "RECENT ITEMS"
 msgstr "Hiljutised dokumendid"

@@ -478,17 +309,17 @@ msgid "Logging out of the system."
 msgstr "Süsteemist väljalogimine"

 msgid "Shut Down"
-msgstr "Lülita välja"
+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 "%d sekundi pärast lülitub süsteem automaatselt välja."
+msgstr "Süsteem seisatakse automaatselt %d sekundi pärast."

 msgid "Shutting down the system."
-msgstr "Süsteemi väljalülitamine."
+msgstr "Süsteemi seiskamine."

 msgid "Restart"
 msgstr "Taaskäivita"
@@ -551,6 +382,38 @@ msgstr "Rakendused"
 msgid "Quit %s"
 msgstr "Lõpeta %s"

+#. Translators: This is the time format with date used
+#. in 24-hour mode.
+msgid "%a %b %e, %R:%S"
+msgstr "%a, %e. %b, %R:%S"
+
+msgid "%a %b %e, %R"
+msgstr "%a, %e. %b, %R"
+
+#. Translators: This is the time format without date used
+#. in 24-hour mode.
+msgid "%a %R:%S"
+msgstr "%A %R:%S"
+
+msgid "%a %R"
+msgstr "%A %R"
+
+#. Translators: This is a time format with date used
+#. for AM/PM.
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%a, %e. %b, %l:%M:%S %p"
+
+msgid "%a %b %e, %l:%M %p"
+msgstr "%a, %e. %b, %l:%M %p"
+
+#. Translators: This is a time format without date used
+#. for AM/PM.
+msgid "%a %l:%M:%S %p"
+msgstr "%A, %l:%M:%S %p"
+
+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".
 msgid "Activities"
@@ -601,12 +464,9 @@ msgstr "Vaheta kasutajat"
 msgid "Log Out..."
 msgstr "Logi välja..."

-#. This is temporarily removed, see
-#. http://bugzilla.gnome.org/show_bug.cgi?id=636680
-#. for details.
-#. item = new PopupMenu.PopupMenuItem(_("Suspend..."));
-#. item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-#. this.menu.addMenuItem(item);
+msgid "Suspend..."
+msgstr "Peata..."
+
 msgid "Shut Down..."
 msgstr "Lülita välja..."

@@ -913,9 +773,6 @@ msgstr "Otsing"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Suspend..."
-#~ msgstr "Peata..."
-
 #~ msgid "Clock"
 #~ msgstr "Kell"

--- a/po/gl.po
+++ b/po/gl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-06 00:11+0100\n"
-"PO-Revision-Date: 2011-02-06 00:14+0100\n"
+"POT-Creation-Date: 2011-01-27 03:33+0100\n"
+"PO-Revision-Date: 2011-01-26 21:02+0100\n"
 "Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
 "Language-Team: Galician <gnome-gl-list@gnome.org>\n"
 "Language: gl\n"
@@ -79,8 +79,8 @@ msgstr "Se é verdadeiro, móstrase a data da semana ISO no calendario."
 msgid "List of desktop file IDs for favorite applications"
 msgstr "Mostra os ID de ficheiros desktop para os aplicativos preferidos"

-#: ../data/org.gnome.shell.gschema.xml.in.h:12
-#, no-c-format
+#: ../data/org.gnome.shell.gschema.xml.in.h:11
+#, fuzzy
 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 "
@@ -89,35 +89,31 @@ 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 ""
 "Estabelece a tubería GStreamer usada para codificar gravacións. Segue a "
 "sintaxe usada para gst-launch. A tubería debería ter un sumideiro («sink») "
-"de ensamblaxe/desensamblaxe onde o vídeo gravado se grava. Xeralmente terá "
-"unha orixe de ensamblado/desensamblado; a saída dese punto escribirase no "
-"ficheiro de saída. Porén, a tubería tamén pode tomar parte na súa propia "
-"saída; isto pódese usar para enviar a saída a un servidor «icecast» a través "
-"de shout2send ou similar. Cando non está estabelecido ou está a un valor "
-"baleiro, usarase a tubería predeterminada. Actualmente é «! vp8enc "
-"quality=10 speed=2 threads=%T ! queue ! webmmux'» e grava en WEBM usando o "
-"códec VP8. Úsase %T como suposición para o número de fillos óptimos no "
-"sistema."
+"de ensamblaxe/desensamblaxe onde o vídeo que se está gravando grávase. "
+"Xeralmente terá unha orixe de ensamblado/desensamblado; a saída dese punto "
+"escribirase no ficheiro de saída. Porén, a tubería tamén pode tomar parte na "
+"súa propia saída; isto pódese usar para enviar a saída a un servidor "
+"«icecast» a través de shout2send ou similar. Cando non está estabelecido ou "
+"está a un valor baleiro, usarase a tubería predeterminada. Actualmente é "
+"«videorate ! theoraenc ! oggmux» e grava en Ogg Theora."

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

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

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

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

-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 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 "
@@ -135,7 +131,7 @@ msgstr ""
 "baseado na data actual e usa esta extensión. Debería cambiar ao grabar nun "
 "formato de contedor diferente."

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

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

-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 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 "
@@ -159,15 +155,15 @@ msgstr ""
 "privados, vostede pode desactivar isto por motivos de privacidade. Teña en "
 "conta que facendo isto non eliminará os datos gardados."

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

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

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "disabled OpenSearch providers"
 msgstr "fornecedores de OpenSearch desactivados"

@@ -275,16 +271,16 @@ msgstr "Mostrar os contidos magnificados máis aló dos bordos do escritorio"

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:16
 msgid "Show or hide crosshairs"
-msgstr "Mostrar ou agochar o punto de mira"
+msgstr "Mostrar ou ocultar o punto de mira"

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:17
 msgid "Show or hide the magnifier"
-msgstr "Mostrar ou agochar o magnificador"
+msgstr "Mostrar ou ocultar o magnificador"

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:18
 msgid "Show or hide the magnifier and all of its zoom regions."
 msgstr ""
-"Mostrar ou agochar o magnificador e todas as súas rexións de magnificación."
+"Mostrar ou ocultar o magnificador e todas as súas rexións de magnificación."

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:19
 msgid ""
@@ -325,47 +321,43 @@ msgstr ""
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr "Anchura das liñas verticais e horizontais que contén o punto de mira."

-#: ../js/misc/util.js:86
-msgid "Command not found"
-msgstr "Orde non atopada"
-
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:113
+#: ../js/misc/util.js:108
 msgid "Could not parse command:"
 msgstr "Non foi posíbel analizar a orde:"

-#: ../js/misc/util.js:135
+#: ../js/misc/util.js:130
 msgid "No such application"
 msgstr "Non existe o aplicativo"

-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:143 ../js/ui/runDialog.js:351
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Produciuse un fallo na execución de «%s»:"

 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:164
+#: ../js/ui/appDisplay.js:155
 msgid "All"
 msgstr "Todos"

-#: ../js/ui/appDisplay.js:245
+#: ../js/ui/appDisplay.js:236
 msgid "APPLICATIONS"
 msgstr "APLICATIVOS"

-#: ../js/ui/appDisplay.js:275
+#: ../js/ui/appDisplay.js:266
 msgid "PREFERENCES"
 msgstr "PREFERENCIAS"

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

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

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

@@ -379,211 +371,10 @@ msgstr "%s foi engadido aos seus favoritos."
 msgid "%s has been removed from your favorites."
 msgstr "%s foi eliminado dos seus favoritos."

-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: ../js/ui/calendar.js:65
-msgctxt "event list time"
-msgid "All Day"
-msgstr "Todo o día"
-
-#. Translators: Shown in calendar event list, if 24h format
-#: ../js/ui/calendar.js:70
-msgctxt "event list time"
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Transators: Shown in calendar event list, if 12h format
-#: ../js/ui/calendar.js:77
-msgctxt "event list time"
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. Translators: Calendar grid abbreviation for Sunday.
-#. *
-#. * NOTE: These grid abbreviations are always shown together
-#. * and in order, e.g. "S M T W T F S".
-#.
-#: ../js/ui/calendar.js:117
-msgctxt "grid sunday"
-msgid "S"
-msgstr "D"
-
-#. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:119
-msgctxt "grid monday"
-msgid "M"
-msgstr "L"
-
-#. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:121
-msgctxt "grid tuesday"
-msgid "T"
-msgstr "M"
-
-#. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:123
-msgctxt "grid wednesday"
-msgid "W"
-msgstr "W"
-
-#. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:125
-msgctxt "grid thursday"
-msgid "T"
-msgstr "X"
-
-#. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:127
-msgctxt "grid friday"
-msgid "F"
-msgstr "V"
-
-#. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:129
-msgctxt "grid saturday"
-msgid "S"
-msgstr "S"
-
-#. Translators: Event list abbreviation for Sunday.
-#. *
-#. * NOTE: These list abbreviations are normally not shown together
-#. * so they need to be unique (e.g. Tuesday and Thursday cannot
-#. * both be 'T').
-#.
-#: ../js/ui/calendar.js:142
-msgctxt "list sunday"
-msgid "Su"
-msgstr "Do"
-
-#. Translators: Event list abbreviation for Monday
-#: ../js/ui/calendar.js:144
-msgctxt "list monday"
-msgid "M"
-msgstr "L"
-
-#. Translators: Event list abbreviation for Tuesday
-#: ../js/ui/calendar.js:146
-msgctxt "list tuesday"
-msgid "T"
-msgstr "M"
-
-#. Translators: Event list abbreviation for Wednesday
-#: ../js/ui/calendar.js:148
-msgctxt "list wednesday"
-msgid "W"
-msgstr "W"
-
-#. Translators: Event list abbreviation for Thursday
-#: ../js/ui/calendar.js:150
-msgctxt "list thursday"
-msgid "Th"
-msgstr "X"
-
-#. Translators: Event list abbreviation for Friday
-#: ../js/ui/calendar.js:152
-msgctxt "list friday"
-msgid "F"
-msgstr "V"
-
-#. Translators: Event list abbreviation for Saturday
-#: ../js/ui/calendar.js:154
-msgctxt "list saturday"
-msgid "S"
-msgstr "S"
-
-#. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:701
-msgid "Nothing Scheduled"
-msgstr "Nada programado"
-
-#. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:717
-msgctxt "calendar heading"
-msgid "%A, %B %d"
-msgstr "%A, %d de %B"
-
-#. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:720
-msgctxt "calendar heading"
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: ../js/ui/calendar.js:730
-msgid "Today"
-msgstr "Hoxe"
-
-#: ../js/ui/calendar.js:734
-msgid "Tomorrow"
-msgstr "Mañá"
-
-#: ../js/ui/calendar.js:743
-msgid "This week"
-msgstr "Esta semana"
-
-#: ../js/ui/calendar.js:751
-msgid "Next week"
-msgstr "A vindeira semana"
-
 #: ../js/ui/dash.js:27
 msgid "Remove"
 msgstr "Eliminar"

-#: ../js/ui/dateMenu.js:91
-msgid "Date and Time Settings"
-msgstr "Configuracións do data e hora"
-
-#: ../js/ui/dateMenu.js:110
-msgid "Open Calendar"
-msgstr "Abrir o calendario"
-
-#. Translators: This is the time format with date used
-#. in 24-hour mode.
-#: ../js/ui/dateMenu.js:149
-msgid "%a %b %e, %R:%S"
-msgstr "%a %e de %b, %R:%S"
-
-#: ../js/ui/dateMenu.js:150
-msgid "%a %b %e, %R"
-msgstr "%a %e de %b, %R"
-
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-#: ../js/ui/dateMenu.js:154
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
-
-#: ../js/ui/dateMenu.js:155
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format with date used
-#. for AM/PM.
-#: ../js/ui/dateMenu.js:162
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e de %b, %H:%M:%S"
-
-#: ../js/ui/dateMenu.js:163
-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/dateMenu.js:167
-msgid "%a %l:%M:%S %p"
-msgstr "%a %H:%M:%S"
-
-#: ../js/ui/dateMenu.js:168
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#. Translators: This is the date format to use when the calendar popup is
-#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-#.
-#: ../js/ui/dateMenu.js:194
-msgid "%A %B %e, %Y"
-msgstr "%a, %e de %B, %Y"
-
 #: ../js/ui/docDisplay.js:18
 msgid "RECENT ITEMS"
 msgstr "ELEMENTOS RECENTES"
@@ -691,31 +482,71 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Páxina web"

-#: ../js/ui/messageTray.js:1809
+#: ../js/ui/messageTray.js:1765
 msgid "System Information"
 msgstr "Información do sistema"

-#: ../js/ui/overview.js:88
+#: ../js/ui/overview.js:75
 msgid "Undo"
 msgstr "Desfacer"

-#: ../js/ui/overview.js:159
+#: ../js/ui/overview.js:140
 msgid "Windows"
 msgstr "Xanelas"

-#: ../js/ui/overview.js:162
+#: ../js/ui/overview.js:143
 msgid "Applications"
 msgstr "Aplicativos"

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

+#. Translators: This is the time format with date used
+#. in 24-hour mode.
+#: ../js/ui/panel.js:564
+msgid "%a %b %e, %R:%S"
+msgstr "%a %e de %b, %R:%S"
+
+#: ../js/ui/panel.js:565
+msgid "%a %b %e, %R"
+msgstr "%a %e de %b, %R"
+
+#. Translators: This is the time format without date used
+#. in 24-hour mode.
+#: ../js/ui/panel.js:569
+msgid "%a %R:%S"
+msgstr "%a %R:%S"
+
+#: ../js/ui/panel.js:570
+msgid "%a %R"
+msgstr "%a %R"
+
+#. Translators: This is a time format with date used
+#. for AM/PM.
+#: ../js/ui/panel.js:577
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%a %e de %b, %H:%M:%S"
+
+#: ../js/ui/panel.js:578
+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:582
+msgid "%a %l:%M:%S %p"
+msgstr "%a %H:%M:%S"
+
+#: ../js/ui/panel.js:583
+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:614
+#: ../js/ui/panel.js:728
 msgid "Activities"
 msgstr "Actividades"

@@ -749,14 +580,6 @@ msgstr "toggle-switch-intl"
 msgid "Please enter a command:"
 msgstr "Insira unha orde:"

-#: ../js/ui/searchDisplay.js:295
-msgid "Searching..."
-msgstr "Buscando..."
-
-#: ../js/ui/searchDisplay.js:309
-msgid "No matching results."
-msgstr "Non hai resultados que coincidan."
-
 #: ../js/ui/statusMenu.js:102
 msgid "Available"
 msgstr "Dispoñíbel"
@@ -785,13 +608,11 @@ msgstr "Cambiar de usuario"
 msgid "Log Out..."
 msgstr "Saír da sesión…"

-#. This is temporarily removed, see
-#. http://bugzilla.gnome.org/show_bug.cgi?id=636680
-#. for details.
-#. item = new PopupMenu.PopupMenuItem(_("Suspend..."));
-#. item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-#. this.menu.addMenuItem(item);
-#: ../js/ui/statusMenu.js:149
+#: ../js/ui/statusMenu.js:142
+msgid "Suspend..."
+msgstr "Suspender…"
+
+#: ../js/ui/statusMenu.js:146
 msgid "Shut Down..."
 msgstr "Apagar…"

@@ -880,7 +701,7 @@ msgstr "Produciuse un erro ao explorar o dispositivo"
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "O dispositivo solicitado non pode explorarse, o erro foi «%s»"

-#: ../js/ui/status/bluetooth.js:251
+#: ../js/ui/status/bluetooth.js:251 ../js/ui/status/keyboard.js:78
 msgid "Keyboard Settings"
 msgstr "Configuracións do teclado"

@@ -955,10 +776,6 @@ msgstr "Introduza o PIN mencionado no dispositivo."
 msgid "OK"
 msgstr "Aceptar"

-#: ../js/ui/status/keyboard.js:78
-msgid "Localization Settings"
-msgstr "Configuracións do son"
-
 #: ../js/ui/status/power.js:85
 msgid "Power Settings"
 msgstr "Configuracións de enerxía"
@@ -1051,22 +868,22 @@ msgstr "Volume"
 msgid "Microphone"
 msgstr "Micrófono"

-#: ../js/ui/telepathyClient.js:563
+#: ../js/ui/telepathyClient.js:561
 #, c-format
 msgid "%s is online."
 msgstr "%s está conectado/a."

-#: ../js/ui/telepathyClient.js:568
+#: ../js/ui/telepathyClient.js:566
 #, c-format
 msgid "%s is offline."
 msgstr "%s está desconectado/a."

-#: ../js/ui/telepathyClient.js:571
+#: ../js/ui/telepathyClient.js:569
 #, c-format
 msgid "%s is away."
 msgstr "%s está ausente."

-#: ../js/ui/telepathyClient.js:574
+#: ../js/ui/telepathyClient.js:572
 #, c-format
 msgid "%s is busy."
 msgstr "%s está ocupado/a."
@@ -1074,7 +891,7 @@ msgstr "%s está ocupado/a."
 #. 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:668
+#: ../js/ui/telepathyClient.js:666
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "Enviado ás %X o %A"
@@ -1093,14 +910,14 @@ msgstr "%s rematou de iniarse"
 msgid "'%s' is ready"
 msgstr "«%s» está preparado"

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

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

@@ -1126,32 +943,32 @@ msgstr[1] "%u entradas"
 msgid "System Sounds"
 msgstr "Sons do sistema"

-#: ../src/shell-global.c:1365
+#: ../src/shell-global.c:1366
 msgid "Less than a minute ago"
 msgstr "Hai menos dun minuto"

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

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

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

-#: ../src/shell-global.c:1384
+#: ../src/shell-global.c:1385
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -1182,8 +999,9 @@ msgstr "Buscar"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Suspend..."
-#~ msgstr "Suspender…"
+#~| msgid "Sound Settings"
+#~ msgid "Localization Settings"
+#~ msgstr "Configuracións do son"

 #~ msgid "Clock"
 #~ msgstr "Reloxo"
@@ -1276,6 +1094,12 @@ msgstr "%1$s: %2$s"
 #~ msgid "Find"
 #~ msgstr "Buscar"

+#~ msgid "Searching..."
+#~ msgstr "Buscando..."
+
+#~ msgid "No matching results."
+#~ msgstr "Non hai resultados que coincidan."
+
 #~ msgid "Invisible"
 #~ msgstr "Invisíbel"

--- a/po/gu.po
+++ b/po/gu.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-21 22:44+0100\n"
-"PO-Revision-Date: 2011-02-21 22:51+0100\n"
+"POT-Creation-Date: 2011-01-21 01:16+0100\n"
+"PO-Revision-Date: 2011-01-15 01:19+0100\n"
 "Last-Translator: Luca Ferretti <lferrett@gnome.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -61,27 +61,22 @@ msgid "History for command (Alt-F2) dialog"
 msgstr "Cronologia per il dialogo dei comandi (Alt-F2)"

 #: ../data/org.gnome.shell.gschema.xml.in.h:7
-msgid "History for the looking glass dialog"
-msgstr "Cronologia per il dialogo looking glass"
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:8
 msgid "If true, display date in the clock, in addition to time."
 msgstr "Se VERO, mostra nell'orologio la data, oltre all'orario."

-#: ../data/org.gnome.shell.gschema.xml.in.h:9
+#: ../data/org.gnome.shell.gschema.xml.in.h:8
 msgid "If true, display seconds in time."
 msgstr "Se VERO, mostra i secondi nell'orario."

-#: ../data/org.gnome.shell.gschema.xml.in.h:10
+#: ../data/org.gnome.shell.gschema.xml.in.h:9
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Se VERO, mostra il giorno della settimana ISO nel calendario."

-#: ../data/org.gnome.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.shell.gschema.xml.in.h:10
 msgid "List of desktop file IDs for favorite applications"
 msgstr "Elenco di ID di file desktop per le applicazioni preferite"

-#: ../data/org.gnome.shell.gschema.xml.in.h:13
-#, no-c-format
+#: ../data/org.gnome.shell.gschema.xml.in.h:11
 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 "
@@ -90,24 +85,31 @@ 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."
-msgstr "Imposta la pipeline di GStreamer utilizzata per codificare le registrazioni, seguendo la sintassi di gst-launch. La pipeline dovrebbe presentare un pad sink scollegato dove il video viene effettivamente registrato. Dispone normalmente di un pad sorgente scollegato: l'output da quel pad viene scritto nel file di uscita. La pipeline può comunque gestire autonomamente il proprio output: questo può essere utile per inviare l'output verso un server icecast attraverso shout2send o simili. Quando non impostata o senza alcun valore, viene usata la pipeline predefinita il cui valore è \"videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux\" e che registra nel formato WEBM usando il codec VP8. %T è usato come un segnaposto per una stima del valore di thread ottimale per il sistema in uso."
+"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
+msgstr ""
+"Imposta la pipeline di GStreamer utilizzata per codificare le registrazioni, "
+"seguendo la sintassi di gst-launch. La pipeline dovrebbe disporre di un sink "
+"pad scollegato dove il video viene effettivamente registrato. Dispone "
+"normalmente di un pad sorgente scollegato: l'output da quel pad viene "
+"scritto nel file di uscita. La pipeline può comunque gestire autonomamente "
+"il proprio output: questo può essere utile per inviare l'output verso un "
+"server icecast attraverso shout2send o simili. Quando non impostata o senza "
+"alcun valore, viene usata la pipeline predefinita il cui valore è "
+"\"videorate ! theoraenc ! oggmux\" e che registra nel formato Ogg Theora."

-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
 msgid "Show date in clock"
 msgstr "Mostra la data nell'orologio"

-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Show the week date in the calendar"
 msgstr "Mostra il giorno della settimana nel calendario"

-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show time with seconds"
 msgstr "Mostra l'ora con i secondi"

-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
@@ -115,7 +117,7 @@ msgstr ""
 "Le applicazioni che corrispondono a questi identificatori vengono "
 "visualizzate nell'area dei preferiti."

-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 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 "
@@ -125,7 +127,7 @@ msgstr ""
 "data corrente e utilizza questa estensione. Dovrebbe essere modificato "
 "quando si registra utilizzando un diverso formato contenitore."

-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -133,12 +135,12 @@ msgstr ""
 "Il framerate in fotogrammi al secondo dello screencast registrato attraverso "
 "il registratore della GNOME Shell."

-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "La pipeline di gstreamer utilizzata per codificare lo screencast"

 # (ndt) quel "in launchers" non mi convince...
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 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 "
@@ -150,60 +152,181 @@ msgstr ""
 "disabilitare questa funzionalità per motivi di privacy. I dati già salvati "
 "non verranno comunque rimossi."

-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Uuids of extensions to disable"
 msgstr "UUID delle estensioni da disabilitare"

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "Whether to collect stats about applications usage"
 msgstr ""
 "Indica se raccogliere statistiche riguardo l'utilizzo delle applicazioni"

-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "disabled OpenSearch providers"
-msgstr "Fornitori OpenSearch disabilitati"
+msgstr ""

-#: ../js/misc/util.js:86
-msgid "Command not found"
-msgstr "Comando non trovato"
+#: ../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 ""
+
+#: ../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 ""

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:113
+#: ../js/misc/util.js:108
 msgid "Could not parse command:"
 msgstr "Impossibile analizzare il comando:"

-#: ../js/misc/util.js:135
+#: ../js/misc/util.js:130
 msgid "No such application"
 msgstr "Applicazione inesistente"

-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:143 ../js/ui/runDialog.js:351
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Esecuzione di «%s» non riuscita:"

 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:174
+#: ../js/ui/appDisplay.js:155
 msgid "All"
 msgstr "Tutte"

-#: ../js/ui/appDisplay.js:261
+#: ../js/ui/appDisplay.js:236
 msgid "APPLICATIONS"
 msgstr "APPLICAZIONI"

-#: ../js/ui/appDisplay.js:291
+#: ../js/ui/appDisplay.js:266
 msgid "PREFERENCES"
 msgstr "PREFERENZE"

-#: ../js/ui/appDisplay.js:551
+#: ../js/ui/appDisplay.js:563
 msgid "New Window"
 msgstr "Nuova finestra"

-#: ../js/ui/appDisplay.js:555
+#: ../js/ui/appDisplay.js:567
 msgid "Remove from Favorites"
 msgstr "Rimuovi dai preferiti"

-#: ../js/ui/appDisplay.js:556
+#: ../js/ui/appDisplay.js:568
 msgid "Add to Favorites"
 msgstr "Aggiungi ai preferiti"

@@ -219,212 +342,11 @@ msgstr "%s è stato aggiunto ai preferiti."
 msgid "%s has been removed from your favorites."
 msgstr "%s è stato rimosso dai preferiti."

-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: ../js/ui/calendar.js:65
-msgctxt "event list time"
-msgid "All Day"
-msgstr "Giornata"
-
-#. Translators: Shown in calendar event list, if 24h format
-#: ../js/ui/calendar.js:70
-msgctxt "event list time"
-msgid "%H:%M"
-msgstr "%k.%M"
-
-#. Transators: Shown in calendar event list, if 12h format
-#: ../js/ui/calendar.js:77
-msgctxt "event list time"
-msgid "%l:%M %p"
-msgstr "%l.%M %P"
-
-#. Translators: Calendar grid abbreviation for Sunday.
-#. *
-#. * NOTE: These grid abbreviations are always shown together
-#. * and in order, e.g. "S M T W T F S".
-#.
-#: ../js/ui/calendar.js:117
-msgctxt "grid sunday"
-msgid "S"
-msgstr "D"
-
-#. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:119
-msgctxt "grid monday"
-msgid "M"
-msgstr "L"
-
-#. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:121
-msgctxt "grid tuesday"
-msgid "T"
-msgstr "M"
-
-#. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:123
-msgctxt "grid wednesday"
-msgid "W"
-msgstr "M"
-
-#. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:125
-msgctxt "grid thursday"
-msgid "T"
-msgstr "G"
-
-#. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:127
-msgctxt "grid friday"
-msgid "F"
-msgstr "V"
-
-#. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:129
-msgctxt "grid saturday"
-msgid "S"
-msgstr "S"
-
-#. Translators: Event list abbreviation for Sunday.
-#. *
-#. * NOTE: These list abbreviations are normally not shown together
-#. * so they need to be unique (e.g. Tuesday and Thursday cannot
-#. * both be 'T').
-#.
-#: ../js/ui/calendar.js:142
-msgctxt "list sunday"
-msgid "Su"
-msgstr "Do"
-
-#. Translators: Event list abbreviation for Monday
-#: ../js/ui/calendar.js:144
-msgctxt "list monday"
-msgid "M"
-msgstr "Lu"
-
-#. Translators: Event list abbreviation for Tuesday
-#: ../js/ui/calendar.js:146
-msgctxt "list tuesday"
-msgid "T"
-msgstr "Ma"
-
-#. Translators: Event list abbreviation for Wednesday
-#: ../js/ui/calendar.js:148
-msgctxt "list wednesday"
-msgid "W"
-msgstr "Me"
-
-#. Translators: Event list abbreviation for Thursday
-#: ../js/ui/calendar.js:150
-msgctxt "list thursday"
-msgid "Th"
-msgstr "Gi"
-
-#. Translators: Event list abbreviation for Friday
-#: ../js/ui/calendar.js:152
-msgctxt "list friday"
-msgid "F"
-msgstr "Ve"
-
-#. Translators: Event list abbreviation for Saturday
-#: ../js/ui/calendar.js:154
-msgctxt "list saturday"
-msgid "S"
-msgstr "Sa"
-
-#. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:701
-msgid "Nothing Scheduled"
-msgstr "Nessun evento"
-
-#. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:717
-msgctxt "calendar heading"
-msgid "%A, %B %d"
-msgstr "%A, %e %B"
-
-#. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:720
-msgctxt "calendar heading"
-msgid "%A, %B %d, %Y"
-msgstr "%A, %e %B %Y"
-
-#: ../js/ui/calendar.js:730
-msgid "Today"
-msgstr "Oggi"
-
-#: ../js/ui/calendar.js:734
-msgid "Tomorrow"
-msgstr "Domani"
-
-#: ../js/ui/calendar.js:743
-msgid "This week"
-msgstr "Questa settimana"
-
-#: ../js/ui/calendar.js:751
-msgid "Next week"
-msgstr "Prossima settimana"
-
-#: ../js/ui/dash.js:174
+#: ../js/ui/dash.js:27
 msgid "Remove"
 msgstr "Rimuovi"

-#: ../js/ui/dateMenu.js:93
-msgid "Date and Time Settings"
-msgstr "Impostazioni data e ora"
-
-#: ../js/ui/dateMenu.js:112
-msgid "Open Calendar"
-msgstr "Apri calendario"
-
-#. Translators: This is the time format with date used
-#. in 24-hour mode.
-#: ../js/ui/dateMenu.js:151
-msgid "%a %b %e, %R:%S"
-msgstr "%a %e %b, %k.%M.%S"
-
-#: ../js/ui/dateMenu.js:152
-msgid "%a %b %e, %R"
-msgstr "%a %e %b, %k.%M"
-
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-#: ../js/ui/dateMenu.js:156
-msgid "%a %R:%S"
-msgstr "%a %k.%M.%S"
-
-#: ../js/ui/dateMenu.js:157
-msgid "%a %R"
-msgstr "%a %k.%M"
-
-#. Translators: This is a time format with date used
-#. for AM/PM.
-#: ../js/ui/dateMenu.js:164
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %l.%M.%S %P"
-
-#: ../js/ui/dateMenu.js:165
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e %b, %l.%M %P"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../js/ui/dateMenu.js:169
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l.%M.%S %P"
-
-#: ../js/ui/dateMenu.js:170
-msgid "%a %l:%M %p"
-msgstr "%a %l.%M %P"
-
-#. Translators: This is the date format to use when the calendar popup is
-#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-#.
-#: ../js/ui/dateMenu.js:196
-msgid "%A %B %e, %Y"
-msgstr "%a %e %B %Y"
-
-#: ../js/ui/docDisplay.js:19
+#: ../js/ui/docDisplay.js:18
 msgid "RECENT ITEMS"
 msgstr "ELEMENTI RECENTI"

@@ -505,81 +427,122 @@ msgstr "Conferma"
 msgid "Cancel"
 msgstr "Annulla"

-#: ../js/ui/lookingGlass.js:587
+#: ../js/ui/lookingGlass.js:556
 msgid "No extensions installed"
 msgstr "Nessuna estensione installata"

 # (ndt) o abilitata?
-#: ../js/ui/lookingGlass.js:624
+#: ../js/ui/lookingGlass.js:593
 msgid "Enabled"
 msgstr "Abilitato"

 # (ndt) o disabilitata?
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:626 ../src/gvc/gvc-mixer-control.c:1087
+#: ../js/ui/lookingGlass.js:595 ../src/gvc/gvc-mixer-control.c:1087
 msgid "Disabled"
 msgstr "Disabilitato"

-#: ../js/ui/lookingGlass.js:628
+#: ../js/ui/lookingGlass.js:597
 msgid "Error"
 msgstr "Errore"

-#: ../js/ui/lookingGlass.js:630
+#: ../js/ui/lookingGlass.js:599
 msgid "Out of date"
 msgstr "Non aggiornato"

-#: ../js/ui/lookingGlass.js:655
+#: ../js/ui/lookingGlass.js:624
 msgid "View Source"
 msgstr "Visualizza sorgente"

-#: ../js/ui/lookingGlass.js:661
+#: ../js/ui/lookingGlass.js:630
 msgid "Web Page"
 msgstr "Pagina web"

-#: ../js/ui/messageTray.js:1864
+#: ../js/ui/messageTray.js:1765
 msgid "System Information"
 msgstr "Informazione di sistema"

-#: ../js/ui/overview.js:88
+#: ../js/ui/overview.js:75
 msgid "Undo"
 msgstr "Annulla"

-#: ../js/ui/overview.js:183
+#: ../js/ui/overview.js:140
 msgid "Windows"
 msgstr "Finestre"

-#: ../js/ui/overview.js:186
+#: ../js/ui/overview.js:143
 msgid "Applications"
 msgstr "Applicazioni"

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

+#. Translators: This is the time format with date used
+#. in 24-hour mode.
+#: ../js/ui/panel.js:564
+msgid "%a %b %e, %R:%S"
+msgstr "%a %e %b, %k.%M.%S"
+
+# (ndt) proviamo col k, se non funge, sappiamo il perché...
+#: ../js/ui/panel.js:565
+msgid "%a %b %e, %R"
+msgstr "%a %e %b, %k.%M"
+
+#. Translators: This is the time format without date used
+#. in 24-hour mode.
+#: ../js/ui/panel.js:569
+msgid "%a %R:%S"
+msgstr "%a %k.%M.%S"
+
+#: ../js/ui/panel.js:570
+msgid "%a %R"
+msgstr "%a %k.%M"
+
+#. Translators: This is a time format with date used
+#. for AM/PM.
+#: ../js/ui/panel.js:577
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%a %e %b, %l.%M.%S %P"
+
+#: ../js/ui/panel.js:578
+msgid "%a %b %e, %l:%M %p"
+msgstr "%a %e %b, %l.%M %P"
+
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#: ../js/ui/panel.js:582
+msgid "%a %l:%M:%S %p"
+msgstr "%a %l.%M.%S %P"
+
+#: ../js/ui/panel.js:583
+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:770
+#: ../js/ui/panel.js:728
 msgid "Activities"
 msgstr "Attività"

 # (ndt) libera, ma unmount non si può proprio vedere...
-#: ../js/ui/placeDisplay.js:122
+#: ../js/ui/placeDisplay.js:106
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "Impossibile scollegare «%s»"

-#: ../js/ui/placeDisplay.js:125
+#: ../js/ui/placeDisplay.js:109
 msgid "Retry"
 msgstr "Riprova"

-#: ../js/ui/placeDisplay.js:165
+#: ../js/ui/placeDisplay.js:150
 msgid "Connect to..."
 msgstr "Connetti a..."

-#: ../js/ui/placeDisplay.js:409
+#: ../js/ui/placeDisplay.js:386
 msgid "PLACES & DEVICES"
 msgstr "RISORSE E DISPOSITIVI"

@@ -588,22 +551,14 @@ msgstr "RISORSE E DISPOSITIVI"
 #. "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:511
+#: ../js/ui/popupMenu.js:33
 msgid "toggle-switch-us"
-msgstr "toggle-switch-us"
+msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:201
+#: ../js/ui/runDialog.js:209
 msgid "Please enter a command:"
 msgstr "Inserire un comando:"

-#: ../js/ui/searchDisplay.js:295
-msgid "Searching..."
-msgstr "Ricerca..."
-
-#: ../js/ui/searchDisplay.js:309
-msgid "No matching results."
-msgstr "Nessun risultato corrispondente."
-
 #: ../js/ui/statusMenu.js:102
 msgid "Available"
 msgstr "Disponibile"
@@ -632,21 +587,19 @@ msgstr "Cambia utente"
 msgid "Log Out..."
 msgstr "Termina sessione..."

-#. This is temporarily removed, see
-#. http://bugzilla.gnome.org/show_bug.cgi?id=636680
-#. for details.
-#. item = new PopupMenu.PopupMenuItem(_("Suspend..."));
-#. item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-#. this.menu.addMenuItem(item);
-#: ../js/ui/statusMenu.js:149
+#: ../js/ui/statusMenu.js:142
+msgid "Suspend..."
+msgstr "Sospendi..."
+
+#: ../js/ui/statusMenu.js:146
 msgid "Shut Down..."
 msgstr "Arresta..."

-#: ../js/ui/status/accessibility.js:81
+#: ../js/ui/status/accessibility.js:83
 msgid "Zoom"
 msgstr "Ingrandimento"

-#: ../js/ui/status/accessibility.js:88
+#: ../js/ui/status/accessibility.js:89
 msgid "Screen Reader"
 msgstr "Lettore schermo"

@@ -654,41 +607,39 @@ msgstr "Lettore schermo"
 msgid "Screen Keyboard"
 msgstr "Tastiera a schermo"

-#: ../js/ui/status/accessibility.js:96
+#: ../js/ui/status/accessibility.js:95
 msgid "Visual Alerts"
 msgstr "Allerte visive"

-#: ../js/ui/status/accessibility.js:99
+#: ../js/ui/status/accessibility.js:98
 msgid "Sticky Keys"
 msgstr "Permanenza tasti"

-#: ../js/ui/status/accessibility.js:102
+#: ../js/ui/status/accessibility.js:101
 msgid "Slow Keys"
 msgstr "Rallentamento tasti"

-#: ../js/ui/status/accessibility.js:105
+#: ../js/ui/status/accessibility.js:104
 msgid "Bounce Keys"
 msgstr "Pressione ravvicinata tasti"

-#: ../js/ui/status/accessibility.js:108
+#: ../js/ui/status/accessibility.js:107
 msgid "Mouse Keys"
 msgstr "Mouse da tastiera"

-#: ../js/ui/status/accessibility.js:112
+#: ../js/ui/status/accessibility.js:111
 msgid "Universal Access Settings"
 msgstr "Impostazioni accesso universale"

-#: ../js/ui/status/accessibility.js:164
+#: ../js/ui/status/accessibility.js:163
 msgid "High Contrast"
 msgstr "Contrasto elevato"

-#: ../js/ui/status/accessibility.js:209
+#: ../js/ui/status/accessibility.js:205
 msgid "Large Text"
 msgstr "Caratteri grandi"

 #: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241
-#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
-#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
 msgid "Bluetooth"
 msgstr "Bluetooth"

@@ -732,7 +683,7 @@ msgstr "Errore nell'esplorare il dispositivo"
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "Non è possibile esplorare il dispositivo richiesto, l'errore è «%s»"

-#: ../js/ui/status/bluetooth.js:251
+#: ../js/ui/status/bluetooth.js:251 ../js/ui/status/keyboard.js:78
 msgid "Keyboard Settings"
 msgstr "Impostazioni tastiera"

@@ -740,10 +691,15 @@ msgstr "Impostazioni tastiera"
 msgid "Mouse Settings"
 msgstr "Impostazioni mouse"

-#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:65
+#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:63
 msgid "Sound Settings"
 msgstr "Impostazioni audio"

+#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
+msgid "Bluetooth Agent"
+msgstr ""
+
 #: ../js/ui/status/bluetooth.js:372
 #, c-format
 msgid "Authorization request from %s"
@@ -802,14 +758,6 @@ msgstr "Inserire il PIN indicato sul dispositivo."
 msgid "OK"
 msgstr "OK"

-#: ../js/ui/status/keyboard.js:73
-msgid "Show Keyboard Layout..."
-msgstr "Mostra disposizione tastiera..."
-
-#: ../js/ui/status/keyboard.js:76
-msgid "Localization Settings"
-msgstr "Impostazioni localizzazione"
-
 #: ../js/ui/status/power.js:85
 msgid "Power Settings"
 msgstr "Impostazioni alimentazione"
@@ -891,34 +839,34 @@ msgstr "Tablet"
 msgid "Computer"
 msgstr "Computer"

-#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1013
+#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1012
 msgid "Unknown"
 msgstr "Sconosciuto"

-#: ../js/ui/status/volume.js:44
+#: ../js/ui/status/volume.js:42
 msgid "Volume"
 msgstr "Volume"

-#: ../js/ui/status/volume.js:57
+#: ../js/ui/status/volume.js:55
 msgid "Microphone"
 msgstr "Microfono"

-#: ../js/ui/telepathyClient.js:240
+#: ../js/ui/telepathyClient.js:561
 #, c-format
 msgid "%s is online."
 msgstr "%s è disponibile."

-#: ../js/ui/telepathyClient.js:245
+#: ../js/ui/telepathyClient.js:566
 #, c-format
 msgid "%s is offline."
 msgstr "%s è fuori rete."

-#: ../js/ui/telepathyClient.js:248
+#: ../js/ui/telepathyClient.js:569
 #, c-format
 msgid "%s is away."
 msgstr "%s è assente."

-#: ../js/ui/telepathyClient.js:251
+#: ../js/ui/telepathyClient.js:572
 #, c-format
 msgid "%s is busy."
 msgstr "%s non è disponibile."
@@ -926,18 +874,15 @@ msgstr "%s non è disponibile."
 #. 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:349
+#: ../js/ui/telepathyClient.js:666
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "Inviato alle %-H.%M di %A"

-#. Translators: this is the text displayed
-#. in the search entry when no search is
-#. active; it should not exceed ~30
-#. characters
-#: ../js/ui/viewSelector.js:30
-msgid "Type to search..."
-msgstr "Digitare per cercare..."
+# FIXME ma ha senso in inglese???
+#: ../js/ui/viewSelector.js:26
+msgid "Search your computer"
+msgstr "Cerca nel computer"

 #: ../js/ui/windowAttentionHandler.js:43
 #, c-format
@@ -950,6 +895,18 @@ msgstr "Avvio di %s completato"
 msgid "'%s' is ready"
 msgstr "«%s» è pronto"

+# (ndt) un po' liberetta...
+#: ../js/ui/workspacesView.js:244
+msgid ""
+"Can't add a new workspace because maximum workspaces limit has been reached."
+msgstr ""
+"Impossibile aggiungere un nuovo spazio di lavoro: raggiunto il limite "
+"massimo consentito."
+
+#: ../js/ui/workspacesView.js:260
+msgid "Can't remove the first workspace."
+msgstr "Impossibile rimuovere il primo spazio di lavoro."
+
 #. translators:
 #. * The number of sound outputs on a particular device
 #: ../src/gvc/gvc-mixer-control.c:1094
@@ -972,32 +929,32 @@ msgstr[1] "%u ingressi"
 msgid "System Sounds"
 msgstr "Audio di sistema"

-#: ../src/shell-global.c:1363
+#: ../src/shell-global.c:1366
 msgid "Less than a minute ago"
 msgstr "Meno di un minuto fa"

-#: ../src/shell-global.c:1367
+#: ../src/shell-global.c:1370
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto fa"
 msgstr[1] "%d minuti fa"

-#: ../src/shell-global.c:1372
+#: ../src/shell-global.c:1375
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ora fa"
 msgstr[1] "%d ore fa"

-#: ../src/shell-global.c:1377
+#: ../src/shell-global.c:1380
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d giorno fa"
 msgstr[1] "%d giorni fa"

-#: ../src/shell-global.c:1382
+#: ../src/shell-global.c:1385
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,989 +0,0 @@
-# Kannada translation for gnome-shell.
-# Copyright (C) 2011 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Shankar Prasad <svenkate@redhat.com>, 2011.
-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: 2011-02-21 01:21+0000\n"
-"PO-Revision-Date: 2011-02-21 12:52+0530\n"
-"Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
-"Language-Team: Kannada <kn@li.org>\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"
-
-#: ../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/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 "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:3
-msgid "File extension used for storing the screencast"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:4
-msgid "Framerate used for recording screencasts."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:5
-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:6
-msgid "History for command (Alt-F2) dialog"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:7
-msgid "History for the looking glass dialog"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:8
-msgid "If true, display date in the clock, in addition to time."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:9
-msgid "If true, display seconds in time."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:10
-msgid "If true, display the ISO week date in the calendar."
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:11
-msgid "List of desktop file IDs for favorite applications"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
-#, no-c-format
-msgid ""
-"Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
-"used for gst-launch. The pipeline should have an unconnected sink pad where "
-"the recorded video is recorded. It will normally have a unconnected source "
-"pad; output from that pad will be written into the output file. However the "
-"pipeline can also take care of its own output - this might be used to send "
-"the output to an icecast server via shout2send or similar. When unset or set "
-"to an empty value, the default pipeline will be used. This is currently "
-"'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."
-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 ""
-
-#: ../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 "Uuids of extensions to disable"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:23
-msgid "Whether to collect stats about applications usage"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:24
-msgid "disabled OpenSearch providers"
-msgstr ""
-
-#: ../js/misc/util.js:86
-msgid "Command not found"
-msgstr ""
-
-#. Replace "Error invoking GLib.shell_parse_argv: " with
-#. something nicer
-#: ../js/misc/util.js:113
-msgid "Could not parse command:"
-msgstr ""
-
-#: ../js/misc/util.js:135
-msgid "No such application"
-msgstr ""
-
-#: ../js/misc/util.js:148
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr ""
-
-#. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:174
-msgid "All"
-msgstr ""
-
-#: ../js/ui/appDisplay.js:261
-msgid "APPLICATIONS"
-msgstr ""
-
-#: ../js/ui/appDisplay.js:291
-msgid "PREFERENCES"
-msgstr "PREFERENCES"
-
-#: ../js/ui/appDisplay.js:551
-msgid "New Window"
-msgstr "ಹೊಸ ವಿಂಡೊ"
-
-#: ../js/ui/appDisplay.js:555
-msgid "Remove from Favorites"
-msgstr ""
-
-#: ../js/ui/appDisplay.js:556
-msgid "Add to Favorites"
-msgstr ""
-
-#: ../js/ui/appFavorites.js:91
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr ""
-
-#: ../js/ui/appFavorites.js:122
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr ""
-
-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: ../js/ui/calendar.js:65
-msgctxt "event list time"
-msgid "All Day"
-msgstr "ಎಲ್ಲಾ ದಿನ"
-
-#. Translators: Shown in calendar event list, if 24h format
-#: ../js/ui/calendar.js:70
-msgctxt "event list time"
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Transators: Shown in calendar event list, if 12h format
-#: ../js/ui/calendar.js:77
-msgctxt "event list time"
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. Translators: Calendar grid abbreviation for Sunday.
-#. *
-#. * NOTE: These grid abbreviations are always shown together
-#. * and in order, e.g. "S M T W T F S".
-#.
-#: ../js/ui/calendar.js:117
-msgctxt "grid sunday"
-msgid "S"
-msgstr "ಭಾ"
-
-#. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:119
-msgctxt "grid monday"
-msgid "M"
-msgstr "ಸೋ"
-
-#. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:121
-msgctxt "grid tuesday"
-msgid "T"
-msgstr "ಮಂ"
-
-#. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:123
-msgctxt "grid wednesday"
-msgid "W"
-msgstr "ಬು"
-
-#. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:125
-msgctxt "grid thursday"
-msgid "T"
-msgstr "ಗು"
-
-#. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:127
-msgctxt "grid friday"
-msgid "F"
-msgstr "ಶು"
-
-#. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:129
-msgctxt "grid saturday"
-msgid "S"
-msgstr "ಶ"
-
-#. Translators: Event list abbreviation for Sunday.
-#. *
-#. * NOTE: These list abbreviations are normally not shown together
-#. * so they need to be unique (e.g. Tuesday and Thursday cannot
-#. * both be 'T').
-#.
-#: ../js/ui/calendar.js:142
-msgctxt "list sunday"
-msgid "Su"
-msgstr "ಭಾ"
-
-#. Translators: Event list abbreviation for Monday
-#: ../js/ui/calendar.js:144
-msgctxt "list monday"
-msgid "M"
-msgstr "ಸೋ"
-
-#. Translators: Event list abbreviation for Tuesday
-#: ../js/ui/calendar.js:146
-msgctxt "list tuesday"
-msgid "T"
-msgstr "ಮಂ"
-
-#. Translators: Event list abbreviation for Wednesday
-#: ../js/ui/calendar.js:148
-msgctxt "list wednesday"
-msgid "W"
-msgstr "ಬು"
-
-#. Translators: Event list abbreviation for Thursday
-#: ../js/ui/calendar.js:150
-msgctxt "list thursday"
-msgid "Th"
-msgstr "ಗು"
-
-#. Translators: Event list abbreviation for Friday
-#: ../js/ui/calendar.js:152
-msgctxt "list friday"
-msgid "F"
-msgstr "ಶು"
-
-#. Translators: Event list abbreviation for Saturday
-#: ../js/ui/calendar.js:154
-msgctxt "list saturday"
-msgid "S"
-msgstr "ಶ"
-
-#. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:701
-msgid "Nothing Scheduled"
-msgstr ""
-
-#. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:717
-msgctxt "calendar heading"
-msgid "%A, %B %d"
-msgstr "%A, %B %d"
-
-#. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:720
-msgctxt "calendar heading"
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: ../js/ui/calendar.js:730
-msgid "Today"
-msgstr "ಇಂದು"
-
-#: ../js/ui/calendar.js:734
-msgid "Tomorrow"
-msgstr "ನಾಳೆ"
-
-#: ../js/ui/calendar.js:743
-msgid "This week"
-msgstr "ಈ ವಾರ"
-
-#: ../js/ui/calendar.js:751
-msgid "Next week"
-msgstr "ಮುಂದಿನ ವಾರ"
-
-#: ../js/ui/dash.js:174
-msgid "Remove"
-msgstr "ತೆಗೆದು ಹಾಕು"
-
-#: ../js/ui/dateMenu.js:93
-msgid "Date and Time Settings"
-msgstr ""
-
-#: ../js/ui/dateMenu.js:112
-msgid "Open Calendar"
-msgstr ""
-
-#. Translators: This is the time format with date used
-#. in 24-hour mode.
-#: ../js/ui/dateMenu.js:151
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
-
-#: ../js/ui/dateMenu.js:152
-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/dateMenu.js:156
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
-
-#: ../js/ui/dateMenu.js:157
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format with date used
-#. for AM/PM.
-#: ../js/ui/dateMenu.js:164
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../js/ui/dateMenu.js:165
-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/dateMenu.js:169
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../js/ui/dateMenu.js:170
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#. Translators: This is the date format to use when the calendar popup is
-#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-#.
-#: ../js/ui/dateMenu.js:196
-msgid "%A %B %e, %Y"
-msgstr "%A %B %e, %Y"
-
-#: ../js/ui/docDisplay.js:19
-msgid "RECENT ITEMS"
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:63
-#, c-format
-msgid "Log Out %s"
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:69
-msgid "Log Out"
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:65
-msgid "Click Log Out to quit these applications and log out of the system."
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:66
-#, c-format
-msgid "%s will be logged out automatically in %d seconds."
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:67
-#, c-format
-msgid "You will be logged out automatically in %d seconds."
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:68
-msgid "Logging out of the system."
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:74 ../js/ui/endSessionDialog.js:78
-msgid "Shut Down"
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:75
-msgid "Click Shut Down to quit these applications and shut down the system."
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:76
-#, c-format
-msgid "The system will shut down automatically in %d seconds."
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:77
-msgid "Shutting down the system."
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:84 ../js/ui/endSessionDialog.js:88
-msgid "Restart"
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:85
-msgid "Click Restart to quit these applications and restart the system."
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:86
-#, c-format
-msgid "The system will restart automatically in %d seconds."
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:87
-msgid "Restarting the system."
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:395
-msgid "Confirm"
-msgstr ""
-
-#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:470
-msgid "Cancel"
-msgstr "ರದ್ದು ಮಾಡು"
-
-#: ../js/ui/lookingGlass.js:587
-msgid "No extensions installed"
-msgstr ""
-
-#: ../js/ui/lookingGlass.js:624
-msgid "Enabled"
-msgstr ""
-
-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:626 ../src/gvc/gvc-mixer-control.c:1087
-msgid "Disabled"
-msgstr ""
-
-#: ../js/ui/lookingGlass.js:628
-msgid "Error"
-msgstr "ದೋಷ"
-
-#: ../js/ui/lookingGlass.js:630
-msgid "Out of date"
-msgstr ""
-
-#: ../js/ui/lookingGlass.js:655
-msgid "View Source"
-msgstr ""
-
-#: ../js/ui/lookingGlass.js:661
-msgid "Web Page"
-msgstr "ಜಾಲ ಪುಟ"
-
-#: ../js/ui/messageTray.js:1864
-msgid "System Information"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಮಾಹಿತಿ"
-
-#: ../js/ui/overview.js:88
-msgid "Undo"
-msgstr "ರದ್ದುಗೊಳಿಸು"
-
-#: ../js/ui/overview.js:183
-msgid "Windows"
-msgstr "ವಿಂಡೋಗಳು"
-
-#: ../js/ui/overview.js:186
-msgid "Applications"
-msgstr "ಅನ್ವಯಗಳು"
-
-#. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:478
-#, c-format
-msgid "Quit %s"
-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:612
-msgid "Activities"
-msgstr ""
-
-#: ../js/ui/placeDisplay.js:122
-#, c-format
-msgid "Failed to unmount '%s'"
-msgstr ""
-
-#: ../js/ui/placeDisplay.js:125
-msgid "Retry"
-msgstr ""
-
-#: ../js/ui/placeDisplay.js:165
-msgid "Connect to..."
-msgstr ""
-
-#: ../js/ui/placeDisplay.js:409
-msgid "PLACES & DEVICES"
-msgstr "PLACES & DEVICES"
-
-#. 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:506
-msgid "toggle-switch-us"
-msgstr ""
-
-#: ../js/ui/runDialog.js:201
-msgid "Please enter a command:"
-msgstr "ದಯವಿಟ್ಟು ಒಂದು ಆಜ್ಞೆಯನ್ನು ನಮೂದಿಸಿ:"
-
-#: ../js/ui/searchDisplay.js:295
-msgid "Searching..."
-msgstr "ಹುಡುಕಲಾಗುತ್ತಿದೆ..."
-
-#: ../js/ui/searchDisplay.js:309
-msgid "No matching results."
-msgstr ""
-
-#: ../js/ui/statusMenu.js:102
-msgid "Available"
-msgstr "ಲಭ್ಯ"
-
-#: ../js/ui/statusMenu.js:107
-msgid "Busy"
-msgstr "ಕಾರ್ಯನಿರತ"
-
-#: ../js/ui/statusMenu.js:115
-msgid "My Account"
-msgstr "ನನ್ನ ಖಾತೆ"
-
-#: ../js/ui/statusMenu.js:119
-msgid "System Settings"
-msgstr "ವ್ಯವಸ್ಥೆಯ ಸಿದ್ಧತೆಗಳು"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Lock Screen"
-msgstr ""
-
-#: ../js/ui/statusMenu.js:130
-msgid "Switch User"
-msgstr "ಬಳಕೆದಾರನನ್ನು ಬದಲಿಸು"
-
-#: ../js/ui/statusMenu.js:135
-msgid "Log Out..."
-msgstr ""
-
-#. This is temporarily removed, see
-#. http://bugzilla.gnome.org/show_bug.cgi?id=636680
-#. for details.
-#. item = new PopupMenu.PopupMenuItem(_("Suspend..."));
-#. item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-#. this.menu.addMenuItem(item);
-#: ../js/ui/statusMenu.js:149
-msgid "Shut Down..."
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:81
-msgid "Zoom"
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:88
-msgid "Screen Reader"
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:92
-msgid "Screen Keyboard"
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:96
-msgid "Visual Alerts"
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:99
-msgid "Sticky Keys"
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:102
-msgid "Slow Keys"
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:105
-msgid "Bounce Keys"
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:108
-msgid "Mouse Keys"
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:112
-msgid "Universal Access Settings"
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:164
-msgid "High Contrast"
-msgstr ""
-
-#: ../js/ui/status/accessibility.js:206
-msgid "Large Text"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241
-#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
-#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
-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:95
-msgid "Bluetooth Settings"
-msgstr "ಬ್ಲೂಟೂತ್ ಸಿದ್ಧತೆಗಳು"
-
-#: ../js/ui/status/bluetooth.js:192
-msgid "Connection"
-msgstr "ಸಂಪರ್ಕ"
-
-#: ../js/ui/status/bluetooth.js:228
-msgid "Send Files..."
-msgstr "ಕಡತಗಳನ್ನು ಕಳುಹಿಸು..."
-
-#: ../js/ui/status/bluetooth.js:233
-msgid "Browse Files..."
-msgstr "ಕಡತಗಳಿಗಾಗಿ ವೀಕ್ಷಿಸು..."
-
-#: ../js/ui/status/bluetooth.js:242
-msgid "Error browsing device"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:243
-#, c-format
-msgid "The requested device cannot be browsed, error is '%s'"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:251
-msgid "Keyboard Settings"
-msgstr "ಕೀಲಿಮಣೆ ಸಿದ್ಧತೆಗಳು"
-
-#: ../js/ui/status/bluetooth.js:256
-msgid "Mouse Settings"
-msgstr "ಮೌಸ್‌ನ ಸಿದ್ಧತೆಗಳು"
-
-#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:65
-msgid "Sound Settings"
-msgstr "ಧ್ವನಿಯ ಸಿದ್ಧತೆಗಳು"
-
-#: ../js/ui/status/bluetooth.js:372
-#, c-format
-msgid "Authorization request from %s"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:378
-#, c-format
-msgid "Device %s wants access to the service '%s'"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:380
-msgid "Always grant access"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:381
-msgid "Grant this time only"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:382
-msgid "Reject"
-msgstr "ತಿರಸ್ಕರಿಸು"
-
-#: ../js/ui/status/bluetooth.js:412
-#, c-format
-msgid "Pairing confirmation for %s"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452
-#, c-format
-msgid "Device %s wants to pair with this computer"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:419
-#, c-format
-msgid "Please confirm whether the PIN '%s' matches the one on the device."
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:421
-msgid "Matches"
-msgstr "ಹೊಂದಾಣಿಕೆಗಳು"
-
-#: ../js/ui/status/bluetooth.js:422
-msgid "Does not match"
-msgstr "ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ"
-
-#: ../js/ui/status/bluetooth.js:445
-#, c-format
-msgid "Pairing request for %s"
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:453
-msgid "Please enter the PIN mentioned on the device."
-msgstr ""
-
-#: ../js/ui/status/bluetooth.js:469
-msgid "OK"
-msgstr "ಸರಿ"
-
-#: ../js/ui/status/keyboard.js:72
-msgid "Localization Settings"
-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] ""
-msgstr[1] ""
-
-#. 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] ""
-msgstr[1] ""
-
-#: ../js/ui/status/power.js:117
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../js/ui/status/power.js:120
-#, c-format
-msgid "%d minute remaining"
-msgid_plural "%d minutes remaining"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../js/ui/status/power.js:235
-msgid "AC adapter"
-msgstr ""
-
-#: ../js/ui/status/power.js:237
-msgid "Laptop battery"
-msgstr ""
-
-#: ../js/ui/status/power.js:239
-msgid "UPS"
-msgstr "UPS"
-
-#: ../js/ui/status/power.js:241
-msgid "Monitor"
-msgstr ""
-
-#: ../js/ui/status/power.js:243
-msgid "Mouse"
-msgstr ""
-
-#: ../js/ui/status/power.js:245
-msgid "Keyboard"
-msgstr ""
-
-#: ../js/ui/status/power.js:247
-msgid "PDA"
-msgstr "PDA"
-
-#: ../js/ui/status/power.js:249
-msgid "Cell phone"
-msgstr ""
-
-#: ../js/ui/status/power.js:251
-msgid "Media player"
-msgstr ""
-
-#: ../js/ui/status/power.js:253
-msgid "Tablet"
-msgstr ""
-
-#: ../js/ui/status/power.js:255
-msgid "Computer"
-msgstr ""
-
-#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1013
-msgid "Unknown"
-msgstr ""
-
-#: ../js/ui/status/volume.js:44
-msgid "Volume"
-msgstr ""
-
-#: ../js/ui/status/volume.js:57
-msgid "Microphone"
-msgstr ""
-
-#: ../js/ui/telepathyClient.js:240
-#, c-format
-msgid "%s is online."
-msgstr ""
-
-#: ../js/ui/telepathyClient.js:245
-#, c-format
-msgid "%s is offline."
-msgstr ""
-
-#: ../js/ui/telepathyClient.js:248
-#, c-format
-msgid "%s is away."
-msgstr ""
-
-#: ../js/ui/telepathyClient.js:251
-#, 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:349
-#, no-c-format
-msgid "Sent at %X on %A"
-msgstr ""
-
-#. Translators: this is the text displayed
-#. in the search entry when no search is
-#. active; it should not exceed ~30
-#. characters
-#: ../js/ui/viewSelector.js:30
-msgid "Type to search..."
-msgstr ""
-
-#: ../js/ui/windowAttentionHandler.js:43
-#, c-format
-msgid "%s has finished starting"
-msgstr ""
-
-#: ../js/ui/windowAttentionHandler.js:45
-#, c-format
-msgid "'%s' is ready"
-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] ""
-msgstr[1] ""
-
-#. 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] ""
-msgstr[1] ""
-
-#: ../src/gvc/gvc-mixer-control.c:1402
-msgid "System Sounds"
-msgstr ""
-
-#: ../src/shell-global.c:1363
-msgid "Less than a minute ago"
-msgstr ""
-
-#: ../src/shell-global.c:1367
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/shell-global.c:1372
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/shell-global.c:1377
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/shell-global.c:1382
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../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"
-
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 2.91.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 12:22+0100\n"
-"PO-Revision-Date: 2011-02-20 12:24+0100\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
+"POT-Creation-Date: 2011-01-25 20:46+0100\n"
+"PO-Revision-Date: 2011-01-25 20:47+0100\n"
+"Last-Translator: Torstein Adolf Winterseth <kvikende@fsfe.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -58,26 +58,22 @@ msgid "History for command (Alt-F2) dialog"
 msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.h:7
-msgid "History for the looking glass dialog"
-msgstr ""
-
-#: ../data/org.gnome.shell.gschema.xml.in.h:8
 msgid "If true, display date in the clock, in addition to time."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:9
+#: ../data/org.gnome.shell.gschema.xml.in.h:8
 msgid "If true, display seconds in time."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:10
+#: ../data/org.gnome.shell.gschema.xml.in.h:9
 msgid "If true, display the ISO week date in the calendar."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.shell.gschema.xml.in.h:10
 msgid "List of desktop file IDs for favorite applications"
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -92,42 +88,42 @@ msgid ""
 "at the optimal thread count on the system."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Show date in clock"
 msgstr "Vis dato i klokken"

-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show the week date in the calendar"
 msgstr "Vis dato for uken i kalender"

-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show time with seconds"
 msgstr "Vis tid med sekunder"

-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 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:17
 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:18
 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:19
 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:20
 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 "
@@ -135,59 +131,180 @@ msgid ""
 "remove already saved data."
 msgstr ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "Uuids of extensions to disable"
 msgstr "Uuider på utvidelser som skal slås av"

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "Whether to collect stats about applications usage"
 msgstr "Om det skal samles statistikk om bruk av programmer"

-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid "disabled OpenSearch providers"
 msgstr ""

-#: ../js/misc/util.js:86
-msgid "Command not found"
-msgstr "Kommando ikke funnet"
+#: ../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 "Slå på linsemodus"
+
+#: ../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 "Forstørrelsesfaktor"
+
+#: ../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 "Skjermposisjon"
+
+#: ../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 "Vis eller skjul forstørrelsesglass"
+
+#: ../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 ""

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:113
+#: ../js/misc/util.js:108
 msgid "Could not parse command:"
 msgstr "Klarte ikke å lese kommando:"

-#: ../js/misc/util.js:135
+#: ../js/misc/util.js:130
 msgid "No such application"
 msgstr "Programmet finnes ikke"

-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:143 ../js/ui/runDialog.js:351
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Kjøring av «%s» feilet:"

 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:174
+#: ../js/ui/appDisplay.js:164
 msgid "All"
 msgstr "Alle"

-#: ../js/ui/appDisplay.js:261
+#: ../js/ui/appDisplay.js:245
 msgid "APPLICATIONS"
 msgstr "PROGRAMMER"

-#: ../js/ui/appDisplay.js:291
+#: ../js/ui/appDisplay.js:275
 msgid "PREFERENCES"
 msgstr "BRUKERVALG"

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

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

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

@@ -201,212 +318,11 @@ msgstr "%s ble lagt til i dine favoritter."
 msgid "%s has been removed from your favorites."
 msgstr "%s ble fjernet fra dine favoritter."

-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: ../js/ui/calendar.js:65
-msgctxt "event list time"
-msgid "All Day"
-msgstr "Hele dagen"
-
-#. Translators: Shown in calendar event list, if 24h format
-#: ../js/ui/calendar.js:70
-msgctxt "event list time"
-msgid "%H:%M"
-msgstr "%H.%M"
-
-#. Transators: Shown in calendar event list, if 12h format
-#: ../js/ui/calendar.js:77
-msgctxt "event list time"
-msgid "%l:%M %p"
-msgstr "%l.%M %p"
-
-#. Translators: Calendar grid abbreviation for Sunday.
-#. *
-#. * NOTE: These grid abbreviations are always shown together
-#. * and in order, e.g. "S M T W T F S".
-#.
-#: ../js/ui/calendar.js:117
-msgctxt "grid sunday"
-msgid "S"
-msgstr "S"
-
-#. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:119
-msgctxt "grid monday"
-msgid "M"
-msgstr "M"
-
-#. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:121
-msgctxt "grid tuesday"
-msgid "T"
-msgstr "T"
-
-#. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:123
-msgctxt "grid wednesday"
-msgid "W"
-msgstr "O"
-
-#. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:125
-msgctxt "grid thursday"
-msgid "T"
-msgstr "T"
-
-#. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:127
-msgctxt "grid friday"
-msgid "F"
-msgstr "F"
-
-#. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:129
-msgctxt "grid saturday"
-msgid "S"
-msgstr "S"
-
-#. Translators: Event list abbreviation for Sunday.
-#. *
-#. * NOTE: These list abbreviations are normally not shown together
-#. * so they need to be unique (e.g. Tuesday and Thursday cannot
-#. * both be 'T').
-#.
-#: ../js/ui/calendar.js:142
-msgctxt "list sunday"
-msgid "Su"
-msgstr "Sø"
-
-#. Translators: Event list abbreviation for Monday
-#: ../js/ui/calendar.js:144
-msgctxt "list monday"
-msgid "M"
-msgstr "M"
-
-#. Translators: Event list abbreviation for Tuesday
-#: ../js/ui/calendar.js:146
-msgctxt "list tuesday"
-msgid "T"
-msgstr "T"
-
-#. Translators: Event list abbreviation for Wednesday
-#: ../js/ui/calendar.js:148
-msgctxt "list wednesday"
-msgid "W"
-msgstr "O"
-
-#. Translators: Event list abbreviation for Thursday
-#: ../js/ui/calendar.js:150
-msgctxt "list thursday"
-msgid "Th"
-msgstr "To"
-
-#. Translators: Event list abbreviation for Friday
-#: ../js/ui/calendar.js:152
-msgctxt "list friday"
-msgid "F"
-msgstr "F"
-
-#. Translators: Event list abbreviation for Saturday
-#: ../js/ui/calendar.js:154
-msgctxt "list saturday"
-msgid "S"
-msgstr "S"
-
-#. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:701
-msgid "Nothing Scheduled"
-msgstr "Ingenting planlagt"
-
-#. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:717
-msgctxt "calendar heading"
-msgid "%A, %B %d"
-msgstr "%A %B %d"
-
-#. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:720
-msgctxt "calendar heading"
-msgid "%A, %B %d, %Y"
-msgstr "%A %B %d, %Y"
-
-#: ../js/ui/calendar.js:730
-msgid "Today"
-msgstr "I dag"
-
-#: ../js/ui/calendar.js:734
-msgid "Tomorrow"
-msgstr "I morgen"
-
-#: ../js/ui/calendar.js:743
-msgid "This week"
-msgstr "Denne uken"
-
-#: ../js/ui/calendar.js:751
-msgid "Next week"
-msgstr "Neste uke"
-
-#: ../js/ui/dash.js:174
+#: ../js/ui/dash.js:27
 msgid "Remove"
 msgstr "Fjern"

-#: ../js/ui/dateMenu.js:93
-msgid "Date and Time Settings"
-msgstr "Innstillinger for dato og klokkeslett"
-
-#: ../js/ui/dateMenu.js:112
-msgid "Open Calendar"
-msgstr "Åpne kalender"
-
-#. Translators: This is the time format with date used
-#. in 24-hour mode.
-#: ../js/ui/dateMenu.js:151
-msgid "%a %b %e, %R:%S"
-msgstr "%a %e %b, %R.%S"
-
-#: ../js/ui/dateMenu.js:152
-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/dateMenu.js:156
-msgid "%a %R:%S"
-msgstr "%a %R.%S"
-
-#: ../js/ui/dateMenu.js:157
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format with date used
-#. for AM/PM.
-#: ../js/ui/dateMenu.js:164
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %l.%M.%S %p"
-
-#: ../js/ui/dateMenu.js:165
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e %b, %l.%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../js/ui/dateMenu.js:169
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l.%M.%S %p"
-
-#: ../js/ui/dateMenu.js:170
-msgid "%a %l:%M %p"
-msgstr "%a %l.%M %p"
-
-#. Translators: This is the date format to use when the calendar popup is
-#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-#.
-#: ../js/ui/dateMenu.js:196
-msgid "%A %B %e, %Y"
-msgstr "%a %e %B, %Y"
-
-#: ../js/ui/docDisplay.js:19
+#: ../js/ui/docDisplay.js:18
 msgid "RECENT ITEMS"
 msgstr "SISTE OPPFØRINGER"

@@ -417,12 +333,11 @@ msgstr "Logg ut %s"

 #: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:69
 msgid "Log Out"
-msgstr "Logg ut"
+msgstr "Logg ut …"

 #: ../js/ui/endSessionDialog.js:65
 msgid "Click Log Out to quit these applications and log out of the system."
-msgstr ""
-"Klikk Logg ut for å avslutte disse programmene og logge ut av systemet."
+msgstr "Klikk Logg ut for å avslutte disse programmene og logge ut av systemet."

 #: ../js/ui/endSessionDialog.js:66
 #, c-format
@@ -461,9 +376,7 @@ msgstr "Start på nytt"

 #: ../js/ui/endSessionDialog.js:85
 msgid "Click Restart to quit these applications and restart the system."
-msgstr ""
-"Klikk Start på nytt for å avslutte disse programmene og starte systemet på "
-"nytt."
+msgstr "Klikk Start på nytt for å avslutte disse programmene og starte systemet på nytt."

 #: ../js/ui/endSessionDialog.js:86
 #, c-format
@@ -482,37 +395,37 @@ msgstr "Bekreft"
 msgid "Cancel"
 msgstr "Avbryt"

-#: ../js/ui/lookingGlass.js:587
+#: ../js/ui/lookingGlass.js:556
 msgid "No extensions installed"
 msgstr "Ingen utvidelser installert"

-#: ../js/ui/lookingGlass.js:624
+#: ../js/ui/lookingGlass.js:593
 msgid "Enabled"
 msgstr "Aktivert"

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

-#: ../js/ui/lookingGlass.js:628
+#: ../js/ui/lookingGlass.js:597
 msgid "Error"
 msgstr "Feil"

-#: ../js/ui/lookingGlass.js:630
+#: ../js/ui/lookingGlass.js:599
 msgid "Out of date"
 msgstr "Utdatert"

-#: ../js/ui/lookingGlass.js:655
+#: ../js/ui/lookingGlass.js:624
 msgid "View Source"
 msgstr "Vis kildekode"

-#: ../js/ui/lookingGlass.js:661
+#: ../js/ui/lookingGlass.js:630
 msgid "Web Page"
 msgstr "Nettside"

-#: ../js/ui/messageTray.js:1864
+#: ../js/ui/messageTray.js:1765
 msgid "System Information"
 msgstr "Systeminformasjon"

@@ -520,40 +433,80 @@ msgstr "Systeminformasjon"
 msgid "Undo"
 msgstr "Angre"

-#: ../js/ui/overview.js:183
+#: ../js/ui/overview.js:159
 msgid "Windows"
 msgstr "Vinduer"

-#: ../js/ui/overview.js:186
+#: ../js/ui/overview.js:162
 msgid "Applications"
 msgstr "Programmer"

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

+#. Translators: This is the time format with date used
+#. in 24-hour mode.
+#: ../js/ui/panel.js:568
+msgid "%a %b %e, %R:%S"
+msgstr "%a %e %b, %R.%S"
+
+#: ../js/ui/panel.js:569
+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:573
+msgid "%a %R:%S"
+msgstr "%a %R.%S"
+
+#: ../js/ui/panel.js:574
+msgid "%a %R"
+msgstr "%a %R"
+
+#. Translators: This is a time format with date used
+#. for AM/PM.
+#: ../js/ui/panel.js:581
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%a %e %b, %l.%M.%S %p"
+
+#: ../js/ui/panel.js:582
+msgid "%a %b %e, %l:%M %p"
+msgstr "%a %e %b, %l.%M %p"
+
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#: ../js/ui/panel.js:586
+msgid "%a %l:%M:%S %p"
+msgstr "%a %l.%M.%S %p"
+
+#: ../js/ui/panel.js:587
+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:612
+#: ../js/ui/panel.js:732
 msgid "Activities"
 msgstr "Aktiviteter"

-#: ../js/ui/placeDisplay.js:122
+#: ../js/ui/placeDisplay.js:106
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "Klarte ikke å avmontere «%s»"

-#: ../js/ui/placeDisplay.js:125
+#: ../js/ui/placeDisplay.js:109
 msgid "Retry"
 msgstr "Prøv igjen"

-#: ../js/ui/placeDisplay.js:165
+#: ../js/ui/placeDisplay.js:150
 msgid "Connect to..."
 msgstr "Koble til …"

-#: ../js/ui/placeDisplay.js:409
+#: ../js/ui/placeDisplay.js:386
 msgid "PLACES & DEVICES"
 msgstr "STEDER & ENHETER"

@@ -562,22 +515,14 @@ msgstr "STEDER & ENHETER"
 #. "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:506
+#: ../js/ui/popupMenu.js:33
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

-#: ../js/ui/runDialog.js:201
+#: ../js/ui/runDialog.js:209
 msgid "Please enter a command:"
 msgstr "Oppgi en kommando:"

-#: ../js/ui/searchDisplay.js:295
-msgid "Searching..."
-msgstr "Søker …"
-
-#: ../js/ui/searchDisplay.js:309
-msgid "No matching results."
-msgstr "Ingen treff."
-
 #: ../js/ui/statusMenu.js:102
 msgid "Available"
 msgstr "Tilgjengelig"
@@ -606,21 +551,19 @@ msgstr "Bytt bruker"
 msgid "Log Out..."
 msgstr "Logg ut …"

-#. This is temporarily removed, see
-#. http://bugzilla.gnome.org/show_bug.cgi?id=636680
-#. for details.
-#. item = new PopupMenu.PopupMenuItem(_("Suspend..."));
-#. item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-#. this.menu.addMenuItem(item);
-#: ../js/ui/statusMenu.js:149
+#: ../js/ui/statusMenu.js:142
+msgid "Suspend..."
+msgstr "Hvilemodus …"
+
+#: ../js/ui/statusMenu.js:146
 msgid "Shut Down..."
 msgstr "Avslutt …"

-#: ../js/ui/status/accessibility.js:81
+#: ../js/ui/status/accessibility.js:83
 msgid "Zoom"
 msgstr "Zoom"

-#: ../js/ui/status/accessibility.js:88
+#: ../js/ui/status/accessibility.js:89
 msgid "Screen Reader"
 msgstr "Skjermleser"

@@ -628,41 +571,39 @@ msgstr "Skjermleser"
 msgid "Screen Keyboard"
 msgstr "Tastatur på skjermen"

-#: ../js/ui/status/accessibility.js:96
+#: ../js/ui/status/accessibility.js:95
 msgid "Visual Alerts"
 msgstr "Synlig varsling"

-#: ../js/ui/status/accessibility.js:99
+#: ../js/ui/status/accessibility.js:98
 msgid "Sticky Keys"
 msgstr "Klebrige taster"

-#: ../js/ui/status/accessibility.js:102
+#: ../js/ui/status/accessibility.js:101
 msgid "Slow Keys"
 msgstr "Trege taster"

-#: ../js/ui/status/accessibility.js:105
+#: ../js/ui/status/accessibility.js:104
 msgid "Bounce Keys"
 msgstr "Spretne taster"

-#: ../js/ui/status/accessibility.js:108
+#: ../js/ui/status/accessibility.js:107
 msgid "Mouse Keys"
 msgstr "Mustaster"

-#: ../js/ui/status/accessibility.js:112
+#: ../js/ui/status/accessibility.js:111
 msgid "Universal Access Settings"
 msgstr "Innstillinger for tilgjengelighet"

-#: ../js/ui/status/accessibility.js:164
+#: ../js/ui/status/accessibility.js:163
 msgid "High Contrast"
 msgstr "Høy kontrast"

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

 #: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241
-#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
-#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
 msgid "Bluetooth"
 msgstr "Bluetooth"

@@ -672,11 +613,11 @@ msgstr "Synlighet"

 #: ../js/ui/status/bluetooth.js:69
 msgid "Send Files to Device..."
-msgstr "Send filer til enhet …"
+msgstr "Send filer til enhet..."

 #: ../js/ui/status/bluetooth.js:70
 msgid "Setup a New Device..."
-msgstr "Sett opp en ny enhet …"
+msgstr "Sett opp en ny enhet..."

 #: ../js/ui/status/bluetooth.js:95
 msgid "Bluetooth Settings"
@@ -688,11 +629,11 @@ msgstr "Tilkobling"

 #: ../js/ui/status/bluetooth.js:228
 msgid "Send Files..."
-msgstr "Send filer …"
+msgstr "Send filer..."

 #: ../js/ui/status/bluetooth.js:233
 msgid "Browse Files..."
-msgstr "Bla gjennom filer …"
+msgstr "Bla gjennom filer..."

 #: ../js/ui/status/bluetooth.js:242
 msgid "Error browsing device"
@@ -711,10 +652,15 @@ msgstr "Innstillinger for tastatur"
 msgid "Mouse Settings"
 msgstr "Innstillinger for mus"

-#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:65
+#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:63
 msgid "Sound Settings"
 msgstr "Innstillinger for lyd"

+#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
+msgid "Bluetooth Agent"
+msgstr "Bluetooth-agent"
+
 #: ../js/ui/status/bluetooth.js:372
 #, c-format
 msgid "Authorization request from %s"
@@ -773,7 +719,7 @@ msgstr "Vennligst oppgi PIN som oppgitt på enheten."
 msgid "OK"
 msgstr "OK"

-#: ../js/ui/status/keyboard.js:72
+#: ../js/ui/status/keyboard.js:78
 msgid "Localization Settings"
 msgstr "Innstillinger for lokalisering"

@@ -857,34 +803,34 @@ msgstr "Nettbrett"
 msgid "Computer"
 msgstr "Datamaskin"

-#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1013
+#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1012
 msgid "Unknown"
 msgstr "Ukjent"

-#: ../js/ui/status/volume.js:44
+#: ../js/ui/status/volume.js:42
 msgid "Volume"
 msgstr "Volum"

-#: ../js/ui/status/volume.js:57
+#: ../js/ui/status/volume.js:55
 msgid "Microphone"
 msgstr "Mikrofon"

-#: ../js/ui/telepathyClient.js:240
+#: ../js/ui/telepathyClient.js:561
 #, c-format
 msgid "%s is online."
 msgstr "%s er tilkoblet."

-#: ../js/ui/telepathyClient.js:245
+#: ../js/ui/telepathyClient.js:566
 #, c-format
 msgid "%s is offline."
 msgstr "%s er frakoblet."

-#: ../js/ui/telepathyClient.js:248
+#: ../js/ui/telepathyClient.js:569
 #, c-format
 msgid "%s is away."
 msgstr "«%s» er borte."

-#: ../js/ui/telepathyClient.js:251
+#: ../js/ui/telepathyClient.js:572
 #, c-format
 msgid "%s is busy."
 msgstr "%s er opptatt."
@@ -892,18 +838,14 @@ msgstr "%s er opptatt."
 #. 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:349
+#: ../js/ui/telepathyClient.js:666
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "Sendt %X på %A"

-#. Translators: this is the text displayed
-#. in the search entry when no search is
-#. active; it should not exceed ~30
-#. characters
-#: ../js/ui/viewSelector.js:30
-msgid "Type to search..."
-msgstr "Skriv for å søke …"
+#: ../js/ui/viewSelector.js:26
+msgid "Search your computer"
+msgstr "Søk på din datamaskin"

 #: ../js/ui/windowAttentionHandler.js:43
 #, c-format
@@ -915,6 +857,17 @@ msgstr "%s er ferdig startet"
 msgid "'%s' is ready"
 msgstr "«%s» er klar"

+#: ../js/ui/workspacesView.js:243
+msgid ""
+"Can't add a new workspace because maximum workspaces limit has been reached."
+msgstr ""
+"Kan ikke legge til nytt arbeidsområde fordi grensen for maksimalt antall "
+"arbeidsområder er nådd."
+
+#: ../js/ui/workspacesView.js:259
+msgid "Can't remove the first workspace."
+msgstr "Kan ikke fjerne første arbeidsområde"
+
 #. translators:
 #. * The number of sound outputs on a particular device
 #: ../src/gvc/gvc-mixer-control.c:1094
@@ -937,32 +890,32 @@ msgstr[1] "%u innganger"
 msgid "System Sounds"
 msgstr "Systemlyder"

-#: ../src/shell-global.c:1363
+#: ../src/shell-global.c:1365
 msgid "Less than a minute ago"
 msgstr "Mindre enn ett minutt siden"

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

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

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

-#: ../src/shell-global.c:1382
+#: ../src/shell-global.c:1384
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -992,21 +945,3 @@ msgstr "Søk"
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
-
-#~ msgid "Search your computer"
-#~ msgstr "Søk på din datamaskin"
-
-#~ msgid "Enable lens mode"
-#~ msgstr "Slå på linsemodus"
-
-#~ msgid "Magnification factor"
-#~ msgstr "Forstørrelsesfaktor"
-
-#~ msgid "Screen position"
-#~ msgstr "Skjermposisjon"
-
-#~ msgid "Show or hide the magnifier"
-#~ msgstr "Vis eller skjul forstørrelsesglass"
-
-#~ msgid "Bluetooth Agent"
-#~ msgstr "Bluetooth-agent"
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2011-02-04 22:28+0000\n"
-"PO-Revision-Date: 2011-02-05 08:04+0530\n"
+"POT-Creation-Date: 2011-01-15 00:23+0000\n"
+"PO-Revision-Date: 2011-01-16 11:07+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.2\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@@ -30,7 +30,9 @@ msgstr "ਵਿੰਡੋ ਪਰਬੰਧ ਅਤੇ ਐਪਲੀਕੇਸ਼ਨ
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
-msgstr "Alt-F2 ਡਾਈਲਾਗ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਅੰਦਰੂਨੀ ਡੀਬੱਗਿਗ ਤੇ ਮਾਨੀਟਰਿੰਗ ਟੂਲ ਵਰਤੋਂ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ"
+msgstr ""
+"Alt-F2 ਡਾਈਲਾਗ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਅੰਦਰੂਨੀ ਡੀਬੱਗਿਗ ਤੇ ਮਾਨੀਟਰਿੰਗ ਟੂਲ ਵਰਤੋਂ ਕਰਨ ਲਈ "
+"ਸਹਾਇਕ ਹੈ"

 #: ../data/org.gnome.shell.gschema.xml.in.h:2
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
@@ -49,7 +51,8 @@ msgid ""
 "GNOME Shell extensions have a uuid property; this key lists extensions which "
 "should not be loaded."
 msgstr ""
-"ਗਨੋਮ ਸ਼ੈਲ ਇਕਸਟੈਨਸ਼ਨ ਲਈ ਇੱਕ uuid ਵਿਸ਼ੇਸ਼ਤਾ ਹੈ; ਇਹ ਕੁੰਜੀ ਇਕਸਟੈਨਸ਼ਨ ਦਰਸਾਉਂਦੀ ਹੈ, ਜੋ ਲੋਡ ਨਹੀਂ ਹਨ।"
+"ਗਨੋਮ ਸ਼ੈਲ ਇਕਸਟੈਨਸ਼ਨ ਲਈ ਇੱਕ uuid ਵਿਸ਼ੇਸ਼ਤਾ ਹੈ; ਇਹ ਕੁੰਜੀ ਇਕਸਟੈਨਸ਼ਨ ਦਰਸਾਉਂਦੀ ਹੈ, "
+"ਜੋ ਲੋਡ ਨਹੀਂ ਹਨ।"

 #: ../data/org.gnome.shell.gschema.xml.in.h:6
 msgid "History for command (Alt-F2) dialog"
@@ -71,8 +74,7 @@ msgstr "ਜੇ ਚੋਣ ਕੀਤੀ ਤਾਂ ਕੈਲੰਡਰ ਵਿੱਚ
 msgid "List of desktop file IDs for favorite applications"
 msgstr "ਪਸੰਦੀਦਾ ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਡੈਸਕਟਾਪ ਫਾਇਲ ID ਦੀ ਲਿਸਟ ਹੈ"

-#: ../data/org.gnome.shell.gschema.xml.in.h:12
-#, no-c-format
+#: ../data/org.gnome.shell.gschema.xml.in.h:11
 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 "
@@ -81,75 +83,76 @@ 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 ""

-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
 msgid "Show date in clock"
 msgstr "ਘੜੀ ਵਿੱਚ ਮਿਤੀ ਵੇਖੋ"

-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Show the week date in the calendar"
 msgstr "ਕੈਲੰਡਰ ਵਿੱਚ ਹਫ਼ਤਾ ਮਿਤੀ ਵੇਖੋ"

-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show time with seconds"
 msgstr "ਸਮਾਂ ਵਿੱਚ ਸਕਿੰਟ ਵੇਖੋ"

-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
-msgstr "ਇਹਨਾਂ ਐਂਡਟਟੀਫਾਇਰ ਨਾਲ ਸਬੰਧਿਤ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਪਸੰਦੀਦਾ ਖੇਤਰ 'ਚ ਵੇਖਾਇਆ ਜਾਵੇਗਾ।"
+msgstr ""
+"ਇਹਨਾਂ ਐਂਡਟਟੀਫਾਇਰ ਨਾਲ ਸਬੰਧਿਤ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਪਸੰਦੀਦਾ ਖੇਤਰ 'ਚ ਵੇਖਾਇਆ ਜਾਵੇਗਾ।"

-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 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:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 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:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "ਸਕਰੀਨਕਾਸਟ ਇੰਕੋਡ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਜੀਸਟਰੀਮਰ ਪਾਇਪਲਾਇਨ"

-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 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:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid "Uuids of extensions to disable"
 msgstr "ਇਕਟੈਨਸ਼ਨ ਦੀ Uuids ਬੰਦ ਹੈ"

-#: ../data/org.gnome.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "Whether to collect stats about applications usage"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਵਰਤੋਂ ਬਾਰੇ ਅੰਕੜੇ ਇੱਕਠੇ ਕਰਨੇ ਹਨ"

-#: ../data/org.gnome.shell.gschema.xml.in.h:23
-msgid "disabled OpenSearch providers"
-msgstr "ਓਪਨਸਰਚ ਉਪਲੱਬਧ ਕਰਵਾਉਣ ਵਾਲੇ ਬੰਦ ਹਨ"
-
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
 msgid "Clip the crosshairs at the center"
 msgstr "ਸੈਂਟਰ ਉੱਤੇ ਕਰਾਂਸਹੇਅਰ ਕਲਿੱਪ ਕਰੋ"
@@ -198,7 +201,8 @@ msgstr "ਲੈਨਜ਼ ਮੋਡ ਚਾਲੂ"
 msgid ""
 "Enables/disables display of crosshairs centered on the magnified mouse "
 "sprite."
-msgstr "ਵੱਡਦਰਸ਼ੀ ਮਾਊਸ ਸਪਰਿਟ ਉੱਤੇ ਸੈਂਟਰ ਕੀਤੇ ਕਰਾਂਸਹੇਅਰ ਵੇਖਾਉਣਾ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ।"
+msgstr ""
+"ਵੱਡਦਰਸ਼ੀ ਮਾਊਸ ਸਪਰਿਟ ਉੱਤੇ ਸੈਂਟਰ ਕੀਤੇ ਕਰਾਂਸਹੇਅਰ ਵੇਖਾਉਣਾ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ।"

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:9
 msgid ""
@@ -206,8 +210,10 @@ msgid ""
 "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
@@ -257,14 +263,17 @@ 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 "ਵੱਡਦਰਸ਼ੀ ਦੀ ਤਾਕਤ ਹੈ। ੧.੦ ਦਾ ਮਤਲਬ ਹੈ ਕਿ ਕੋਈ ਵੀ ਨਹੀਂ। ੨.੦ ਦਾ ਮਤਲਬ ਹੈ ਆਕਾਰ ਦਾ ਦੋ ਗੁਣਾ।"
+msgstr ""
+"ਵੱਡਦਰਸ਼ੀ ਦੀ ਤਾਕਤ ਹੈ। ੧.੦ ਦਾ ਮਤਲਬ ਹੈ ਕਿ ਕੋਈ ਵੀ ਨਹੀਂ। ੨.੦ ਦਾ ਮਤਲਬ ਹੈ ਆਕਾਰ ਦਾ ਦੋ "
+"ਗੁਣਾ।"

 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:22
 msgid "Thickness of the crosshairs"
@@ -274,53 +283,52 @@ msgstr "ਕਰਾਂਸਹੇਅਰ ਦੀ ਮੋਟਾਈ"
 msgid ""
 "Whether the magnified view should be centered over the location of the "
 "system mouse and move with it."
-msgstr "ਕੀ ਵੱਡਦਰਸ਼ੀ ਝਲਕ ਦੀ ਸਥਿਤੀ ਸਿਸਟਮ ਮਾਊਂਸ ਦੁਆਲੇ ਕੇਂਦਰਤ ਰਹੇ ਅਤੇ ਉਸ ਨਾਲ ਹੀ ਹਿੱਲੇ।"
+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 "ਵਰਟੀਕਲ ਤੇ ਹਰੀਜੱਟਲ ਲਾਈਨਾਂ ਦੀ ਚੌੜਾਈ, ਜੋ ਕਿ ਕਰਾਂਸਹੇਅਰ ਬਣਾਉਂਦੀਆਂ ਹਨ"

-#: ../js/misc/util.js:86
-msgid "Command not found"
-msgstr "ਕਮਾਂਡ ਨਹੀਂ ਲੱਭੀ"
-
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:113
+#: ../js/misc/util.js:108
+#| msgid "Please enter a command:"
 msgid "Could not parse command:"
 msgstr "ਕਮਾਂਡ ਪਾਰਸ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ:"

-#: ../js/misc/util.js:135
+#: ../js/misc/util.js:130
+#| msgid "Applications"
 msgid "No such application"
 msgstr "ਇੰਞ ਦੀ ਕੋਈ ਐਪਲੀਕੇਸ਼ਨ ਨਹੀਂ ਹੈ"

-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:143 ../js/ui/runDialog.js:364
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "'%s' ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ:"

 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:164
+#: ../js/ui/appDisplay.js:155
 msgid "All"
 msgstr "ਸਭ"

-#: ../js/ui/appDisplay.js:245
+#: ../js/ui/appDisplay.js:236
 msgid "APPLICATIONS"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ"

-#: ../js/ui/appDisplay.js:275
+#: ../js/ui/appDisplay.js:266
 msgid "PREFERENCES"
 msgstr "ਪਸੰਦ"

-#: ../js/ui/appDisplay.js:572
+#: ../js/ui/appDisplay.js:563
 msgid "New Window"
 msgstr "ਨਵੀਂ ਵਿੰਡੋ"

-#: ../js/ui/appDisplay.js:576
+#: ../js/ui/appDisplay.js:567
 msgid "Remove from Favorites"
 msgstr "ਪਸੰਦ ਵਿੱਚੋਂ ਹਟਾਓ"

-#: ../js/ui/appDisplay.js:577
+#: ../js/ui/appDisplay.js:568
 msgid "Add to Favorites"
 msgstr "ਪਸੰਦ 'ਚ ਸ਼ਾਮਲ ਕਰੋ"

@@ -334,246 +342,29 @@ msgstr "%s ਨੂੰ ਤੁਹਾਡੀ ਪਸੰਦ ਵਿੱਚ ਸ਼ਾਮ
 msgid "%s has been removed from your favorites."
 msgstr "%s ਨੂੰ ਤੁਹਾਡੀ ਪਸੰਦ ਤੋਂ ਹਟਾਇਆ ਜਾ ਚੁੱਕਿਆ ਹੈ।"

-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: ../js/ui/calendar.js:65
-#| msgid "All Day"
-msgctxt "event list time"
-msgid "All Day"
-msgstr "ਸਭ ਦਿਨ"
-
-#. Translators: Shown in calendar event list, if 24h format
-#: ../js/ui/calendar.js:70
-#| msgid "%H:%M"
-msgctxt "event list time"
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. Transators: Shown in calendar event list, if 12h format
-#: ../js/ui/calendar.js:77
-#| msgid "%a %l:%M %p"
-msgctxt "event list time"
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#. Translators: Calendar grid abbreviation for Sunday.
-#. *
-#. * NOTE: These grid abbreviations are always shown together
-#. * and in order, e.g. "S M T W T F S".
-#.
-#: ../js/ui/calendar.js:117
-#| msgid "S"
-msgctxt "grid sunday"
-msgid "S"
-msgstr "ਐ"
-
-#. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:119
-#| msgid "M"
-msgctxt "grid monday"
-msgid "M"
-msgstr "ਸੋ"
-
-#. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:121
-#| msgid "T"
-msgctxt "grid tuesday"
-msgid "T"
-msgstr "ਮੰ"
-
-#. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:123
-#| msgid "W"
-msgctxt "grid wednesday"
-msgid "W"
-msgstr "ਬੁੱ"
-
-#. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:125
-#| msgid "T"
-msgctxt "grid thursday"
-msgid "T"
-msgstr "ਵੀ"
-
-#. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:127
-#| msgid "F"
-msgctxt "grid friday"
-msgid "F"
-msgstr "ਸ਼ੁੱ"
-
-#. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:129
-#| msgid "S"
-msgctxt "grid saturday"
-msgid "S"
-msgstr "ਸ਼"
-
-#. Translators: Event list abbreviation for Sunday.
-#. *
-#. * NOTE: These list abbreviations are normally not shown together
-#. * so they need to be unique (e.g. Tuesday and Thursday cannot
-#. * both be 'T').
-#.
-#: ../js/ui/calendar.js:142
-#| msgid "Su"
-msgctxt "list sunday"
-msgid "Su"
-msgstr "ਐ"
-
-#. Translators: Event list abbreviation for Monday
-#: ../js/ui/calendar.js:144
-#| msgid "M"
-msgctxt "list monday"
-msgid "M"
-msgstr "ਸੋ"
-
-#. Translators: Event list abbreviation for Tuesday
-#: ../js/ui/calendar.js:146
-#| msgid "T"
-msgctxt "list tuesday"
-msgid "T"
-msgstr "ਮੰ"
-
-#. Translators: Event list abbreviation for Wednesday
-#: ../js/ui/calendar.js:148
-#| msgid "W"
-msgctxt "list wednesday"
-msgid "W"
-msgstr "ਬੁੱ"
-
-#. Translators: Event list abbreviation for Thursday
-#: ../js/ui/calendar.js:150
-#| msgid "Th"
-msgctxt "list thursday"
-msgid "Th"
-msgstr "ਵੀ"
-
-#. Translators: Event list abbreviation for Friday
-#: ../js/ui/calendar.js:152
-#| msgid "F"
-msgctxt "list friday"
-msgid "F"
-msgstr "ਸ਼ੁੱ"
-
-#. Translators: Event list abbreviation for Saturday
-#: ../js/ui/calendar.js:154
-#| msgid "S"
-msgctxt "list saturday"
-msgid "S"
-msgstr "ਸ਼"
-
-#. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:701
-msgid "Nothing Scheduled"
-msgstr "ਕੋਈ ਵੀ ਸੈਡਿਊਲ ਨਹੀਂ ਹੈ"
-
-#. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:717
-#| msgid "%A %B %e, %Y"
-msgctxt "calendar heading"
-msgid "%A, %B %d"
-msgstr "%A, %d %B"
-
-#. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:720
-#| msgid "%A %B %e, %Y"
-msgctxt "calendar heading"
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#: ../js/ui/calendar.js:730
-msgid "Today"
-msgstr "ਅੱਜ"
-
-#: ../js/ui/calendar.js:734
-msgid "Tomorrow"
-msgstr "ਭਲਕ"
-
-#: ../js/ui/calendar.js:743
-msgid "This week"
-msgstr "ਇਹ ਹਫ਼ਤਾ"
-
-#: ../js/ui/calendar.js:751
-msgid "Next week"
-msgstr "ਹਫ਼ਤਾ ਅੱਗੇ"
-
 #: ../js/ui/dash.js:27
 msgid "Remove"
 msgstr "ਹਟਾਓ"

-#: ../js/ui/dateMenu.js:91
-msgid "Date and Time Settings"
-msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ ਸੈਟਿੰਗ"
-
-#: ../js/ui/dateMenu.js:110
-msgid "Open Calendar"
-msgstr "ਕੈਲੰਡਰ ਖੋਲ੍ਹੋ"
-
-#. Translators: This is the time format with date used
-#. in 24-hour mode.
-#: ../js/ui/dateMenu.js:149
-msgid "%a %b %e, %R:%S"
-msgstr "%a, %e %b %R:%S"
-
-#: ../js/ui/dateMenu.js:150
-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/dateMenu.js:154
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
-
-#: ../js/ui/dateMenu.js:155
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format with date used
-#. for AM/PM.
-#: ../js/ui/dateMenu.js:162
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %l:%M:%S %p"
-
-#: ../js/ui/dateMenu.js:163
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e %b, %l:%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../js/ui/dateMenu.js:167
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../js/ui/dateMenu.js:168
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#. Translators: This is the date format to use when the calendar popup is
-#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-#.
-#: ../js/ui/dateMenu.js:194
-msgid "%A %B %e, %Y"
-msgstr "%A, %e %B %Y"
-
 #: ../js/ui/docDisplay.js:18
 msgid "RECENT ITEMS"
 msgstr "ਤਾਜ਼ਾ ਆਈਟਮਾਂ"

 #: ../js/ui/endSessionDialog.js:63
 #, c-format
+#| msgid "Log Out..."
 msgid "Log Out %s"
 msgstr "%s ਲਾਗਆਉਟ"

 #: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:69
+#| msgid "Log Out..."
 msgid "Log Out"
 msgstr "ਲਾਗਆਉਟ"

 #: ../js/ui/endSessionDialog.js:65
 msgid "Click Log Out to quit these applications and log out of the system."
-msgstr "ਇਹ ਐਪਲੀਕੇਸ਼ਨ ਬੰਦ ਕਰਨ ਤੇ ਸਿਸਟਮ ਨੂੰ ਲਾਗਆਉਟ ਕਰਨ ਲਈ ਲਾਗਆਉਟ ਕਰੋ ਨੂੰ ਕਲਿੱਕ ਕਰੋ।"
+msgstr ""
+"ਇਹ ਐਪਲੀਕੇਸ਼ਨ ਬੰਦ ਕਰਨ ਤੇ ਸਿਸਟਮ ਨੂੰ ਲਾਗਆਉਟ ਕਰਨ ਲਈ ਲਾਗਆਉਟ ਕਰੋ ਨੂੰ ਕਲਿੱਕ ਕਰੋ।"

 #: ../js/ui/endSessionDialog.js:66
 #, c-format
@@ -590,6 +381,7 @@ msgid "Logging out of the system."
 msgstr "ਸਿਸਟਮ ਲਾਗ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"

 #: ../js/ui/endSessionDialog.js:74 ../js/ui/endSessionDialog.js:78
+#| msgid "Shut Down..."
 msgid "Shut Down"
 msgstr "ਬੰਦ ਕਰੋ"

@@ -607,12 +399,14 @@ msgid "Shutting down the system."
 msgstr "ਸਿਸਟਮ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"

 #: ../js/ui/endSessionDialog.js:84 ../js/ui/endSessionDialog.js:88
+#| msgid "Restart..."
 msgid "Restart"
 msgstr "ਮੁੜ-ਚਾਲੂ ਕਰੋ"

 #: ../js/ui/endSessionDialog.js:85
 msgid "Click Restart to quit these applications and restart the system."
-msgstr "ਇਹ ਐਪਲੀਕੇਸ਼ਨ ਬੰਦ ਕਰਨ ਤੇ ਸਿਸਟਮ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਲਈ ਮੁੜ-ਚਾਲੂ ਕਰੋ ਨੂੰ ਕਲਿੱਕ ਕਰੋ।"
+msgstr ""
+"ਇਹ ਐਪਲੀਕੇਸ਼ਨ ਬੰਦ ਕਰਨ ਤੇ ਸਿਸਟਮ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਲਈ ਮੁੜ-ਚਾਲੂ ਕਰੋ ਨੂੰ ਕਲਿੱਕ ਕਰੋ।"

 #: ../js/ui/endSessionDialog.js:86
 #, c-format
@@ -627,7 +421,7 @@ msgstr "ਸਿਸਟਮ ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ
 msgid "Confirm"
 msgstr "ਪੁਸ਼ਟੀ"

-#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:470
+#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:469
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"

@@ -661,48 +455,89 @@ msgstr "ਸਰੋਤ ਵੇਖੋ"
 msgid "Web Page"
 msgstr "ਵੈੱਬ ਪੇਜ਼"

-#: ../js/ui/messageTray.js:1809
+#: ../js/ui/messageTray.js:1748
+#| msgid "Account Information..."
 msgid "System Information"
 msgstr "ਸਿਸਟਮ ਜਾਣਕਾਰੀ"

-#: ../js/ui/overview.js:88
+#: ../js/ui/overview.js:75
 msgid "Undo"
 msgstr "ਵਾਪਸ"

-#: ../js/ui/overview.js:159
+#: ../js/ui/overview.js:140
 msgid "Windows"
 msgstr "ਵਿੰਡੋ"

-#: ../js/ui/overview.js:162
+#: ../js/ui/overview.js:143
 msgid "Applications"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ"

 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:480
+#: ../js/ui/panel.js:479
 #, c-format
 msgid "Quit %s"
 msgstr "%s ਬੰਦ ਕਰੋ"

+#. Translators: This is the time format with date used
+#. in 24-hour mode.
+#: ../js/ui/panel.js:564
+msgid "%a %b %e, %R:%S"
+msgstr "%a, %e %b %R:%S"
+
+#: ../js/ui/panel.js:565
+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:569
+msgid "%a %R:%S"
+msgstr "%a %R:%S"
+
+#: ../js/ui/panel.js:570
+msgid "%a %R"
+msgstr "%a %R"
+
+#. Translators: This is a time format with date used
+#. for AM/PM.
+#: ../js/ui/panel.js:577
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%a %e %b, %l:%M:%S %p"
+
+#: ../js/ui/panel.js:578
+msgid "%a %b %e, %l:%M %p"
+msgstr "%a %e %b, %l:%M %p"
+
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#: ../js/ui/panel.js:582
+msgid "%a %l:%M:%S %p"
+msgstr "%a %l:%M:%S %p"
+
+#: ../js/ui/panel.js:583
+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:614
+#: ../js/ui/panel.js:728
 msgid "Activities"
 msgstr "ਸਰਗਰਮੀਆਂ"

-#: ../js/ui/placeDisplay.js:106
+#: ../js/ui/placeDisplay.js:112
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "'%s' ਅਣ-ਮਾਊਂਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"

-#: ../js/ui/placeDisplay.js:109
+#: ../js/ui/placeDisplay.js:115
 msgid "Retry"
 msgstr "ਮੁੜ-ਕੋਸ਼ਿਸ਼"

-#: ../js/ui/placeDisplay.js:150
+#: ../js/ui/placeDisplay.js:160
 msgid "Connect to..."
 msgstr "...ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ"

-#: ../js/ui/placeDisplay.js:386
+#: ../js/ui/placeDisplay.js:559
 msgid "PLACES & DEVICES"
 msgstr "ਥਾਵਾਂ ਤੇ ਜੰਤਰ"

@@ -715,7 +550,7 @@ msgstr "ਥਾਵਾਂ ਤੇ ਜੰਤਰ"
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"

-#: ../js/ui/runDialog.js:209
+#: ../js/ui/runDialog.js:222
 msgid "Please enter a command:"
 msgstr "ਕਮਾਂਡ ਦਿਓ ਜੀ:"

@@ -747,13 +582,11 @@ msgstr "ਯੂਜ਼ਰ ਬਦਲੋ"
 msgid "Log Out..."
 msgstr "ਲਾਗਆਉਟ..."

-#. This is temporarily removed, see
-#. http://bugzilla.gnome.org/show_bug.cgi?id=636680
-#. for details.
-#. item = new PopupMenu.PopupMenuItem(_("Suspend..."));
-#. item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-#. this.menu.addMenuItem(item);
-#: ../js/ui/statusMenu.js:149
+#: ../js/ui/statusMenu.js:142
+msgid "Suspend..."
+msgstr "ਸਸਪੈਂਡ..."
+
+#: ../js/ui/statusMenu.js:146
 msgid "Shut Down..."
 msgstr "ਬੰਦ ਕਰੋ..."

@@ -801,7 +634,7 @@ msgstr "ਵੱਧ ਕਨਟਰਾਸਟ"
 msgid "Large Text"
 msgstr "ਵੱਡੇ ਅੱਖਰ"

-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241
+#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:240
 msgid "Bluetooth"
 msgstr "ਬਲਿਊਟੁੱਥ"

@@ -817,110 +650,106 @@ msgstr "...ਜੰਤਰ ਨੂੰ ਫਾਇਲਾਂ ਭੇਜੋ"
 msgid "Setup a New Device..."
 msgstr "...ਨਵਾਂ ਜੰਤਰ ਸੈਟਅੱਪ"

-#: ../js/ui/status/bluetooth.js:95
+#: ../js/ui/status/bluetooth.js:94
 msgid "Bluetooth Settings"
 msgstr "ਬਲਿਊਟੁੱਥ ਸੈਟਿੰਗ"

-#: ../js/ui/status/bluetooth.js:192
+#: ../js/ui/status/bluetooth.js:191
 msgid "Connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ"

-#: ../js/ui/status/bluetooth.js:228
+#: ../js/ui/status/bluetooth.js:227
 msgid "Send Files..."
 msgstr "...ਫਾਇਲਾਂ ਭੇਜੋ"

-#: ../js/ui/status/bluetooth.js:233
+#: ../js/ui/status/bluetooth.js:232
 msgid "Browse Files..."
 msgstr "...ਫਾਇਲਾਂ ਦੀ ਝਲਕ"

-#: ../js/ui/status/bluetooth.js:242
+#: ../js/ui/status/bluetooth.js:241
 msgid "Error browsing device"
 msgstr "ਜੰਤਰ ਬਰਾਊਜ਼ ਕਰਨ ਲਈ ਗਲਤੀ"

-#: ../js/ui/status/bluetooth.js:243
+#: ../js/ui/status/bluetooth.js:242
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "ਮੰਗ ਕੀਤੇ ਗਏ ਜੰਤਰ ਨੂੰ ਬਰਾਊਜ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ, ਗਲਤੀ ਸੀ '%s'"

-#: ../js/ui/status/bluetooth.js:251
+#: ../js/ui/status/bluetooth.js:250 ../js/ui/status/keyboard.js:78
 msgid "Keyboard Settings"
 msgstr "ਕੀਬੋਰਡ ਸੈਟਿੰਗ"

-#: ../js/ui/status/bluetooth.js:256
+#: ../js/ui/status/bluetooth.js:255
 msgid "Mouse Settings"
 msgstr "ਮਾਊਸ ਸੈਟਿੰਗ"

-#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:63
+#: ../js/ui/status/bluetooth.js:262 ../js/ui/status/volume.js:63
 msgid "Sound Settings"
 msgstr "ਸਾਊਂਡ ਸੈਟਿੰਗ"

-#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
-#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
+#: ../js/ui/status/bluetooth.js:336 ../js/ui/status/bluetooth.js:370
+#: ../js/ui/status/bluetooth.js:410 ../js/ui/status/bluetooth.js:443
 msgid "Bluetooth Agent"
 msgstr "ਬਲਿਊਟੁੱਥ ਏਜੰਟ"

-#: ../js/ui/status/bluetooth.js:372
+#: ../js/ui/status/bluetooth.js:371
 #, c-format
 msgid "Authorization request from %s"
 msgstr "'%s' ਤੋਂ ਪਰਮਾਣਕਿਤਾ ਮੰਗ"

-#: ../js/ui/status/bluetooth.js:378
+#: ../js/ui/status/bluetooth.js:377
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "ਜੰਤਰ %s ਸਰਵਿਸ '%s' ਨੂੰ ਵਰਤਣੀ ਚਾਹੁੰਦਾ ਹੈ।"

-#: ../js/ui/status/bluetooth.js:380
+#: ../js/ui/status/bluetooth.js:379
 msgid "Always grant access"
 msgstr "ਹਮੇਸ਼ਾ ਪਹੁੰਚ ਮਨਜ਼ੂਰ"

-#: ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:380
 msgid "Grant this time only"
 msgstr "ਕੇਵਲ ਇਸ ਸਮੇਂ ਹੀ ਮਨਜ਼ੂਰ"

-#: ../js/ui/status/bluetooth.js:382
+#: ../js/ui/status/bluetooth.js:381
 msgid "Reject"
 msgstr "ਨਾ-ਮਨਜ਼ੂਰ"

-#: ../js/ui/status/bluetooth.js:412
+#: ../js/ui/status/bluetooth.js:411
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s ਲਈ ਪੇਅਰ ਕਰਨ ਦੀ ਪੁਸ਼ਟੀ"

-#: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452
+#: ../js/ui/status/bluetooth.js:417 ../js/ui/status/bluetooth.js:451
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "ਜੰਤਰ %s ਇਸ ਕੰਪਿਊਟਰ ਨਾਲ ਪੇਅਰ ਹੋਣਾ ਚਾਹੁੰਦਾ ਹੈ"

-#: ../js/ui/status/bluetooth.js:419
+#: ../js/ui/status/bluetooth.js:418
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgstr "ਪੁਸ਼ਟੀ ਕਰੋ ਜੀ ਕਿ ਪਿੰਨ '%s' ਜੰਤਰ ਉੱਤੇ ਮੌਜੂਦ ਪਿੰਨ ਨਾਲ ਮਿਲਦਾ ਹੈ।"

-#: ../js/ui/status/bluetooth.js:421
+#: ../js/ui/status/bluetooth.js:420
 msgid "Matches"
 msgstr "ਮਿਲਦਾ ਹੈ"

-#: ../js/ui/status/bluetooth.js:422
+#: ../js/ui/status/bluetooth.js:421
 msgid "Does not match"
 msgstr "ਮਿਲਦਾ ਨਹੀਂ ਹੈ"

-#: ../js/ui/status/bluetooth.js:445
+#: ../js/ui/status/bluetooth.js:444
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s ਲਈ ਪੇਅਰ ਕਰਨ ਦੀ ਮੰਗ"

-#: ../js/ui/status/bluetooth.js:453
+#: ../js/ui/status/bluetooth.js:452
 msgid "Please enter the PIN mentioned on the device."
 msgstr "ਜੰਤਰ ਉੱਤੇ ਦਿੱਤਾ ਗਿਆ ਪਿੰਨ ਦਿਉ ਜੀ।"

-#: ../js/ui/status/bluetooth.js:469
+#: ../js/ui/status/bluetooth.js:468
 msgid "OK"
 msgstr "ਠੀਕ ਹੈ"

-#: ../js/ui/status/keyboard.js:78
-msgid "Localization Settings"
-msgstr "ਲੋਕਲਾਈਜ਼ੇਸ਼ਨ ਸੈਟਿੰਗ"
-
 #: ../js/ui/status/power.js:85
 msgid "Power Settings"
 msgstr "ਪਾਵਰ ਸੈਟਿੰਗ"
@@ -1013,22 +842,22 @@ msgstr "ਆਵਾਜ਼"
 msgid "Microphone"
 msgstr "ਮਾਈਕਰੋਫੋਨ"

-#: ../js/ui/telepathyClient.js:563
+#: ../js/ui/telepathyClient.js:561
 #, c-format
 msgid "%s is online."
 msgstr "%s ਆਨਲਾਈਨ ਹੈ।"

-#: ../js/ui/telepathyClient.js:568
+#: ../js/ui/telepathyClient.js:566
 #, c-format
 msgid "%s is offline."
 msgstr "%s ਆਫਲਾਈਨ ਹੈ।"

-#: ../js/ui/telepathyClient.js:571
+#: ../js/ui/telepathyClient.js:569
 #, c-format
 msgid "%s is away."
 msgstr "%s ਦੂਰ ਹੈ।"

-#: ../js/ui/telepathyClient.js:574
+#: ../js/ui/telepathyClient.js:572
 #, c-format
 msgid "%s is busy."
 msgstr "%s ਰੁੱਝਿਆ/ਰੁੱਝੀ ਹੈ।"
@@ -1036,7 +865,7 @@ 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:668
+#: ../js/ui/telepathyClient.js:666
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "%2$A ਨੂੰ %1$X ਵਜੇ ਭੇਜਿਆ"
@@ -1055,11 +884,14 @@ msgstr "%s ਸ਼ੁਰੂ ਹੋਣਾ ਖਤਮ ਹੋਇਆ"
 msgid "'%s' is ready"
 msgstr "'%s' ਤਿਆਰ ਹੈ"

-#: ../js/ui/workspacesView.js:243
-msgid "Can't add a new workspace because maximum workspaces limit has been reached."
-msgstr "ਨਵਾਂ ਵਰਕਸਪੇਸ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਵਰਕਸਪੇਸਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ ਪੂਰੀ ਹੋ ਚੁੱਕੀ ਹੈ।"
+#: ../js/ui/workspacesView.js:244
+msgid ""
+"Can't add a new workspace because maximum workspaces limit has been reached."
+msgstr ""
+"ਨਵਾਂ ਵਰਕਸਪੇਸ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਵਰਕਸਪੇਸਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ ਪੂਰੀ ਹੋ "
+"ਚੁੱਕੀ ਹੈ।"

-#: ../js/ui/workspacesView.js:259
+#: ../js/ui/workspacesView.js:260
 msgid "Can't remove the first workspace."
 msgstr "ਪਹਿਲਾਂ ਵਰਕਸਪੇਸ ਨਹੀਂ ਹਟਾਇਆ ਜਾ ਸਕਦਾ।"

@@ -1085,32 +917,32 @@ msgstr[1] "%u ਇੰਪੁੱਟ"
 msgid "System Sounds"
 msgstr "ਸਿਸਟਮ ਸਾਊਂਡ"

-#: ../src/shell-global.c:1365
+#: ../src/shell-global.c:1233
 msgid "Less than a minute ago"
 msgstr "ਇੱਕ ਮਿੰਟ ਤੋਂ ਘੱਟ ਚਿਰ ਪਹਿਲਾਂ"

-#: ../src/shell-global.c:1369
+#: ../src/shell-global.c:1237
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"

-#: ../src/shell-global.c:1374
+#: ../src/shell-global.c:1242
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਘੰਟੇ ਪਹਿਲਾਂ"

-#: ../src/shell-global.c:1379
+#: ../src/shell-global.c:1247
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"

-#: ../src/shell-global.c:1384
+#: ../src/shell-global.c:1252
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -1141,9 +973,6 @@ msgstr "ਖੋਜ"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Suspend..."
-#~ msgstr "ਸਸਪੈਂਡ..."
-
 #~ msgid "Clock"
 #~ msgstr "ਘੜੀ"

@@ -1242,6 +1071,9 @@ msgstr "%1$s: %2$s"
 #~ msgid "Sidebar"
 #~ msgstr "ਬਾਹੀ"

+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
 #~ msgid "Recent Documents"
 #~ msgstr "ਤਾਜ਼ਾ ਡੌਕੂਮੈਂਟ"

--- a/po/sl.po
+++ b/po/sl.po
--- a/po/ug.po
+++ b/po/ug.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@@ -72,6 +72,7 @@ st_source_h =					\
 	st/st-box-layout.h			\
 	st/st-box-layout-child.h		\
 	st/st-button.h				\
+	st/st-clickable.h			\
 	st/st-clipboard.h			\
 	st/st-container.h			\
 	st/st-drawing-area.h			\
@@ -129,6 +130,7 @@ st_source_c =					\
 	st/st-box-layout.c			\
 	st/st-box-layout-child.c		\
 	st/st-button.c				\
+	st/st-clickable.c			\
 	st/st-clipboard.c			\
 	st/st-container.c			\
 	st/st-drawing-area.c			\
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,6 +56,7 @@ shell_public_headers_h =		\
 	shell-app-usage.h		\
 	shell-arrow.h			\
 	shell-doc-system.h		\
+	shell-drawing.h			\
 	shell-embedded-window.h		\
 	shell-generic-container.h	\
 	shell-gtk-embed.h		\
@@ -87,6 +88,7 @@ libgnome_shell_la_SOURCES =		\
 	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	\
@@ -94,8 +96,6 @@ libgnome_shell_la_SOURCES =		\
 	shell-gtk-embed.c		\
 	shell-global.c			\
 	shell-perf-log.c		\
-	shell-polkit-authentication-agent.h	\
-	shell-polkit-authentication-agent.c	\
 	shell-slicer.c			\
 	shell-stack.c			\
 	shell-tray-icon.c		\
@@ -234,7 +234,6 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) St-1.0.gir libgnome-shell.la Makefile
 		--include=Clutter-1.0			\
 		--include=ClutterX11-1.0		\
 		--include=Meta-2.91			\
-		--include=TelepathyGLib-0.12		\
 		--libtool="$(LIBTOOL)"			\
 		--add-include-path=$(builddir)		\
 		--include=St-1.0			\
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -368,7 +368,7 @@ gnome_shell_gdk_event_handler (GdkEvent *event_gdk,
          ClutterInputDevice *keyboard = clutter_device_manager_get_core_device (device_manager,
                                                                                 CLUTTER_KEYBOARD_DEVICE);

-          ClutterEvent *event_clutter = clutter_event_new ((event_gdk->type == GDK_KEY_PRESS) ?
+          ClutterEvent *event_clutter = clutter_event_new ((event_gdk->type == GDK_KEY_RELEASE) ?
                                                           CLUTTER_KEY_PRESS : CLUTTER_KEY_RELEASE);
          event_clutter->key.time = event_gdk->key.time;
          event_clutter->key.flags = CLUTTER_EVENT_NONE;
@@ -478,7 +478,7 @@ gnome_shell_plugin_start (MetaPlugin *plugin)
                     muted_log_handler, NULL);
  g_log_set_handler ("GdmUser", G_LOG_LEVEL_DEBUG,
                     muted_log_handler, NULL);
-  g_log_set_handler ("Bluetooth", G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_MESSAGE,
+  g_log_set_handler ("libgnome-bluetooth", G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_MESSAGE,
                     muted_log_handler, NULL);

  /* Initialize the global object here. */
@@ -670,17 +670,3 @@ MetaPluginInfo *gnome_shell_plugin_plugin_info (MetaPlugin *plugin)

  return &info;
 }
-
-#if HAVE_BLUETOOTH
-/* HACK:
-   Add a non-static function that calls into libgnome-bluetooth-applet.so,
-   to avoid the linker being too smart and removing the dependency.
-   This function is never actually called.
-*/
-extern GType bluetooth_applet_get_type(void);
-void _shell_link_to_bluetooth(void);
-
-void _shell_link_to_bluetooth(void) {
-  bluetooth_applet_get_type();
-}
-#endif
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -79,6 +79,49 @@ def get_running_session_environs():
                result[key] = environs[key]
        return result

+def start_xephyr():
+    tmpdir = tempfile.mkdtemp("", "gnome-shell.")
+    atexit.register(shutil.rmtree, tmpdir)
+
+    display = ":" + str(random.randint(10, 99))
+    xauth_file = os.path.join(tmpdir, "database")
+
+    # Create a random 128-bit key and format it as hex
+    f = open("/dev/urandom", "r")
+    key = f.read(16)
+    f.close()
+    hexkey = "".join(("%02x" % ord(byte) for byte in key))
+
+    # Store that in an xauthority file as the key for connecting to our Xephyr
+    retcode = subprocess.call(["xauth",
+                               "-f", xauth_file,
+                               "add", display,  "MIT-MAGIC-COOKIE-1", hexkey])
+    if retcode != 0:
+        raise RuntimeError("xauth failed")
+
+    # Launch Xephyr
+    try:
+        xephyr = subprocess.Popen(["Xephyr", display,
+                                   "-auth", xauth_file,
+                                   "-screen", options.geometry,
+                                   "-host-cursor"])
+    except OSError, e:
+        if e.errno == errno.ENOENT:
+            print "Could not find Xephyr."
+            sys.exit(1)
+        else:
+            raise
+    os.environ['DISPLAY'] = display
+    os.environ['XAUTHORITY'] = xauth_file
+
+    # Wait for server to get going: LAME
+    time.sleep(1)
+
+    # Start some windows in our session.
+    subprocess.Popen(["gnome-terminal"])
+
+    return xephyr;
+
 def start_dconf_await_service():
    DCONF_NAME = 'ca.desrt.dconf'

@@ -234,6 +277,9 @@ def start_shell(perf_output=None):
        # be supported on both the client and server but not in the
        # list of effective extensions as a signal of needing to force
        # indirect rendering.
+        #
+        # Note that this check would give the wrong answer for Xephyr,
+        # but since we force !use_tfp there anyway, it doesn't matter.
        (server_glx_extensions, client_glx_extensions, glx_extensions) = _get_glx_extensions()

        if ("GLX_EXT_texture_from_pixmap" in server_glx_extensions and
@@ -272,12 +318,21 @@ def run_shell(perf_output=None):
        termattrs = termios.tcgetattr(0);

    normal_exit = False
+    xephyr = None

    if options.verbose:
        print "Starting shell"

    try:
-        shell = start_shell(perf_output=perf_output)
+        shell = None
+        if options.xephyr:
+            xephyr = start_xephyr()
+            # This makes us not grab the org.gnome.Panel or
+            # org.freedesktop.Notifications D-Bus names
+            os.environ['GNOME_SHELL_NO_REPLACE'] = '1'
+            shell = start_shell()
+        else:
+            shell = start_shell(perf_output=perf_output)

        # Wait for shell to exit
        if options.verbose:
@@ -291,6 +346,13 @@ def run_shell(perf_output=None):
            pass
        shell.wait()
    finally:
+        # Clean up Xephyr if it outlived the shell
+        if xephyr:
+            try:
+                os.kill(xephyr.pid, signal.SIGKILL)
+            except OSError:
+                pass
+
        if shell is None:
            print "Failed to start shell"
        elif shell.returncode == 0:
@@ -558,6 +620,13 @@ parser.add_option("", "--perf-output", metavar="OUTPUT_FILE",
 		  help="Output file to write performance report")
 parser.add_option("", "--perf-upload", action="store_true",
 		  help="Upload performance report to server")
+parser.add_option("", "--xephyr", action="store_true",
+                  help="Run a debugging instance inside Xephyr")
+parser.add_option("", "--geometry", metavar="GEOMETRY",
+                  help="Specify Xephyr screen geometry",
+                  default="1024x768");
+parser.add_option("-w", "--wide", action="store_true",
+                  help="Use widescreen (1280x800) with Xephyr")
 parser.add_option("", "--eval-file", metavar="EVAL_FILE",
                  help="Evaluate the contents of the given JavaScript file")
 parser.add_option("", "--create-extension", action="store_true",
@@ -686,10 +755,20 @@ if options.debug_command:
 elif options.debug:
    options.debug_command = "gdb --args"

-# Figure out whether or not to use GL_EXT_texture_from_pixmap.
+if options.wide:
+    options.geometry = "1280x800"
+
+# Figure out whether or not to use GL_EXT_texture_from_pixmap. By default
+# we use it iff we aren't running Xephyr, but we allow the user to
+# explicitly disable it.
 # FIXME: Move this to ClutterGlxPixmap like
 # CLUTTER_PIXMAP_TEXTURE_RECTANGLE=disable.
-use_tfp = os.environ.get('GNOME_SHELL_DISABLE_TFP', '') != ''
+if 'GNOME_SHELL_DISABLE_TFP' in os.environ and \
+       os.environ['GNOME_SHELL_DISABLE_TFP'] != '':
+    use_tfp = False
+else:
+    # tfp does not work correctly in Xephyr
+    use_tfp = not options.xephyr

 # We only respawn the previous environment on abnormal exit;
 # for a clean exit, we assume that gnome-shell was replaced with
@@ -705,5 +784,5 @@ try:
    else:
        normal_exit = run_shell()
 finally:
-    if options.replace and (options.perf or not normal_exit):
+    if not options.xephyr and options.replace and (options.perf or not normal_exit):
        restore_gnome()
--- a/src/shell-a11y.c
+++ b/src/shell-a11y.c
@@ -28,7 +28,7 @@

 #define INIT_METHOD "gnome_accessibility_module_init"
 #define DESKTOP_SCHEMA "org.gnome.desktop.interface"
-#define ACCESSIBILITY_ENABLED_KEY "toolkit-accessibility"
+#define ACCESSIBILITY_ENABLED_KEY "accessibility"
 #define AT_SPI_SCHEMA "org.a11y.atspi"
 #define ATK_BRIDGE_LOCATION_KEY "atk-bridge-location"

--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -12,7 +12,6 @@
 #include <glib/gi18n.h>

 #include "shell-app-private.h"
-#include "shell-window-tracker-private.h"
 #include "shell-global.h"
 #include "display.h"
 #include "st.h"
@@ -1297,24 +1296,6 @@ shell_app_info_get_source_window (ShellAppInfo *info)
  return NULL;
 }

-static void
-_gather_pid_callback (GDesktopAppInfo   *gapp,
-                      GPid               pid,
-                      gpointer           data)
-{
-  ShellApp *app;
-  ShellWindowTracker *tracker;
-
-  g_return_if_fail (data != NULL);
-
-  app = SHELL_APP (data);
-  tracker = shell_window_tracker_get_default ();
-
-  _shell_window_tracker_add_child_process_app (tracker,
-                                               pid,
-                                               app);
-}
-
 /**
 * shell_app_info_launch_full:
 * @timestamp: Event timestamp, or 0 for current event timestamp
@@ -1331,7 +1312,6 @@ shell_app_info_launch_full (ShellAppInfo *info,
                            char        **startup_id,
                            GError      **error)
 {
-  ShellApp *shell_app;
  GDesktopAppInfo *gapp;
  GdkAppLaunchContext *context;
  gboolean ret;
@@ -1383,15 +1363,7 @@ shell_app_info_launch_full (ShellAppInfo *info,
  gdk_app_launch_context_set_timestamp (context, timestamp);
  gdk_app_launch_context_set_desktop (context, workspace);

-  shell_app = shell_app_system_get_app (shell_app_system_get_default (),
-                                        shell_app_info_get_id (info));
-
-  ret = g_desktop_app_info_launch_uris_as_manager (gapp, uris,
-                                                   G_APP_LAUNCH_CONTEXT (context),
-                                                   G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
-                                                   NULL, NULL,
-                                                   _gather_pid_callback, shell_app,
-                                                   error);
+  ret = g_app_info_launch (G_APP_INFO (gapp), uris, (GAppLaunchContext*) context, error);

  g_object_unref (G_OBJECT (gapp));

--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -411,8 +411,6 @@ shell_app_activate_window (ShellApp     *app,
 /**
 * shell_app_activate:
 * @app: a #ShellApp
- * @workspace: launch on this workspace, or -1 for default. Ignored if
- *   activating an existing window
 *
 * Perform an appropriate default action for operating on this application,
 * dependent on its current state.  For example, if the application is not
@@ -421,19 +419,13 @@ shell_app_activate_window (ShellApp     *app,
 * recently used transient for that window).
 */
 void
-shell_app_activate (ShellApp      *app,
-                    int            workspace)
+shell_app_activate (ShellApp  *app)
 {
  switch (app->state)
    {
      case SHELL_APP_STATE_STOPPED:
        /* TODO sensibly handle this error */
-        shell_app_info_launch_full (app->info,
-                                    0,
-                                    NULL,
-                                    workspace,
-                                    NULL,
-                                    NULL);
+        shell_app_info_launch (app->info, NULL);
        break;
      case SHELL_APP_STATE_STARTING:
        break;
@@ -446,13 +438,11 @@ shell_app_activate (ShellApp      *app,
 /**
 * shell_app_open_new_window:
 * @app: a #ShellApp
- * @workspace: open on this workspace, or -1 for default
 *
 * Request that the application create a new window.
 */
 void
-shell_app_open_new_window (ShellApp      *app,
-                           int            workspace)
+shell_app_open_new_window (ShellApp *app)
 {
  /* Here we just always launch the application again, even if we know
   * it was already running.  For most applications this
@@ -462,12 +452,7 @@ shell_app_open_new_window (ShellApp      *app,
   * as say Pidgin.  Ideally, we have the application express to us
   * that it supports an explicit new-window action.
   */
-  shell_app_info_launch_full (app->info,
-                              0,
-                              NULL,
-                              workspace,
-                              NULL,
-                              NULL);
+  shell_app_info_launch (app->info, NULL);
 }

 /**
--- a/src/shell-app.h
+++ b/src/shell-app.h
@@ -44,11 +44,9 @@ gboolean shell_app_is_transient (ShellApp *app);

 void shell_app_activate_window (ShellApp *app, MetaWindow *window, guint32 timestamp);

-void shell_app_activate (ShellApp      *app,
-                         int            workspace);
+void shell_app_activate (ShellApp *app);

-void shell_app_open_new_window (ShellApp *app,
-                                int       workspace);
+void shell_app_open_new_window (ShellApp *app);

 ShellAppState shell_app_get_state (ShellApp *app);

--- a/src/shell-doc-system.c
+++ b/src/shell-doc-system.c
@@ -227,24 +227,17 @@ shell_doc_system_on_recent_changed (GtkRecentManager  *manager,
 * shell_doc_system_open:
 * @system: A #ShellDocSystem
 * @info: A #GtkRecentInfo
- * @workspace: Open on this workspace, or -1 for default
 *
 * Launch the default application associated with the mime type of
 * @info, using its uri.
 */
 void
 shell_doc_system_open (ShellDocSystem *system,
-                       GtkRecentInfo  *info,
-                       int             workspace)
+                       GtkRecentInfo  *info)
 {
  GFile *file;
  GAppInfo *app_info;
  gboolean needs_uri;
-  GAppLaunchContext *context;
-
-  context = shell_global_create_app_launch_context (shell_global_get ());
-  if (workspace != -1)
-    gdk_app_launch_context_set_desktop ((GdkAppLaunchContext *)context, workspace);

  file = g_file_new_for_uri (gtk_recent_info_get_uri (info));
  needs_uri = g_file_get_path (file) == NULL;
@@ -255,13 +248,17 @@ shell_doc_system_open (ShellDocSystem *system,
    {
      GList *uris;
      uris = g_list_prepend (NULL, (gpointer)gtk_recent_info_get_uri (info));
-      g_app_info_launch_uris (app_info, uris, context, NULL);
+      g_app_info_launch_uris (app_info, uris, shell_global_create_app_launch_context (shell_global_get ()), NULL);
      g_list_free (uris);
    }
  else
    {
      char *app_name;
+#if GTK_MINOR_VERSION >= 18
      const char *app_exec;
+#else
+      char *app_exec;
+#endif
      char *app_exec_quoted;
      guint count;
      time_t time;
@@ -270,6 +267,7 @@ shell_doc_system_open (ShellDocSystem *system,
      if (gtk_recent_info_get_application_info (info, app_name, &app_exec, &count, &time))
        {
          GRegex *regex;
+          GAppLaunchContext *context;

          /* TODO: Change this once better support for creating
             GAppInfo is added to GtkRecentInfo, as right now
@@ -300,13 +298,13 @@ shell_doc_system_open (ShellDocSystem *system,
             despite passing the app launch context, no startup
             notification occurs.
           */
+          context = shell_global_create_app_launch_context (shell_global_get ());
          g_app_info_launch (app_info, NULL, context, NULL);
+          g_object_unref (context);
        }

      g_free (app_name);
    }
-
-  g_object_unref (context);
 }

 static void
--- a/src/shell-doc-system.h
+++ b/src/shell-doc-system.h
@@ -41,7 +41,6 @@ void shell_doc_system_queue_existence_check (ShellDocSystem   *system,
                                             guint             n_items);

 void shell_doc_system_open (ShellDocSystem *system,
-                            GtkRecentInfo  *info,
-                            int             workspace);
+                            GtkRecentInfo  *info);

 #endif /* __SHELL_DOC_SYSTEM_H__ */
--- a/src/shell-drawing.c
+++ b/src/shell-drawing.c
@@ -0,0 +1,138 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#include "config.h"
+
+#include "shell-drawing.h"
+#include <math.h>
+
+void
+shell_draw_clock (StDrawingArea       *area,
+                  int                  hour,
+                  int                  minute)
+{
+  cairo_t *cr;
+  guint width, height;
+  double xc, yc, radius, hour_radius, minute_radius;
+  double angle;
+
+  st_drawing_area_get_surface_size (area, &width, &height);
+  xc = (double)width / 2;
+  yc = (double)height / 2;
+  radius = (double)(MIN(width, height)) / 2 - 2;
+  minute_radius = radius - 3;
+  hour_radius = radius / 2;
+
+  cr = st_drawing_area_get_context (area);
+  cairo_set_line_width (cr, 1.0);
+
+  /* Outline */
+  cairo_arc (cr, xc, yc, radius, 0.0, 2.0 * M_PI);
+  cairo_stroke (cr);
+
+  /* Hour hand. (We add a fraction to @hour for the minutes, then
+   * convert to radians, and then subtract pi/2 because cairo's origin
+   * is at 3:00, not 12:00.)
+   */
+  angle = ((hour + minute / 60.0) / 12.0) * 2.0 * M_PI - M_PI / 2.0;
+  cairo_move_to (cr, xc, yc);
+  cairo_line_to (cr,
+                 xc + hour_radius * cos (angle),
+                 yc + hour_radius * sin (angle));
+  cairo_stroke (cr);
+
+  /* Minute hand */
+  angle = (minute / 60.0) * 2.0 * M_PI - M_PI / 2.0;
+  cairo_move_to (cr, xc, yc);
+  cairo_line_to (cr,
+                 xc + minute_radius * cos (angle),
+                 yc + minute_radius * sin (angle));
+  cairo_stroke (cr);
+}
+
+void
+shell_draw_box_pointer (StDrawingArea         *area,
+                        ShellPointerDirection  direction)
+{
+  StThemeNode *theme_node;
+  ClutterColor border_color, body_color;
+  guint width, height;
+  cairo_t *cr;
+
+  theme_node = st_widget_get_theme_node (ST_WIDGET (area));
+  st_theme_node_get_border_color (theme_node, (StSide)direction, &border_color);
+  st_theme_node_get_foreground_color (theme_node, &body_color);
+
+  st_drawing_area_get_surface_size (area, &width, &height);
+
+  cr = st_drawing_area_get_context (area);
+
+  cairo_set_line_width (cr, 1.0);
+
+  clutter_cairo_set_source_color (cr, &border_color);
+
+  switch (direction)
+    {
+    case SHELL_POINTER_UP:
+      cairo_move_to (cr, 0, height);
+      cairo_line_to (cr, floor (width * 0.5), 0);
+      cairo_line_to (cr, width, height);
+      break;
+
+    case SHELL_POINTER_DOWN:
+      cairo_move_to (cr, width, 0);
+      cairo_line_to (cr, floor (width * 0.5), height);
+      cairo_line_to (cr, 0, 0);
+      break;
+
+    case SHELL_POINTER_LEFT:
+      cairo_move_to (cr, width, height);
+      cairo_line_to (cr, 0, floor (height * 0.5));
+      cairo_line_to (cr, width, 0);
+      break;
+
+    case SHELL_POINTER_RIGHT:
+      cairo_move_to (cr, 0, 0);
+      cairo_line_to (cr, width, floor (height * 0.5));
+      cairo_line_to (cr, 0, height);
+      break;
+
+    default:
+      g_assert_not_reached();
+    }
+
+  cairo_stroke_preserve (cr);
+
+  clutter_cairo_set_source_color (cr, &body_color);
+
+  cairo_fill (cr);
+}
+
+static void
+hook_paint_red_border (ClutterActor  *actor,
+                       gpointer       user_data)
+{
+  CoglColor color;
+  ClutterGeometry geom;
+  float width = 2;
+
+  cogl_color_set_from_4ub (&color, 0xff, 0, 0, 0xc4);
+  cogl_set_source_color (&color);
+
+  clutter_actor_get_allocation_geometry (actor, &geom);
+
+  /** clockwise order **/
+  cogl_rectangle (0, 0, geom.width, width);
+  cogl_rectangle (geom.width - width, width,
+                  geom.width, geom.height);
+  cogl_rectangle (0, geom.height,
+                  geom.width - width, geom.height - width);
+  cogl_rectangle (0, geom.height - width,
+                  width, width);
+}
+
+guint
+shell_add_hook_paint_red_border (ClutterActor *actor)
+{
+  return g_signal_connect_after (G_OBJECT (actor), "paint",
+                                 G_CALLBACK (hook_paint_red_border), NULL);
+}
--- a/src/shell-drawing.h
+++ b/src/shell-drawing.h
@@ -0,0 +1,30 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#ifndef __SHELL_DRAWING_H__
+#define __SHELL_DRAWING_H__
+
+#include <clutter/clutter.h>
+#include "st.h"
+
+G_BEGIN_DECLS
+
+/* Note that these correspond to StSide */
+typedef enum {
+  SHELL_POINTER_UP,
+  SHELL_POINTER_RIGHT,
+  SHELL_POINTER_DOWN,
+  SHELL_POINTER_LEFT
+} ShellPointerDirection;
+
+void shell_draw_box_pointer (StDrawingArea         *area,
+                             ShellPointerDirection  direction);
+
+void shell_draw_clock (StDrawingArea       *area,
+	               int                  hour,
+	               int                  minute);
+
+guint shell_add_hook_paint_red_border (ClutterActor *actor);
+
+G_END_DECLS
+
+#endif /* __SHELL_GLOBAL_H__ */
--- a/src/shell-evolution-event-source.c
+++ b/src/shell-evolution-event-source.c
@@ -99,7 +99,7 @@ shell_evolution_event_source_request_range (ShellEvolutionEventSource *source,
                                            gint64                     msec_begin,
                                            gint64                     msec_end)
 {
-  GDateTime *middle_utc, *middle;
+  GDateTime *middle;

  /* The CalendarClient type is a convenience wrapper on top of
   * Evolution Data Server. It is based on the assumption that only
@@ -112,10 +112,7 @@ shell_evolution_event_source_request_range (ShellEvolutionEventSource *source,
   * days before and after) it works out just fine.
   */

-  middle_utc = g_date_time_new_from_unix_utc ((msec_begin + msec_end) / 2 / 1000);
-  /* CalendarClient uses localtime rather than UTC */
-  middle = g_date_time_to_local (middle_utc);
-  g_date_time_unref (middle_utc);
+  middle = g_date_time_new_from_unix_utc ((msec_begin + msec_end) / 2 / 1000);
  g_date_time_get_ymd (middle, &source->req_year, &source->req_mon, NULL);
  g_date_time_unref (middle);
  calendar_client_select_month (source->client, source->req_mon - 1, source->req_year);
@@ -155,22 +152,15 @@ shell_evolution_event_source_get_events  (ShellEvolutionEventSource *source,
 {
  GList *result;
  GDateTime *cur_date;
-  GDateTime *begin_date_utc, *begin_date;
-  GDateTime *end_date_utc, *end_date;
+  GDateTime *begin_date;
+  GDateTime *end_date;

  g_return_val_if_fail (msec_begin <= msec_end, NULL);

  result = NULL;

-  begin_date_utc = g_date_time_new_from_unix_utc (msec_begin / 1000);
-  end_date_utc = g_date_time_new_from_unix_utc (msec_end / 1000);
-
-  /* CalendarClient uses localtime rather than UTC */
-  begin_date = g_date_time_to_local (begin_date_utc);
-  end_date = g_date_time_to_local (end_date_utc);
-  g_date_time_unref (begin_date_utc);
-  g_date_time_unref (end_date_utc);
-
+  begin_date = g_date_time_new_from_unix_utc (msec_begin / 1000);
+  end_date = g_date_time_new_from_unix_utc (msec_end / 1000);
  cur_date = g_date_time_ref (begin_date);
  do
    {
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1228,7 +1228,9 @@ shell_global_gc (ShellGlobal *global)
 void
 shell_global_maybe_gc (ShellGlobal *global)
 {
-  gjs_context_maybe_gc (global->js_context);
+  JSContext *context = gjs_context_get_native_context (global->js_context);
+
+  JS_MaybeGC (context);
 }

 void
@@ -1628,7 +1630,6 @@ shell_global_get_current_time (ShellGlobal *global)
 {
  guint32 time;
  MetaDisplay *display;
-  const ClutterEvent *clutter_event;

  /* In case we have a xdnd timestamp use it */
  if (global->xdnd_timestamp != 0)
@@ -1651,16 +1652,8 @@ shell_global_get_current_time (ShellGlobal *global)
  time = meta_display_get_current_time (display);
  if (time != CLUTTER_CURRENT_TIME)
      return time;
-  /*
-   * We don't use clutter_get_current_event_time as it can give us a
-   * too old timestamp if there is no current event.
-   */
-  clutter_event = clutter_get_current_event ();

-  if (clutter_event != NULL)
-    return clutter_event_get_time (clutter_event);
-  else
-    return CLUTTER_CURRENT_TIME;
+  return clutter_get_current_event_time ();
 }

 /**
@@ -1898,7 +1891,6 @@ shell_global_run_at_leisure (ShellGlobal         *global,
 /**
 * shell_global_play_theme_sound:
 * @global: the #ShellGlobal
- * @id: an id, used to cancel later (0 if not needed)
 * @name: the sound name
 *
 * Plays a simple sound picked according to Freedesktop sound theme.
@@ -1906,24 +1898,9 @@ shell_global_run_at_leisure (ShellGlobal         *global,
 */
 void
 shell_global_play_theme_sound (ShellGlobal *global,
-                               guint        id,
                               const char  *name)
 {
-  ca_context_play (global->sound_context, id, CA_PROP_EVENT_ID, name, NULL);
-}
-
-/**
- * shell_global_cancel_theme_sound:
- * @global: the #ShellGlobal
- * @id: the id previously passed to shell_global_play_theme_sound()
- *
- * Cancels a sound notification.
- */
-void
-shell_global_cancel_theme_sound (ShellGlobal *global,
-                                 guint id)
-{
-  ca_context_cancel (global->sound_context, id);
+  ca_context_play (global->sound_context, 0, CA_PROP_EVENT_ID, name, NULL);
 }

 /*
@@ -1989,63 +1966,3 @@ gboolean _shell_global_check_xdnd_event (ShellGlobal  *global,

    return FALSE;
 }
-
-/**
- * ShellGetTpContactCb:
- * @connection: The connection
- * @contacts: (element-type TelepathyGLib.Contact): List of contacts
- * @failed: Array of failed contacts
- */
-
-static void
-shell_global_get_tp_contacts_cb (TpConnection *self,
-                                 guint n_contacts,
-                                 TpContact * const *contacts,
-                                 guint n_failed,
-                                 const TpHandle *failed,
-                                 const GError *error,
-                                 gpointer user_data,
-                                 GObject *weak_object)
-{
-  int i;
-  GList *contact_list = NULL;
-  for (i = 0; i < n_contacts; i++) {
-      contact_list = g_list_append(contact_list, contacts[i]);
-  }
-
-  TpHandle *failed_list = g_new0 (TpHandle, n_failed + 1);
-  memcpy(failed_list, failed, n_failed);
-
-  ((ShellGetTpContactCb)user_data)(self, contact_list, failed_list);
-}
-
-
-/**
- * shell_get_tp_contacts:
- * @self: A connection, which must be ready
- * @n_handles: Number of handles in handles
- * @handles: (array length=n_handles) (element-type uint): Array of handles
- * @n_features: Number of features in features
- * @features: (array length=n_features) (allow-none) (element-type uint):
- *  Array of features
- * @callback: (scope async): User callback to run when the contacts are ready
- *
- * Wrap tp_connection_get_contacts_by_handle so we can transform the array
- * into a null-terminated one, which gjs can handle.
- * We send the original callback to tp_connection_get_contacts_by_handle as
- * user_data, and we have our own function as callback, which does the
- * transforming.
- */
-void
-shell_get_tp_contacts (TpConnection *self,
-                       guint n_handles,
-                       const TpHandle *handles,
-                       guint n_features,
-                       const TpContactFeature *features,
-                       ShellGetTpContactCb callback)
-{
-  tp_connection_get_contacts_by_handle(self, n_handles, handles,
-                                       n_features, features,
-                                       shell_global_get_tp_contacts_cb,
-                                       callback, NULL, NULL);
-}
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -8,8 +8,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>

-#include <telepathy-glib/telepathy-glib.h>
-
 G_BEGIN_DECLS

 typedef struct _ShellGlobal      ShellGlobal;
@@ -140,24 +138,10 @@ void shell_global_run_at_leisure (ShellGlobal         *global,
                                  GDestroyNotify       notify);

 void shell_global_play_theme_sound (ShellGlobal       *global,
-                                    guint              id,
                                    const char        *name);
-void shell_global_cancel_theme_sound (ShellGlobal     *global,
-                                      guint            id);

 void shell_global_init_xdnd (ShellGlobal *global);

-typedef void (*ShellGetTpContactCb) (TpConnection *connection,
-                                     GList *contacts,
-                                     TpHandle *failed);
-
-void shell_get_tp_contacts (TpConnection *self,
-                            guint n_handles,
-                            const TpHandle *handles,
-                            guint n_features,
-                            const TpContactFeature *features,
-                            ShellGetTpContactCb callback);
-
 G_END_DECLS

 #endif /* __SHELL_GLOBAL_H__ */
--- a/src/shell-marshal.list
+++ b/src/shell-marshal.list
@@ -5,4 +5,3 @@ VOID:BOXED,OBJECT
 VOID:OBJECT,OBJECT
 VOID:STRING,OBJECT,BOOLEAN
 VOID:INT,INT
-VOID:STRING,STRING,STRING,STRING,BOXED
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
David Zeuthen	2be92900b6	Merge branch 'master' into datetime	2011-01-28 14:47:34 -05:00
David Zeuthen	e82cbf3cc8	Simplify code for 'This week' / 'Next week' logic Also make the calendar work when there are many all-day events shown. See http://people.freedesktop.org/~david/many-all-day-events.png for details. Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-28 14:30:52 -05:00
David Zeuthen	0b05280e03	Merge branch 'master' into datetime	2011-01-28 13:32:19 -05:00
David Zeuthen	cd468021e2	Merge branch 'master' into datetime	2011-01-28 13:26:05 -05:00
David Zeuthen	57ebfb596b	Add Evolution Data Server to required packages Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-28 13:21:27 -05:00
David Zeuthen	8a1313be71	Update for comments from code review See https://bugzilla.gnome.org/show_bug.cgi?id=632109#c41 for the review. Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-28 12:05:17 -05:00
David Zeuthen	803e74101c	Merge branch 'master' into datetime	2011-01-28 11:06:58 -05:00
David Zeuthen	858e1b7f5b	Hard-code width of calendar popup to 600px and fix ellipsis for events We might want the width to be expressed in em or in % of the available monitor width. Or perhaps a combination of all three. I don't know. Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-26 14:34:13 -05:00
David Zeuthen	a922db0398	Align day name to "This week" Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-26 14:26:05 -05:00
David Zeuthen	bbd2b89df3	Collapse two-pixel borders inside the table It's a hack, but it works http://people.freedesktop.org/~david/calendar-table-collapse-hack.png Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-26 14:10:34 -05:00
David Zeuthen	505b9047d7	Adjust alignment in event list As per this comment https://bugzilla.gnome.org/show_bug.cgi?id=632109#c38 See http://people.freedesktop.org/~david/calendar-today-align-fixes.png Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-26 13:39:04 -05:00
David Zeuthen	dd8716e5d9	Don't show "[All Day] Nothing Scheduled" for "This week" or "Next week" Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-26 13:22:46 -05:00
David Zeuthen	18f2f6f938	Forgot to add file Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-25 15:53:07 -05:00
David Zeuthen	41b0e0832e	Get events from Evolution This commit copies existing and deployed (thus, working!) GPLv2 code from gnome-panel into src/calendar-client. Please keep in sync. Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-25 15:42:10 -05:00
David Zeuthen	374a88366b	Set up glue for native Evolution Data Server event source Right now it's just native code returning a fake event. Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-25 12:17:32 -05:00
David Zeuthen	a71c82863e	Merge branch 'master' into datetime	2011-01-25 10:10:22 -05:00
David Zeuthen	a1440bdec7	Calendar updates - Reshuffle items to make it look more like the mockup - Increase vertical spacing between event section ("Today") headings and the event items (see mockup) - Don't show the year in month-switcher and event list unless it's a different year - Include the day in the date heading - Sort events in event list according to start time - Respect 12h/24h setting in event list - Support "All Day" events in CalendarTask abstraction - Show "Nothing Scheduled" if there are no events - Add a "Open Calendar" button - Refactor some of the code Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-25 10:07:54 -05:00
David Zeuthen	b10458e57a	Use stippled line instead of gradient in calendar See http://people.freedesktop.org/~david/shell-calendar-with-dash.png We still have to move around some stuff to make it look like the mock-up, see https://live.gnome.org/GnomeShell/Design/Whiteboards/DateNTime Thanks to Colin for binding Cairo's, set_dash() method. Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-24 16:01:08 -05:00
David Zeuthen	50c5591ec2	Merge branch 'master' into datetime	2011-01-24 15:27:13 -05:00
David Zeuthen	bce2cf9164	Switch to empty event source We are leaving in the fake event source so it's easy to debug the UI. This is helpful because the fake event source has a transient event that is being added/removed every five seconds. Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-20 13:17:57 -05:00
David Zeuthen	2f52b87451	Merge branch 'master' into datetime	2011-01-20 13:11:13 -05:00
David Zeuthen	ba5a28023e	Update comment about work days Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-20 13:08:58 -05:00
David Zeuthen	0a87e28d1a	Rework interaction between Calendar, EventList and EventSource abstractions As proposed by Florian in the review. Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-19 13:55:04 -05:00
David Zeuthen	d7ad949ecb	Remove separator comment lines Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-19 13:33:19 -05:00
David Zeuthen	fd49fe6915	Use camelCase for naming Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-19 13:31:29 -05:00
David Zeuthen	c3c34890ce	Merge branch 'master' into datetime	2011-01-19 12:46:00 -05:00
David Zeuthen	af68881a94	Partial update for code review This addresses some of the comments in https://bugzilla.gnome.org/show_bug.cgi?id=632109#c22 Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-19 12:44:40 -05:00
David Zeuthen	0d9095d2d4	Catch up with master	2011-01-19 11:09:57 -05:00
Florian Müllner	8bc396a7e0	Adjust for merging commit `24f1e87` Signed-off-by: David Zeuthen <davidz@redhat.com>	2011-01-19 11:08:36 -05:00
David Zeuthen	71851a58e5	Minor updates Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-12-20 15:29:14 -05:00
David Zeuthen	70f50d61e0	Merge branch 'master' into datetime	2010-12-20 15:07:50 -05:00
David Zeuthen	f3ad82442d	Remove remaining references to EDS/ical We can add this back using the Calendar.EventSource abstraction once we are ready for it. Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-12-20 14:49:20 -05:00
David Zeuthen	6c80a35f8f	Minor changes to event source code Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-12-20 14:36:29 -05:00
David Zeuthen	a2932250a7	Refactor calendar code Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-12-20 13:51:44 -05:00
David Zeuthen	1d5cce679a	Neuter debug output	2010-12-20 11:58:56 -05:00
David Zeuthen	137ea12109	Fix merge conflicts	2010-12-20 11:55:36 -05:00
David Zeuthen	0b866a620f	Rework some of the visual layout Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-12-15 17:32:35 -05:00
David Zeuthen	397386c761	Use SVGs from Jimmac for arrows instead of '<' and '>' glyphs Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-12-15 15:37:28 -05:00
David Zeuthen	f51984b20c	Merge branch 'master' into datetime	2010-12-15 13:12:54 -05:00
David Zeuthen	8e9bc6019c	Rework how fake events work Also draw days with events with bold in the calendar view. Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-11-30 14:31:37 -05:00
David Zeuthen	51481bed82	Fix merge conflicts Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-11-30 11:11:10 -05:00
David Zeuthen	8dd05f9e7b	Use fake events Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-11-30 10:50:20 -05:00
David Zeuthen	b7fe72e74a	Merge branch 'master' into datetime	2010-11-19 07:22:28 -05:00
David Zeuthen	7aa3aba0c2	Merge branch 'master' into datetime	2010-11-16 09:16:38 -05:00
David Zeuthen	eb66993447	Merge branch 'master' into datetime	2010-10-28 13:34:27 -04:00
David Zeuthen	7d5b4511cd	Update datetime branch for latest changes Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-10-28 13:33:12 -04:00
David Zeuthen	3d1063dacb	Merge branch 'master' into datetime Conflicts: configure.ac	2010-10-26 11:48:34 -04:00
Maxim Ermilov	b4c038c036	calendar: implement Events List Signed-off-by: David Zeuthen <davidz@redhat.com>	2010-10-20 14:30:35 -04:00
David Zeuthen	1ca1a2712d	Merge branch 'master' into datetime	2010-10-20 13:55:41 -04:00
David Zeuthen	85ec4d86f3	Start implementing the Date and Time mockups	2010-10-13 17:53:26 -04:00