Fix most of the Cogl deprecation warnings

2013-09-11 15:26:44 -04:00
138 changed files with 28277 additions and 24889 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,6 @@ configure
 data/50-gnome-shell-*.xml
 data/gnome-shell.desktop
 data/gnome-shell.desktop.in
-data/gnome-shell-wayland.desktop
-data/gnome-shell-wayland.desktop.in
 data/gnome-shell-extension-prefs.desktop
 data/gnome-shell-extension-prefs.desktop.in
 data/gschemas.compiled
@@ -73,14 +71,13 @@ src/calendar-server/evolution-calendar.desktop.in
 src/calendar-server/org.gnome.Shell.CalendarServer.service
 src/gnome-shell
 src/gnome-shell-calendar-server
-src/gnome-shell-extension-prefs
 src/gnome-shell-extension-tool
+src/gnome-shell-extension-prefs
 src/gnome-shell-hotplug-sniffer
 src/gnome-shell-jhbuild
 src/gnome-shell-perf-helper
 src/gnome-shell-perf-tool
 src/gnome-shell-real
-src/gnome-shell-wayland
 src/hotplug-sniffer/org.gnome.Shell.HotplugSniffer.service
 src/run-js-test
 src/test-recorder
--- a/166
+++ b/166
@@ -1,169 +1,3 @@
-3.10.3
-======
-* Fix reentrancy issue in message tray [Jasper; #711694]
-* Fix resetting prompt on user switch [Ray; #710456]
-* Fix screen shield on login screen [Florian; #719378]
-* Catch more extension errors on enable/disable [Sebastien; #688331]
-* Fix entry focus of chat notifications [Jasper; #709853]
-* Fix app switcher order with dialog windows [Florian; #719824]
-* Allow remote search providers without icons [Debarshi; #719965]
-* Fix ref-counting issue in ShellApp [Giovanni; #721439]
-
-Contributors:
-  Giovanni Campagna, Sebastien Lafargue, Florian Müllner, Debarshi Ray,
-  Jasper St. Pierre, Ray Strode
-
-Translations:
-  Emin Tufan Çetin [tr], Muhammet Kara [tr], A S Alam [pa], Khaled Hosny [ar],
-  Dušan Kazik [sk], Wylmer Wang [zh_CN], Benjamin Steinwender [de],
-  Matej Urbančič [sl], Aurimas Černius [lt], Rafael Ferreira [pt_BR],
-  Andika Triwidada [id], Marek Černocký [cs], Tong Hui [zh_CN],
-  Adorilson Bezerra [pt_BR], Christian Kirbach [de],
-  Мирослав Николић [sr, sr@latin]
-
-3.10.2.1
-========
-* Lower mutter requirement to not end up without wayland support
-
-3.10.2
-======
-* gdm: Don't allow user-list to fill up the entire screen [Florian; #710555]
-* Restore support for 'disable-restart-buttons' [Florian; #711244]
-* alidate parameters of exposed DBus methods [Florian; #699752]
-* Misc. bug fixes [Florian; #709806]
-
-Contributors:
-  Florian Müllner
-
-Translations:
-  Ihar Hrachyshka [be], Stas Solovey [ru], Kjartan Maraas [nb],
-  Dimitris Spingos [el], Rafael Ferreira [pt_BR], Yuri Myasoedov [ru],
-  Sphinx Jiang [zh_CN], Shantha kumar [ta]
-
-3.10.1
-======
-* Make sure lock screen is drawn once before switching user [Giovanni; #708051]
-* Fix signal strength indicators in network selector [Jasper; #708442]
-* Scroll search results when focusing provider icons [Jasper; #708868]
-* Add separate hover/active states to page indicators [Carlos; #708852]
-* Tweak appearance of user name and avatar [Yash; #702309]
-* Hide "Turn On" in network menu when disabled by hardware [Giovanni; #709635]
-* Cancel open keyring prompts when the screen is locked [Florian; #708910]
-* Differentiate "Not Connected" and "Off" in network menu [Giovanni; #709043]
-* Make network settings items point to the right device [Giovanni; #709246]
-* Remove animation of window preview titles [Sebastien; #709392]
-* Add 'Notifications' switch to tray menu [Florian; #707073]
-* Make dropdown arrows consistent [Carlos; #709564]
-* power: Use icon from primary device for status [Jasper; #709925]
-* Fix XDND drags to overview [Adel; #708887]
-* Fix workspace switcher disappearing with too many workspaces [Jasper; #694881]
-* Handle search results with 'special:' prefix specially [Giovanni; #707055]
-* gdm: Support pre-authenticated logins from oVirt [Vinzenz; #702162]
-* Use ARROW role for labels representing arrows [Alejandro; #710120]
-* Make selected view in app picker persistent [Florian; #710042]
-* Make network selector navigable by keyboard [Alejandro; #710144]
-* Misc bug fixes [Florian, Adel, Jasper, Aleksander, Giovanni, Dan, Michael,
-  Tim; #709034, #709263, #698486, #709286, #709248, #709543, #696564, #703265,
-  #709638, #709866, #709998, #710019, #710104, #710115]
-
-Contributors:
-  Giovanni Campagna, Michael Catanzaro, Vinzenz Feenstra, Adel Gadllah,
-  Yash Girdhar, Sebastien Lafargue, Tim Lunn, Aleksander Morgado,
-  Florian Müllner, Alejandro Piñeiro, Carlos Soriano, Jasper St. Pierre,
-  Dieter Verfaillie, Dan Winship
-
-Translations:
-  Inaki Larranaga Murgoitio [eu], Christian Kirbach [de], Muhammet Kara [tr],
-  Aurimas Černius [lt], Ryan Lortie [eo], Rūdolfs Mazurs [lv],
-  Dušan Kazik [sk], Fran Diéguez [gl], Enrico Nicoletto [pt_BR],
-  Kjartan Maraas [nb], Victor Ibragimov [tg], Matej Urbančič [sl],
-  A S Alam [pa], Nilamdyuti Goswami [as], Daniel Mustieles [es],
-  Cheng-Chia Tseng [zh_HK, zh_TW], Mattias Põldaru [et], Kenneth Nielsen [da],
-  Milo Casagrande [it], Marek Černocký [cs], Ihar Hrachyshka [be],
-  Мирослав Николић [sr, sr@latin], Arash Mousavi [fa], Yuri Myasoedov [ru],
-  Gil Forcada [ca], Carles Ferrando [ca@valencia], Andika Triwidada [id],
-  Timo Jyrinki [fi], Piotr Drąg [pl], Rafael Ferreira [pt_BR],
-  Gabor Kelemen [hu], Yosef Or Boczko [he], Daniel Korostil [uk],
-  Wouter Bolsterlee [nl], António Lima [pt]
-
-3.10.0.1
-=========
-* Fix login screen [Ray; #708691]
-
-Contributors:
-  Ray Strode, Giovanni Campagna, Jasper St. Pierree
-
-Translations:
-  Kjartan Maraas [nb], Marek Černocký [cs], A S Alam [pa], Daniel Mustieles [es],
-  Ihar Hrachyshka [be], Chao-Hsiung Liao [zh_HK], Nilamdyuti Goswami [as],
-  Yuri Myasoedov [ru], Baurzhan Muftakhidinov [kk]
-
-3.10.0
-======
-* Fix fade effect in ScrollViews [Carlos; #708256]
-* network: Resync when activating connection changes [Jasper; #708322]
-* Close run dialog when the screen locks [Florian; #708218]
-* Fix entry growing out of password dialogs [Florian; #708324, #703833]
-* Vertically center labels in submenu items [Jasper; #708330]
-* https://bugzilla.gnome.org/show_bug.cgi?id=708387 [Mike; #708387]
-* Fix bluetooth icon not being added to status menu [Jasper; #708541]
-* Fix GNOME 2 keyring dialogs appearing on lock screen [Florian; #708187]
-* Fix passwords being cleared twice when authentication fails [Florian; #708186]
-* Fix message tray appearing in a11y popup on login screen [Florian; #708380]
-* Increase width of aggregate menu popup [Adel; #708472]
-
-Contributors:
-  Adel Gadllah, Mike Gorse, Ryan Lortie, Florian Müllner, Frédéric Péters,
-  Carlos Soriano, Jasper St. Pierre, Rico Tzschichholz
-
-Translations:
-  Daniel Șerbănescu [ro], Ryan Lortie [eo], Ihar Hrachyshka [be],
-  A S Alam [pa], Jiro Matsuzawa [ja], Chao-Hsiung Liao [zh_HK, zh_TW],
-  Piotr Drąg [pl], Kristjan SCHMIDT [eo], Daniel Korostil [uk],
-  Rūdolfs Mazurs [lv], Reinout van Schouwen [nl], Yosef Or Boczko [he],
-  Fran Diéguez [gl], António Lima [pt], Andika Triwidada [id],
-  Alexandre Franke [fr], Rafael Ferreira [pt_BR], Milo Casagrande [it],
-  Kenneth Nielsen [da], Matej Urbančič [sl]
-
-3.9.92
-======
-* Don't show page indicators if there's only one page [Florian; #707363]
-* Make :active style of app and non-app results consistent [Jakub; #704714]
-* Fade app pages when scrolled [Florian; #707409]
-* Don't block scrolling on page indicators [Carlos; #707609]
-* Tweak visual appearance of folder views [Florian; #707662]
-* Don't put minimized apps at the end of the app switcher [Florian; #707663]
-* Merge the wayland branch [Giovanni, Neil; #707467]
-* Make search entry behave better in RTL locales [Matthias, Florian; #705779]
-* Allow to change app pages with pageUp/pageDown keys [Carlos; #707979]
-* Set approriate a11y states on expandable menu items [Alejandro; #708038]
-* Improve page indicator animation [Carlos; #707565]
-* Misc bug fixes and cleanups [Florian, Olivier, Jasper, Giovanni, Magdalen,
-  Adel, Carlos, Rico, Joanmarie; #707308, #707430, #707508, #707557, #707600,
-  #707614, #707666, #707814, #707806, #707801, #707889, #707892, #707935,
-  #707842, #707940, #707996, #708007, #708009, #708020, #707580, #708080]
-
-Contributors:
-  Magdalen Berns, Olivier Blin, Giovanni Campagna, Matthias Clasen,
-  Joanmarie Diggs, Adel Gadllah, Florian Müllner, Alejandro Piñeiro,
-  Neil Roberts, Carlos Soriano, Jasper St. Pierre, Jakub Steiner,
-  Rico Tzschichholz
-
-Translations:
-  Rafael Ferreira [pt_BR], Fran Diéguez [gl], Daniel Mustieles [es],
-  Aurimas Černius [lt], Luca Ferretti [it], Piotr Drąg [pl],
-  Chao-Hsiung Liao [zh_HK, zh_TW], Timo Jyrinki [fi], Daniel Korostil [uk],
-  Dušan Kazik [sk], Adam Matoušek [cs], Marek Černocký [cs],
-  Jiro Matsuzawa [ja], Yuri Myasoedov [ru], Tobias Endrigkeit [de],
-  Kjartan Maraas [nb], Victor Ibragimov [tg], Мирослав Николић [sr, sr@latin],
-  A S Alam [pa], Khaled Hosny [ar], Andika Triwidada [id],
-  Nilamdyuti Goswami [as], Ihar Hrachyshka [be], Rūdolfs Mazurs [lv],
-  Mattias Põldaru [et], Gabor Kelemen [hu], Bruce Cowan [en_GB],
-  Matej Urbančič [sl], Enrico Nicoletto [pt_BR], Benjamin Steinwender [de],
-  Changwoo Ryu [ko], Kris Thomsen [da], Alexandre Franke [fr],
-  Evgeny Bobkin [ru], Baurzhan Muftakhidinov [kk], Peter Mráz [sk],
-  Inaki Larranaga Murgoitio [eu], Yosef Or Boczko [he]
-
 3.9.91
 ======
 * Improve submenu styling [Jakub; #706037]
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.10.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.9.91],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

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

 CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=1.38.1
-MUTTER_MIN_VERSION=3.10.1
+GJS_MIN_VERSION=1.35.4
+MUTTER_MIN_VERSION=3.9.91
 GTK_MIN_VERSION=3.7.9
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,10 +3,6 @@ dist_wanda_DATA = wanda.png

 desktopdir=$(datadir)/applications
 desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
-if HAVE_MUTTER_WAYLAND
-desktop_DATA += gnome-shell-wayland.desktop
-endif HAVE_MUTTER_WAYLAND
-

 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
@@ -45,10 +41,8 @@ dist_theme_DATA =				\
 	theme/message-tray-background.png	\
 	theme/more-results.svg			\
 	theme/noise-texture.png			\
-	theme/page-indicator-active.svg		\
+	theme/page-indicator-active.svg	\
 	theme/page-indicator-inactive.svg	\
-	theme/page-indicator-checked.svg	\
-	theme/page-indicator-hover.svg		\
 	theme/panel-button-border.svg		\
 	theme/panel-button-highlight-narrow.svg	\
 	theme/panel-button-highlight-wide.svg	\
@@ -89,7 +83,6 @@ convert_DATA = gnome-shell-overrides.convert

 EXTRA_DIST =						\
 	gnome-shell.desktop.in.in			\
-	gnome-shell-wayland.desktop.in.in		\
 	gnome-shell-extension-prefs.desktop.in.in	\
 	$(introspection_DATA)				\
 	$(menu_DATA)					\
@@ -99,7 +92,6 @@ EXTRA_DIST =						\

 CLEANFILES =						\
 	gnome-shell.desktop.in				\
-	gnome-shell-wayland.desktop.in			\
 	gnome-shell-extension-prefs.in			\
 	$(desktop_DATA)					\
 	$(keys_DATA)					\
--- a/data/gnome-shell-wayland.desktop.in.in
+++ b/data/gnome-shell-wayland.desktop.in.in
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=GNOME Shell (wayland compositor)
-_Comment=Window management and application launching
-Exec=@bindir@/mutter-launch -- gnome-shell-wayland --wayland
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-shell
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
-Categories=GNOME;GTK;Core;
-OnlyShowIn=GNOME;
-NoDisplay=true
-X-GNOME-Autostart-Phase=DisplayServer
-X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=false
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -37,13 +37,6 @@
        application view, rather than being displayed inline in the main view.
      </_description>
    </key>
-    <key name="app-picker-view" type="u">
-      <default>0</default>
-      <summary>App Picker View</summary>
-      <description>
-        Index of the currently selected view in the application picker.
-      </description>
-    </key>
    <key name="command-history" type="as">
      <default>[]</default>
      <_summary>History for command (Alt-F2) dialog</_summary>
@@ -223,10 +216,10 @@

    <key name="focus-change-on-pointer-rest" type="b">
      <default>true</default>
-      <_summary>Delay focus changes in mouse mode until the pointer stops moving</_summary>
-      <_description>
+      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
+      <description>
        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </_description>
+      </description>
    </key>
  </schema>
 </schemalist>
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -157,7 +157,7 @@ StScrollBar StButton#vhandle:active {
    min-width: 200px;
 }

-.unicode-arrow {
+.popup-submenu-menu-item-triangle {
    font-size: 120%;
 }

@@ -642,7 +642,7 @@ StScrollBar StButton#vhandle:active {
 }

 .aggregate-menu {
-    width: 360px;
+    width: 340px;
 }

 .aggregate-menu .popup-menu-icon {
@@ -693,9 +693,7 @@ StScrollBar StButton#vhandle:active {
    padding-bottom: 32px;
 }

-.workspace-thumbnails {
-    spacing: 11px;
-    visible-width: 32px; /* Amount visible before hovering */
+.workspace-thumbnails-background {
    border: 1px solid rgba(128, 128, 128, 0.4);
    border-right: 0px;
    border-radius: 9px 0px 0px 9px;
@@ -703,13 +701,18 @@ StScrollBar StButton#vhandle:active {
    padding: 11px 7px 11px 11px;
 }

-.workspace-thumbnails:rtl {
+.workspace-thumbnails-background:rtl {
    border-right: 1px;
    border-left: 0px;
    border-radius: 0px 9px 9px 0px;
    padding: 11px 11px 11px 7px;
 }

+.workspace-thumbnails {
+    spacing: 11px;
+    visible-width: 32px; /* Amount visible before hovering */
+}
+
 .workspace-thumbnail-indicator {
    border: 4px solid rgba(255,255,255,0.7);
    border-radius: 4px;
@@ -915,6 +918,7 @@ StScrollBar StButton#vhandle:active {
 }

 .app-display {
+    padding: 8px;
    spacing: 20px;
 }

@@ -938,7 +942,7 @@ StScrollBar StButton#vhandle:active {
 }

 .page-indicator {
-    padding: 15px 20px;
+    padding: 15px 30px;
 }

 .page-indicator .page-indicator-icon {
@@ -947,19 +951,11 @@ StScrollBar StButton#vhandle:active {
    background-image: url(page-indicator-inactive.svg);
 }

-.page-indicator:hover .page-indicator-icon {
-    background-image: url(page-indicator-hover.svg);
-}
-
-.page-indicator:active .page-indicator-icon {
+.page-indicator:hover .page-indicator-icon,
+.page-indicator:checked .page-indicator-icon {
    background-image: url(page-indicator-active.svg);
 }

-.page-indicator:checked .page-indicator-icon,
-.page-indicator:checked:active .page-indicator-icon {
-    background-image: url(page-indicator-checked.svg);
-}
-
 .no-frequent-applications-label {
    font-size: 18pt;
    color: #999999;
@@ -2273,7 +2269,7 @@ StScrollBar StButton#vhandle:active {

 .framed-user-icon {
    border: 2px solid #8b8b8b;
-    border-radius: 3px;
+    border-radius: 5px;
    background-size: contain;
 }

@@ -2317,7 +2313,7 @@ StScrollBar StButton#vhandle:active {
 }

 .login-dialog-user-list-item {
-    border-radius: 5px;
+    border-radius: 10px;
    padding: .2em;
 }

@@ -2330,20 +2326,19 @@ StScrollBar StButton#vhandle:active {
 }

 .login-dialog-user-list-item .login-dialog-user-list-item-name {
-    font-size: 20px;
-    padding-left: 18px;
-    font-weight: bold;
+    font-size: 20pt;
+    padding-left: 9px;
 }

 .login-dialog-user-list:expanded .login-dialog-user-list-item {
-    color: #bfbfbf;
+    color: #666666;
 }

 .login-dialog-user-list-item,
 .login-dialog-user-list-item:hover .login-dialog-user-list-item-name,
 .login-dialog-user-list:expanded .login-dialog-user-list-item:focus .login-dialog-user-list-item-name,
 .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
-    color: #bfbfbf;
+    color: white;
    text-shadow: black 0px 2px 2px;
 }

@@ -2375,7 +2370,7 @@ StScrollBar StButton#vhandle:active {

 .login-dialog-user-list-item-icon {
    border: 2px solid #8b8b8b;
-    border-radius: 3px;
+    border-radius: 8px;
    width: 64px;
    height: 64px;
 }
@@ -2387,10 +2382,6 @@ StScrollBar StButton#vhandle:active {
    padding-top: 1em;
 }

-.login-dialog-user-selection-box {
-    padding: 100px 0;
-}
-
 .login-dialog-user-selection-box .login-dialog-not-listed-label {
    padding-left: 2px;
 }
@@ -2496,11 +2487,10 @@ StScrollBar StButton#vhandle:active {
 }

 .user-widget-label {
-    font-size: 20px;
+    font-size: 16pt;
    font-weight: bold;
    text-align: left;
-    padding-left: 18px;
-    color:white;
+    padding-left: 15px;
    text-shadow: black 0px 4px 3px 0px;
 }

--- a/data/theme/page-indicator-active.svg
+++ b/data/theme/page-indicator-active.svg
@@ -14,7 +14,7 @@
   id="svg4703"
   version="1.1"
   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-pushed.svg">
+   sodipodi:docname="page-indicator-active.svg">
  <defs
     id="defs4705" />
  <sodipodi:namedview
@@ -24,22 +24,18 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="31.392433"
-     inkscape:cx="1.0245308"
-     inkscape:cy="13.3715"
+     inkscape:zoom="22.197802"
+     inkscape:cx="2.1522887"
+     inkscape:cy="16.782904"
     inkscape:current-layer="layer1"
     showgrid="true"
     inkscape:grid-bbox="true"
     inkscape:document-units="px"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
     inkscape:window-x="0"
     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid6140" />
-  </sodipodi:namedview>
+     inkscape:window-maximized="1" />
  <metadata
     id="metadata4708">
    <rdf:RDF>
@@ -48,7 +44,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
      </cc:Work>
    </rdf:RDF>
  </metadata>
@@ -58,14 +54,14 @@
     inkscape:groupmode="layer"
     transform="translate(0,2)">
    <path
-       transform="matrix(0.54617904,0,0,0.62523128,-1131.9904,-392.39214)"
-       d="m 2099.9808,638.83099 a 10.985409,9.5964489 0 1 1 -21.9708,0 10.985409,9.5964489 0 1 1 21.9708,0 z"
+       transform="matrix(0.72823872,0,0,0.8336417,-1512.2872,-525.55618)"
+       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
       sodipodi:ry="9.5964489"
       sodipodi:rx="10.985409"
       sodipodi:cy="638.83099"
       sodipodi:cx="2088.9954"
       id="path4711"
-       style="fill:#fdffff;fill-opacity:1;stroke:none"
+       style="fill:#fdffff;fill-opacity:0.94117647;stroke:none"
       sodipodi:type="arc" />
  </g>
 </svg>
--- a/data/theme/page-indicator-checked.svg
+++ b/data/theme/page-indicator-checked.svg
@@ -1,67 +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="18"
-   height="18"
-   id="svg4703"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-active.svg">
-  <defs
-     id="defs4705" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="2.1522887"
-     inkscape:cy="16.782904"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4708">
-    <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,2)">
-    <path
-       transform="matrix(0.72823872,0,0,0.8336417,-1512.2872,-525.55618)"
-       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
-       sodipodi:ry="9.5964489"
-       sodipodi:rx="10.985409"
-       sodipodi:cy="638.83099"
-       sodipodi:cx="2088.9954"
-       id="path4711"
-       style="fill:#fdffff;fill-opacity:0.94117647;stroke:none"
-       sodipodi:type="arc" />
-  </g>
-</svg>
--- a/data/theme/page-indicator-hover.svg
+++ b/data/theme/page-indicator-hover.svg
@@ -1,67 +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="18"
-   height="18"
-   id="svg5266"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page-indicator-inactive.svg">
-  <defs
-     id="defs5268" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-2.307566"
-     inkscape:cy="17.859535"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5271">
-    <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,2)">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path5274"
-       sodipodi:cx="2088.9954"
-       sodipodi:cy="638.83099"
-       sodipodi:rx="10.985409"
-       sodipodi:ry="9.5964489"
-       d="m 2099.9808,638.83099 c 0,5.29998 -4.9184,9.59645 -10.9854,9.59645 -6.0671,0 -10.9854,-4.29647 -10.9854,-9.59645 0,-5.29997 4.9183,-9.59645 10.9854,-9.59645 6.067,0 10.9854,4.29648 10.9854,9.59645 z"
-       transform="matrix(0.63720887,0,0,0.72943648,-1322.1264,-458.98661)" />
-  </g>
-</svg>
--- a/data/theme/page-indicator-inactive.svg
+++ b/data/theme/page-indicator-inactive.svg
@@ -25,14 +25,14 @@
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:zoom="11.313709"
-     inkscape:cx="-2.307566"
+     inkscape:cx="13.381365"
     inkscape:cy="17.859535"
     inkscape:current-layer="layer1"
     showgrid="true"
     inkscape:grid-bbox="true"
     inkscape:document-units="px"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
+     inkscape:window-width="1920"
+     inkscape:window-height="1021"
     inkscape:window-x="0"
     inkscape:window-y="27"
     inkscape:window-maximized="1" />
@@ -55,7 +55,7 @@
     transform="translate(0,2)">
    <path
       sodipodi:type="arc"
-       style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:0.39215686000000000;stroke-dasharray:none"
+       style="fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276;stroke-miterlimit:4;stroke-opacity:0.39215686;stroke-dasharray:none"
       id="path5274"
       sodipodi:cx="2088.9954"
       sodipodi:cy="638.83099"
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -21,7 +21,6 @@ nobase_dist_js_DATA = 	\
 	gdm/batch.js		\
 	gdm/fingerprint.js	\
 	gdm/loginDialog.js	\
-	gdm/oVirt.js		\
 	gdm/realmd.js		\
 	gdm/util.js		\
 	extensionPrefs/main.js	\
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -59,7 +59,6 @@ const AuthPrompt = new Lang.Class({
        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
        this._userVerifier.connect('smartcard-status-changed', Lang.bind(this, this._onSmartcardStatusChanged));
-        this._userVerifier.connect('ovirt-user-authenticated', Lang.bind(this, this._onOVirtUserAuthenticated));
        this.smartcardDetected = this._userVerifier.smartcardDetected;

        this.connect('next', Lang.bind(this, function() {
@@ -220,11 +219,6 @@ const AuthPrompt = new Lang.Class({
        this.emit('prompted');
    },

-    _onOVirtUserAuthenticated: function() {
-        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
-            this.reset();
-    },
-
    _onSmartcardStatusChanged: function() {
        this.smartcardDetected = this._userVerifier.smartcardDetected;

@@ -250,7 +244,6 @@ const AuthPrompt = new Lang.Class({
    },

    _onVerificationFailed: function() {
-        this._queryingService = null;
        this.clear();

        this.updateSensitivity(true);
@@ -263,8 +256,10 @@ const AuthPrompt = new Lang.Class({
    },

    _onReset: function() {
-        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
-        this.reset();
+        if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED) {
+            this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
+            this.reset();
+        }
    },

    addActorToDefaultButtonWell: function(actor) {
@@ -448,11 +443,10 @@ const AuthPrompt = new Lang.Class({
            // The user is constant at the unlock screen, so it will immediately
            // respond to the request with the username
            beginRequestType = BeginRequestType.PROVIDE_USERNAME;
-        } else if (this._userVerifier.serviceIsForeground(GdmUtil.OVIRT_SERVICE_NAME) ||
-                   (this.smartcardDetected &&
-                    this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME))) {
+        } else if (this.smartcardDetected &&
+                   this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME)) {
            // We don't need to know the username if the user preempted the login screen
-            // with a smartcard or with preauthenticated oVirt credentials
+            // with a smartcard.
            beginRequestType = BeginRequestType.DONT_PROVIDE_USERNAME;
        } else {
            // In all other cases, we should get the username up front.
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -619,7 +619,7 @@ const LoginDialog = new Lang.Class({

        // Translators: this message is shown below the username entry field
        // to clue the user in on how to login to the local network realm
-        this._authPrompt.setMessage(_("(e.g., user or %s)").format(hint), GdmUtil.MessageType.HINT);
+        this._authPrompt.setMessage(_("(e.g., user or %s)").format(hint), AuthPrompt.MessageType.HINT);
    },

    _askForUsernameAndBeginVerification: function() {
@@ -907,10 +907,6 @@ const LoginDialog = new Lang.Class({
        Main.ctrlAltTabManager.removeGroup(this.dialogLayout);
    },

-    cancel: function() {
-        this._authPrompt.cancel();
-    },
-
    addCharacter: function(unichar) {
        this._authPrompt.addCharacter(unichar);
    },
--- a/js/gdm/oVirt.js
+++ b/js/gdm/oVirt.js
@@ -1,62 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const Signals = imports.signals;
-
-const OVirtCredentialsIface = <interface name='org.ovirt.vdsm.Credentials'>
-<signal name="UserAuthenticated">
-    <arg type="s" name="token"/>
-</signal>
-</interface>;
-
-const OVirtCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(OVirtCredentialsIface);
-
-let _oVirtCredentialsManager = null;
-
-function OVirtCredentials() {
-    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system,
-                                   g_interface_name: OVirtCredentialsInfo.name,
-                                   g_interface_info: OVirtCredentialsInfo,
-                                   g_name: 'org.ovirt.vdsm.Credentials',
-                                   g_object_path: '/org/ovirt/vdsm/Credentials',
-                                   g_flags: (Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) });
-    self.init(null);
-    return self;
-}
-
-const OVirtCredentialsManager = new Lang.Class({
-    Name: 'OVirtCredentialsManager',
-    _init: function() {
-        this._token = null;
-
-        this._credentials = new OVirtCredentials();
-        this._credentials.connectSignal('UserAuthenticated',
-                                        Lang.bind(this, this._onUserAuthenticated));
-    },
-
-    _onUserAuthenticated: function(proxy, sender, [token]) {
-        this._token = token;
-        this.emit('user-authenticated', token);
-    },
-
-    hasToken: function() {
-        return this._token != null;
-    },
-
-    getToken: function() {
-        return this._token;
-    },
-
-    resetToken: function() {
-        this._token = null;
-    }
-});
-Signals.addSignalMethods(OVirtCredentialsManager.prototype);
-
-function getOVirtCredentialsManager() {
-    if (!_oVirtCredentialsManager)
-        _oVirtCredentialsManager = new OVirtCredentialsManager();
-
-    return _oVirtCredentialsManager;
-}
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -10,7 +10,6 @@ const St = imports.gi.St;

 const Batch = imports.gdm.batch;
 const Fprint = imports.gdm.fingerprint;
-const OVirt = imports.gdm.oVirt;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const ShellEntry = imports.ui.shellEntry;
@@ -20,7 +19,6 @@ const Tweener = imports.ui.tweener;
 const PASSWORD_SERVICE_NAME = 'gdm-password';
 const FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
 const SMARTCARD_SERVICE_NAME = 'gdm-smartcard';
-const OVIRT_SERVICE_NAME = 'gdm-ovirtcred';
 const FADE_ANIMATION_TIME = 0.16;
 const CLONE_FADE_ANIMATION_TIME = 0.25;

@@ -153,14 +151,6 @@ const ShellUserVerifier = new Lang.Class({
        this.reauthenticating = false;

        this._failCounter = 0;
-
-        this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
-
-        if (this._oVirtCredentialsManager.hasToken())
-            this._oVirtUserAuthenticated(this._oVirtCredentialsManager.getToken());
-
-        this._oVirtCredentialsManager.connect('user-authenticated',
-                                              Lang.bind(this, this._oVirtUserAuthenticated));
    },

    begin: function(userName, hold) {
@@ -287,11 +277,6 @@ const ShellUserVerifier = new Lang.Class({
            }));
    },

-    _oVirtUserAuthenticated: function(token) {
-        this._preemptingService = OVIRT_SERVICE_NAME;
-        this.emit('ovirt-user-authenticated');
-    },
-
    _checkForSmartcard: function() {
        let smartcardDetected;

@@ -470,12 +455,6 @@ const ShellUserVerifier = new Lang.Class({
        if (!this.serviceIsForeground(serviceName))
            return;

-        if (serviceName == OVIRT_SERVICE_NAME) {
-            // The only question asked by this service is "Token?"
-            this.answerQuery(serviceName, this._oVirtCredentialsManager.getToken());
-            return;
-        }
-
        this.emit('ask-question', serviceName, secretQuestion, '\u25cf');
    },

@@ -536,16 +515,6 @@ const ShellUserVerifier = new Lang.Class({
    },

    _onConversationStopped: function(client, serviceName) {
-        // If the login failed with the preauthenticated oVirt credentials
-        // then discard the credentials and revert to default authentication
-        // mechanism.
-        if (this.serviceIsForeground(OVIRT_SERVICE_NAME)) {
-            this._oVirtCredentialsManager.resetToken();
-            this._preemptingService = null;
-            this._verificationFailed(false);
-            return;
-        }
-
        // if the password service fails, then cancel everything.
        // But if, e.g., fingerprint fails, still give
        // password authentication a chance to succeed
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@@ -72,10 +72,8 @@ function versionCompare(required, reference) {
    reference = reference.split('.');

    for (let i = 0; i < required.length; i++) {
-        let requiredInt = parseInt(required[i]);
-        let referenceInt = parseInt(reference[i]);
-        if (requiredInt != referenceInt)
-            return requiredInt < referenceInt;
+        if (required[i] != reference[i])
+            return required[i] < reference[i];
    }

    return true;
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -1,9 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Lang = imports.lang;
 const St = imports.gi.St;

 const Main = imports.ui.main;
@@ -80,22 +78,6 @@ function spawnCommandLine(command_line) {
    }
 }

-// spawnApp:
-// @argv: an argv array
-//
-// Runs @argv as if it was an application, handling startup notification
-function spawnApp(argv) {
-    try {
-        let app = Gio.AppInfo.create_from_commandline(argv.join(' '), null,
-                                                      Gio.AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION);
-
-        let context = global.create_app_launch_context();
-        app.launch([], context);
-    } catch(err) {
-        _handleSpawnError(argv[0], err);
-    }
-}
-
 // trySpawn:
 // @argv: an argv array
 //
@@ -207,57 +189,28 @@ function insertSorted(array, val, cmp) {
    return pos;
 }

-const CloseButton = new Lang.Class({
-    Name: 'CloseButton',
-    Extends: St.Button,
+function makeCloseButton() {
+    let closeButton = new St.Button({ style_class: 'notification-close'});

-    _init: function(boxpointer) {
-        this.parent({ style_class: 'notification-close'});
+    // This is a bit tricky. St.Bin has its own x-align/y-align properties
+    // that compete with Clutter's properties. This should be fixed for
+    // Clutter 2.0. Since St.Bin doesn't define its own setters, the
+    // setters are a workaround to get Clutter's version.
+    closeButton.set_x_align(Clutter.ActorAlign.END);
+    closeButton.set_y_align(Clutter.ActorAlign.START);

-        // This is a bit tricky. St.Bin has its own x-align/y-align properties
-        // that compete with Clutter's properties. This should be fixed for
-        // Clutter 2.0. Since St.Bin doesn't define its own setters, the
-        // setters are a workaround to get Clutter's version.
-        this.set_x_align(Clutter.ActorAlign.END);
-        this.set_y_align(Clutter.ActorAlign.START);
+    // XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
+    // to respect the alignments.
+    closeButton.set_x_expand(true);
+    closeButton.set_y_expand(true);

-        // XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
-        // to respect the alignments.
-        this.set_x_expand(true);
-        this.set_y_expand(true);
+    closeButton.connect('style-changed', function() {
+        let themeNode = closeButton.get_theme_node();
+        closeButton.translation_x = themeNode.get_length('-shell-close-overlap-x');
+        closeButton.translation_y = themeNode.get_length('-shell-close-overlap-y');
+    });

-        this._boxPointer = boxpointer;
-        if (boxpointer)
-            this._boxPointer.connect('arrow-side-changed', Lang.bind(this, this._sync));
-    },
-
-    _computeBoxPointerOffset: function() {
-        if (!this._boxPointer || !this._boxPointer.actor.get_stage())
-            return 0;
-
-        let side = this._boxPointer.arrowSide;
-        if (side == St.Side.TOP)
-            return this._boxPointer.getArrowHeight();
-        else
-            return 0;
-    },
-
-    _sync: function() {
-        let themeNode = this.get_theme_node();
-
-        let offY = this._computeBoxPointerOffset();
-        this.translation_x = themeNode.get_length('-shell-close-overlap-x')
-        this.translation_y = themeNode.get_length('-shell-close-overlap-y') + offY;
-    },
-
-    vfunc_style_changed: function() {
-        this._sync();
-        this.parent();
-    },
-});
-
-function makeCloseButton(boxpointer) {
-    return new CloseButton(boxpointer);
+    return closeButton;
 }

 function ensureActorVisibleInScrollView(scrollView, actor) {
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -39,9 +39,12 @@ const FOLDER_SUBICON_FRACTION = .4;

 const MIN_FREQUENT_APPS_COUNT = 3;

-const INDICATORS_BASE_TIME = 0.25;
-const INDICATORS_ANIMATION_DELAY = 0.125;
-const INDICATORS_ANIMATION_MAX_TIME = 0.75;
+const INDICATORS_ANIMATION_TIME = 0.5;
+// 100% means indicators wait for be animated until the previous one
+// is animated completely. 0% means all animators are animated
+// at once without delay
+const INDICATORS_ANIMATION_DELAY_PERCENTAGE = 50;
+
 // Fraction of page height the finger or mouse must reach
 // to change page
 const PAGE_SWITCH_TRESHOLD = 0.2;
@@ -227,23 +230,24 @@ const PageIndicators = new Lang.Class({
        if (children.length == 0)
            return;

-        let offset;
-        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
-            offset = -children[0].width;
-        else
-            offset = children[0].width;
+        let timePerChild = INDICATORS_ANIMATION_TIME / this._nPages;
+        let delay = INDICATORS_ANIMATION_DELAY_PERCENTAGE / 100 * timePerChild;

-        let delay = INDICATORS_ANIMATION_DELAY;
-        let totalAnimationTime = INDICATORS_BASE_TIME + INDICATORS_ANIMATION_DELAY * this._nPages;
-        if (totalAnimationTime > INDICATORS_ANIMATION_MAX_TIME)
-            delay -= (totalAnimationTime - INDICATORS_ANIMATION_MAX_TIME) / this._nPages;
+        let [stageX, ] = children[0].get_transformed_position();
+        let offset;
+        let monitor = Main.layoutManager.primaryMonitor;
+        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+            offset = monitor.x - stageX - children[0].width;
+        else
+            offset = monitor.x + monitor.width - stageX;

        for (let i = 0; i < this._nPages; i++) {
            children[i].translation_x = offset;
            Tweener.addTween(children[i],
                             { translation_x: 0,
-                               time: INDICATORS_BASE_TIME + delay * i,
-                               transition: 'easeInOutQuad'
+                               time: timePerChild,
+                               delay: delay * i,
+                               transition: 'easeOutQuad'
                             });
        }
    }
@@ -333,19 +337,6 @@ const AllView = new Lang.Class({
            function() {
                this._displayingPopup = false;
            }));
-
-        this.actor.connect('notify::mapped', Lang.bind(this,
-            function() {
-                if (this.actor.mapped) {
-                    this._keyPressEventId =
-                        global.stage.connect('key-press-event',
-                                             Lang.bind(this, this._onKeyPressEvent));
-                } else {
-                    if (this._keyPressEventId)
-                        global.stage.disconnect(this._keyPressEventId);
-                    this._keyPressEventId = 0;
-                }
-            }));
    },

    getCurrentPageY: function() {
@@ -353,8 +344,6 @@ const AllView = new Lang.Class({
    },

    goToPage: function(pageNumber) {
-        if(pageNumber < 0 || pageNumber > this._grid.nPages() - 1)
-            return;
        if (this._currentPage == pageNumber && this._displayingPopup && this._currentPopup)
            return;
        if (this._displayingPopup && this._currentPopup)
@@ -416,13 +405,16 @@ const AllView = new Lang.Class({
    _onScroll: function(actor, event) {
        if (this._displayingPopup)
            return true;
-
        let direction = event.get_scroll_direction();
-        if (direction == Clutter.ScrollDirection.UP)
-            this.goToPage(this._currentPage - 1);
-        else if (direction == Clutter.ScrollDirection.DOWN)
-            this.goToPage(this._currentPage + 1);
-
+        if (direction == Clutter.ScrollDirection.UP) {
+            if (this._currentPage > 0)
+                this.goToPage(this._currentPage - 1);
+        } else {
+            if (direction == Clutter.ScrollDirection.DOWN) {
+                if (this._currentPage < (this._grid.nPages() - 1))
+                    this.goToPage(this._currentPage + 1);
+            }
+        }
        return true;
    },

@@ -442,9 +434,9 @@ const AllView = new Lang.Class({
            return;
        let diffCurrentPage = this._diffToPage(this._currentPage);
        if (diffCurrentPage > this._scrollView.height * PAGE_SWITCH_TRESHOLD) {
-            if (action.get_velocity(0)[2] > 0)
+            if (action.get_velocity(0)[2] > 0 && this._currentPage > 0)
                this.goToPage(this._currentPage - 1);
-            else
+            else if (this._currentPage < this._grid.nPages() - 1)
                this.goToPage(this._currentPage + 1);
        } else {
            this.goToPage(this._currentPage);
@@ -452,21 +444,6 @@ const AllView = new Lang.Class({
        this._panning = false;
    },

-    _onKeyPressEvent: function(actor, event) {
-        if (this._displayingPopup)
-            return true;
-
-        if (event.get_key_symbol() == Clutter.Page_Up) {
-            this.goToPage(this._currentPage - 1);
-            return true;
-        } else if (event.get_key_symbol() == Clutter.Page_Down) {
-            this.goToPage(this._currentPage + 1);
-            return true;
-        }
-
-        return false;
-    },
-
    _getItemId: function(item) {
        if (item instanceof Shell.App)
            return item.get_id();
@@ -744,15 +721,10 @@ const AppDisplay = new Lang.Class({
            this._views[i].control.connect('clicked', Lang.bind(this,
                function(actor) {
                    this._showView(viewIndex);
-                    global.settings.set_uint('app-picker-view', viewIndex);
                }));
        }
-        let initialView = Math.min(global.settings.get_uint('app-picker-view'),
-                                   this._views.length - 1);
        let frequentUseful = this._views[Views.FREQUENT].view.hasUsefulData();
-        if (initialView == Views.FREQUENT && !frequentUseful)
-            initialView = Views.ALL;
-        this._showView(initialView);
+        this._showView(frequentUseful ? Views.FREQUENT : Views.ALL);
        this._updateFrequentVisibility();

        // We need a dummy actor to catch the keyboard focus if the
@@ -882,10 +854,6 @@ const AppSearchProvider = new Lang.Class({
        callback(metas);
    },

-    filterResults: function(results, maxNumber) {
-        return results.slice(0, maxNumber);
-    },
-
    getInitialResultSet: function(terms) {
        this.searchSystem.setResults(this, this._appSys.initial_search(terms));
    },
@@ -1189,7 +1157,7 @@ const AppFolderPopup = new Lang.Class({
        this.actor.add_actor(this._boxPointer.actor);
        this._boxPointer.bin.set_child(this._view.actor);

-        this.closeButton = Util.makeCloseButton(this._boxPointer);
+        this.closeButton = Util.makeCloseButton();
        this.closeButton.connect('clicked', Lang.bind(this, this.popdown));
        this.actor.add_actor(this.closeButton);

@@ -1498,9 +1466,7 @@ const AppIconMenu = new Lang.Class({
    _redisplay: function() {
        this.removeAll();

-        let windows = this._source.app.get_windows().filter(function(w) {
-            return Shell.WindowTracker.is_window_interesting(w);
-        });
+        let windows = this._source.app.get_windows();

        // Display the app windows menu items and the separator between windows
        // of the current desktop and other windows.
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -319,9 +319,9 @@ const Background = new Lang.Class({
        this._cancellable = new Gio.Cancellable();
        this.isLoaded = false;

-        this._settingsChangedSignalId = this._settings.connect('changed', Lang.bind(this, function() {
-                                            this.emit('changed');
-                                        }));
+        this._settings.connect('changed', Lang.bind(this, function() {
+                                   this.emit('changed');
+                               }));

        this._load();
    },
@@ -362,10 +362,6 @@ const Background = new Lang.Class({

        this.actor.disconnect(this._destroySignalId);
        this._destroySignalId = 0;
-
-        if (this._settingsChangedSignalId != 0)
-            this._settings.disconnect(this._settingsChangedSignalId);
-        this._settingsChangedSignalId = 0;
    },

    _setLoaded: function() {
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -3,9 +3,8 @@
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
+const Shell = imports.gi.Shell;

 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@@ -62,10 +61,6 @@ const BoxPointer = new Lang.Class({
        this._muteInput();
    },

-    get arrowSide() {
-        return this._arrowSide;
-    },
-
    _muteInput: function() {
        if (this._capturedEventId == 0)
            this._capturedEventId = this.actor.connect('captured-event',
@@ -185,9 +180,7 @@ const BoxPointer = new Lang.Class({
    },

    _getPreferredHeight: function(actor, forWidth, alloc) {
-        let themeNode = this.actor.get_theme_node();
-        let borderWidth = themeNode.get_length('-arrow-border-width');
-        let [minSize, naturalSize] = this.bin.get_preferred_height(forWidth - 2 * borderWidth);
+        let [minSize, naturalSize] = this.bin.get_preferred_height(forWidth);
        alloc.min_size = minSize;
        alloc.natural_size = naturalSize;
        this._adjustAllocationForArrow(false, alloc);
@@ -619,8 +612,6 @@ const BoxPointer = new Lang.Class({
                this._container.queue_relayout();
                return false;
            }));
-
-            this.emit('arrow-side-changed');
        }
    },

@@ -653,8 +644,6 @@ const BoxPointer = new Lang.Class({
    updateArrowSide: function(side) {
        this._arrowSide = side;
        this._border.queue_repaint();
-
-        this.emit('arrow-side-changed');
    },

    getPadding: function(side) {
@@ -665,4 +654,3 @@ const BoxPointer = new Lang.Class({
        return this.actor.get_theme_node().get_length('-arrow-rise');
    }
 });
-Signals.addSignalMethods(BoxPointer.prototype);
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -13,6 +13,8 @@ const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
 const CheckBox = imports.ui.checkBox;

+let prompter = null;
+
 const KeyringDialog = new Lang.Class({
    Name: 'KeyringDialog',
    Extends: ModalDialog.ModalDialog,
@@ -78,26 +80,23 @@ const KeyringDialog = new Lang.Class({
    },

    _buildControlTable: function() {
-        let layout = new Clutter.TableLayout();
-        let table = new St.Widget({ style_class: 'keyring-dialog-control-table',
-                                    layout_manager: layout });
-        layout.hookup_style(table);
+        let table = new St.Table({ style_class: 'keyring-dialog-control-table' });
        let row = 0;

        if (this.prompt.password_visible) {
-            let label = new St.Label({ style_class: 'prompt-dialog-password-label' });
+            let label = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
            label.set_text(_("Password:"));
-            label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            layout.pack(label, 0, row);
-            layout.child_set(label, { x_expand: false, y_fill: false,
-                                      x_align: Clutter.TableAlignment.START });
+            table.add(label, { row: row, col: 0,
+                               x_expand: false, x_fill: true,
+                               x_align: St.Align.START,
+                               y_fill: false, y_align: St.Align.MIDDLE });
            this._passwordEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                                 text: '',
-                                                 can_focus: true });
+                                                 can_focus: true});
            this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
            ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
            this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onPasswordActivate));
-            layout.pack(this._passwordEntry, 1, row);
+            table.add(this._passwordEntry, { row: row, col: 1, x_expand: true, x_fill: true, x_align: St.Align.START });
            row++;
        } else {
            this._passwordEntry = null;
@@ -106,16 +105,17 @@ const KeyringDialog = new Lang.Class({
        if (this.prompt.confirm_visible) {
            var label = new St.Label(({ style_class: 'prompt-dialog-password-label' }));
            label.set_text(_("Type again:"));
-            layout.pack(label, 0, row);
-            layout.child_set(label, { x_expand: false, y_fill: false,
-                                      x_align: Clutter.TableAlignment.START });
+            table.add(label, { row: row, col: 0,
+                               x_expand: false, x_fill: true,
+                               x_align: St.Align.START,
+                               y_fill: false, y_align: St.Align.MIDDLE });
            this._confirmEntry = new St.Entry({ style_class: 'prompt-dialog-password-entry',
                                                text: '',
-                                                can_focus: true });
+                                                can_focus: true});
            this._confirmEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
            ShellEntry.addContextMenu(this._confirmEntry, { isPassword: true });
            this._confirmEntry.clutter_text.connect('activate', Lang.bind(this, this._onConfirmActivate));
-            layout.pack(this._confirmEntry, 1, row);
+            table.add(this._confirmEntry, { row: row, col: 1, x_expand: true, x_fill: true, x_align: St.Align.START });
            row++;
        } else {
            this._confirmEntry = null;
@@ -128,14 +128,14 @@ const KeyringDialog = new Lang.Class({
            let choice = new CheckBox.CheckBox();
            this.prompt.bind_property('choice-label', choice.getLabelActor(), 'text', GObject.BindingFlags.SYNC_CREATE);
            this.prompt.bind_property('choice-chosen', choice.actor, 'checked', GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.BIDIRECTIONAL);
-            layout.pack(choice.actor, 1, row);
+            table.add(choice.actor, { row: row, col: 1, x_expand: false, x_fill: true, x_align: St.Align.START });
            row++;
        }

        let warning = new St.Label({ style_class: 'prompt-dialog-error-label' });
        warning.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
        warning.clutter_text.line_wrap = true;
-        layout.pack(warning, 1, row);
+        table.add(warning, { row: row, col: 1, x_expand: false, x_fill: false, x_align: St.Align.START });
        this.prompt.bind_property('warning-visible', warning, 'visible', GObject.BindingFlags.SYNC_CREATE);
        this.prompt.bind_property('warning', warning, 'text', GObject.BindingFlags.SYNC_CREATE);

@@ -221,56 +221,27 @@ const KeyringDialog = new Lang.Class({
    },
 });

-const KeyringDummyDialog = new Lang.Class({
-    Name: 'KeyringDummyDialog',
-
-    _init: function() {
-        this.prompt = new Shell.KeyringPrompt();
-        this.prompt.connect('show-password',
-                            Lang.bind(this, this._cancelPrompt));
-        this.prompt.connect('show-confirm', Lang.bind(this,
-                            this._cancelPrompt));
-    },
-
-    _cancelPrompt: function() {
-        this.prompt.cancel();
-    }
-});
-
 const KeyringPrompter = new Lang.Class({
    Name: 'KeyringPrompter',

    _init: function() {
        this._prompter = new Gcr.SystemPrompter();
-        this._prompter.connect('new-prompt', Lang.bind(this,
-            function() {
-                let dialog = this._enabled ? new KeyringDialog()
-                                           : new KeyringDummyDialog();
-                this._currentPrompt = dialog.prompt;
-                return this._currentPrompt;
-            }));
+        this._prompter.connect('new-prompt', function(prompter) {
+            let dialog = new KeyringDialog();
+            return dialog.prompt;
+        });
        this._dbusId = null;
-        this._registered = false;
-        this._enabled = false;
-        this._currentPrompt = null;
    },

    enable: function() {
-        if (!this._registered) {
-            this._prompter.register(Gio.DBus.session);
-            this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
-                                                     Gio.BusNameOwnerFlags.ALLOW_REPLACEMENT, null, null);
-            this._registered = true;
-        }
-        this._enabled = true;
+        this._prompter.register(Gio.DBus.session);
+        this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
+                                                 Gio.BusNameOwnerFlags.ALLOW_REPLACEMENT, null, null);
    },

    disable: function() {
-        this._enabled = false;
-
-        if (this._prompter.prompting)
-            this._currentPrompt.cancel();
-        this._currentPrompt = null;
+        this._prompter.unregister(false);
+        Gio.DBus.session.unown_name(this._dbusId);
    }
 });

--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -72,18 +72,13 @@ const NetworkSecretDialog = new Lang.Class({
                             expand: true });
        }

-        let layout = new Clutter.TableLayout();
-        let secretTable = new St.Widget({ style_class: 'network-dialog-secret-table',
-                                          layout_manager: layout });
-        layout.hookup_style(secretTable);
-
+        let secretTable = new St.Table({ style_class: 'network-dialog-secret-table' });
        let initialFocusSet = false;
        let pos = 0;
        for (let i = 0; i < this._content.secrets.length; i++) {
            let secret = this._content.secrets[i];
            let label = new St.Label({ style_class: 'prompt-dialog-password-label',
                                       text: secret.label });
-            label.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;

            let reactive = secret.key != null;

@@ -116,10 +111,11 @@ const NetworkSecretDialog = new Lang.Class({
            } else
                secret.valid = true;

-            layout.pack(label, 0, pos);
-            layout.child_set(label, { x_expand: false, y_fill: false,
-                                      x_align: Clutter.TableAlignment.START });
-            layout.pack(secret.entry, 1, pos);
+            secretTable.add(label, { row: pos, col: 0,
+                                     x_expand: false, x_fill: true,
+                                     x_align: St.Align.START,
+                                     y_fill: false, y_align: St.Align.MIDDLE });
+            secretTable.add(secret.entry, { row: pos, col: 1, x_expand: true, x_fill: true, y_align: St.Align.END });
            pos++;

            if (secret.password)
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -13,6 +13,7 @@ const Tp = imports.gi.TelepathyGLib;
 const History = imports.misc.history;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
+const NotificationDaemon = imports.ui.notificationDaemon;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;

@@ -415,7 +416,7 @@ const TelepathyClient = new Lang.Class({
    _ensureAppSource: function() {
        if (this._appSource == null) {
            this._appSource = new MessageTray.Source(_("Chat"), 'empathy');
-            this._appSource.policy = new MessageTray.NotificationApplicationPolicy('empathy');
+            this._appSource.policy = new NotificationDaemon.NotificationApplicationPolicy('empathy');

            Main.messageTray.add(this._appSource);
            this._appSource.connect('destroy', Lang.bind(this, function () {
@@ -487,7 +488,7 @@ const ChatSource = new Lang.Class({
    },

    _createPolicy: function() {
-        return new MessageTray.NotificationApplicationPolicy('empathy');
+        return new NotificationDaemon.NotificationApplicationPolicy('empathy');
    },

    _updateAlias: function() {
@@ -1060,7 +1061,7 @@ const ApproverSource = new Lang.Class({
    },

    _createPolicy: function() {
-        return new MessageTray.NotificationApplicationPolicy('empathy');
+        return new NotificationDaemon.NotificationApplicationPolicy('empathy');
    },

    destroy: function() {
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -5,7 +5,6 @@ const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const St = imports.gi.St;
 const Lang = imports.lang;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const Tweener = imports.ui.tweener;
@@ -28,9 +27,9 @@ const DragMotionResult = {
 };

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

 const DragDropResult = {
@@ -86,6 +85,11 @@ const _Draggable = new Lang.Class({
        this.actor.connect('destroy', Lang.bind(this, function() {
            this._actorDestroyed = true;

+            // If the drag actor is destroyed and we were going to fix
+            // up its hover state, fix up the parent hover state instead
+            if (this.actor == this._firstLeaveActor)
+                this._firstLeaveActor = this._dragOrigParent;
+
            if (this._dragInProgress && this._dragCancellable)
                this._cancelDrag(global.get_current_time());
            this.disconnectAll();
@@ -101,6 +105,12 @@ const _Draggable = new Lang.Class({
        this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting).
        this._dragCancellable = true;

+        // During the drag, we eat enter/leave events so that actors don't prelight.
+        // But we remember the actors that we first left/last entered so we can
+        // fix up the hover state after the drag ends.
+        this._firstLeaveActor = null;
+        this._lastEnterActor = null;
+
        this._eventsGrabbed = false;
    },

@@ -186,6 +196,11 @@ const _Draggable = new Lang.Class({
                this._cancelDrag(event.get_time());
                return true;
            }
+        } else if (event.type() == Clutter.EventType.LEAVE) {
+            if (this._firstLeaveActor == null)
+                this._firstLeaveActor = event.get_source();
+        } else if (event.type() == Clutter.EventType.ENTER) {
+            this._lastEnterActor = event.get_source();
        }

        return false;
@@ -229,7 +244,7 @@ const _Draggable = new Lang.Class({
        if (this._onEventId)
            this._ungrabActor();
        this._grabEvents();
-        global.screen.set_cursor(Meta.Cursor.DND_IN_DRAG);
+        global.set_cursor(Shell.Cursor.DND_IN_DRAG);

        this._dragX = this._dragStartX = stageX;
        this._dragY = this._dragStartY = stageY;
@@ -359,7 +374,7 @@ const _Draggable = new Lang.Class({
            if (motionFunc) {
                let result = motionFunc(dragEvent);
                if (result != DragMotionResult.CONTINUE) {
-                    global.screen.set_cursor(DRAG_CURSOR_MAP[result]);
+                    global.set_cursor(DRAG_CURSOR_MAP[result]);
                    return false;
                }
            }
@@ -377,13 +392,13 @@ const _Draggable = new Lang.Class({
                                                             targY,
                                                             0);
                if (result != DragMotionResult.CONTINUE) {
-                    global.screen.set_cursor(DRAG_CURSOR_MAP[result]);
+                    global.set_cursor(DRAG_CURSOR_MAP[result]);
                    return false;
                }
            }
            target = target.get_parent();
        }
-        global.screen.set_cursor(Meta.Cursor.DND_IN_DRAG);
+        global.set_cursor(Shell.Cursor.DND_IN_DRAG);
        return false;
    },

@@ -455,7 +470,7 @@ const _Draggable = new Lang.Class({
                    }

                    this._dragInProgress = false;
-                    global.screen.set_cursor(Meta.Cursor.DEFAULT);
+                    global.unset_cursor();
                    this.emit('drag-end', event.get_time(), true);
                    this._dragComplete();
                    return true;
@@ -507,7 +522,7 @@ const _Draggable = new Lang.Class({
        let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();

        if (this._actorDestroyed) {
-            global.screen.set_cursor(Meta.Cursor.DEFAULT);
+            global.unset_cursor();
            if (!this._buttonDown)
                this._dragComplete();
            this.emit('drag-end', eventTime, false);
@@ -561,7 +576,7 @@ const _Draggable = new Lang.Class({
        } else {
            dragActor.destroy();
        }
-        global.screen.set_cursor(Meta.Cursor.DEFAULT);
+        global.unset_cursor();
        this.emit('drag-end', eventTime, false);

        this._animationInProgress = false;
@@ -569,12 +584,33 @@ const _Draggable = new Lang.Class({
            this._dragComplete();
    },

+    // Actor is an actor we have entered or left during the drag; call
+    // st_widget_sync_hover on all StWidget ancestors
+    _syncHover: function(actor) {
+        while (actor) {
+            let parent = actor.get_parent();
+            if (actor instanceof St.Widget)
+                actor.sync_hover();
+
+            actor = parent;
+        }
+    },
+
    _dragComplete: function() {
        if (!this._actorDestroyed)
            Shell.util_set_hidden_from_pick(this._dragActor, false);

        this._ungrabEvents();
-        global.sync_pointer();
+
+        if (this._firstLeaveActor) {
+            this._syncHover(this._firstLeaveActor);
+            this._firstLeaveActor = null;
+        }
+
+        if (this._lastEnterActor) {
+            this._syncHover(this._lastEnterActor);
+            this._lastEnterActor = null;
+        }

        if (this._updateHoverId) {
            GLib.source_remove(this._updateHoverId);
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -76,11 +76,7 @@ function disableExtension(uuid) {
        theme.unload_stylesheet(extension.stylesheet.get_path());
    }

-    try {
-        extension.stateObj.disable();
-    } catch(e) {
-        logExtensionError(uuid, e);
-    }
+    extension.stateObj.disable();

    for (let i = 0; i < order.length; i++) {
        let uuid = order[i];
@@ -93,10 +89,8 @@ function disableExtension(uuid) {

    extensionOrder.splice(orderIdx, 1);

-    if ( extension.state != ExtensionState.ERROR ) {
-        extension.state = ExtensionState.DISABLED;
-        _signals.emit('extension-state-changed', extension);
-    }
+    extension.state = ExtensionState.DISABLED;
+    _signals.emit('extension-state-changed', extension);
 }

 function enableExtension(uuid) {
@@ -123,15 +117,10 @@ function enableExtension(uuid) {
        }
    }

-    try {
-        extension.stateObj.enable();
-        extension.state = ExtensionState.ENABLED;
-        _signals.emit('extension-state-changed', extension);
-        return;
-    } catch(e) {
-        logExtensionError(uuid, e);
-        return;
-    }
+    extension.stateObj.enable();
+
+    extension.state = ExtensionState.ENABLED;
+    _signals.emit('extension-state-changed', extension);
 }

 function logExtensionError(uuid, error) {
@@ -161,8 +150,7 @@ function loadExtension(extension) {
    } else {
        let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
        if (enabled) {
-            if (!initExtension(extension.uuid))
-                return;
+            initExtension(extension.uuid);
            if (extension.state == ExtensionState.DISABLED)
                enableExtension(extension.uuid);
        } else {
@@ -217,12 +205,7 @@ function initExtension(uuid) {
    extensionModule = extension.imports.extension;

    if (extensionModule.init) {
-        try {
-            extensionState = extensionModule.init(extension);
-        } catch(e) {
-            logExtensionError(uuid, e);
-            return false;
-        }
+        extensionState = extensionModule.init(extension);
    }

    if (!extensionState)
@@ -231,7 +214,6 @@ function initExtension(uuid) {

    extension.state = ExtensionState.DISABLED;
    _signals.emit('extension-loaded', uuid);
-    return true;
 }

 function getEnabledExtensions() {
@@ -253,7 +235,11 @@ function onEnabledExtensionsChanged() {
    newEnabledExtensions.filter(function(uuid) {
        return enabledExtensions.indexOf(uuid) == -1;
    }).forEach(function(uuid) {
+        try {
            enableExtension(uuid);
+        } catch(e) {
+            logExtensionError(uuid, e);
+        }
    });

    // Find and disable all the newly disabled extensions: UUIDs found in the
@@ -261,7 +247,11 @@ function onEnabledExtensionsChanged() {
    enabledExtensions.filter(function(item) {
        return newEnabledExtensions.indexOf(item) == -1;
    }).forEach(function(uuid) {
+        try {
            disableExtension(uuid);
+        } catch(e) {
+            logExtensionError(uuid, e);
+        }
    });

    enabledExtensions = newEnabledExtensions;
@@ -273,7 +263,11 @@ function _loadExtensions() {

    let finder = new ExtensionUtils.ExtensionFinder();
    finder.connect('extension-found', function(signals, extension) {
-        loadExtension(extension);
+        try {
+            loadExtension(extension);
+        } catch(e) {
+            logExtensionError(extension.uuid, e);
+        }
    });
    finder.scanExtensions();
 }
--- a/js/ui/focusCaretTracker.js
+++ b/js/ui/focusCaretTracker.js
@@ -33,7 +33,6 @@ const FocusCaretTracker = new Lang.Class({

    _init: function() {
        Atspi.init();
-        Atspi.set_timeout(250, 250);
        this._atspiListener = Atspi.EventListener.new(Lang.bind(this, this._onChanged));
    },

--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -251,7 +251,7 @@ const LayoutManager = new Lang.Class({

        this._inOverview = true;
        this._updateVisibility();
-        this._updateRegions();
+        this._queueUpdateRegions();
    },

    hideOverview: function() {
@@ -362,7 +362,7 @@ const LayoutManager = new Lang.Class({
                              BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
                          }));

-        this._bgManagers[monitorIndex] = bgManager;
+        this._bgManagers.push(bgManager);

        return bgManager.background;
    },
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -1072,15 +1072,15 @@ const LookingGlass = new Lang.Class({
        let myWidth = primary.width * 0.7;
        let availableHeight = primary.height - Main.layoutManager.keyboardBox.height;
        let myHeight = Math.min(primary.height * 0.7, availableHeight * 0.9);
-        this.actor.x = primary.x + (primary.width - myWidth) / 2;
-        this._hiddenY = primary.y + Main.layoutManager.panelBox.height - myHeight - 4; // -4 to hide the top corners
+        this.actor.x = (primary.width - myWidth) / 2;
+        this._hiddenY = Main.layoutManager.panelBox.height - myHeight - 4; // -4 to hide the top corners
        this._targetY = this._hiddenY + myHeight;
        this.actor.y = this._hiddenY;
        this.actor.width = myWidth;
        this.actor.height = myHeight;
        this._objInspector.actor.set_size(Math.floor(myWidth * 0.8), Math.floor(myHeight * 0.8));
-        this._objInspector.actor.set_position(this.actor.x + Math.floor(myWidth * 0.1),
-                                              this._targetY + Math.floor(myHeight * 0.1));
+        this._objInspector.actor.set_position(primary.x + this.actor.x + Math.floor(myWidth * 0.1),
+                                              primary.y + this._targetY + Math.floor(myHeight * 0.1));
    },

    insertObject: function(obj) {
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -57,20 +57,6 @@ const Magnifier = new Lang.Class({
        // Magnifier is a manager of ZoomRegions.
        this._zoomRegions = [];

-        // Export to dbus.
-        magDBusService = new MagnifierDBus.ShellMagnifier();
-
-        let showAtLaunch = this._settingsInit();
-        this.setActive(showAtLaunch);
-    },
-
-    _initialize: function() {
-        if (this._initialized)
-            return;
-        this._initialized = true;
-
-        this._settingsInitLate();
-
        // Create small clutter tree for the magnified mouse.
        let cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
        this._mouseSprite = new Clutter.Texture();
@@ -86,11 +72,15 @@ const Magnifier = new Lang.Class({

        let aZoomRegion = new ZoomRegion(this, this._cursorRoot);
        this._zoomRegions.push(aZoomRegion);
-        this._settingsInitRegion(aZoomRegion);
+        let showAtLaunch = this._settingsInit(aZoomRegion);
        aZoomRegion.scrollContentsTo(this.xMouse, this.yMouse);

        cursorTracker.connect('cursor-changed', Lang.bind(this, this._updateMouseSprite));
        this._cursorTracker = cursorTracker;
+
+        // Export to dbus.
+        magDBusService = new MagnifierDBus.ShellMagnifier();
+        this.setActive(showAtLaunch);
    },

    /**
@@ -98,7 +88,7 @@ const Magnifier = new Lang.Class({
     * Show the system mouse pointer.
     */
    showSystemCursor: function() {
-        this._cursorTracker.set_pointer_visible(true);
+        global.stage.show_cursor();
    },

    /**
@@ -106,7 +96,7 @@ const Magnifier = new Lang.Class({
     * Hide the system mouse pointer.
     */
    hideSystemCursor: function() {
-        this._cursorTracker.set_pointer_visible(false);
+        global.stage.hide_cursor();
    },

    /**
@@ -115,12 +105,6 @@ const Magnifier = new Lang.Class({
     * @activate:   Boolean to activate or de-activate the magnifier.
     */
    setActive: function(activate) {
-        if (activate == this.isActive())
-            return;
-
-        if (activate)
-            this._initialize();
-
        this._zoomRegions.forEach (function(zoomRegion, index, array) {
            zoomRegion.setActive(activate);
        });
@@ -133,7 +117,7 @@ const Magnifier = new Lang.Class({
        // Make sure system mouse pointer is shown when all zoom regions are
        // invisible.
        if (!activate)
-            this._cursorTracker.set_pointer_visible(true);
+            global.stage.show_cursor();

        // Notify interested parties of this change
        this.emit('active-changed', activate);
@@ -448,68 +432,64 @@ const Magnifier = new Lang.Class({
        this._mouseSprite.set_anchor_point(xHot, yHot);
    },

-    _settingsInitRegion: function(zoomRegion) {
-        // Mag factor is accurate to two decimal places.
-        let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
-        if (aPref != 0.0)
-            zoomRegion.setMagFactor(aPref, aPref);
-
-        aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
-        if (aPref)
-            zoomRegion.setScreenPosition(aPref);
-
-        zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
-        zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
-
-        aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
-        if (aPref)
-            zoomRegion.setMouseTrackingMode(aPref);
-
-        aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
-        if (aPref)
-            zoomRegion.setFocusTrackingMode(aPref);
-
-        aPref = this._settings.get_enum(CARET_TRACKING_KEY);
-        if (aPref)
-            zoomRegion.setCaretTrackingMode(aPref);
-
-        aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
-        if (aPref)
-            zoomRegion.setInvertLightness(aPref);
-
-        aPref = this._settings.get_double(COLOR_SATURATION_KEY);
-        if (aPref)
-            zoomRegion.setColorSaturation(aPref);
-
-        let bc = {};
-        bc.r = this._settings.get_double(BRIGHT_RED_KEY);
-        bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
-        bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
-        zoomRegion.setBrightness(bc);
-
-        bc.r = this._settings.get_double(CONTRAST_RED_KEY);
-        bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
-        bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
-        zoomRegion.setContrast(bc);
-    },
-
-    _settingsInit: function() {
+    _settingsInit: function(zoomRegion) {
        this._appSettings = new Gio.Settings({ schema: APPLICATIONS_SCHEMA });
        this._settings = new Gio.Settings({ schema: MAGNIFIER_SCHEMA });

-        this._appSettings.connect('changed::' + SHOW_KEY, Lang.bind(this, function() {
-            let active = this._appSettings.get_boolean(SHOW_KEY);
-            this.setActive(active);
-        }));
+        if (zoomRegion) {
+            // Mag factor is accurate to two decimal places.
+            let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
+            if (aPref != 0.0)
+                zoomRegion.setMagFactor(aPref, aPref);

-        return this._appSettings.get_boolean(SHOW_KEY);
-    },
+            aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
+            if (aPref)
+                zoomRegion.setScreenPosition(aPref);
+
+            zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
+            zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
+
+            aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
+            if (aPref)
+                zoomRegion.setMouseTrackingMode(aPref);
+
+            aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
+            if (aPref)
+                zoomRegion.setFocusTrackingMode(aPref);
+
+            aPref = this._settings.get_enum(CARET_TRACKING_KEY);
+            if (aPref)
+                zoomRegion.setCaretTrackingMode(aPref);
+
+            aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
+            if (aPref)
+                zoomRegion.setInvertLightness(aPref);
+
+            aPref = this._settings.get_double(COLOR_SATURATION_KEY);
+            if (aPref)
+                zoomRegion.setColorSaturation(aPref);
+
+            let bc = {};
+            bc.r = this._settings.get_double(BRIGHT_RED_KEY);
+            bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
+            bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
+            zoomRegion.setBrightness(bc);
+
+            bc.r = this._settings.get_double(CONTRAST_RED_KEY);
+            bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
+            bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
+            zoomRegion.setContrast(bc);
+        }

-    _settingsInitLate: function() {
        let showCrosshairs = this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY);
        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::' + SCREEN_POSITION_KEY,
                               Lang.bind(this, this._updateScreenPosition));
        this._settings.connect('changed::' + MAG_FACTOR_KEY,
@@ -573,6 +553,8 @@ const Magnifier = new Lang.Class({
                               Lang.bind(this, function() {
            this.setCrosshairsClip(this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY));
        }));
+
+        return this._appSettings.get_boolean(SHOW_KEY);
   },

    _updateScreenPosition: function() {
@@ -750,17 +732,14 @@ const ZoomRegion = new Lang.Class({
     * @activate:   Boolean to show/hide the ZoomRegion.
     */
    setActive: function(activate) {
-        if (activate == this.isActive())
-            return;
-
-        if (activate) {
+        if (activate && !this.isActive()) {
            this._createActors();
            if (this._isMouseOverRegion())
                this._magnifier.hideSystemCursor();
            this._updateMagViewGeometry();
            this._updateCloneGeometry();
            this._updateMousePosition();
-        } else {
+        } else if (!activate && this.isActive()) {
            this._destroyActors();
        }
    },
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -90,12 +90,8 @@ function _sessionUpdated() {
                                  Shell.KeyBindingMode.OVERVIEW,
                                  sessionMode.hasRunDialog ? openRunDialog : null);

-    if (!sessionMode.hasRunDialog) {
-        if (runDialog)
-            runDialog.close();
-        if (lookingGlass)
-            lookingGlass.close();
-    }
+    if (!sessionMode.hasRunDialog && lookingGlass)
+        lookingGlass.close();
 }

 function start() {
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -215,10 +215,10 @@ const URLHighlighter = new Lang.Class({

            let urlId = this._findUrlAtPos(event);
            if (urlId != -1 && !this._cursorChanged) {
-                global.screen.set_cursor(Meta.Cursor.POINTING_HAND);
+                global.set_cursor(Shell.Cursor.POINTING_HAND);
                this._cursorChanged = true;
            } else if (urlId == -1) {
-                global.screen.set_cursor(Meta.Cursor.DEFAULT);
+                global.unset_cursor();
                this._cursorChanged = false;
            }
            return false;
@@ -229,7 +229,7 @@ const URLHighlighter = new Lang.Class({

            if (this._cursorChanged) {
                this._cursorChanged = false;
-                global.screen.set_cursor(Meta.Cursor.DEFAULT);
+                global.unset_cursor();
            }
        }));
    },
@@ -310,126 +310,6 @@ const NotificationPolicy = new Lang.Class({
 });
 Signals.addSignalMethods(NotificationPolicy.prototype);

-const NotificationGenericPolicy = new Lang.Class({
-    Name: 'NotificationGenericPolicy',
-    Extends: NotificationPolicy,
-
-    _init: function() {
-        // Don't chain to parent, it would try setting
-        // our properties to the defaults
-
-        this.id = 'generic';
-
-        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
-        this._masterSettings.connect('changed', Lang.bind(this, this._changed));
-    },
-
-    store: function() { },
-
-    destroy: function() {
-        this._masterSettings.run_dispose();
-    },
-
-    _changed: function(settings, key) {
-        this.emit('policy-changed', key);
-    },
-
-    get enable() {
-        return true;
-    },
-
-    get enableSound() {
-        return true;
-    },
-
-    get showBanners() {
-        return this._masterSettings.get_boolean('show-banners');
-    },
-
-    get forceExpanded() {
-        return false;
-    },
-
-    get showInLockScreen() {
-        return this._masterSettings.get_boolean('show-in-lock-screen');
-    },
-
-    get detailsInLockScreen() {
-        return false;
-    }
-});
-
-const NotificationApplicationPolicy = new Lang.Class({
-    Name: 'NotificationApplicationPolicy',
-    Extends: NotificationPolicy,
-
-    _init: function(id) {
-        // Don't chain to parent, it would try setting
-        // our properties to the defaults
-
-        this.id = id;
-        this._canonicalId = this._canonicalizeId(id);
-
-        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
-        this._settings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications.application',
-                                            path: '/org/gnome/desktop/notifications/application/' + this._canonicalId + '/' });
-
-        this._masterSettings.connect('changed', Lang.bind(this, this._changed));
-        this._settings.connect('changed', Lang.bind(this, this._changed));
-    },
-
-    store: function() {
-        this._settings.set_string('application-id', this.id + '.desktop');
-
-        let apps = this._masterSettings.get_strv('application-children');
-        if (apps.indexOf(this._canonicalId) < 0) {
-            apps.push(this._canonicalId);
-            this._masterSettings.set_strv('application-children', apps);
-        }
-    },
-
-    destroy: function() {
-        this._masterSettings.run_dispose();
-        this._settings.run_dispose();
-    },
-
-    _changed: function(settings, key) {
-        this.emit('policy-changed', key);
-    },
-
-    _canonicalizeId: function(id) {
-        // Keys are restricted to lowercase alphanumeric characters and dash,
-        // and two dashes cannot be in succession
-        return id.toLowerCase().replace(/[^a-z0-9\-]/g, '-').replace(/--+/g, '-');
-    },
-
-    get enable() {
-        return this._settings.get_boolean('enable');
-    },
-
-    get enableSound() {
-        return this._settings.get_boolean('enable-sound-alerts');
-    },
-
-    get showBanners() {
-        return this._masterSettings.get_boolean('show-banners') &&
-            this._settings.get_boolean('show-banners');
-    },
-
-    get forceExpanded() {
-        return this._settings.get_boolean('force-expanded');
-    },
-
-    get showInLockScreen() {
-        return this._masterSettings.get_boolean('show-in-lock-screen') &&
-            this._settings.get_boolean('show-in-lock-screen');
-    },
-
-    get detailsInLockScreen() {
-        return this._settings.get_boolean('details-in-lock-screen');
-    }
-});
-
 // Notification:
 // @source: the notification's Source
 // @title: the title
@@ -558,12 +438,7 @@ const Notification = new Lang.Class({
        this._bannerLabel = this._bannerUrlHighlighter.actor;
        this._bannerBox.add_actor(this._bannerLabel);

-        // If called with only one argument we assume the caller
-        // will call .update() later on. This is the case of
-        // NotificationDaemon, which wants to use the same code
-        // for new and updated notifications
-        if (arguments.length != 1)
-            this.update(title, banner, params);
+        this.update(title, banner, params);
    },

    // update:
@@ -848,6 +723,7 @@ const Notification = new Lang.Class({
    // %action-invoked signal with @id as a parameter
    addButton: function(id, label) {
        if (!this._buttonBox) {
+
            let box = new St.BoxLayout({ style_class: 'notification-actions' });
            this.setActionArea(box, { x_expand: false,
                                      y_expand: false,
@@ -855,7 +731,6 @@ const Notification = new Lang.Class({
                                      y_fill: false,
                                      x_align: St.Align.END });
            this._buttonBox = box;
-            global.focus_manager.add_group(this._buttonBox);
        }

        let button = new St.Button({ can_focus: true });
@@ -870,7 +745,11 @@ const Notification = new Lang.Class({
            button.label = label;
        }

+        if (this._buttonBox.get_n_children() > 0)
+            global.focus_manager.remove_group(this._buttonBox);
+
        this._buttonBox.add(button);
+        global.focus_manager.add_group(this._buttonBox);
        button.connect('clicked', Lang.bind(this, this._onActionInvoked, id));

        this.updated();
@@ -1327,10 +1206,6 @@ const Source = new Lang.Class({
        return this.count > 1;
    },

-    get isClearable() {
-        return !this.trayIcon && !this.isChat && !this.resident;
-    },
-
    countUpdated: function() {
        this.emit('count-updated');
    },
@@ -1402,27 +1277,25 @@ const Source = new Lang.Class({
        return this._mainIcon.actor;
    },

-    _onNotificationDestroy: function(notification) {
-        let index = this.notifications.indexOf(notification);
-        if (index < 0)
-            return;
-
-        this.notifications.splice(index, 1);
-        if (this.notifications.length == 0)
-            this._lastNotificationRemoved();
-
-        this.countUpdated();
-    },
-
    pushNotification: function(notification) {
-        if (this.notifications.indexOf(notification) >= 0)
-            return;
+        if (this.notifications.indexOf(notification) < 0) {
+            this.notifications.push(notification);
+            this.emit('notification-added', notification);
+        }

        notification.connect('clicked', Lang.bind(this, this.open));
-        notification.connect('destroy', Lang.bind(this, this._onNotificationDestroy));
+        notification.connect('destroy', Lang.bind(this,
+            function () {
+                let index = this.notifications.indexOf(notification);
+                if (index < 0)
+                    return;

-        this.notifications.push(notification);
-        this.emit('notification-added', notification);
+                this.notifications.splice(index, 1);
+                if (this.notifications.length == 0)
+                    this._lastNotificationRemoved();
+
+                this.countUpdated();
+            }));

        this.countUpdated();
    },
@@ -1634,42 +1507,26 @@ const MessageTrayMenu = new Lang.Class({

        this._tray = tray;

-        this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
-            if (error) {
-                logError(error, 'Error while reading gnome-session presence');
-                return;
-            }
-
-            this._onStatusChanged(proxy.status);
-        }));
-        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
-            this._onStatusChanged(status);
-        }));
-
-        this._accountManager = Tp.AccountManager.dup();
-        this._accountManager.connect('most-available-presence-changed',
-                                     Lang.bind(this, this._onIMPresenceChanged));
-        this._accountManager.prepare_async(null, Lang.bind(this, this._onIMPresenceChanged));
-
        this.actor.hide();
        Main.layoutManager.addChrome(this.actor);

-        this._busyItem = new PopupMenu.PopupSwitchMenuItem(_("Notifications"));
-        this._busyItem.connect('toggled', Lang.bind(this, this._updatePresence));
-        this.addMenuItem(this._busyItem);
-
-        let separator = new PopupMenu.PopupSeparatorMenuItem();
-        this.addMenuItem(separator);
-
        this._clearItem = this.addAction(_("Clear Messages"), function() {
-            let toDestroy = tray.getSources().filter(function(source) {
-                return source.isClearable;
-            })
+            let toDestroy = [];
+            let sources = tray.getSources();
+            for (let i = 0; i < sources.length; i++) {
+                // We exclude trayIcons, chat and resident sources
+                if (sources[i].trayIcon ||
+                    sources[i].isChat ||
+                    sources[i].resident)
+                    continue;
+                toDestroy.push(sources[i]);
+            }

-            toDestroy.forEach(function(source) {
-                source.destroy();
-            });
+            for (let i = 0; i < toDestroy.length; i++) {
+                toDestroy[i].destroy();
+            }

+            toDestroy = null;
            tray.close();
        });

@@ -1684,43 +1541,9 @@ const MessageTrayMenu = new Lang.Class({
        settingsItem.connect('activate', function() { tray.close(); });
    },

-    _onStatusChanged: function(status) {
-        this._sessionStatus = status;
-        this._busyItem.setToggleState(status != GnomeSession.PresenceStatus.BUSY);
-    },
-
-    _onIMPresenceChanged: function(am, type) {
-        if (type == Tp.ConnectionPresenceType.AVAILABLE &&
-            this._sessionStatus == GnomeSession.PresenceStatus.BUSY)
-            this._presence.SetStatusRemote(GnomeSession.PresenceStatus.AVAILABLE);
-    },
-
    _updateClearSensitivity: function() {
        this._clearItem.setSensitive(this._tray.clearableCount > 0);
    },
-
-    _updatePresence: function(item, state) {
-        let status = state ? GnomeSession.PresenceStatus.AVAILABLE
-                           : GnomeSession.PresenceStatus.BUSY;
-        this._presence.SetStatusRemote(status);
-
-        let [type, s ,msg] = this._accountManager.get_most_available_presence();
-        let newType = 0;
-        let newStatus;
-        if (status == GnomeSession.PresenceStatus.BUSY &&
-            type == Tp.ConnectionPresenceType.AVAILABLE) {
-            newType = Tp.ConnectionPresenceType.BUSY;
-            newStatus = 'busy';
-        } else if (status == GnomeSession.PresenceStatus.AVAILABLE &&
-                 type == Tp.ConnectionPresenceType.BUSY) {
-            newType = Tp.ConnectionPresenceType.AVAILABLE;
-            newStatus = 'available';
-        }
-
-        if (newType > 0)
-            this._accountManager.set_all_requested_presences(newType,
-                                                             newStatus, msg);
-    }
 });

 const MessageTrayMenuButton = new Lang.Class({
@@ -1982,9 +1805,8 @@ const MessageTray = new Lang.Class({
    },

    _sessionUpdated: function() {
-        if (Main.sessionMode.isLocked || Main.sessionMode.isGreeter) {
-            if (this._inCtrlAltTab)
-                Main.ctrlAltTabManager.removeGroup(this._summary);
+        if ((Main.sessionMode.isLocked || Main.sessionMode.isGreeter) && this._inCtrlAltTab) {
+            Main.ctrlAltTabManager.removeGroup(this._summary);
            this._inCtrlAltTab = false;
        } else if (!this._inCtrlAltTab) {
            Main.ctrlAltTabManager.addGroup(this._summary, _("Message Tray"), 'user-available-symbolic',
@@ -2103,7 +1925,7 @@ const MessageTray = new Lang.Class({
            this._summary.insert_child_at_index(summaryItem.actor, this._chatSummaryItemsCount);
        }

-        if (source.isClearable)
+        if (!source.trayIcon && !source.isChat && !source.resident)
            this.clearableCount++;

        this._sources.set(source, obj);
@@ -2147,7 +1969,7 @@ const MessageTray = new Lang.Class({
        if (source.isChat)
            this._chatSummaryItemsCount--;

-        if (source.isClearable)
+        if (!source.trayIcon && !source.isChat && !source.resident)
            this.clearableCount--;

        source.disconnect(obj.notifyId);
@@ -2392,13 +2214,6 @@ const MessageTray = new Lang.Class({
    // _updateState() figures out what (if anything) needs to be done
    // at the present time.
    _updateState: function() {
-        // If our state changes caused _updateState to be called,
-        // just exit now to prevent reentrancy issues.
-        if (this._updatingState)
-            return;
-
-        this._updatingState = true;
-
        // Filter out acknowledged notifications.
        this._notificationQueue = this._notificationQueue.filter(function(n) {
            return !n.acknowledged;
@@ -2481,8 +2296,6 @@ const MessageTray = new Lang.Class({
        } else if (desktopCloneIsVisible && !desktopCloneShouldBeVisible) {
            this._hideDesktopClone();
        }
-
-        this._updatingState = false;
    },

    _tween: function(actor, statevar, value, params) {
@@ -2847,13 +2660,13 @@ const MessageTray = new Lang.Class({
                                                                                  Lang.bind(this, this._onSourceDoneDisplayingContent));

        this._summaryBoxPointer.bin.child = child;
+        this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
+                                onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });
+
        this._summaryBoxPointer.actor.opacity = 0;
        this._summaryBoxPointer.actor.show();
        this._adjustSummaryBoxPointerPosition();

-        this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
-                                onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });
-
        this._summaryBoxPointerState = State.SHOWING;
        this._summaryBoxPointer.show(BoxPointer.PopupAnimation.FULL, Lang.bind(this, function() {
            this._summaryBoxPointerState = State.SHOWN;
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -103,6 +103,126 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
    'ibus-ui-gtk': 'keyboard'
 };

+const NotificationGenericPolicy = new Lang.Class({
+    Name: 'NotificationGenericPolicy',
+    Extends: MessageTray.NotificationPolicy,
+
+    _init: function() {
+        // Don't chain to parent, it would try setting
+        // our properties to the defaults
+
+        this.id = 'generic';
+
+        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
+        this._masterSettings.connect('changed', Lang.bind(this, this._changed));
+    },
+
+    store: function() { },
+
+    destroy: function() {
+        this._masterSettings.run_dispose();
+    },
+
+    _changed: function(settings, key) {
+        this.emit('policy-changed', key);
+    },
+
+    get enable() {
+        return true;
+    },
+
+    get enableSound() {
+        return true;
+    },
+
+    get showBanners() {
+        return this._masterSettings.get_boolean('show-banners');
+    },
+
+    get forceExpanded() {
+        return false;
+    },
+
+    get showInLockScreen() {
+        return this._masterSettings.get_boolean('show-in-lock-screen');
+    },
+
+    get detailsInLockScreen() {
+        return false;
+    }
+});
+
+const NotificationApplicationPolicy = new Lang.Class({
+    Name: 'NotificationApplicationPolicy',
+    Extends: MessageTray.NotificationPolicy,
+
+    _init: function(id) {
+        // Don't chain to parent, it would try setting
+        // our properties to the defaults
+
+        this.id = id;
+        this._canonicalId = this._canonicalizeId(id)
+
+        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
+        this._settings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications.application',
+                                            path: '/org/gnome/desktop/notifications/application/' + this._canonicalId + '/' });
+
+        this._masterSettings.connect('changed', Lang.bind(this, this._changed));
+        this._settings.connect('changed', Lang.bind(this, this._changed));
+    },
+
+    store: function() {
+        this._settings.set_string('application-id', this.id + '.desktop');
+
+        let apps = this._masterSettings.get_strv('application-children');
+        if (apps.indexOf(this._canonicalId) < 0) {
+            apps.push(this._canonicalId);
+            this._masterSettings.set_strv('application-children', apps);
+        }
+    },
+
+    destroy: function() {
+        this._masterSettings.run_dispose();
+        this._settings.run_dispose();
+    },
+
+    _changed: function(settings, key) {
+        this.emit('policy-changed', key);
+    },
+
+    _canonicalizeId: function(id) {
+        // Keys are restricted to lowercase alphanumeric characters and dash,
+        // and two dashes cannot be in succession
+        return id.toLowerCase().replace(/[^a-z0-9\-]/g, '-').replace(/--+/g, '-');
+    },
+
+    get enable() {
+        return this._settings.get_boolean('enable');
+    },
+
+    get enableSound() {
+        return this._settings.get_boolean('enable-sound-alerts');
+    },
+
+    get showBanners() {
+        return this._masterSettings.get_boolean('show-banners') &&
+            this._settings.get_boolean('show-banners');
+    },
+
+    get forceExpanded() {
+        return this._settings.get_boolean('force-expanded');
+    },
+
+    get showInLockScreen() {
+        return this._masterSettings.get_boolean('show-in-lock-screen') &&
+            this._settings.get_boolean('show-in-lock-screen');
+    },
+
+    get detailsInLockScreen() {
+        return this._settings.get_boolean('details-in-lock-screen');
+    }
+});
+
 const NotificationDaemon = new Lang.Class({
    Name: 'NotificationDaemon',

@@ -276,13 +396,12 @@ const NotificationDaemon = new Lang.Class({
        if (!hints['image-path'] && hints['image_path'])
            hints['image-path'] = hints['image_path']; // version 1.1 of the spec

-        if (!hints['image-data']) {
+        if (!hints['image-data'])
            if (hints['image_data'])
                hints['image-data'] = hints['image_data']; // version 1.1 of the spec
            else if (hints['icon_data'] && !hints['image-path'])
                // early versions of the spec; 'icon_data' should only be used if 'image-path' is not available
                hints['image-data'] = hints['icon_data'];
-        }

        let ndata = { appName: appName,
                      icon: icon,
@@ -555,9 +674,9 @@ const Source = new Lang.Class({
    _createPolicy: function() {
        if (this.app) {
            let id = this.app.get_id().replace(/\.desktop$/,'');
-            return new MessageTray.NotificationApplicationPolicy(id);
+            return new NotificationApplicationPolicy(id);
        } else {
-            return new MessageTray.NotificationGenericPolicy();
+            return new NotificationGenericPolicy();
        }
    },

@@ -633,6 +752,22 @@ const Source = new Lang.Class({
        return null;
    },

+    _setApp: function(appId) {
+        if (this.app)
+            return;
+
+        this.app = this._getApp(appId);
+        if (!this.app)
+            return;
+
+        // Only override the icon if we were previously using
+        // notification-based icons (ie, not a trayicon) or if it was unset before
+        if (!this.trayIcon) {
+            this.useNotificationIcon = false;
+            this.iconUpdated();
+        }
+    },
+
    setTitle: function(title) {
        // Do nothing if .app is set, we don't want to override the
        // app name with whatever is provided through libnotify (usually
@@ -644,8 +779,8 @@ const Source = new Lang.Class({
    },

    open: function(notification) {
-        this.openApp();
        this.destroyNonResidentNotifications();
+        this.openApp();
    },

    _lastNotificationRemoved: function() {
@@ -657,8 +792,11 @@ const Source = new Lang.Class({
        if (this.app == null)
            return;

-        this.app.activate();
-        Main.overview.hide();
+        let windows = this.app.get_windows();
+        if (windows.length > 0) {
+            let mostRecentWindow = windows[0];
+            Main.activateWindow(mostRecentWindow);
+        }
    },

    destroy: function() {
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -148,7 +148,7 @@ const Overview = new Lang.Class({
        // Dash elements, or mouseover handlers in the workspaces.
        this._coverPane = new Clutter.Actor({ opacity: 0,
                                              reactive: true });
-        Main.layoutManager.overviewGroup.add_child(this._coverPane);
+        this._stack.add_actor(this._coverPane);
        this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return true; }));

        this._stack.add_actor(this._overview);
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -55,21 +55,18 @@ const SlideLayout = new Lang.Class({
    vfunc_allocate: function(container, box, flags) {
        let child = container.get_first_child();

+        let [, , natWidth, natHeight] = child.get_preferred_size();
        let availWidth = Math.round(box.x2 - box.x1);
        let availHeight = Math.round(box.y2 - box.y1);
-        let [, natWidth] = child.get_preferred_width(availHeight);

-        // Align the actor inside the clipped box, as the actor's alignment
-        // flags only determine what to do if the allocated box is bigger
-        // than the actor's box.
        let realDirection = getRtlSlideDirection(this._direction, child);
-        let alignX = (realDirection == SlideDirection.LEFT) ? (availWidth - natWidth) : 0;
+        let translationX = (realDirection == SlideDirection.LEFT) ?
+            (availWidth - natWidth) : (natWidth - availWidth);

-        let actorBox = new Clutter.ActorBox();
-        actorBox.x1 = alignX;
-        actorBox.x2 = actorBox.x1 + child.x_expand ? availWidth : natWidth;
-        actorBox.y1 = 0;
-        actorBox.y2 = actorBox.y1 + availHeight;
+        let actorBox = new Clutter.ActorBox({ x1: translationX,
+                                              y1: 0,
+                                              x2: child.x_expand ? availWidth : natWidth,
+                                              y2: child.y_expand ? availHeight : natHeight });

        child.allocate(actorBox, flags);
    },
@@ -239,6 +236,11 @@ const ThumbnailsSlider = new Lang.Class({

        this._thumbnailsBox = thumbnailsBox;

+        // SlideLayout reads the actor's expand flags to decide
+        // whether to allocate the natural size to its child, or the whole
+        // available allocation
+        this._thumbnailsBox.actor.y_expand = true;
+
        this.actor.request_mode = Clutter.RequestMode.WIDTH_FOR_HEIGHT;
        this.actor.reactive = true;
        this.actor.track_hover = true;
@@ -322,6 +324,7 @@ const DashSlider = new Lang.Class({
        // whether to allocate the natural size to its child, or the whole
        // available allocation
        this._dash.actor.x_expand = true;
+        this._dash.actor.y_expand = true;

        this.actor.x_align = Clutter.ActorAlign.START;
        this.actor.y_expand = true;
@@ -501,17 +504,6 @@ const MessagesIndicator = new Lang.Class({
    }
 });

-const ControlsLayout = new Lang.Class({
-    Name: 'ControlsLayout',
-    Extends: Clutter.BinLayout,
-    Signals: { 'allocation-changed': { flags: GObject.SignalFlags.RUN_LAST } },
-
-    vfunc_allocate: function(container, box, flags) {
-        this.parent(container, box, flags);
-        this.emit('allocation-changed');
-    }
-});
-
 const ControlsManager = new Lang.Class({
    Name: 'ControlsManager',

@@ -532,8 +524,7 @@ const ControlsManager = new Lang.Class({
        this._indicator = new MessagesIndicator(this.viewSelector);
        this.indicatorActor = this._indicator.actor;

-        let layout = new ControlsLayout();
-        this.actor = new St.Widget({ layout_manager: layout,
+        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                     reactive: true,
                                     x_expand: true, y_expand: true,
                                     clip_to_allocation: true });
@@ -548,7 +539,7 @@ const ControlsManager = new Lang.Class({
                                                   expand: true });
        this._group.add_actor(this._thumbnailsSlider.actor);

-        layout.connect('allocation-changed', Lang.bind(this, this._updateWorkspacesGeometry));
+        this._group.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesGeometry));

        Main.overview.connect('showing', Lang.bind(this, this._updateSpacerVisibility));
        Main.overview.connect('item-drag-begin', Lang.bind(this,
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -213,7 +213,9 @@ const AppMenuButton = new Lang.Class({
        this._label = new TextShadower();
        this._label.actor.y_align = Clutter.ActorAlign.CENTER;
        this._hbox.add_actor(this._label.actor);
-        this._arrow = PopupMenu.unicodeArrow(St.Side.BOTTOM);
+        this._arrow = new St.Label({ text: '\u25BE',
+                                     y_expand: true,
+                                     y_align: Clutter.ActorAlign.CENTER });
        this._hbox.add_actor(this._arrow);

        this._iconBottomClip = 0;
@@ -609,7 +611,6 @@ const ActivitiesButton = new Lang.Class({

    _onButtonRelease: function() {
        Main.overview.toggle();
-        this.menu.close();
    },

    _onKeyRelease: function(actor, event) {
@@ -803,7 +804,7 @@ const AggregateMenu = new Lang.Class({
    Extends: PanelMenu.Button,

    _init: function() {
-        this.parent(0.0, _("Settings"), false);
+        this.parent(0.0, _("Settings Menu"), false);
        this.menu.actor.add_style_class_name('aggregate-menu');

        this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
@@ -831,7 +832,9 @@ const AggregateMenu = new Lang.Class({
        this._indicators.add_child(this._rfkill.indicators);
        this._indicators.add_child(this._volume.indicators);
        this._indicators.add_child(this._power.indicators);
-        this._indicators.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM));
+        this._indicators.add_child(new St.Label({ text: '\u25BE',
+                                                  y_expand: true,
+                                                  y_align: Clutter.ActorAlign.CENTER }));

        this.menu.addMenuItem(this._volume.menu);
        this.menu.addMenuItem(this._brightness.menu);
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -42,33 +42,6 @@ function isPopupMenuItemVisible(child) {
    return child.visible;
 }

-/**
- * @side Side to which the arrow points.
- */
-function unicodeArrow(side) {
-    let arrowChar;
-    switch (side) {
-        case St.Side.TOP:
-            arrowChar = '\u25B4';
-            break;
-        case St.Side.RIGHT:
-            arrowChar = '\u25B8';
-            break;
-        case St.Side.BOTTOM:
-            arrowChar = '\u25BE';
-            break;
-        case St.Side.LEFT:
-            arrowChar = '\u25C2';
-            break;
-    }
-
-    return new St.Label({ text: arrowChar,
-                          style_class: 'unicode-arrow',
-                          accessible_role: Atk.Role.ARROW,
-                          y_expand: true,
-                          y_align: Clutter.ActorAlign.CENTER });
-}
-
 const PopupBaseMenuItem = new Lang.Class({
    Name: 'PopupBaseMenuItem',

@@ -975,21 +948,18 @@ const PopupSubMenuMenuItem = new Lang.Class({
            this.actor.add_child(this.icon);
        }

-        this.label = new St.Label({ text: text,
-                                    y_expand: true,
-                                    y_align: Clutter.ActorAlign.CENTER });
+        this.label = new St.Label({ text: text });
        this.actor.add_child(this.label);
        this.actor.label_actor = this.label;

        let expander = new St.Bin({ style_class: 'popup-menu-item-expander' });
        this.actor.add(expander, { expand: true });

-        this.status = new St.Label({ style_class: 'popup-status-menu-item',
-                                     y_expand: true,
-                                     y_align: Clutter.ActorAlign.CENTER });
+        this.status = new St.Label({ style_class: 'popup-status-menu-item' });
        this.actor.add_child(this.status);

-        this._triangle = unicodeArrow(St.Side.RIGHT);
+        this._triangle = new St.Label({ text: '\u25B8',
+                                        style_class: 'popup-submenu-menu-item-triangle' });
        this._triangle.pivot_point = new Clutter.Point({ x: 0.5, y: 0.6 });

        this._triangleBin = new St.Widget({ y_expand: true,
@@ -999,7 +969,6 @@ const PopupSubMenuMenuItem = new Lang.Class({
            this._triangleBin.set_scale(-1.0, 1.0);

        this.actor.add_child(this._triangleBin);
-        this.actor.add_accessible_state (Atk.StateType.EXPANDABLE);

        this.menu = new PopupSubMenu(this.actor, this._triangle);
        this.menu.connect('open-state-changed', Lang.bind(this, this._subMenuOpenStateChanged));
@@ -1021,11 +990,9 @@ const PopupSubMenuMenuItem = new Lang.Class({
        if (open) {
            this.actor.add_style_pseudo_class('open');
            this._getTopMenu()._setOpenedSubMenu(this.menu);
-            this.actor.add_accessible_state (Atk.StateType.EXPANDED);
        } else {
            this.actor.remove_style_pseudo_class('open');
            this._getTopMenu()._setOpenedSubMenu(null);
-            this.actor.remove_accessible_state (Atk.StateType.EXPANDED);
        }
    },

@@ -1114,7 +1081,7 @@ const PopupMenuManager = new Lang.Class({

    removeMenu: function(menu) {
        if (menu == this.activeMenu)
-            this._closeMenu(false, menu);
+            this._closeMenu(menu);

        let position = this._findMenu(menu);
        if (position == -1) // not a menu we manage
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -191,9 +191,7 @@ const RemoteSearchProvider = new Lang.Class({
    },

    createIcon: function(size, meta) {
-        let gicon = null;
-        let icon = null;
-
+        let gicon;
        if (meta['icon']) {
            gicon = Gio.icon_deserialize(meta['icon']);
        } else if (meta['gicon']) {
@@ -205,20 +203,8 @@ const RemoteSearchProvider = new Lang.Class({
                                                       bitsPerSample, width, height, rowStride);
        }

-        if (gicon)
-            icon = new St.Icon({ gicon: gicon,
-                                 icon_size: size });
-        return icon;
-    },
-
-    filterResults: function(results, maxNumber) {
-        if (results.length <= maxNumber)
-            return results;
-
-        let regularResults = results.filter(function(r) { return !r.startsWith('special:'); });
-        let specialResults = results.filter(function(r) { return r.startsWith('special:'); });
-
-        return regularResults.slice(0, maxNumber).concat(specialResults.slice(0, maxNumber));
+        return new St.Icon({ gicon: gicon,
+                             icon_size: size });
    },

    _getResultsFinished: function(results, error) {
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -19,7 +19,6 @@ const Background = imports.ui.background;
 const GnomeSession = imports.misc.gnomeSession;
 const Hash = imports.misc.hash;
 const Layout = imports.ui.layout;
-const OVirt = imports.gdm.oVirt;
 const LoginManager = imports.misc.loginManager;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
@@ -546,13 +545,6 @@ const ScreenShield = new Lang.Class({
                                               this._liftShield(true, 0);
                                       }));

-        this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
-        this._oVirtCredentialsManager.connect('user-authenticated',
-                                              Lang.bind(this, function() {
-                                                  if (this._isLocked)
-                                                      this._liftShield(true, 0);
-                                              }));
-
        this._inhibitor = null;
        this._aboutToSuspend = false;
        this._loginManager = LoginManager.getLoginManager();
@@ -592,7 +584,6 @@ const ScreenShield = new Lang.Class({
        this._shortLightbox.connect('shown', Lang.bind(this, this._onShortLightboxShown));

        this.idleMonitor = Meta.IdleMonitor.get_core();
-        this._cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
    },

    _createBackground: function(monitorIndex) {
@@ -962,7 +953,7 @@ const ScreenShield = new Lang.Class({
            this._hideLockScreenComplete();
        }

-        this._cursorTracker.set_pointer_visible(true);
+        global.stage.show_cursor();
    },

    _ensureUnlockDialog: function(onPrimary, allowCancel) {
@@ -1095,15 +1086,15 @@ const ScreenShield = new Lang.Class({

        this._checkArrowAnimation();

-        let motionId = global.stage.connect('captured-event', Lang.bind(this, function(stage, event) {
+        let motionId = global.stage.connect('captured-event', function(stage, event) {
            if (event.type() == Clutter.EventType.MOTION) {
-                this._cursorTracker.set_pointer_visible(true);
+                global.stage.show_cursor();
                global.stage.disconnect(motionId);
            }

            return false;
-        }));
-        this._cursorTracker.set_pointer_visible(false);
+        });
+        global.stage.hide_cursor();

        this._lockScreenState = MessageTray.State.SHOWN;
        this._lockScreenGroup.fixed_position_set = false;
--- a/js/ui/screencast.js
+++ b/js/ui/screencast.js
@@ -103,10 +103,8 @@ const ScreencastService = new Lang.Class({

    ScreencastAsync: function(params, invocation) {
        let returnValue = [false, ''];
-        if (!Main.sessionMode.allowScreencast) {
+        if (!Main.sessionMode.allowScreencast)
            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-            return;
-        }

        let sender = invocation.get_sender();
        let recorder = this._ensureRecorderForSender(sender);
@@ -124,10 +122,8 @@ const ScreencastService = new Lang.Class({

    ScreencastAreaAsync: function(params, invocation) {
        let returnValue = [false, ''];
-        if (!Main.sessionMode.allowScreencast) {
+        if (!Main.sessionMode.allowScreencast)
            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-            return;
-        }

        let sender = invocation.get_sender();
        let recorder = this._ensureRecorderForSender(sender);
@@ -135,16 +131,6 @@ const ScreencastService = new Lang.Class({
        if (!recorder.is_recording()) {
            let [x, y, width, height, fileTemplate, options] = params;

-            if (x < 0 || y < 0 ||
-                width <= 0 || height <= 0 ||
-                x + width > global.screen_width ||
-                y + height > global.screen_height) {
-                invocation.return_error_literal(Gio.IOErrorEnum,
-                                                Gio.IOErrorEnum.CANCELLED,
-                                                "Invalid params");
-                return;
-            }
-
            recorder.set_file_template(fileTemplate);
            recorder.set_area(x, y, width, height);
            this._applyOptionalParameters(recorder, options);
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -6,7 +6,6 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@@ -77,9 +76,7 @@ const ScreenshotService = new Lang.Class({

    ScreenshotAreaAsync : function (params, invocation) {
        let [x, y, width, height, flash, filename, callback] = params;
-        if (x < 0 || y < 0 ||
-            width <= 0 || height <= 0 ||
-            x + width > global.screen_width || y + height > global.screen_height) {
+        if (height <= 0 || width <= 0) {
            invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
                        "Invalid params");
            return;
@@ -170,7 +167,7 @@ const SelectArea = new Lang.Class({
        if (!Main.pushModal(this._group) || this._group.visible)
            return;

-        global.screen.set_cursor(Meta.Cursor.CROSSHAIR);
+        global.set_cursor(Shell.Cursor.CROSSHAIR);
        this._group.visible = true;
    },

@@ -241,7 +238,7 @@ const SelectArea = new Lang.Class({
                               function() {
                                   Main.popModal(this._group);
                                   this._group.destroy();
-                                   global.screen.set_cursor(Meta.Cursor.DEFAULT);
+                                   global.unset_cursor();

                                   this.emit('finished', geometry);
                               })
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -214,8 +214,8 @@ const SearchResultsBase = new Lang.Class({
        this.actor.hide();
    },

-    _keyFocusIn: function(actor) {
-        this.emit('key-focus-in', actor);
+    _keyFocusIn: function(icon) {
+        this.emit('key-focus-in', icon);
    },

    _setMoreIconVisible: function(visible) {
@@ -230,7 +230,7 @@ const SearchResultsBase = new Lang.Class({
            callback();
        } else {
            let maxResults = this._getMaxDisplayedResults();
-            let results = this.provider.filterResults(providerResults, maxResults);
+            let results = providerResults.slice(0, maxResults);
            let hasMoreResults = results.length < providerResults.length;

            this.provider.getResultMetas(results, Lang.bind(this, function(metas) {
@@ -259,7 +259,6 @@ const ListSearchResults = new Lang.Class({

        this._container = new St.BoxLayout({ style_class: 'search-section-content' });
        this.providerIcon = new ProviderIcon(provider);
-        this.providerIcon.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
        this.providerIcon.connect('clicked', Lang.bind(this,
            function() {
                provider.launchSearch(this._terms);
@@ -405,8 +404,8 @@ const SearchResults = new Lang.Class({
        return false;
    },

-    _keyFocusIn: function(provider, actor) {
-        Util.ensureActorVisibleInScrollView(this._scrollView, actor);
+    _keyFocusIn: function(provider, icon) {
+        Util.ensureActorVisibleInScrollView(this._scrollView, icon);
    },

    createProviderDisplay: function(provider) {
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -43,7 +43,9 @@ const ATIndicator = new Lang.Class({
        this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
        this._hbox.add_child(new St.Icon({ style_class: 'system-status-icon',
                                           icon_name: 'preferences-desktop-accessibility-symbolic' }));
-        this._hbox.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM));
+        this._hbox.add_child(new St.Label({ text: '\u25BE',
+                                            y_expand: true,
+                                            y_align: Clutter.ActorAlign.CENTER }));

        this.actor.add_child(this._hbox);

--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -9,6 +9,7 @@ const St = imports.gi.St;

 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
+const NotificationDaemon = imports.ui.notificationDaemon;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

@@ -30,7 +31,6 @@ const Indicator = new Lang.Class({
            this._applet.killswitch_state = GnomeBluetooth.KillswitchState.SOFT_BLOCKED;
        }));
        this._item.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-bluetooth-panel.desktop');
-        this.menu.addMenuItem(this._item);

        this._applet = new GnomeBluetoothApplet.Applet();
        this._applet.connect('devices-changed', Lang.bind(this, this._sync));
@@ -54,13 +54,13 @@ const Indicator = new Lang.Class({
        this._item.actor.visible = on;

        if (on)
-            this._item.status.text = ngettext("%d Connected Device", "%d Connected Devices", nDevices).format(nDevices);
+            this._item.status.text = ngettext("%d Connected Device", "%d Connected Devices").format(nDevices);
    },

    _ensureSource: function() {
        if (!this._source) {
            this._source = new MessageTray.Source(_("Bluetooth"), 'bluetooth-active');
-            this._source.policy = new MessageTray.NotificationApplicationPolicy('gnome-bluetooth-panel');
+            this._source.policy = new NotificationDaemon.NotificationApplicationPolicy('gnome-bluetooth-panel');
            Main.messageTray.add(this._source);
        }
    },
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -339,7 +339,9 @@ const InputSourceIndicator = new Lang.Class({

        this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
        this._hbox.add_child(this._container);
-        this._hbox.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM));
+        this._hbox.add_child(new St.Label({ text: '\u25BE',
+                                            y_expand: true,
+                                            y_align: Clutter.ActorAlign.CENTER }));

        this.actor.add_child(this._hbox);
        this.actor.add_style_class_name('panel-status-button');
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -16,6 +16,7 @@ const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const MessageTray = imports.ui.messageTray;
+const NotificationDaemon = imports.ui.notificationDaemon;
 const ModalDialog = imports.ui.modalDialog;
 const ModemManager = imports.misc.modemManager;
 const Util = imports.misc.util;
@@ -72,27 +73,6 @@ function ssidToLabel(ssid) {
    return label;
 }

-function ensureActiveConnectionProps(active, settings) {
-    if (!active._connection) {
-        active._connection = settings.get_connection_by_path(active.connection);
-
-        // This list is guaranteed to have only one device in it.
-        let device = active.get_devices()[0]._delegate;
-        active._primaryDevice = device;
-    }
-}
-
-function createSettingsAction(label, device) {
-    let item = new PopupMenu.PopupMenuItem(label);
-
-    item.connect('activate', function() {
-        Util.spawnApp(['gnome-control-center', 'network', 'show-device',
-                       device.get_path()]);
-    });
-
-    return item;
-}
-
 const NMConnectionItem = new Lang.Class({
    Name: 'NMConnectionItem',

@@ -190,7 +170,8 @@ const NMConnectionSection = new Lang.Class({
    },

    destroy: function() {
-        this.item.destroy();
+        this.statusItem.destroy();
+        this.section.destroy();
    },

    _sync: function() {
@@ -287,12 +268,12 @@ const NMConnectionDevice = new Lang.Class({
    Extends: NMConnectionSection,
    Abstract: true,

-    _init: function(client, device, settings) {
+    _init: function(client, device) {
        this.parent(client);
        this._device = device;
-        this._settings = settings;

        this._autoConnectItem = this.item.menu.addAction(_("Connect"), Lang.bind(this, this._autoConnect));
+        this.item.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');

        this._stateChangedId = this._device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));
        this._activeConnectionChangedId = this._device.connect('notify::active-connection', Lang.bind(this, this._activeConnectionChanged));
@@ -320,7 +301,6 @@ const NMConnectionDevice = new Lang.Class({
        this._activeConnection = this._device.active_connection;

        if (this._activeConnection) {
-            ensureActiveConnectionProps(this._activeConnection, this._settings);
            let item = this._connectionItems.get(this._activeConnection._connection.get_uuid());
            item.setActiveConnection(this._activeConnection);
        }
@@ -376,9 +356,8 @@ const NMConnectionDevice = new Lang.Class({

        switch(this._device.state) {
        case NetworkManager.DeviceState.DISCONNECTED:
-            return _("Off");
        case NetworkManager.DeviceState.ACTIVATED:
-            return this.parent();
+            return '';
        case NetworkManager.DeviceState.UNMANAGED:
            /* Translators: this is for network devices that are physically present but are not
               under NetworkManager's control (and thus cannot be used in the menu) */
@@ -420,11 +399,8 @@ const NMDeviceModem = new Lang.Class({
    Extends: NMConnectionDevice,
    category: NMConnectionCategory.WWAN,

-    _init: function(client, device, settings) {
-        this.parent(client, device, settings);
-
-        this.item.menu.addMenuItem(createSettingsAction(_("Mobile Broadband Settings"), device));
-
+    _init: function(client, device) {
+        this.parent(client, device);
        this._mobileDevice = null;

        let capabilities = device.current_capabilities;
@@ -438,7 +414,16 @@ const NMDeviceModem = new Lang.Class({
            this._mobileDevice = new ModemManager.ModemGsm(device.udi);

        if (this._mobileDevice) {
-            this._operatorNameId = this._mobileDevice.connect('notify::operator-name', Lang.bind(this, this._sync));
+            this._operatorNameId = this._mobileDevice.connect('notify::operator-name', Lang.bind(this, function() {
+                if (this._operatorItem) {
+                    let name = this._mobileDevice.operator_name;
+                    if (name) {
+                        this._operatorItem.label.text = name;
+                        this._operatorItem.actor.show();
+                    } else
+                        this._operatorItem.actor.hide();
+                }
+            }));
            this._signalQualityId = this._mobileDevice.connect('notify::signal-quality', Lang.bind(this, function() {
                this.emit('icon-changed');
            }));
@@ -463,20 +448,6 @@ const NMDeviceModem = new Lang.Class({
        this.parent();
    },

-    _getStatus: function() {
-        if (!this._client.wwan_hardware_enabled)
-            return _("Hardware Disabled");
-        else if (!this._client.wwan_enabled)
-            /* Translators: this is for a network device that cannot be activated
-               because it's disabled by rfkill (airplane mode) */
-            return _("Disabled");
-        else if (this._device.state == NetworkManager.DeviceState.ACTIVATED &&
-                 this._mobileDevice && this._mobileDevice.operator_name)
-            return this._mobileDevice.operator_name;
-        else
-            return this.parent();
-    },
-
    _getMenuIcon: function() {
        if (this._device.active_connection)
            return this.getIndicatorIcon();
@@ -506,12 +477,6 @@ const NMDeviceBluetooth = new Lang.Class({
    Extends: NMConnectionDevice,
    category: NMConnectionCategory.WWAN,

-    _init: function(client, device, settings) {
-        this.parent(client, device, settings);
-
-        this.item.menu.addMenuItem(createSettingsAction(_("Mobile Broadband Settings"), device));
-    },
-
    _autoConnect: function() {
        // FIXME: DUN devices are configured like modems, so
        // We need to spawn the mobile wizard
@@ -559,8 +524,6 @@ const NMWirelessDialogItem = new Lang.Class({
            this.actor.grab_key_focus();
        }));

-        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
-
        this._content = new St.BoxLayout({ style_class: 'nm-dialog-item-box' });
        this.actor.set_child(this._content);

@@ -584,38 +547,22 @@ const NMWirelessDialogItem = new Lang.Class({

        this._signalIcon = new St.Icon({ style_class: 'nm-dialog-icon' });
        this._icons.add_actor(this._signalIcon);
-
-        this._sync();
-    },
-
-    _sync: function() {
-        this._signalIcon.icon_name = this._getSignalIcon();
    },

    updateBestAP: function(ap) {
        this._ap = ap;
-        this._sync();
+        this._signalIcon.icon_name = this._getIcon();
    },

    setActive: function(isActive) {
        this._selectedIcon.opacity = isActive ? 255 : 0;
    },

-    _getSignalIcon: function() {
+    _getIcon: function() {
        if (this._ap.mode == NM80211Mode.ADHOC)
            return 'network-workgroup-symbolic';
        else
            return 'network-wireless-signal-' + signalToIcon(this._ap.strength) + '-symbolic';
-    },
-
-    _onKeyPressEvent: function(actor, event) {
-        let symbol = event.get_key_symbol();
-        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return
-            || symbol == Clutter.KEY_KP_Enter) {
-            this.emit('connect');
-            return true;
-        }
-        return false;
    }
 });
 Signals.addSignalMethods(NMWirelessDialogItem.prototype);
@@ -984,9 +931,6 @@ const NMWirelessDialog = new Lang.Class({
            Util.ensureActorVisibleInScrollView(this._scrollView, network.item.actor);
            this._selectNetwork(network);
        }));
-        network.item.connect('connect', Lang.bind(this, function() {
-            this._connect();
-        }));
    },
 });

@@ -1008,10 +952,9 @@ const NMDeviceWireless = new Lang.Class({
        this._toggleItem.connect('activate', Lang.bind(this, this._toggleWifi));
        this.item.menu.addMenuItem(this._toggleItem);

-        this.item.menu.addMenuItem(createSettingsAction(_("Wi-Fi Settings"), device));
+        this.item.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');

-        this._wirelessEnabledChangedId = this._client.connect('notify::wireless-enabled', Lang.bind(this, this._sync));
-        this._wirelessHwEnabledChangedId = this._client.connect('notify::wireless-hardware-enabled', Lang.bind(this, this._sync));
+        this._wirelessEnabledChangedId = this._device.connect('notify::wireless-enabled', Lang.bind(this, this._sync));
        this._activeApChangedId = this._device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged));
        this._stateChangedId = this._device.connect('state-changed', Lang.bind(this, this._deviceStateChanged));

@@ -1031,14 +974,6 @@ const NMDeviceWireless = new Lang.Class({
            this._activeAccessPoint.disconnect(this._strengthChangedId);
            this._strengthChangedId = 0;
        }
-        if (this._wirelessEnabledChangedId) {
-            this._client.disconnect(this._wirelessEnabledChangedId);
-            this._wirelessEnabledChangedId = 0;
-        }
-        if (this._wirelessHwEnabledChangedId) {
-            this._client.disconnect(this._wirelessHwEnabledChangedId);
-            this._wirelessHwEnabledChangedId = 0;
-        }

        this.item.destroy();
    },
@@ -1097,7 +1032,6 @@ const NMDeviceWireless = new Lang.Class({

    _sync: function() {
        this._toggleItem.label.text = this._client.wireless_enabled ? _("Turn Off") : _("Turn On");
-        this._toggleItem.actor.visible = this._client.wireless_hardware_enabled;

        this.item.status.text = this._getStatus();
        this.item.icon.icon_name = this._getMenuIcon();
@@ -1111,17 +1045,10 @@ const NMDeviceWireless = new Lang.Class({

    _getStatus: function() {
        let ap = this._device.active_access_point;
+        if (!ap)
+            return _("Off"); // XXX -- interpret actual status

-        if (ap)
-            return ssidToLabel(ap.get_ssid());
-        else if (!this._client.wireless_hardware_enabled)
-            return _("Hardware Disabled");
-        else if (!this._client.wireless_enabled)
-            return _("Off");
-        else if (this._device.state == NetworkManager.DeviceState.DISCONNECTED)
-            return _("Not Connected");
-        else
-            return '';
+        return ssidToLabel(ap.get_ssid());
    },

    _getMenuIcon: function() {
@@ -1132,8 +1059,7 @@ const NMDeviceWireless = new Lang.Class({
    },

    getIndicatorIcon: function() {
-        if (this._device.state >= NetworkManager.DeviceState.PREPARE &&
-            this._device.state < NetworkManager.DeviceState.ACTIVATED)
+        if (this._device.active_connection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
            return 'network-wireless-acquiring-symbolic';

        let ap = this._device.active_access_point;
@@ -1191,7 +1117,6 @@ const NMVPNConnectionItem = new Lang.Class({
            this.emit('activation-failed', reason);
        }

-        this.emit('icon-changed');
        this.parent();
    },

@@ -1362,7 +1287,6 @@ const NMApplet = new Lang.Class({
        this._client.connect('notify::networking-enabled', Lang.bind(this, this._syncNMState));
        this._client.connect('notify::state', Lang.bind(this, this._syncNMState));
        this._client.connect('notify::primary-connection', Lang.bind(this, this._syncMainConnection));
-        this._client.connect('notify::activating-connection', Lang.bind(this, this._syncMainConnection));
        this._client.connect('notify::active-connections', Lang.bind(this, this._syncVPNConnections));
        this._client.connect('device-added', Lang.bind(this, this._deviceAdded));
        this._client.connect('device-removed', Lang.bind(this, this._deviceRemoved));
@@ -1381,7 +1305,7 @@ const NMApplet = new Lang.Class({
        if (!this._source) {
            this._source = new MessageTray.Source(_("Network Manager"),
                                                  'network-transmit-receive');
-            this._source.policy = new MessageTray.NotificationApplicationPolicy('gnome-network-panel');
+            this._source.policy = new NotificationDaemon.NotificationApplicationPolicy('gnome-network-panel');

            this._source.connect('destroy', Lang.bind(this, function() {
                this._source = null;
@@ -1493,18 +1417,28 @@ const NMApplet = new Lang.Class({
        devices.splice(pos, 1);
    },

+    _ensureActiveConnectionProps: function(a) {
+        if (!a._connection) {
+            a._connection = this._settings.get_connection_by_path(a.connection);
+
+            // This list is guaranteed to have only one device in it.
+            let device = a.get_devices()[0]._delegate;
+            a._primaryDevice = device;
+        }
+    },
+
    _getMainConnection: function() {
        let connection;

        connection = this._client.get_primary_connection();
        if (connection) {
-            ensureActiveConnectionProps(connection, this._settings);
+            this._ensureActiveConnectionProps(connection);
            return connection;
        }

        connection = this._client.get_activating_connection();
        if (connection) {
-            ensureActiveConnectionProps(connection, this._settings);
+            this._ensureActiveConnectionProps(connection);
            return connection;
        }

@@ -1540,7 +1474,7 @@ const NMApplet = new Lang.Class({
            return (a instanceof NMClient.VPNConnection);
        });
        vpnConnections.forEach(Lang.bind(this, function(a) {
-            ensureActiveConnectionProps(a, this._settings);
+            this._ensureActiveConnectionProps(a);
        }));
        this._vpnSection.setActiveConnections(vpnConnections);

@@ -1643,7 +1577,6 @@ const NMApplet = new Lang.Class({
    _updateIcon: function() {
        if (!this._client.networking_enabled || !this._mainConnection) {
            this._primaryIndicator.icon_name = 'network-offline-symbolic';
-            this._primaryIndicator.visible = true;
        } else {
            let dev = this._mainConnection._primaryDevice;
            this._primaryIndicator.visible = (dev != null);
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -86,30 +86,38 @@ const Indicator = new Lang.Class({
        return _("Estimating…");
    },

-    _sync: function() {
-        function isBattery(result) {
-            if (!result)
-                return false;
+    _syncStatusLabel: function() {
+        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
+            if (error) {
+                this._item.actor.hide();
+                return;
+            }

            let [device] = result;
-            let [, deviceType] = device;
-            return (deviceType == UPower.DeviceKind.BATTERY);
-        }
-
-        this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
-            if (isBattery(result)) {
-                let [device] = result;
-                let [,, icon] = device;
-                let gicon = Gio.icon_new_for_string(icon);
-                this._indicator.gicon = gicon;
-                this._item.icon.gicon = gicon;
+            let [device_id, device_type] = device;
+            if (device_type == UPower.DeviceKind.BATTERY) {
                this._item.status.text = this._statusForDevice(device);
                this._item.actor.show();
            } else {
-                // If there's no battery, then we use the power icon.
-                this._indicator.icon_name = 'system-shutdown-symbolic';
                this._item.actor.hide();
            }
        }));
    },
+
+    _syncIcon: function() {
+        let icon = this._proxy.Icon;
+        if (icon) {
+            let gicon = Gio.icon_new_for_string(icon);
+            this._indicator.gicon = gicon;
+            this._item.icon.gicon = gicon;
+        } else {
+            // If there's no battery, then we use the power icon.
+            this._indicator.icon_name = 'system-shutdown-symbolic';
+        }
+    },
+
+    _sync: function() {
+        this._syncIcon();
+        this._syncStatusLabel();
+    }
 });
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -18,12 +18,10 @@ const PopupMenu = imports.ui.popupMenu;

 const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
-const LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
 const PRIVACY_SCHEMA = 'org.gnome.desktop.privacy'
 const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
 const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
 const DISABLE_LOG_OUT_KEY = 'disable-log-out';
-const DISABLE_RESTART_KEY = 'disable-restart-buttons';
 const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';

 const AltSwitcher = new Lang.Class({
@@ -93,7 +91,6 @@ const Indicator = new Lang.Class({
        this.parent();

        this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
-        this._loginScreenSettings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
        this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });
        this._orientationSettings = new Gio.Settings({ schema: 'org.gnome.settings-daemon.peripherals.touchscreen' });
@@ -264,10 +261,7 @@ const Indicator = new Lang.Class({
    },

    _updatePowerOff: function() {
-        let disabled = Main.sessionMode.isLocked ||
-                       (Main.sessionMode.isGreeter &&
-                        this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
-        this._powerOffAction.visible = this._haveShutdown && !disabled;
+        this._powerOffAction.visible = this._haveShutdown && !Main.sessionMode.isLocked;
        this._updateActionsVisibility();
    },

@@ -279,10 +273,7 @@ const Indicator = new Lang.Class({
    },

    _updateSuspend: function() {
-        let disabled = Main.sessionMode.isLocked ||
-                       (Main.sessionMode.isGreeter &&
-                        this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
-        this._suspendAction.visible = this._haveShutdown && !disabled;
+        this._suspendAction.visible = this._haveSuspend && !Main.sessionMode.isLocked;
        this._updateActionsVisibility();
    },

@@ -381,11 +372,7 @@ const Indicator = new Lang.Class({
        Main.overview.hide();
        if (Main.screenShield)
            Main.screenShield.lock(false);
-
-        Clutter.threads_add_repaint_func_full(Clutter.RepaintFlags.POST_PAINT, function() {
-            Gdm.goto_login_session_sync(null);
-            return false;
-        });
+        Gdm.goto_login_session_sync(null);
    },

    _onQuitSessionActivate: function() {
--- a/js/ui/wanda.js
+++ b/js/ui/wanda.js
@@ -132,10 +132,6 @@ const WandaSearchProvider = new Lang.Class({
                  }]);
    },

-    filterResults: function(results) {
-        return results;
-    },
-
    getInitialResultSet: function(terms) {
        if (terms.join(' ') == MAGIC_FISH_KEY) {
            this.searchSystem.setResults(this, [ FISH_NAME ]);
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -20,6 +20,8 @@ const FOCUS_ANIMATION_TIME = 0.15;

 const WINDOW_DND_SIZE = 256;

+const SCROLL_SCALE_AMOUNT = 100 / 5;
+
 const WINDOW_CLONE_MAXIMUM_SCALE = 0.7;

 const LIGHTBOX_FADE_TIME = 0.1;
@@ -343,6 +345,19 @@ const WindowOverlay = new Lang.Class({
            this._animateVisible();
    },

+    fadeIn: function() {
+        if (!this._hidden)
+            return;
+
+        this.show();
+        this.title.opacity = 0;
+        this._parentActor.raise_top();
+        Tweener.addTween(this.title,
+                         { opacity: 255,
+                           time: CLOSE_BUTTON_FADE_TIME,
+                           transition: 'easeOutQuad' });
+    },
+
    chromeHeights: function () {
        return [Math.max(this.borderSize, this.closeButton.height - this.closeButton._overlap),
                this.title.height + this.title._spacing];
@@ -359,6 +374,7 @@ const WindowOverlay = new Lang.Class({
        let border = this.border;

        Tweener.removeTweens(button);
+        Tweener.removeTweens(title);
        Tweener.removeTweens(border);

        let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
@@ -1128,7 +1144,7 @@ const Workspace = new Lang.Class({
                clone.actor.set_scale(scale, scale);
                clone.actor.set_opacity(255);
                clone.overlay.relayout(false);
-                this._showWindowOverlay(clone, overlay);
+                this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
            }
        }
    },
@@ -1158,19 +1174,23 @@ const Workspace = new Lang.Class({
                           time: Overview.ANIMATION_TIME,
                           transition: 'easeOutQuad',
                           onComplete: Lang.bind(this, function() {
-                               this._showWindowOverlay(clone, overlay);
+                               this._showWindowOverlay(clone, overlay, true);
                           })
                         });

        clone.overlay.relayout(true);
    },

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

-        if (overlay && overlay._hidden)
+        if (overlay) {
+            if (fade)
+                overlay.fadeIn();
+            else
                overlay.show();
+        }
    },

    _delayedWindowRepositioning: function() {
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -536,6 +536,20 @@ const ThumbnailsBox = new Lang.Class({
        this.actor.connect('allocate', Lang.bind(this, this._allocate));
        this.actor._delegate = this;

+        // 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.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
@@ -1028,6 +1042,9 @@ const ThumbnailsBox = new Lang.Class({
    },

    _getPreferredHeight: function(actor, forWidth, alloc) {
+        // See comment about this._background in _init()
+        let themeNode = this._background.get_theme_node();
+
        // 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.
@@ -1035,21 +1052,24 @@ const ThumbnailsBox = new Lang.Class({
        if (this._thumbnails.length == 0)
            return;

-        let themeNode = this.actor.get_theme_node();
-
-        let spacing = themeNode.get_length('spacing');
+        let spacing = this.actor.get_theme_node().get_length('spacing');
        let nWorkspaces = global.screen.n_workspaces;
        let totalSpacing = (nWorkspaces - 1) * spacing;

-        alloc.min_size = totalSpacing;
-        alloc.natural_size = totalSpacing + nWorkspaces * this._porthole.height * MAX_THUMBNAIL_SCALE;
+        [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;

-        let themeNode = this.actor.get_theme_node();
+        // 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;
@@ -1061,26 +1081,28 @@ const ThumbnailsBox = new Lang.Class({
        scale = Math.min(scale, MAX_THUMBNAIL_SCALE);

        let width = Math.round(this._porthole.width * scale);
-        alloc.min_size = width;
-        alloc.natural_size = width;
+        [alloc.min_size, alloc.natural_size] =
+            themeNode.adjust_preferred_width(width, width);
    },

    _allocate: function(actor, box, flags) {
        let rtl = (Clutter.get_default_text_direction () == Clutter.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 themeNode = this.actor.get_theme_node();
-
        let portholeWidth = this._porthole.width;
        let portholeHeight = this._porthole.height;
-        let spacing = themeNode.get_length('spacing');
+        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 = (box.y2 - box.y1) - totalSpacing;
+        let avail = (contentBox.y2 - contentBox.y1) - totalSpacing;

        let newScale = (avail / nWorkspaces) / portholeHeight;
        newScale = Math.min(newScale, MAX_THUMBNAIL_SCALE);
@@ -1109,6 +1131,21 @@ const ThumbnailsBox = new Lang.Class({
        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 indicatorY1 = this._indicatorY;
        let indicatorY2;
        // when not animating, the workspace position overrides this._indicatorY
@@ -1120,7 +1157,7 @@ const ThumbnailsBox = new Lang.Class({
        let indicatorLeftFullBorder = indicatorThemeNode.get_padding(St.Side.LEFT) + indicatorThemeNode.get_border_width(St.Side.LEFT);
        let indicatorRightFullBorder = indicatorThemeNode.get_padding(St.Side.RIGHT) + indicatorThemeNode.get_border_width(St.Side.RIGHT);

-        let y = box.y1;
+        let y = contentBox.y1;

        if (this._dropPlaceholderPos == -1) {
            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
@@ -1128,8 +1165,6 @@ const ThumbnailsBox = new Lang.Class({
            }));
        }

-        let childBox = new Clutter.ActorBox();
-
        for (let i = 0; i < this._thumbnails.length; i++) {
            let thumbnail = this._thumbnails[i];

@@ -1138,10 +1173,10 @@ const ThumbnailsBox = new Lang.Class({

            let x1, x2;
            if (rtl) {
-                x1 = box.x1 + slideOffset * thumbnail.slidePosition;
+                x1 = contentBox.x1 + slideOffset * thumbnail.slidePosition;
                x2 = x1 + thumbnailWidth;
            } else {
-                x1 = box.x2 - thumbnailWidth + slideOffset * thumbnail.slidePosition;
+                x1 = contentBox.x2 - thumbnailWidth + slideOffset * thumbnail.slidePosition;
                x2 = x1 + thumbnailWidth;
            }

@@ -1188,11 +1223,11 @@ const ThumbnailsBox = new Lang.Class({
        }

        if (rtl) {
-            childBox.x1 = box.x1;
-            childBox.x2 = box.x1 + thumbnailWidth;
+            childBox.x1 = contentBox.x1;
+            childBox.x2 = contentBox.x1 + thumbnailWidth;
        } else {
-            childBox.x1 = box.x2 - thumbnailWidth;
-            childBox.x2 = box.x2;
+            childBox.x1 = contentBox.x2 - thumbnailWidth;
+            childBox.x2 = contentBox.x2;
        }
        childBox.x1 -= indicatorLeftFullBorder;
        childBox.x2 += indicatorRightFullBorder;
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -62,6 +62,7 @@ const WorkspacesView = new Lang.Class({
        this._animating = false; // tweening
        this._scrolling = false; // swipe-scrolling
        this._animatingScroll = false; // programatically updating the adjustment
+        this._zoomOut = false; // zoom to a larger area
        this._inDrag = false; // dragging a window

        this._settings = new Gio.Settings({ schema: OVERRIDE_SCHEMA });
@@ -167,6 +168,14 @@ const WorkspacesView = new Lang.Class({
            this._workspaces[i].setActualGeometry(geom);
    },

+    _lookupWorkspaceForMetaWindow: function (metaWindow) {
+        for (let i = 0; i < this._workspaces.length; i++) {
+            if (this._workspaces[i].containsMetaWindow(metaWindow))
+                return this._workspaces[i];
+        }
+        return null;
+    },
+
    getActiveWorkspace: function() {
        let active = global.screen.get_active_workspace_index();
        return this._workspaces[active];
@@ -424,6 +433,10 @@ const WorkspacesView = new Lang.Class({
            this._workspaces[i].actor.y += dy;
        }
    },
+
+    _getWorkspaceIndexToRemove: function() {
+        return global.screen.get_active_workspace_index();
+    }
 });
 Signals.addSignalMethods(WorkspacesView.prototype);

--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@@ -3,7 +3,6 @@
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Main = imports.ui.main;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const DND = imports.ui.dnd;
@@ -21,8 +20,7 @@ const XdndHandler = new Lang.Class({
        Main.uiGroup.add_actor(this._dummy);
        this._dummy.hide();

-        if (!Meta.is_wayland_compositor())
-            global.init_xdnd();
+        global.init_xdnd();

        global.connect('xdnd-enter', Lang.bind(this, this._onEnter));
        global.connect('xdnd-position-changed', Lang.bind(this, this._onPositionChanged));
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@
 data/50-gnome-shell-system.xml.in
 data/gnome-shell.desktop.in.in
 data/gnome-shell-extension-prefs.desktop.in.in
-data/gnome-shell-wayland.desktop.in.in
 data/org.gnome.shell.gschema.xml.in.in
 js/extensionPrefs/main.js
 js/gdm/authPrompt.js
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
--- a/po/be.po
+++ b/po/be.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/et.po
+++ b/po/et.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-23 13:35+0000\n"
-"PO-Revision-Date: 2013-09-23 23:30+0900\n"
+"POT-Creation-Date: 2013-09-06 21:55+0000\n"
+"PO-Revision-Date: 2013-09-07 22:28+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa@gnome.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
@@ -52,7 +52,6 @@ msgid "GNOME Shell"
 msgstr "GNOME Shell"

 #: ../data/gnome-shell.desktop.in.in.h:2
-#: ../data/gnome-shell-wayland.desktop.in.in.h:2
 msgid "Window management and application launching"
 msgstr "ウィンドウ管理とアプリケーションの起動"

@@ -65,10 +64,6 @@ msgstr "GNOME Shell 拡張機能設定"
 msgid "Configure GNOME Shell Extensions"
 msgstr "GNOME Shell 拡張機能の設定を行います"

-#: ../data/gnome-shell-wayland.desktop.in.in.h:1
-msgid "GNOME Shell (wayland compositor)"
-msgstr "GNOME Shell (Wayland コンポジター)"
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr "Alt-F2 から開発・テスト用の内部ツールを利用可能にする"
@@ -217,10 +212,6 @@ msgstr "ワークスペースを動的に管理する"
 msgid "Workspaces only on primary monitor"
 msgstr "プライマリモニターのみワークスペースを切り替える"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "マウスモードにおけるフォーカス遷移をポインターが停止するまで遅延させる"
-
 #: ../js/extensionPrefs/main.js:125
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
@@ -234,10 +225,10 @@ msgstr "拡張機能"
 msgid "Select an extension to configure using the combobox above."
 msgstr "設定する拡張機能を上部のコンボボックスから選択してください。"

-#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:136
+#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:132
 #: ../js/ui/components/polkitAgent.js:161 ../js/ui/endSessionDialog.js:351
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:222 ../js/ui/status/network.js:686
+#: ../js/ui/status/bluetooth.js:221 ../js/ui/status/network.js:686
 msgid "Cancel"
 msgstr "キャンセル"

@@ -276,8 +267,8 @@ msgstr "(たとえば、user あるいは %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:627 ../js/ui/components/networkAgent.js:259
-#: ../js/ui/components/networkAgent.js:277
+#: ../js/gdm/loginDialog.js:627 ../js/ui/components/networkAgent.js:255
+#: ../js/ui/components/networkAgent.js:273
 msgid "Username: "
 msgstr "ユーザー名: "

@@ -298,42 +289,42 @@ msgstr "認証エラー"
 msgid "(or swipe finger)"
 msgstr "(あるいは指でスワイプする)"

-#: ../js/misc/util.js:98
+#: ../js/misc/util.js:97
 msgid "Command not found"
 msgstr "コマンドが見つかりません"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:131
+#: ../js/misc/util.js:130
 msgid "Could not parse command:"
 msgstr "次のコマンドは解析できません:"

-#: ../js/misc/util.js:139
+#: ../js/misc/util.js:138
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "'%s'の実行に失敗しました:"

-#: ../js/ui/appDisplay.js:596
+#: ../js/ui/appDisplay.js:573
 msgid "Frequently used applications will appear here"
 msgstr "よく使うアプリケーションがここに表示されます"

-#: ../js/ui/appDisplay.js:712
+#: ../js/ui/appDisplay.js:689
 msgid "Frequent"
 msgstr "常用"

-#: ../js/ui/appDisplay.js:719
+#: ../js/ui/appDisplay.js:696
 msgid "All"
 msgstr "すべて"

-#: ../js/ui/appDisplay.js:1514
+#: ../js/ui/appDisplay.js:1491
 msgid "New Window"
 msgstr "新しいウィンドウで開く"

-#: ../js/ui/appDisplay.js:1517 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:1494 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "お気に入りから削除"

-#: ../js/ui/appDisplay.js:1518
+#: ../js/ui/appDisplay.js:1495
 msgid "Add to Favorites"
 msgstr "お気に入りに追加"

@@ -347,8 +338,7 @@ msgstr "%s をお気に入りに追加しました。"
 msgid "%s has been removed from your favorites."
 msgstr "%s をお気に入りから削除しました。"

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:807
-#: ../js/ui/status/system.js:325
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/status/system.js:325
 msgid "Settings"
 msgstr "設定"

@@ -534,83 +524,83 @@ msgstr "%s で開く"
 msgid "Eject"
 msgstr "取り出し"

-#: ../js/ui/components/keyring.js:91 ../js/ui/components/polkitAgent.js:280
+#: ../js/ui/components/keyring.js:88 ../js/ui/components/polkitAgent.js:280
 msgid "Password:"
 msgstr "パスワード:"

-#: ../js/ui/components/keyring.js:110
+#: ../js/ui/components/keyring.js:107
 msgid "Type again:"
 msgstr "再入力:"

-#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:112
+#: ../js/ui/components/networkAgent.js:127 ../js/ui/status/network.js:112
 #: ../js/ui/status/network.js:275 ../js/ui/status/network.js:689
 msgid "Connect"
 msgstr "接続"

 #. Cisco LEAP
-#: ../js/ui/components/networkAgent.js:222
-#: ../js/ui/components/networkAgent.js:234
-#: ../js/ui/components/networkAgent.js:261
-#: ../js/ui/components/networkAgent.js:281
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:218
+#: ../js/ui/components/networkAgent.js:230
+#: ../js/ui/components/networkAgent.js:257
+#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:287
 msgid "Password: "
 msgstr "パスワード: "

 #. static WEP
-#: ../js/ui/components/networkAgent.js:227
+#: ../js/ui/components/networkAgent.js:223
 msgid "Key: "
 msgstr "キー: "

-#: ../js/ui/components/networkAgent.js:265
+#: ../js/ui/components/networkAgent.js:261
 msgid "Identity: "
 msgstr "識別子: "

-#: ../js/ui/components/networkAgent.js:267
+#: ../js/ui/components/networkAgent.js:263
 msgid "Private key password: "
 msgstr "プライベートキーパスワード: "

-#: ../js/ui/components/networkAgent.js:279
+#: ../js/ui/components/networkAgent.js:275
 msgid "Service: "
 msgstr "サービス: "

-#: ../js/ui/components/networkAgent.js:308
+#: ../js/ui/components/networkAgent.js:304
 msgid "Authentication required by wireless network"
 msgstr "無線ネットワークでは認証が要求されます"

-#: ../js/ui/components/networkAgent.js:309
+#: ../js/ui/components/networkAgent.js:305
 #, c-format
 msgid "Passwords or encryption keys are required to access the wireless network '%s'."
 msgstr "無線ネットワーク '%s' にアクセスするにはパスワードか、または暗号化キーが必要です。"

-#: ../js/ui/components/networkAgent.js:313
+#: ../js/ui/components/networkAgent.js:309
 msgid "Wired 802.1X authentication"
 msgstr "有線 802.1X の認証"

-#: ../js/ui/components/networkAgent.js:315
+#: ../js/ui/components/networkAgent.js:311
 msgid "Network name: "
 msgstr "ネットワーク名: "

-#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:316
 msgid "DSL authentication"
 msgstr "DSL 認証"

-#: ../js/ui/components/networkAgent.js:327
+#: ../js/ui/components/networkAgent.js:323
 msgid "PIN code required"
 msgstr "PIN コードが必要です"

-#: ../js/ui/components/networkAgent.js:328
+#: ../js/ui/components/networkAgent.js:324
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "モバイルブロードバンドデバイスには PIN コードが必要です"

-#: ../js/ui/components/networkAgent.js:329
+#: ../js/ui/components/networkAgent.js:325
 msgid "PIN: "
 msgstr "PIN 番号: "

-#: ../js/ui/components/networkAgent.js:335
+#: ../js/ui/components/networkAgent.js:331
 msgid "Mobile broadband network password"
 msgstr "モバイルブロードバンドネットワークのパスワード"

-#: ../js/ui/components/networkAgent.js:336
+#: ../js/ui/components/networkAgent.js:332
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' への接続にパスワードが必要です。"
@@ -866,7 +856,7 @@ msgstr "アカウントを表示"
 msgid "Unknown reason"
 msgstr "原因不明"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:100
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:96
 msgid "Windows"
 msgstr "ウィンドウ"

@@ -1004,7 +994,7 @@ msgstr "インストール"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "extensions.gnome.org から '%s' をダウンロードしてインストールしますか?"

-#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:333
+#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:334
 msgid "Keyboard"
 msgstr "キーボード"

@@ -1080,11 +1070,11 @@ msgstr "トレイメニュー"
 msgid "No Messages"
 msgstr "メッセージなし"

-#: ../js/ui/messageTray.js:1813
+#: ../js/ui/messageTray.js:1812
 msgid "Message Tray"
 msgstr "メッセージトレイ"

-#: ../js/ui/messageTray.js:2788
+#: ../js/ui/messageTray.js:2787
 msgid "System Information"
 msgstr "システム情報"

@@ -1115,17 +1105,21 @@ msgstr "アクティビティ画面"
 msgid "Type to search…"
 msgstr "検索ワードを入力…"

-#: ../js/ui/panel.js:518
+#: ../js/ui/panel.js:516
 msgid "Quit"
 msgstr "終了"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:570
+#: ../js/ui/panel.js:568
 msgid "Activities"
 msgstr "アクティビティ"

-#: ../js/ui/panel.js:903
+#: ../js/ui/panel.js:805
+msgid "Settings Menu"
+msgstr "設定メニュー"
+
+#: ../js/ui/panel.js:901
 msgid "Top Bar"
 msgstr "トップバー"

@@ -1134,7 +1128,7 @@ msgstr "トップバー"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:233
+#: ../js/ui/popupMenu.js:226
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"

@@ -1162,7 +1156,7 @@ msgstr[0] "%d 件の新しい通知"
 msgid "Lock"
 msgstr "ロック"

-#: ../js/ui/screenShield.js:704
+#: ../js/ui/screenShield.js:703
 msgid "GNOME needs to lock the screen"
 msgstr "画面をロックする必要があります"

@@ -1173,11 +1167,11 @@ msgstr "画面をロックする必要があります"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
+#: ../js/ui/screenShield.js:830 ../js/ui/screenShield.js:1296
 msgid "Unable to lock"
 msgstr "ロックできません"

-#: ../js/ui/screenShield.js:832 ../js/ui/screenShield.js:1298
+#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
 msgid "Lock was blocked by an application"
 msgstr "アプリケーションによってロックがブロックされました"

@@ -1259,9 +1253,9 @@ msgstr "大きな文字"

 #. The Bluetooth menu only appears when Bluetooth is in use,
 #. so just statically build it with a "Turn Off" menu item.
-#: ../js/ui/status/bluetooth.js:28 ../js/ui/status/bluetooth.js:63
-#: ../js/ui/status/bluetooth.js:100 ../js/ui/status/bluetooth.js:128
-#: ../js/ui/status/bluetooth.js:164 ../js/ui/status/bluetooth.js:195
+#: ../js/ui/status/bluetooth.js:28 ../js/ui/status/bluetooth.js:62
+#: ../js/ui/status/bluetooth.js:99 ../js/ui/status/bluetooth.js:127
+#: ../js/ui/status/bluetooth.js:163 ../js/ui/status/bluetooth.js:194
 msgid "Bluetooth"
 msgstr "Bluetooth"

@@ -1274,78 +1268,78 @@ msgstr "オフにする"
 msgid "Bluetooth Settings"
 msgstr "Bluetooth の設定"

-#: ../js/ui/status/bluetooth.js:58
+#: ../js/ui/status/bluetooth.js:57
 #, c-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "接続デバイス: %d台"

-#: ../js/ui/status/bluetooth.js:101 ../js/ui/status/bluetooth.js:129
+#: ../js/ui/status/bluetooth.js:100 ../js/ui/status/bluetooth.js:128
 #, c-format
 msgid "Authorization request from %s"
 msgstr "%s からアクセス許可の要求"

-#: ../js/ui/status/bluetooth.js:107 ../js/ui/status/bluetooth.js:172
-#: ../js/ui/status/bluetooth.js:203
+#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/bluetooth.js:171
+#: ../js/ui/status/bluetooth.js:202
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "デバイス %s がこのコンピューターとのペアリングを要求しています"

-#: ../js/ui/status/bluetooth.js:109
+#: ../js/ui/status/bluetooth.js:108
 msgid "Allow"
 msgstr "許可"

-#: ../js/ui/status/bluetooth.js:110
+#: ../js/ui/status/bluetooth.js:109
 msgid "Deny"
 msgstr "拒否"

-#: ../js/ui/status/bluetooth.js:135
+#: ../js/ui/status/bluetooth.js:134
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "デバイス '%s' が サービス '%s' へのアクセスを要求しています"

-#: ../js/ui/status/bluetooth.js:137
+#: ../js/ui/status/bluetooth.js:136
 msgid "Always grant access"
 msgstr "許可"

-#: ../js/ui/status/bluetooth.js:138
+#: ../js/ui/status/bluetooth.js:137
 msgid "Grant this time only"
 msgstr "今回のみ許可"

-#: ../js/ui/status/bluetooth.js:139
+#: ../js/ui/status/bluetooth.js:138
 msgid "Reject"
 msgstr "拒否"

 #. Translators: argument is the device short name
-#: ../js/ui/status/bluetooth.js:166
+#: ../js/ui/status/bluetooth.js:165
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s からペアリングの確認"

-#: ../js/ui/status/bluetooth.js:173
+#: ../js/ui/status/bluetooth.js:172
 #, c-format
 msgid "Please confirm whether the Passkey '%06d' matches the one on the device."
 msgstr "'%06d' がデバイスのパスキーと一致しているか確認してください。"

 #. Translators: this is the verb, not the noun
-#: ../js/ui/status/bluetooth.js:176
+#: ../js/ui/status/bluetooth.js:175
 msgid "Matches"
 msgstr "一致"

-#: ../js/ui/status/bluetooth.js:177
+#: ../js/ui/status/bluetooth.js:176
 msgid "Does not match"
 msgstr "不一致"

-#: ../js/ui/status/bluetooth.js:196
+#: ../js/ui/status/bluetooth.js:195
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s からペアリングの要求"

-#: ../js/ui/status/bluetooth.js:204
+#: ../js/ui/status/bluetooth.js:203
 msgid "Please enter the PIN mentioned on the device."
 msgstr "デバイスの PIN コードを入力してください。"

-#: ../js/ui/status/bluetooth.js:221
+#: ../js/ui/status/bluetooth.js:220
 msgid "OK"
 msgstr "OK"

@@ -1353,7 +1347,7 @@ msgstr "OK"
 msgid "Brightness"
 msgstr "明るさ"

-#: ../js/ui/status/keyboard.js:403
+#: ../js/ui/status/keyboard.js:404
 msgid "Show Keyboard Layout"
 msgstr "キーボードレイアウトの表示"

@@ -1429,15 +1423,15 @@ msgstr "オンにする"
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1307
+#: ../js/ui/status/network.js:1306
 msgid "Network Manager"
 msgstr "ネットワークマネージャー"

-#: ../js/ui/status/network.js:1346
+#: ../js/ui/status/network.js:1345
 msgid "Connection failed"
 msgstr "接続失敗"

-#: ../js/ui/status/network.js:1347
+#: ../js/ui/status/network.js:1346
 msgid "Activation of network connection failed"
 msgstr "ネットワーク接続を有効にできません"

@@ -1523,11 +1517,11 @@ msgstr "他のユーザーでログイン"
 msgid "Unlock Window"
 msgstr "ロック解除"

-#: ../js/ui/viewSelector.js:104
+#: ../js/ui/viewSelector.js:100
 msgid "Applications"
 msgstr "アプリケーション"

-#: ../js/ui/viewSelector.js:108
+#: ../js/ui/viewSelector.js:104
 msgid "Search"
 msgstr "検索"

@@ -1628,9 +1622,6 @@ msgstr "パスワードを空白にすることはできません。"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "認証ダイアログはユーザーに拒否されました"

-#~ msgid "Settings Menu"
-#~ msgstr "設定メニュー"
-
 #~ msgid "Internally used to store the last IM presence explicitly set by the user. The value here is from the TpConnectionPresenceType enumeration."
 #~ msgstr "ユーザーにより明示的に設定された最新の IM プレゼンスを保存するのに内部的に使用されます。ここは TpConnectionPresenceType 列挙型の値になります。"

--- a/po/kk.po
+++ b/po/kk.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-23 13:35+0000\n"
-"PO-Revision-Date: 2013-09-24 06:33+0600\n"
+"POT-Creation-Date: 2013-08-30 14:46+0000\n"
+"PO-Revision-Date: 2013-08-31 19:43+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
 "Language: kk\n"
@@ -48,7 +48,6 @@ msgid "GNOME Shell"
 msgstr "GNOME Shell"

 #: ../data/gnome-shell.desktop.in.in.h:2
-#: ../data/gnome-shell-wayland.desktop.in.in.h:2
 msgid "Window management and application launching"
 msgstr "Терезелерді басқару мен қолданбаларды жөнелту"

@@ -61,10 +60,6 @@ msgstr "GNOME Shell кеңейту баптаулары"
 msgid "Configure GNOME Shell Extensions"
 msgstr "GNOME Shell кеңейтулерін баптау"

-#: ../data/gnome-shell-wayland.desktop.in.in.h:1
-msgid "GNOME Shell (wayland compositor)"
-msgstr "GNOME Shell (wayland үйлестіргіші)"
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
@@ -90,10 +85,6 @@ msgid ""
 "list. You can also manipulate this list with the EnableExtension and "
 "DisableExtension DBus methods on org.gnome.Shell."
 msgstr ""
-"GNOME Shell кеңейтулерінде uuid қасиеті бар; бұл кілт жүктелетін кеңейтулер "
-"тізімін сақтайды. Жүйеге кірген кезде жүктелем дейтін кеңейту осы тізімде "
-"болуы тиіс. Бұл тізімді org.gnome.Shell ішіндегі EnableExtension және "
-"DisableExtension DBus тәсілдерімен де өзгертуге болады."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "List of desktop file IDs for favorite applications"
@@ -104,8 +95,6 @@ msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr ""
-"Осы анықтағыштарға сәйкес келетін қолданбалар таңдамалылар аймағында "
-"көрсетілетін болады."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of categories that should be displayed as folders"
@@ -116,8 +105,6 @@ msgid ""
 "Each category name in this list will be represented as folder in the "
 "application view, rather than being displayed inline in the main view."
 msgstr ""
-"Бұл тізімдегі әрбір санат аты басты көріністе қатарынан көрсетілудің орнына "
-"қолданбалар көрінісінде бума ретінде көрсетіледі."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "History for command (Alt-F2) dialog"
@@ -136,8 +123,6 @@ msgid ""
 "This key overrides the automatic hiding of the 'Log out' menuitem in single-"
 "user, single-session situations."
 msgstr ""
-"Бұл кілт бір пайдаланушы, бір сессия бар кезінде 'Жүйеден шығу' "
-"мүмкіндігінің автоматты түрде жасыруын алмастырады."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid ""
@@ -153,10 +138,6 @@ msgid ""
 "'Remember Password' checkbox will be present. This key sets the default "
 "state of the checkbox."
 msgstr ""
-"Қоршам шифрленген құрылғы немесе қашықтағы файлдық жүйе тіркелген кезде "
-"парольді сұрайды. Егер парольді болашақтағы қолданулар үшін сақтау керек "
-"болса, 'Парольді еске сақтау' жалаушасые орнатыңыз. Бұл кілт жалаушаның "
-"бастапқы күйін орнатады."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Show the week date in the calendar"
@@ -226,13 +207,10 @@ msgid ""
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
 "only' (shows only the application icon) or 'both'."
 msgstr ""
-"Терезелер ауыстырғышта қалай көрсетілетінін сипаттайды. Мүмкін мәндері "
-"'thumbnail-only' (терезенің кіші көрінісі көрсетіледі), 'app-icon-only' (тек "
-"қолданба таңбашасы көрсетіледі) немесе 'both' (екеуі де)."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Attach modal dialog to the parent window"
-msgstr "Модальды сұхбатты аталық терезесіне жалғау"
+msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid ""
@@ -256,8 +234,6 @@ msgstr ""
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Терезелерді экран шеттеріне апарған кезде олардың өлшемдерін өзгертуді іске "
-"қосу"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:36
 msgid "Workspaces are managed dynamically"
@@ -267,10 +243,6 @@ msgstr "Жұмыс орындары динамикалы түрде басқар
 msgid "Workspaces only on primary monitor"
 msgstr "Жұмыс орындар тек біріншілік мониторда"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Тышқан режиміндегі фокусты ауыстыру курсор тоқтағанша дейін кідірту"
-
 #: ../js/extensionPrefs/main.js:125
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
@@ -284,10 +256,10 @@ msgstr "Кеңейту"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Жоғарыдағы ашылмалы тізімнен баптау үшін кеңейтуді таңдаңыз."

-#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:136
+#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:132
 #: ../js/ui/components/polkitAgent.js:161 ../js/ui/endSessionDialog.js:351
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:222 ../js/ui/status/network.js:686
+#: ../js/ui/status/bluetooth.js:221 ../js/ui/status/network.js:679
 msgid "Cancel"
 msgstr "Бас тарту"

@@ -326,8 +298,8 @@ msgstr "(мыс., пайдаланушы не %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:627 ../js/ui/components/networkAgent.js:259
-#: ../js/ui/components/networkAgent.js:277
+#: ../js/gdm/loginDialog.js:627 ../js/ui/components/networkAgent.js:255
+#: ../js/ui/components/networkAgent.js:273
 msgid "Username: "
 msgstr "Пайдаланушы аты:"

@@ -348,42 +320,38 @@ msgstr "Аутентификация қатесі"
 msgid "(or swipe finger)"
 msgstr "(немесе саусағыңызды өткізіңіз)"

-#: ../js/misc/util.js:98
+#: ../js/misc/util.js:97
 msgid "Command not found"
 msgstr "Команда табылмады"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:131
+#: ../js/misc/util.js:130
 msgid "Could not parse command:"
 msgstr "Команданы талдау мүмкін емес:"

-#: ../js/misc/util.js:139
+#: ../js/misc/util.js:138
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "'%s' жөнелту сәтсіз:"

-#: ../js/ui/appDisplay.js:596
-msgid "Frequently used applications will appear here"
-msgstr "Жиі қолданылатын қолданбалар осында көрінеді"
-
-#: ../js/ui/appDisplay.js:712
+#: ../js/ui/appDisplay.js:386
 msgid "Frequent"
 msgstr "Жиі"

-#: ../js/ui/appDisplay.js:719
+#: ../js/ui/appDisplay.js:393
 msgid "All"
 msgstr "Барлық"

-#: ../js/ui/appDisplay.js:1514
+#: ../js/ui/appDisplay.js:991
 msgid "New Window"
 msgstr "Жаңа терезе"

-#: ../js/ui/appDisplay.js:1517 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:994 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Таңдамалылардан өшіру"

-#: ../js/ui/appDisplay.js:1518
+#: ../js/ui/appDisplay.js:995
 msgid "Add to Favorites"
 msgstr "Таңдамалыларға қосу"

@@ -397,8 +365,7 @@ msgstr "%s таңдамалыларыңызға қосылды."
 msgid "%s has been removed from your favorites."
 msgstr "%s таңдамалыларыңыздан өшірілді."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:807
-#: ../js/ui/status/system.js:325
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/status/system.js:325
 msgid "Settings"
 msgstr "Баптаулар"

@@ -553,7 +520,7 @@ msgstr "Бүгін"

 #: ../js/ui/calendar.js:789
 msgid "Tomorrow"
-msgstr "Ертең"
+msgstr "Ертен"

 #: ../js/ui/calendar.js:800
 msgid "This week"
@@ -584,85 +551,85 @@ msgstr "%s көмегімен ашу"
 msgid "Eject"
 msgstr "Шығару"

-#: ../js/ui/components/keyring.js:91 ../js/ui/components/polkitAgent.js:280
+#: ../js/ui/components/keyring.js:88 ../js/ui/components/polkitAgent.js:280
 msgid "Password:"
 msgstr "Пароль:"

-#: ../js/ui/components/keyring.js:110
+#: ../js/ui/components/keyring.js:107
 msgid "Type again:"
 msgstr "Қайтадан енгізіңіз:"

-#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:112
-#: ../js/ui/status/network.js:275 ../js/ui/status/network.js:689
+#: ../js/ui/components/networkAgent.js:127 ../js/ui/status/network.js:112
+#: ../js/ui/status/network.js:268 ../js/ui/status/network.js:682
 msgid "Connect"
 msgstr "Байланысу"

 #. Cisco LEAP
-#: ../js/ui/components/networkAgent.js:222
-#: ../js/ui/components/networkAgent.js:234
-#: ../js/ui/components/networkAgent.js:261
-#: ../js/ui/components/networkAgent.js:281
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:218
+#: ../js/ui/components/networkAgent.js:230
+#: ../js/ui/components/networkAgent.js:257
+#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:287
 msgid "Password: "
 msgstr "Пароль:"

 #. static WEP
-#: ../js/ui/components/networkAgent.js:227
+#: ../js/ui/components/networkAgent.js:223
 msgid "Key: "
 msgstr "Кілт:"

-#: ../js/ui/components/networkAgent.js:265
+#: ../js/ui/components/networkAgent.js:261
 msgid "Identity: "
-msgstr "Анықтағыш:"
+msgstr ""

-#: ../js/ui/components/networkAgent.js:267
+#: ../js/ui/components/networkAgent.js:263
 msgid "Private key password: "
 msgstr "Жеке кілт паролі:"

-#: ../js/ui/components/networkAgent.js:279
+#: ../js/ui/components/networkAgent.js:275
 msgid "Service: "
 msgstr "Қызмет:"

-#: ../js/ui/components/networkAgent.js:308
+#: ../js/ui/components/networkAgent.js:304
 msgid "Authentication required by wireless network"
 msgstr "Сымсыз желісі аутентификацияны талап етеді"

-#: ../js/ui/components/networkAgent.js:309
+#: ../js/ui/components/networkAgent.js:305
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 msgstr "'%s' сымсыз желісіне қатынау үшін парольдер не шифрлеу кілттері керек."

-#: ../js/ui/components/networkAgent.js:313
+#: ../js/ui/components/networkAgent.js:309
 msgid "Wired 802.1X authentication"
 msgstr "Сымды 802.1X аутентификациясы"

-#: ../js/ui/components/networkAgent.js:315
+#: ../js/ui/components/networkAgent.js:311
 msgid "Network name: "
 msgstr "Желі аты:"

-#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:316
 msgid "DSL authentication"
 msgstr "DSL аутентификациясы"

-#: ../js/ui/components/networkAgent.js:327
+#: ../js/ui/components/networkAgent.js:323
 msgid "PIN code required"
 msgstr "PIN коды керек"

-#: ../js/ui/components/networkAgent.js:328
+#: ../js/ui/components/networkAgent.js:324
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Сымсыз кеңжолақты құрылғы үшін PIN коды керек"

-#: ../js/ui/components/networkAgent.js:329
+#: ../js/ui/components/networkAgent.js:325
 msgid "PIN: "
 msgstr "PIN: "

-#: ../js/ui/components/networkAgent.js:335
+#: ../js/ui/components/networkAgent.js:331
 msgid "Mobile broadband network password"
 msgstr "Сымсыз кеңжолақты желісінің паролі"

-#: ../js/ui/components/networkAgent.js:336
+#: ../js/ui/components/networkAgent.js:332
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' үшін байланысты орнату үшін пароль керек."
@@ -926,7 +893,7 @@ msgstr "Тіркелгіні қарап шығу"
 msgid "Unknown reason"
 msgstr "Себебі белгісіз"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:100
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:96
 msgid "Windows"
 msgstr "Терезелер"

@@ -936,7 +903,7 @@ msgstr "Қолданбаларды көрсету"

 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: ../js/ui/dash.js:442
+#: ../js/ui/dash.js:439
 msgid "Dash"
 msgstr "Dash"

@@ -1020,12 +987,15 @@ msgid_plural "The system will restart automatically in %d seconds."
 msgstr[0] "Жүйе %d секундтан кейін автоматты түрде қайта қосылады."

 #: ../js/ui/endSessionDialog.js:112
+#| msgid "Install Updates & Restart"
 msgctxt "title"
 msgid "Restart & Install Updates"
 msgstr "Қайта қосу және жаңартуларды орнату"

 #: ../js/ui/endSessionDialog.js:114
 #, c-format
+#| msgid "The system will restart automatically in %d second."
+#| msgid_plural "The system will restart automatically in %d seconds."
 msgid "The system will automatically restart and install updates in %d second."
 msgid_plural ""
 "The system will automatically restart and install updates in %d seconds."
@@ -1067,7 +1037,7 @@ msgstr "Орнату"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "extensions.gnome.org адресінен '%s' жүктеп алып, орнату керек пе?"

-#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:333
+#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:334
 msgid "Keyboard"
 msgstr "Пернетақта"

@@ -1143,11 +1113,11 @@ msgstr "Трей мәзірі"
 msgid "No Messages"
 msgstr "Хабарламалар жоқ"

-#: ../js/ui/messageTray.js:1813
+#: ../js/ui/messageTray.js:1812
 msgid "Message Tray"
 msgstr "Жүйелік трей"

-#: ../js/ui/messageTray.js:2788
+#: ../js/ui/messageTray.js:2786
 msgid "System Information"
 msgstr "Жүйелік ақпарат"

@@ -1178,17 +1148,21 @@ msgstr "Шолу"
 msgid "Type to search…"
 msgstr "Іздеу үшін теріңіз..."

-#: ../js/ui/panel.js:518
+#: ../js/ui/panel.js:516
 msgid "Quit"
 msgstr "Шығу"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:570
+#: ../js/ui/panel.js:568
 msgid "Activities"
 msgstr "Көрініс"

-#: ../js/ui/panel.js:903
+#: ../js/ui/panel.js:805
+msgid "Settings Menu"
+msgstr "Баптаулар мәзірі"
+
+#: ../js/ui/panel.js:892
 msgid "Top Bar"
 msgstr "Үстідегі панель"

@@ -1197,7 +1171,7 @@ msgstr "Үстідегі панель"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:233
+#: ../js/ui/popupMenu.js:226
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

@@ -1225,7 +1199,7 @@ msgstr[0] "%d жаңа ескерту"
 msgid "Lock"
 msgstr "Блоктау"

-#: ../js/ui/screenShield.js:704
+#: ../js/ui/screenShield.js:703
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME экранды блоктау керек"

@@ -1236,19 +1210,19 @@ msgstr "GNOME экранды блоктау керек"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
+#: ../js/ui/screenShield.js:830 ../js/ui/screenShield.js:1296
 msgid "Unable to lock"
 msgstr "Блоктау мүмкін емес"

-#: ../js/ui/screenShield.js:832 ../js/ui/screenShield.js:1298
+#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
 msgid "Lock was blocked by an application"
 msgstr "Блоктауды басқа қолданба болдырмады"

-#: ../js/ui/searchDisplay.js:447
+#: ../js/ui/searchDisplay.js:445
 msgid "Searching…"
 msgstr "Іздеу..."

-#: ../js/ui/searchDisplay.js:491
+#: ../js/ui/searchDisplay.js:489
 msgid "No results."
 msgstr "Нәтижелер жоқ."

@@ -1322,14 +1296,14 @@ msgstr "Үлкен мәтін"

 #. The Bluetooth menu only appears when Bluetooth is in use,
 #. so just statically build it with a "Turn Off" menu item.
-#: ../js/ui/status/bluetooth.js:28 ../js/ui/status/bluetooth.js:63
-#: ../js/ui/status/bluetooth.js:100 ../js/ui/status/bluetooth.js:128
-#: ../js/ui/status/bluetooth.js:164 ../js/ui/status/bluetooth.js:195
+#: ../js/ui/status/bluetooth.js:28 ../js/ui/status/bluetooth.js:62
+#: ../js/ui/status/bluetooth.js:99 ../js/ui/status/bluetooth.js:127
+#: ../js/ui/status/bluetooth.js:163 ../js/ui/status/bluetooth.js:194
 msgid "Bluetooth"
 msgstr "Bluetooth"

 #: ../js/ui/status/bluetooth.js:30 ../js/ui/status/network.js:112
-#: ../js/ui/status/network.js:1034 ../js/ui/status/rfkill.js:46
+#: ../js/ui/status/network.js:1027 ../js/ui/status/rfkill.js:46
 msgid "Turn Off"
 msgstr "Сөндіру"

@@ -1337,79 +1311,79 @@ msgstr "Сөндіру"
 msgid "Bluetooth Settings"
 msgstr "Bluetooth баптаулары"

-#: ../js/ui/status/bluetooth.js:58
+#: ../js/ui/status/bluetooth.js:57
 #, c-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d байланысқан құрылғы"

-#: ../js/ui/status/bluetooth.js:101 ../js/ui/status/bluetooth.js:129
+#: ../js/ui/status/bluetooth.js:100 ../js/ui/status/bluetooth.js:128
 #, c-format
 msgid "Authorization request from %s"
 msgstr "%s жіберген авторизация сұранымы"

-#: ../js/ui/status/bluetooth.js:107 ../js/ui/status/bluetooth.js:172
-#: ../js/ui/status/bluetooth.js:203
+#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/bluetooth.js:171
+#: ../js/ui/status/bluetooth.js:202
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "%s құрылғысы бұл компьютермен пар болғысы кеп тұр"

-#: ../js/ui/status/bluetooth.js:109
+#: ../js/ui/status/bluetooth.js:108
 msgid "Allow"
 msgstr "Рұқсат ету"

-#: ../js/ui/status/bluetooth.js:110
+#: ../js/ui/status/bluetooth.js:109
 msgid "Deny"
 msgstr "Тайдыру"

-#: ../js/ui/status/bluetooth.js:135
+#: ../js/ui/status/bluetooth.js:134
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "%s құрылғысы '%s' қызметін қатынағысы кеп тұр"

-#: ../js/ui/status/bluetooth.js:137
+#: ../js/ui/status/bluetooth.js:136
 msgid "Always grant access"
 msgstr "Әрқашан рұқсат ету"

-#: ../js/ui/status/bluetooth.js:138
+#: ../js/ui/status/bluetooth.js:137
 msgid "Grant this time only"
 msgstr "Тек осы ретке рұқсат ету"

-#: ../js/ui/status/bluetooth.js:139
+#: ../js/ui/status/bluetooth.js:138
 msgid "Reject"
 msgstr "Болдырмау"

 #. Translators: argument is the device short name
-#: ../js/ui/status/bluetooth.js:166
+#: ../js/ui/status/bluetooth.js:165
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s жіберген парлау растауы"

-#: ../js/ui/status/bluetooth.js:173
+#: ../js/ui/status/bluetooth.js:172
 #, c-format
 msgid ""
 "Please confirm whether the Passkey '%06d' matches the one on the device."
 msgstr "'%06d' кілт коды құрылғыдағы кодымен сәйкес келетінін растаңыз."

 #. Translators: this is the verb, not the noun
-#: ../js/ui/status/bluetooth.js:176
+#: ../js/ui/status/bluetooth.js:175
 msgid "Matches"
 msgstr "Сәйкес"

-#: ../js/ui/status/bluetooth.js:177
+#: ../js/ui/status/bluetooth.js:176
 msgid "Does not match"
 msgstr "Сәйкес емес"

-#: ../js/ui/status/bluetooth.js:196
+#: ../js/ui/status/bluetooth.js:195
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s үшін парлау сұранымы"

-#: ../js/ui/status/bluetooth.js:204
+#: ../js/ui/status/bluetooth.js:203
 msgid "Please enter the PIN mentioned on the device."
 msgstr "Құрылғыда көрсетілген PIN кодын енгізіңіз."

-#: ../js/ui/status/bluetooth.js:221
+#: ../js/ui/status/bluetooth.js:220
 msgid "OK"
 msgstr "ОК"

@@ -1417,7 +1391,7 @@ msgstr "ОК"
 msgid "Brightness"
 msgstr "Жарықтылығы"

-#: ../js/ui/status/keyboard.js:403
+#: ../js/ui/status/keyboard.js:404
 msgid "Show Keyboard Layout"
 msgstr "Пернетақта жаймасын көрсету"

@@ -1425,83 +1399,83 @@ msgstr "Пернетақта жаймасын көрсету"
 msgid "<unknown>"
 msgstr "<белгісіз>"

-#: ../js/ui/status/network.js:203 ../js/ui/status/network.js:1049
+#: ../js/ui/status/network.js:196 ../js/ui/status/network.js:1042
 msgid "Off"
 msgstr "Сөнд."

-#: ../js/ui/status/network.js:276 ../js/ui/status/network.js:955
+#: ../js/ui/status/network.js:269 ../js/ui/status/network.js:948
 #: ../js/ui/status/rfkill.js:49
 msgid "Network Settings"
 msgstr "Желі баптаулары"

 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu)
-#: ../js/ui/status/network.js:364
+#: ../js/ui/status/network.js:357
 msgid "unmanaged"
 msgstr "басқарылмайтын"

-#: ../js/ui/status/network.js:366
+#: ../js/ui/status/network.js:359
 msgid "disconnecting..."
 msgstr "байланысты үзу..."

-#: ../js/ui/status/network.js:372 ../js/ui/status/network.js:1100
+#: ../js/ui/status/network.js:365 ../js/ui/status/network.js:1093
 msgid "connecting..."
 msgstr "байланысты орнату..."

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:375 ../js/ui/status/network.js:1103
+#: ../js/ui/status/network.js:368 ../js/ui/status/network.js:1096
 msgid "authentication required"
 msgstr "аутентификация керек"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:383
+#: ../js/ui/status/network.js:376
 msgid "firmware missing"
 msgstr "бинарлы кодтары жоқ"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage
-#: ../js/ui/status/network.js:387
+#: ../js/ui/status/network.js:380
 msgid "unavailable"
 msgstr "қолжетерсіз"

-#: ../js/ui/status/network.js:389 ../js/ui/status/network.js:1105
+#: ../js/ui/status/network.js:382 ../js/ui/status/network.js:1098
 msgid "connection failed"
 msgstr "байланысты орнату сәтсіз"

-#: ../js/ui/status/network.js:654
+#: ../js/ui/status/network.js:647
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi желілері"

-#: ../js/ui/status/network.js:656
+#: ../js/ui/status/network.js:649
 msgid "Select a network"
 msgstr "Желіні таңдаңыз"

-#: ../js/ui/status/network.js:680
+#: ../js/ui/status/network.js:673
 msgid "No Networks"
 msgstr "Желілер жоқ"

-#: ../js/ui/status/network.js:949
+#: ../js/ui/status/network.js:942
 msgid "Select Network"
 msgstr "Желіні таңдаңыз"

-#: ../js/ui/status/network.js:1034
+#: ../js/ui/status/network.js:1027
 msgid "Turn On"
 msgstr "Іске қосу"

-#: ../js/ui/status/network.js:1167
+#: ../js/ui/status/network.js:1160
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1307
+#: ../js/ui/status/network.js:1299
 msgid "Network Manager"
 msgstr "Желілер басқарушысы"

-#: ../js/ui/status/network.js:1346
+#: ../js/ui/status/network.js:1338
 msgid "Connection failed"
 msgstr "Байланыс орнату сәтсіз"

-#: ../js/ui/status/network.js:1347
+#: ../js/ui/status/network.js:1339
 msgid "Activation of network connection failed"
 msgstr "Желілік байланысты белсендіру сәтсіз"

@@ -1587,11 +1561,11 @@ msgstr "Басқа пайдаланушы ретінде жүйеге кіру"
 msgid "Unlock Window"
 msgstr "Блоктауды алу терезесі"

-#: ../js/ui/viewSelector.js:104
+#: ../js/ui/viewSelector.js:100
 msgid "Applications"
 msgstr "Қолданбалар"

-#: ../js/ui/viewSelector.js:108
+#: ../js/ui/viewSelector.js:104
 msgid "Search"
 msgstr "Іздеу"

@@ -1607,7 +1581,7 @@ msgstr ""
 #: ../js/ui/wanda.js:81
 #, c-format
 msgid "%s the Oracle says"
-msgstr "Болжаушы айтады: %s"
+msgstr ""

 #: ../js/ui/windowAttentionHandler.js:19
 #, c-format
@@ -1691,6 +1665,3 @@ msgstr "Пароль бос болуы мүмкін емес"
 #: ../src/shell-polkit-authentication-agent.c:343
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Аутентификация терезесін пайдаланушы тайдырды"
-
-#~ msgid "Settings Menu"
-#~ msgstr "Баптаулар мәзірі"
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/ta.po
+++ b/po/ta.po
--- a/po/tg.po
+++ b/po/tg.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-11 14:58+0300\n"
-"PO-Revision-Date: 2013-10-11 15:01+0300\n"
+"POT-Creation-Date: 2013-09-04 18:06+0300\n"
+"PO-Revision-Date: 2013-09-04 18:44+0300\n"
 "Last-Translator: Daniel Korostil <ted.korostiled@gmail.com>\n"
 "Language-Team: linux.org.ua\n"
 "Language: uk\n"
@@ -51,7 +51,6 @@ msgid "GNOME Shell"
 msgstr "GNOME Shell"

 #: ../data/gnome-shell.desktop.in.in.h:2
-#: ../data/gnome-shell-wayland.desktop.in.in.h:2
 msgid "Window management and application launching"
 msgstr "Керування вікнами та запуск програм"

@@ -63,10 +62,6 @@ msgstr "Параметри розширень GNOME Shell"
 msgid "Configure GNOME Shell Extensions"
 msgstr "Налаштувати розширення GNOME Shell"

-#: ../data/gnome-shell-wayland.desktop.in.in.h:1
-msgid "GNOME Shell (wayland compositor)"
-msgstr "Оболонка GNOME (поверх wayland)"
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
@@ -263,18 +258,14 @@ msgstr "Робочі простори організовуються динам
 msgid "Workspaces only on primary monitor"
 msgstr "Робочий простір лише на основному моніторі"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Затримувати зміни фокусу миші, поки вказівник не перестане рухатись"
-
 #: ../js/extensionPrefs/main.js:189
 msgid "Select an extension to configure using the combobox above."
 msgstr "Вибрати розширення для налаштування через список вище."

-#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:136
+#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:132
 #: ../js/ui/components/polkitAgent.js:161 ../js/ui/endSessionDialog.js:351
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/bluetooth.js:222 ../js/ui/status/network.js:728
+#: ../js/ui/status/bluetooth.js:221 ../js/ui/status/network.js:686
 msgid "Cancel"
 msgstr "Скасувати"

@@ -305,8 +296,8 @@ msgstr "Немає в переліку?"
 msgid "(e.g., user or %s)"
 msgstr "(наприклад, користувач або %s)"

-#: ../js/gdm/loginDialog.js:627 ../js/ui/components/networkAgent.js:259
-#: ../js/ui/components/networkAgent.js:277
+#: ../js/gdm/loginDialog.js:627 ../js/ui/components/networkAgent.js:255
+#: ../js/ui/components/networkAgent.js:273
 msgid "Username: "
 msgstr "Користувач:"

@@ -322,40 +313,40 @@ msgstr "Помилка розпізнавання"
 msgid "(or swipe finger)"
 msgstr "(або проведіть пальцем)"

-#: ../js/misc/util.js:115
+#: ../js/misc/util.js:97
 msgid "Command not found"
 msgstr "Команди не знайдено"

-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:130
 msgid "Could not parse command:"
 msgstr "Неможливо розібрати команду:"

-#: ../js/misc/util.js:156
+#: ../js/misc/util.js:138
 #, javascript-format
 msgid "Execution of '%s' failed:"
 msgstr "Не вдалось виконати «%s»:"

-#: ../js/ui/appDisplay.js:596
+#: ../js/ui/appDisplay.js:580
 msgid "Frequently used applications will appear here"
 msgstr "Часто використовувані програми будуть з'являтись тут"

-#: ../js/ui/appDisplay.js:712
+#: ../js/ui/appDisplay.js:696
 msgid "Frequent"
 msgstr "Частовживане"

-#: ../js/ui/appDisplay.js:719
+#: ../js/ui/appDisplay.js:703
 msgid "All"
 msgstr "Усе"

-#: ../js/ui/appDisplay.js:1514
+#: ../js/ui/appDisplay.js:1490
 msgid "New Window"
 msgstr "Нове вікно"

-#: ../js/ui/appDisplay.js:1517 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:1493 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Вилучити з улюбленого"

-#: ../js/ui/appDisplay.js:1518
+#: ../js/ui/appDisplay.js:1494
 msgid "Add to Favorites"
 msgstr "Додати до улюбленого"

@@ -369,8 +360,7 @@ msgstr "%s додано до улюбленого."
 msgid "%s has been removed from your favorites."
 msgstr "%s вилучено з улюбленого."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:808
-#: ../js/ui/status/system.js:325
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/status/system.js:325
 msgid "Settings"
 msgstr "Параметри"

@@ -560,83 +550,83 @@ msgstr "Відкрити через %s"
 msgid "Eject"
 msgstr "Витягнути"

-#: ../js/ui/components/keyring.js:89 ../js/ui/components/polkitAgent.js:280
+#: ../js/ui/components/keyring.js:88 ../js/ui/components/polkitAgent.js:280
 msgid "Password:"
 msgstr "Пароль:"

-#: ../js/ui/components/keyring.js:108
+#: ../js/ui/components/keyring.js:107
 msgid "Type again:"
 msgstr "Введіть знову:"

-#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:133
-#: ../js/ui/status/network.js:296 ../js/ui/status/network.js:731
+#: ../js/ui/components/networkAgent.js:127 ../js/ui/status/network.js:112
+#: ../js/ui/status/network.js:275 ../js/ui/status/network.js:689
 msgid "Connect"
 msgstr "З'єднатись"

-#: ../js/ui/components/networkAgent.js:222
-#: ../js/ui/components/networkAgent.js:234
-#: ../js/ui/components/networkAgent.js:261
-#: ../js/ui/components/networkAgent.js:281
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:218
+#: ../js/ui/components/networkAgent.js:230
+#: ../js/ui/components/networkAgent.js:257
+#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:287
 msgid "Password: "
 msgstr "Пароль:"

-#: ../js/ui/components/networkAgent.js:227
+#: ../js/ui/components/networkAgent.js:223
 msgid "Key: "
 msgstr "Ключ:"

-#: ../js/ui/components/networkAgent.js:265
+#: ../js/ui/components/networkAgent.js:261
 msgid "Identity: "
 msgstr "Тотожність"

-#: ../js/ui/components/networkAgent.js:267
+#: ../js/ui/components/networkAgent.js:263
 msgid "Private key password: "
 msgstr "Пароль закритого ключа:"

-#: ../js/ui/components/networkAgent.js:279
+#: ../js/ui/components/networkAgent.js:275
 msgid "Service: "
 msgstr "Служба:"

-#: ../js/ui/components/networkAgent.js:308
+#: ../js/ui/components/networkAgent.js:304
 msgid "Authentication required by wireless network"
 msgstr "Потрібна аутентифікація для радіомережі"

-#: ../js/ui/components/networkAgent.js:309
+#: ../js/ui/components/networkAgent.js:305
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "'%s'."
 msgstr "Потрібно паролі або зашифровані ключі для доступу до радіомережі «%s»."

-#: ../js/ui/components/networkAgent.js:313
+#: ../js/ui/components/networkAgent.js:309
 msgid "Wired 802.1X authentication"
 msgstr "Дротова аутентифікація 802.1X"

-#: ../js/ui/components/networkAgent.js:315
+#: ../js/ui/components/networkAgent.js:311
 msgid "Network name: "
 msgstr "Назва мережні: "

-#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:316
 msgid "DSL authentication"
 msgstr "Аутентифікація DSL"

-#: ../js/ui/components/networkAgent.js:327
+#: ../js/ui/components/networkAgent.js:323
 msgid "PIN code required"
 msgstr "Потрібен код PIN"

-#: ../js/ui/components/networkAgent.js:328
+#: ../js/ui/components/networkAgent.js:324
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Потрібен код PIN для мобільних широкосмугових пристроїв"

-#: ../js/ui/components/networkAgent.js:329
+#: ../js/ui/components/networkAgent.js:325
 msgid "PIN: "
 msgstr "PIN: "

-#: ../js/ui/components/networkAgent.js:335
+#: ../js/ui/components/networkAgent.js:331
 msgid "Mobile broadband network password"
 msgstr "пароль до мобільної широкосмугової радіомережі"

-#: ../js/ui/components/networkAgent.js:336
+#: ../js/ui/components/networkAgent.js:332
 #, javascript-format
 msgid "A password is required to connect to '%s'."
 msgstr "Пароль потрібен для з'єднання з «%s»."
@@ -892,7 +882,7 @@ msgstr "Переглянути обліковий запис"
 msgid "Unknown reason"
 msgstr "Невідома причина"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:100
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:96
 msgid "Windows"
 msgstr "Вікна"

@@ -1002,9 +992,11 @@ msgid "The system will automatically restart and install updates in %d second."
 msgid_plural ""
 "The system will automatically restart and install updates in %d seconds."
 msgstr[0] ""
-"Система автоматично перезапуститься та встановить оновлення через %d секунду."
+"Система автоматично перезапуститься та встановить оновлення через %d "
+"секунду."
 msgstr[1] ""
-"Система автоматично перезапуститься та встановить оновлення через %d секунди."
+"Система автоматично перезапуститься та встановить оновлення через %d "
+"секунди."
 msgstr[2] ""
 "Система автоматично перезапуститься та встановить оновлення через %d секунд."

@@ -1068,12 +1060,9 @@ msgstr "Показати помилки"
 msgid "Enabled"
 msgstr "Увімкнено"

-#. Translators: this is for a network device that cannot be activated
-#. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:765 ../js/ui/status/network.js:473
-#: ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/lookingGlass.js:765 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Вимкнено"

@@ -1105,31 +1094,27 @@ msgstr "Відкрити"
 msgid "Remove"
 msgstr "Вилучити"

-#: ../js/ui/messageTray.js:1530
-msgid "Notifications"
-msgstr "Сповіщення"
-
-#: ../js/ui/messageTray.js:1537
+#: ../js/ui/messageTray.js:1513
 msgid "Clear Messages"
 msgstr "Очистити повідомлення"

-#: ../js/ui/messageTray.js:1564
+#: ../js/ui/messageTray.js:1540
 msgid "Notification Settings"
 msgstr "Параметри сповіщення"

-#: ../js/ui/messageTray.js:1617
+#: ../js/ui/messageTray.js:1559
 msgid "Tray Menu"
 msgstr "Меню лотка"

-#: ../js/ui/messageTray.js:1833
+#: ../js/ui/messageTray.js:1775
 msgid "No Messages"
 msgstr "Немає повідомлень"

-#: ../js/ui/messageTray.js:1871
+#: ../js/ui/messageTray.js:1812
 msgid "Message Tray"
 msgstr "Лоток повідомлень"

-#: ../js/ui/messageTray.js:2846
+#: ../js/ui/messageTray.js:2786
 msgid "System Information"
 msgstr "Інформація про систему"

@@ -1162,21 +1147,25 @@ msgstr "Огляд"
 msgid "Type to search…"
 msgstr "Введіть для пошуку…"

-#: ../js/ui/panel.js:518
+#: ../js/ui/panel.js:516
 msgid "Quit"
 msgstr "Вийти"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview". */
-#: ../js/ui/panel.js:570
+#: ../js/ui/panel.js:568
 msgid "Activities"
 msgstr "Діяльність"

-#: ../js/ui/panel.js:904
+#: ../js/ui/panel.js:805
+msgid "Settings Menu"
+msgstr "Меню параметрів"
+
+#: ../js/ui/panel.js:901
 msgid "Top Bar"
 msgstr "Верхня панель"

-#: ../js/ui/popupMenu.js:233
+#: ../js/ui/popupMenu.js:226
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

@@ -1206,23 +1195,23 @@ msgstr[2] "%d нових сповіщень"
 msgid "Lock"
 msgstr "Заблокувати"

-#: ../js/ui/screenShield.js:704
+#: ../js/ui/screenShield.js:703
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME потребує заблокувати екран"

-#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
+#: ../js/ui/screenShield.js:830 ../js/ui/screenShield.js:1296
 msgid "Unable to lock"
 msgstr "Неможливо заблокувати"

-#: ../js/ui/screenShield.js:832 ../js/ui/screenShield.js:1298
+#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
 msgid "Lock was blocked by an application"
 msgstr "Блокування заборонено програмою"

-#: ../js/ui/searchDisplay.js:448
+#: ../js/ui/searchDisplay.js:447
 msgid "Searching…"
 msgstr "Пошуки…"

-#: ../js/ui/searchDisplay.js:492
+#: ../js/ui/searchDisplay.js:491
 msgid "No results."
 msgstr "Безрезультатно."

@@ -1294,14 +1283,14 @@ msgstr "Висока контрастність"
 msgid "Large Text"
 msgstr "Більший текст"

-#: ../js/ui/status/bluetooth.js:28 ../js/ui/status/bluetooth.js:63
-#: ../js/ui/status/bluetooth.js:100 ../js/ui/status/bluetooth.js:128
-#: ../js/ui/status/bluetooth.js:164 ../js/ui/status/bluetooth.js:195
+#: ../js/ui/status/bluetooth.js:28 ../js/ui/status/bluetooth.js:62
+#: ../js/ui/status/bluetooth.js:99 ../js/ui/status/bluetooth.js:127
+#: ../js/ui/status/bluetooth.js:163 ../js/ui/status/bluetooth.js:194
 msgid "Bluetooth"
 msgstr "Bluetooth"

-#: ../js/ui/status/bluetooth.js:30 ../js/ui/status/network.js:133
-#: ../js/ui/status/network.js:1085 ../js/ui/status/rfkill.js:46
+#: ../js/ui/status/bluetooth.js:30 ../js/ui/status/network.js:112
+#: ../js/ui/status/network.js:1034 ../js/ui/status/rfkill.js:46
 msgid "Turn Off"
 msgstr "Вимкнути"

@@ -1309,7 +1298,7 @@ msgstr "Вимкнути"
 msgid "Bluetooth Settings"
 msgstr "Параметри Bluetooth"

-#: ../js/ui/status/bluetooth.js:58
+#: ../js/ui/status/bluetooth.js:57
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
@@ -1317,73 +1306,73 @@ msgstr[0] "Під'єднано %d пристрій"
 msgstr[1] "Під'єднано %d пристрої"
 msgstr[2] "Під'єднано %d пристроїв"

-#: ../js/ui/status/bluetooth.js:101 ../js/ui/status/bluetooth.js:129
+#: ../js/ui/status/bluetooth.js:100 ../js/ui/status/bluetooth.js:128
 #, javascript-format
 msgid "Authorization request from %s"
 msgstr "Запит про авторизацію від %s"

-#: ../js/ui/status/bluetooth.js:107 ../js/ui/status/bluetooth.js:172
-#: ../js/ui/status/bluetooth.js:203
+#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/bluetooth.js:171
+#: ../js/ui/status/bluetooth.js:202
 #, javascript-format
 msgid "Device %s wants to pair with this computer"
 msgstr "Пристрій %s потребує прив'язання до цього комп'ютера"

-#: ../js/ui/status/bluetooth.js:109
+#: ../js/ui/status/bluetooth.js:108
 msgid "Allow"
 msgstr "Дозволити"

-#: ../js/ui/status/bluetooth.js:110
+#: ../js/ui/status/bluetooth.js:109
 msgid "Deny"
 msgstr "Заборонити"

-#: ../js/ui/status/bluetooth.js:135
+#: ../js/ui/status/bluetooth.js:134
 #, javascript-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "Пристрій %s потребує доступ до служби «%s»"

-#: ../js/ui/status/bluetooth.js:137
+#: ../js/ui/status/bluetooth.js:136
 msgid "Always grant access"
 msgstr "Завжди надавати доступ"

-#: ../js/ui/status/bluetooth.js:138
+#: ../js/ui/status/bluetooth.js:137
 msgid "Grant this time only"
 msgstr "Надати лише цього разу"

-#: ../js/ui/status/bluetooth.js:139
+#: ../js/ui/status/bluetooth.js:138
 msgid "Reject"
 msgstr "Відмовити"

 #. Translators: argument is the device short name */
-#: ../js/ui/status/bluetooth.js:166
+#: ../js/ui/status/bluetooth.js:165
 #, javascript-format
 msgid "Pairing confirmation for %s"
 msgstr "Сполучення підтвердження для %s"

-#: ../js/ui/status/bluetooth.js:173
+#: ../js/ui/status/bluetooth.js:172
 #, javascript-format
 msgid ""
 "Please confirm whether the Passkey '%06d' matches the one on the device."
 msgstr "Підвердьте, чи ключ «%06d» збігається з ключем на пристрої."

 #. Translators: this is the verb, not the noun */
-#: ../js/ui/status/bluetooth.js:176
+#: ../js/ui/status/bluetooth.js:175
 msgid "Matches"
 msgstr "Збігається"

-#: ../js/ui/status/bluetooth.js:177
+#: ../js/ui/status/bluetooth.js:176
 msgid "Does not match"
 msgstr "Не збігається"

-#: ../js/ui/status/bluetooth.js:196
+#: ../js/ui/status/bluetooth.js:195
 #, javascript-format
 msgid "Pairing request for %s"
 msgstr "Запит на сполучення для %s"

-#: ../js/ui/status/bluetooth.js:204
+#: ../js/ui/status/bluetooth.js:203
 msgid "Please enter the PIN mentioned on the device."
 msgstr "Будь ласка, введіть PIN, згаданий на пристрої."

-#: ../js/ui/status/bluetooth.js:221
+#: ../js/ui/status/bluetooth.js:220
 msgid "OK"
 msgstr "Гаразд"

@@ -1395,95 +1384,83 @@ msgstr "Яскравість"
 msgid "<unknown>"
 msgstr "<невідомо>"

-#: ../js/ui/status/network.js:223 ../js/ui/status/network.js:380
-#: ../js/ui/status/network.js:1106
+#: ../js/ui/status/network.js:203 ../js/ui/status/network.js:1049
 msgid "Off"
 msgstr "Вимкнено"

+#: ../js/ui/status/network.js:276 ../js/ui/status/network.js:955
+#: ../js/ui/status/rfkill.js:49
+msgid "Network Settings"
+msgstr "Налаштування мережі"
+
 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu) */
-#: ../js/ui/status/network.js:386
+#: ../js/ui/status/network.js:364
 msgid "unmanaged"
 msgstr "некерований"

-#: ../js/ui/status/network.js:388
+#: ../js/ui/status/network.js:366
 msgid "disconnecting..."
 msgstr "від'єднання…"

-#: ../js/ui/status/network.js:394 ../js/ui/status/network.js:1160
+#: ../js/ui/status/network.js:372 ../js/ui/status/network.js:1100
 msgid "connecting..."
 msgstr "з'єднання…"

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:397 ../js/ui/status/network.js:1163
+#: ../js/ui/status/network.js:375 ../js/ui/status/network.js:1103
 msgid "authentication required"
 msgstr "Потрібна аутентифікація"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing */
-#: ../js/ui/status/network.js:405
+#: ../js/ui/status/network.js:383
 msgid "firmware missing"
 msgstr "Бракує мікропрограми"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage */
-#: ../js/ui/status/network.js:409
+#: ../js/ui/status/network.js:387
 msgid "unavailable"
 msgstr "недоступний"

-#: ../js/ui/status/network.js:411 ../js/ui/status/network.js:1165
+#: ../js/ui/status/network.js:389 ../js/ui/status/network.js:1105
 msgid "connection failed"
 msgstr "не вдалось з'єднатись"

-#: ../js/ui/status/network.js:427 ../js/ui/status/network.js:513
-msgid "Mobile Broadband Settings"
-msgstr "параметри мобільної радіомережі"
-
-#: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1104
-msgid "Hardware Disabled"
-msgstr "Пристрій вимкнено"
-
-#: ../js/ui/status/network.js:696
+#: ../js/ui/status/network.js:654
 msgid "Wi-Fi Networks"
 msgstr "Мережі Wi-Fi"

-#: ../js/ui/status/network.js:698
+#: ../js/ui/status/network.js:656
 msgid "Select a network"
 msgstr "Вибрати мережу"

-#: ../js/ui/status/network.js:722
+#: ../js/ui/status/network.js:680
 msgid "No Networks"
 msgstr "Немає мереж"

-#: ../js/ui/status/network.js:991
+#: ../js/ui/status/network.js:949
 msgid "Select Network"
 msgstr "Виберіть мережу"

-#: ../js/ui/status/network.js:997
-msgid "Wi-Fi Settings"
-msgstr "Параметри Wi-Fi"
-
-#: ../js/ui/status/network.js:1085
+#: ../js/ui/status/network.js:1034
 msgid "Turn On"
 msgstr "Увімкнути"

-#: ../js/ui/status/network.js:1108
-msgid "Not Connected"
-msgstr "Роз'єднано"
-
-#: ../js/ui/status/network.js:1228
+#: ../js/ui/status/network.js:1167
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1368
+#: ../js/ui/status/network.js:1306
 msgid "Network Manager"
 msgstr "Керування мережею"

-#: ../js/ui/status/network.js:1407
+#: ../js/ui/status/network.js:1345
 msgid "Connection failed"
 msgstr "Не вдалось з'єднатись"

-#: ../js/ui/status/network.js:1408
+#: ../js/ui/status/network.js:1346
 msgid "Activation of network connection failed"
 msgstr "Не вдалось увімкнути мережеве з'єднання"

@@ -1521,10 +1498,6 @@ msgstr "У літаку"
 msgid "On"
 msgstr "Увімкнено"

-#: ../js/ui/status/rfkill.js:49
-msgid "Network Settings"
-msgstr "Налаштування мережі"
-
 #: ../js/ui/status/system.js:305
 msgid "Switch User"
 msgstr "Змінити користувача"
@@ -1565,11 +1538,11 @@ msgstr "Увійти як інший користувач"
 msgid "Unlock Window"
 msgstr "Розблокувати вікно"

-#: ../js/ui/viewSelector.js:104
+#: ../js/ui/viewSelector.js:100
 msgid "Applications"
 msgstr "Програми"

-#: ../js/ui/viewSelector.js:108
+#: ../js/ui/viewSelector.js:104
 msgid "Search"
 msgstr "Пошук"

@@ -1676,26 +1649,6 @@ msgstr "Пароль не може бути порожнім"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Вікно авторизації відхилено користувачем"

-#~ msgid "There was an error loading the preferences dialog for %s:"
-#~ msgstr "Помилка завантаження вікна параметрів для %s:"
-
-#~ msgid "Extension"
-#~ msgstr "Розширення"
-
-#~ msgctxt "event list time"
-#~ msgid "%H\\u2236%M"
-#~ msgstr "%H\\u2236%M"
-
-#~ msgctxt "event list time"
-#~ msgid "%l\\u2236%M\\u2009%p"
-#~ msgstr "%l\\u2236%M\\u2009%p"
-
-#~ msgid "Show Keyboard Layout"
-#~ msgstr "Показати розкладку клавіатури"
-
-#~ msgid "Settings Menu"
-#~ msgstr "Меню параметрів"
-
 #~ msgid "Screenshots"
 #~ msgstr "Знімки"

@@ -1789,6 +1742,12 @@ msgstr "Вікно авторизації відхилено користува
 #~ "на даті, та буде використовувати це розширення. Слід змінити це, коли "
 #~ "записуєте в різні формати контейнера. "

+#~ msgid "There was an error loading the preferences dialog for %s:"
+#~ msgstr "Помилка завантаження вікна параметрів для %s:"
+
+#~ msgid "Extension"
+#~ msgstr "Розширення"
+
 #~ msgid "Session…"
 #~ msgstr "Сеанс…"

@@ -1798,6 +1757,14 @@ msgstr "Вікно авторизації відхилено користува
 #~ msgid "Restart"
 #~ msgstr "Перезапустити"

+#~ msgctxt "event list time"
+#~ msgid "%H\\u2236%M"
+#~ msgstr "%H\\u2236%M"
+
+#~ msgctxt "event list time"
+#~ msgid "%l\\u2236%M\\u2009%p"
+#~ msgstr "%l\\u2236%M\\u2009%p"
+
 #~ msgid "Screencast from %d %t"
 #~ msgstr "Трансляція з екрана від %d %t"

@@ -1833,6 +1800,9 @@ msgstr "Вікно авторизації відхилено користува
 #~ msgid "Set Up a New Device…"
 #~ msgstr "Налаштувати новий пристрій…"

+#~ msgid "hardware disabled"
+#~ msgstr "пристрій вимкнено"
+
 #~ msgid "Connection"
 #~ msgstr "З'єднання"

@@ -1848,6 +1818,9 @@ msgstr "Вікно авторизації відхилено користува
 #~ msgid "Sound Settings"
 #~ msgstr "Параметри звуку"

+#~ msgid "Show Keyboard Layout"
+#~ msgstr "Показати розкладку клавіатури"
+
 #~ msgid "Region & Language Settings"
 #~ msgstr "Параметри регіону та мови"

@@ -1869,6 +1842,9 @@ msgstr "Вікно авторизації відхилено користува
 #~ msgid "Auto Ethernet"
 #~ msgstr "Автоматично Ethernet"

+#~ msgid "Mobile broadband"
+#~ msgstr "Мобільна радіомережа"
+
 #~ msgid "Auto broadband"
 #~ msgstr "Автоматично радіомережа"

@@ -1970,6 +1946,9 @@ msgstr "Вікно авторизації відхилено користува
 #~ msgid "Idle"
 #~ msgstr "Бездіяльний"

+#~ msgid "Notifications"
+#~ msgstr "Сповіщення"
+
 #~ msgid "Your chat status will be set to busy"
 #~ msgstr "Ваш стан балачки буде змінено на «зайнятий»"

--- 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/Show More
+++ b/Show More