app-system: Add back StartupWMClass matching

While unfortunate that we still have to scan all apps with get_all(), support for this feature will be short-lived, so hopefully we can drop it in the future as new apps adapt to the desktop file / app ID recommendations. For now, simply scan all desktop IDs.
app-system: Put back support for the installed-changed signal
2013-10-02 18:22:28 -04:00 · 2013-10-02 18:22:27 -04:00 · 2013-10-02 18:22:27 -04:00 · 2013-10-02 18:22:27 -04:00 · 2013-10-02 18:22:27 -04:00 · 2013-10-02 18:22:27 -04:00
117 changed files with 23982 additions and 24962 deletions
--- a/.gitignore
+++ b/.gitignore
@ -19,6 +19,8 @@ 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
@ -71,13 +73,14 @@ 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-tool
 src/gnome-shell-extension-prefs
+src/gnome-shell-extension-tool
 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/78
+++ b/78
@ -1,3 +1,81 @@
+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.9.91],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.10.0.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -60,7 +60,7 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.35.4
-MUTTER_MIN_VERSION=3.9.91
+MUTTER_MIN_VERSION=3.10.0
 GTK_MIN_VERSION=3.7.9
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
@ -70,7 +70,6 @@ POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
 GCR_MIN_VERSION=3.7.5
 GNOME_DESKTOP_REQUIRED_VERSION=3.7.90
-GNOME_MENUS_REQUIRED_VERSION=3.5.3
 NETWORKMANAGER_MIN_VERSION=0.9.8
 PULSE_MIN_VERS=2.0

@ -80,7 +79,6 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
            gtk+-3.0 >= $GTK_MIN_VERSION
            atk-bridge-2.0
            gjs-internals-1.0 >= $GJS_MIN_VERSION
-            libgnome-menu-3.0 >= $GNOME_MENUS_REQUIRED_VERSION
            $recorder_modules
            gdk-x11-3.0 libsoup-2.4
            xtst
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -3,6 +3,10 @@ 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
@ -41,8 +45,10 @@ 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	\
@ -83,6 +89,7 @@ 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)					\
@ -92,6 +99,7 @@ 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
@ -0,0 +1,15 @@
+[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
@ -216,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
@ -642,7 +642,7 @@ StScrollBar StButton#vhandle:active {
 }

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

 .aggregate-menu .popup-menu-icon {
@ -918,7 +918,6 @@ StScrollBar StButton#vhandle:active {
 }

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

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

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

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

-.page-indicator:hover .page-indicator-icon,
-.page-indicator:checked .page-indicator-icon {
+.page-indicator:hover .page-indicator-icon {
+    background-image: url(page-indicator-hover.svg);
+}
+
+.page-indicator:active .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;
@ -1022,7 +1029,7 @@ StScrollBar StButton#vhandle:active {
 }

 .app-folder-popup-bin {
-    padding: 15px;
+    padding: 5px;
 }

 .app-well-app.running > .overview-icon {
@ -1069,12 +1076,14 @@ StScrollBar StButton#vhandle:active {
 .app-well-app:checked > .overview-icon,
 .app-well-app:active > .overview-icon,
 .show-apps:checked > .overview-icon,
-.show-apps:active > .overview-icon {
+.show-apps:active > .overview-icon,
+.search-provider-icon:active,
+.list-search-result:active {
    background-gradient-start: rgba(255, 255, 255, .05);
    background-gradient-end: rgba(255, 255, 255, .15);
    background-gradient-direction: vertical;
    border-radius: 4px;
-    box-shadow: inset 0px 1px 2px 0px rgba(0, 0, 0, 1);
+    box-shadow: inset 0px 1px 2px 0px rgba(0, 0, 0, 0.7);
    transition-duration: 100ms;
 }

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

 .chat-notification-scrollview{
-	max-height: 22em;
+    max-height: 22em;
 }

 .subscription-message {
--- 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-active.svg">
+   sodipodi:docname="page-indicator-pushed.svg">
  <defs
     id="defs4705" />
  <sodipodi:namedview
@ -24,18 +24,22 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="2.1522887"
-     inkscape:cy="16.782904"
+     inkscape:zoom="31.392433"
+     inkscape:cx="1.0245308"
+     inkscape:cy="13.3715"
     inkscape:current-layer="layer1"
     showgrid="true"
     inkscape:grid-bbox="true"
     inkscape:document-units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
+     inkscape:window-width="2560"
+     inkscape:window-height="1374"
     inkscape:window-x="0"
     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid6140" />
+  </sodipodi:namedview>
  <metadata
     id="metadata4708">
    <rdf:RDF>
@ -44,7 +48,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>
@ -54,14 +58,14 @@
     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"
+       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"
       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"
+       style="fill:#fdffff;fill-opacity:1;stroke:none"
       sodipodi:type="arc" />
  </g>
 </svg>
--- a/data/theme/page-indicator-checked.svg
+++ b/data/theme/page-indicator-checked.svg
@ -0,0 +1,67 @@
+<?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
@ -0,0 +1,67 @@
+<?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="13.381365"
+     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="1920"
-     inkscape:window-height="1021"
+     inkscape:window-width="2560"
+     inkscape:window-height="1374"
     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:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276;stroke-miterlimit:4;stroke-opacity:0.39215686;stroke-dasharray:none"
+       style="fill:none;fill-opacity:0;stroke:#ffffff;stroke-width:2.93356276000000005;stroke-miterlimit:4;stroke-opacity:0.39215686000000000;stroke-dasharray:none"
       id="path5274"
       sodipodi:cx="2088.9954"
       sodipodi:cy="638.83099"
--- a/docs/reference/shell/Makefile.am
+++ b/docs/reference/shell/Makefile.am
@ -112,7 +112,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS)
-GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(BLUETOOTH_LIBS) $(top_builddir)/src/libgnome-shell.la
+GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(BLUETOOTH_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la

 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
--- a/js/Makefile.am
+++ b/js/Makefile.am
@ -55,6 +55,7 @@ nobase_dist_js_DATA = 	\
 	ui/extensionSystem.js	\
 	ui/extensionDownloader.js \
 	ui/environment.js	\
+	ui/focusCaretTracker.js\
 	ui/ibusCandidatePopup.js\
 	ui/grabHelper.js	\
 	ui/iconGrid.js		\
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@ -244,6 +244,7 @@ const AuthPrompt = new Lang.Class({
    },

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

        this.updateSensitivity(true);
--- 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), AuthPrompt.MessageType.HINT);
+        this._authPrompt.setMessage(_("(e.g., user or %s)").format(hint), GdmUtil.MessageType.HINT);
    },

    _askForUsernameAndBeginVerification: function() {
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@ -72,8 +72,10 @@ function versionCompare(required, reference) {
    reference = reference.split('.');

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

    return true;
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@ -20,7 +20,7 @@ const ObjectManagerIface = <interface name="org.freedesktop.DBus.ObjectManager">
    <arg name="objectPath" type="o"/>
    <arg name="interfaces" type="as" />
  </signal>
-</interface>
+</interface>;

 const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface);

--- a/js/misc/util.js
+++ b/js/misc/util.js
@ -2,6 +2,7 @@

 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
+const Lang = imports.lang;
 const St = imports.gi.St;

 const Main = imports.ui.main;
@ -189,28 +190,57 @@ function insertSorted(array, val, cmp) {
    return pos;
 }

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

-    // 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);
+    _init: function(boxpointer) {
+        this.parent({ style_class: 'notification-close'});

-    // XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
-    // to respect the alignments.
-    closeButton.set_x_expand(true);
-    closeButton.set_y_expand(true);
+        // 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);

-    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');
-    });
+        // XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
+        // to respect the alignments.
+        this.set_x_expand(true);
+        this.set_y_expand(true);

-    return closeButton;
+        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);
 }

 function ensureActorVisibleInScrollView(scrollView, actor) {
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -355,10 +355,13 @@ const WindowSwitcherPopup = new Lang.Class({
    Name: 'WindowSwitcherPopup',
    Extends: SwitcherPopup.SwitcherPopup,

+    _init: function(items) {
+        this.parent(items);
+        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.window-switcher' });
+    },
+
    _getWindowList: function() {
-        let settings = new Gio.Settings({ schema: 'org.gnome.shell.window-switcher' });
-        let workspace = settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace()
-                                                                       : null;
+        let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
        return global.display.get_tab_list(Meta.TabList.NORMAL, global.screen, workspace);
    },

@ -368,7 +371,8 @@ const WindowSwitcherPopup = new Lang.Class({
        if (windows.length == 0)
            return false;

-        this._switcherList = new WindowList(windows);
+        let mode = this._settings.get_enum('app-icon-mode');
+        this._switcherList = new WindowList(windows, mode);
        this._items = this._switcherList.icons;

        return true;
@ -663,7 +667,7 @@ const ThumbnailList = new Lang.Class({
 const WindowIcon = new Lang.Class({
    Name: 'WindowIcon',

-    _init: function(window) {
+    _init: function(window, mode) {
        this.window = window;

        this.actor = new St.BoxLayout({ style_class: 'alt-tab-app',
@ -681,8 +685,7 @@ const WindowIcon = new Lang.Class({

        this._icon.destroy_all_children();

-        let settings = new Gio.Settings({ schema: 'org.gnome.shell.window-switcher' });
-        switch (settings.get_enum('app-icon-mode')) {
+        switch (mode) {
            case AppIconMode.THUMBNAIL_ONLY:
                size = WINDOW_PREVIEW_SIZE;
                this._icon.add_actor(_createWindowClone(mutterWindow, WINDOW_PREVIEW_SIZE));
@ -720,7 +723,7 @@ const WindowList = new Lang.Class({
    Name: 'WindowList',
    Extends: SwitcherPopup.SwitcherList,

-    _init : function(windows) {
+    _init : function(windows, mode) {
        this.parent(true);

        this._label = new St.Label({ x_align: Clutter.ActorAlign.CENTER,
@ -732,7 +735,7 @@ const WindowList = new Lang.Class({

        for (let i = 0; i < windows.length; i++) {
            let win = windows[i];
-            let icon = new WindowIcon(win);
+            let icon = new WindowIcon(win, mode);

            this.addItem(icon.actor, icon.label);
            this.icons.push(icon);
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -39,12 +39,9 @@ const FOLDER_SUBICON_FRACTION = .4;

 const MIN_FREQUENT_APPS_COUNT = 3;

-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;
-
+const INDICATORS_BASE_TIME = 0.25;
+const INDICATORS_ANIMATION_DELAY = 0.125;
+const INDICATORS_ANIMATION_MAX_TIME = 0.75;
 // Fraction of page height the finger or mouse must reach
 // to change page
 const PAGE_SWITCH_TRESHOLD = 0.2;
@ -58,13 +55,13 @@ function _loadCategory(dir, view) {
    while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
        if (nextType == GMenu.TreeItemType.ENTRY) {
            let entry = iter.get_entry();
-            let app = appSystem.lookup_app_by_tree_entry(entry);
-            if (!entry.get_app_info().get_nodisplay())
+            let appInfo = entry.get_app_info();
+            let app = appSystem.lookup_app(entry.get_desktop_file_id());
+            if (appInfo.should_show())
                view.addApp(app);
        } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
            let itemDir = iter.get_directory();
-            if (!itemDir.get_is_nodisplay())
-                _loadCategory(itemDir, view);
+            _loadCategory(itemDir, view);
        }
    }
 };
@ -125,7 +122,7 @@ const BaseAppView = new Lang.Class({
    },

    loadGrid: function() {
-        this._allItems.sort(this._compareItems);
+        this._allItems.sort(Lang.bind(this, this._compareItems));

        for (let i = 0; i < this._allItems.length; i++) {
            let id = this._getItemId(this._allItems[i]);
@ -167,20 +164,6 @@ const BaseAppView = new Lang.Class({
 Signals.addSignalMethods(BaseAppView.prototype);


-// Ignore child size requests to use the available size from the parent
-const PagesBin = new Lang.Class({
-    Name: 'PagesBin',
-    Extends: St.Bin,
-
-    vfunc_get_preferred_height: function (forWidth) {
-        return [0, 0];
-    },
-
-    vfunc_get_preferred_width: function(forHeight) {
-        return [0, 0];
-    }
-});
-
 const PageIndicators = new Lang.Class({
    Name:'PageIndicators',

@ -189,7 +172,8 @@ const PageIndicators = new Lang.Class({
                                        vertical: true,
                                        x_expand: true, y_expand: true,
                                        x_align: Clutter.ActorAlign.END,
-                                        y_align: Clutter.ActorAlign.CENTER });
+                                        y_align: Clutter.ActorAlign.CENTER,
+                                        reactive: true });
        this._nPages = 0;
        this._currentPage = undefined;

@ -224,6 +208,7 @@ const PageIndicators = new Lang.Class({
                children[i].destroy();
        }
        this._nPages = nPages;
+        this.actor.visible = (this._nPages > 1);
    },

    setCurrentPage: function(currentPage) {
@ -242,24 +227,23 @@ const PageIndicators = new Lang.Class({
        if (children.length == 0)
            return;

-        let timePerChild = INDICATORS_ANIMATION_TIME / this._nPages;
-        let delay = INDICATORS_ANIMATION_DELAY_PERCENTAGE / 100 * timePerChild;
-
-        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;
+        if (this.actor.get_text_direction() == Clutter.TextDirection.RTL)
+            offset = -children[0].width;
        else
-            offset = monitor.x + monitor.width - stageX;
+            offset = children[0].width;
+
+        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;

        for (let i = 0; i < this._nPages; i++) {
            children[i].translation_x = offset;
            Tweener.addTween(children[i],
                             { translation_x: 0,
-                               time: timePerChild,
-                               delay: delay * i,
-                               transition: 'easeOutQuad'
+                               time: INDICATORS_BASE_TIME + delay * i,
+                               transition: 'easeInOutQuad'
                             });
        }
    }
@ -272,30 +256,35 @@ const AllView = new Lang.Class({

    _init: function() {
        this.parent({ usePagination: true }, null);
-        this._pagesBin = new PagesBin({ style_class: 'all-apps',
-                                          x_expand: true,
-                                          y_expand: true,
-                                          x_fill: true,
-                                          y_fill: false,
-                                          reactive: true,
-                                          y_align: St.Align.START });
+        this._scrollView = new St.ScrollView({ style_class: 'all-apps',
+                                               x_expand: true,
+                                               y_expand: true,
+                                               x_fill: true,
+                                               y_fill: false,
+                                               reactive: true,
+                                               y_align: St.Align.START });
        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                     x_expand:true, y_expand:true });
-        this.actor.add_actor(this._pagesBin);
+        this.actor.add_actor(this._scrollView);
+
+        this._scrollView.set_policy(Gtk.PolicyType.NEVER,
+                                    Gtk.PolicyType.AUTOMATIC);
+        // we are only using ScrollView for the fade effect, hide scrollbars
+        this._scrollView.vscroll.hide();
+        this._adjustment = this._scrollView.vscroll.adjustment;

        this._pageIndicators = new PageIndicators();
        this._pageIndicators.connect('page-activated', Lang.bind(this,
            function(indicators, pageIndex) {
                this.goToPage(pageIndex);
            }));
+        this._pageIndicators.actor.connect('scroll-event', Lang.bind(this, this._onScroll));
        this.actor.add_actor(this._pageIndicators.actor);

        this._folderIcons = [];

        this._stack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
        let box = new St.BoxLayout({ vertical: true });
-        this._verticalAdjustment = new St.Adjustment();
-        box.set_adjustments(new St.Adjustment() /* unused */, this._verticalAdjustment);

        this._currentPage = 0;
        this._stack.add_actor(this._grid.actor);
@ -303,16 +292,16 @@ const AllView = new Lang.Class({
        this._stack.add_actor(this._eventBlocker);

        box.add_actor(this._stack);
-        this._pagesBin.add_actor(box);
+        this._scrollView.add_actor(box);

-        this._pagesBin.connect('scroll-event', Lang.bind(this, this._onScroll));
+        this._scrollView.connect('scroll-event', Lang.bind(this, this._onScroll));

        let panAction = new Clutter.PanAction({ interpolate: false });
        panAction.connect('pan', Lang.bind(this, this._onPan));
        panAction.connect('gesture-cancel', Lang.bind(this, this._onPanEnd));
        panAction.connect('gesture-end', Lang.bind(this, this._onPanEnd));
        this._panAction = panAction;
-        this._pagesBin.add_action(panAction);
+        this._scrollView.add_action(panAction);
        this._panning = false;
        this._clickAction = new Clutter.ClickAction();
        this._clickAction.connect('clicked', Lang.bind(this, function() {
@ -337,12 +326,26 @@ const AllView = new Lang.Class({
            }));
        this._grid.connect('space-opened', Lang.bind(this,
            function() {
+                this._scrollView.get_effect('fade').enabled = false;
                this.emit('space-ready');
            }));
        this._grid.connect('space-closed', Lang.bind(this,
            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() {
@ -350,6 +353,8 @@ 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)
@ -365,7 +370,7 @@ const AllView = new Lang.Class({
        // use the same speed regardless of original position
        // if velocity is specified, it's in pixels per milliseconds
        let diffToPage = this._diffToPage(pageNumber);
-        let childBox = this._pagesBin.get_allocation_box();
+        let childBox = this._scrollView.get_allocation_box();
        let totalHeight = childBox.y2 - childBox.y1;
        let time;
        // Only take the velocity into account on page changes, otherwise
@ -383,7 +388,7 @@ const AllView = new Lang.Class({

        if (pageNumber < this._grid.nPages() && pageNumber >= 0) {
            this._currentPage = pageNumber;
-            Tweener.addTween(this._verticalAdjustment,
+            Tweener.addTween(this._adjustment,
                             { value: this._grid.getPageY(this._currentPage),
                               time: time,
                               transition: 'easeOutQuad' });
@ -392,7 +397,7 @@ const AllView = new Lang.Class({
    },

    _diffToPage: function (pageNumber) {
-        let currentScrollPosition = this._verticalAdjustment.value;
+        let currentScrollPosition = this._adjustment.value;
        return Math.abs(currentScrollPosition - this._grid.getPageY(pageNumber));
    },

@ -404,22 +409,21 @@ const AllView = new Lang.Class({

    _closeSpaceForPopup: function() {
        this._updateIconOpacities(false);
+        this._scrollView.get_effect('fade').enabled = true;
        this._grid.closeExtraSpace();
    },

    _onScroll: function(actor, event) {
-         if(this._displayingPopup)
-            return;
+        if (this._displayingPopup)
+            return true;
+
        let direction = event.get_scroll_direction();
-        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);
-            }
-        }
+        if (direction == Clutter.ScrollDirection.UP)
+            this.goToPage(this._currentPage - 1);
+        else if (direction == Clutter.ScrollDirection.DOWN)
+            this.goToPage(this._currentPage + 1);
+
+        return true;
    },

    _onPan: function(action) {
@ -428,8 +432,8 @@ const AllView = new Lang.Class({
        this._panning = true;
        this._clickAction.release();
        let [dist, dx, dy] = action.get_motion_delta(0);
-        let adjustment = this._verticalAdjustment;
-        adjustment.value -= (dy / this._pagesBin.height) * adjustment.page_size;
+        let adjustment = this._adjustment;
+        adjustment.value -= (dy / this._scrollView.height) * adjustment.page_size;
        return false;
    },

@ -437,10 +441,10 @@ const AllView = new Lang.Class({
         if (this._displayingPopup)
            return;
        let diffCurrentPage = this._diffToPage(this._currentPage);
-        if (diffCurrentPage > this._pagesBin.height * PAGE_SWITCH_TRESHOLD) {
-            if (action.get_velocity(0)[2] > 0 && this._currentPage > 0)
+        if (diffCurrentPage > this._scrollView.height * PAGE_SWITCH_TRESHOLD) {
+            if (action.get_velocity(0)[2] > 0)
                this.goToPage(this._currentPage - 1);
-            else if (this._currentPage < this._grid.nPages() - 1)
+            else
                this.goToPage(this._currentPage + 1);
        } else {
            this.goToPage(this._currentPage);
@ -448,6 +452,21 @@ 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();
@ -511,11 +530,6 @@ const AllView = new Lang.Class({
        this.goToPage(itemPage);
    },

-    _updateAdjustment: function(availHeight) {
-        this._verticalAdjustment.page_size = availHeight;
-        this._verticalAdjustment.upper = this._stack.height;
-    },
-
    _updateIconOpacities: function(folderOpen) {
        for (let id in this._items) {
            let params, opacity;
@ -538,18 +552,21 @@ const AllView = new Lang.Class({
        box.y1 = 0;
        box.y2 = height;
        box = this.actor.get_theme_node().get_content_box(box);
-        box = this._pagesBin.get_theme_node().get_content_box(box);
+        box = this._scrollView.get_theme_node().get_content_box(box);
        box = this._grid.actor.get_theme_node().get_content_box(box);
        let availWidth = box.x2 - box.x1;
        let availHeight = box.y2 - box.y1;
        let oldNPages = this._grid.nPages();

-        this._updateAdjustment(availHeight);
-
        this._grid.adaptToSize(availWidth, availHeight);

+        let fadeOffset = Math.min(this._grid.topPadding,
+                                  this._grid.bottomPadding);
+        this._scrollView.update_fade_effect(fadeOffset, 0);
+        this._scrollView.get_effect('fade').fade_edges = true;
+
        if (this._availWidth != availWidth || this._availHeight != availHeight || oldNPages != this._grid.nPages()) {
-            this._verticalAdjustment.value = 0;
+            this._adjustment.value = 0;
            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
                function() {
                    this._pageIndicators.setNPages(this._grid.nPages());
@ -674,8 +691,7 @@ const AppDisplay = new Lang.Class({
    Name: 'AppDisplay',

    _init: function() {
-        this._appSystem = Shell.AppSystem.get_default();
-        this._appSystem.connect('installed-changed', Lang.bind(this, function() {
+        Shell.AppSystem.get_default().connect('installed-changed', Lang.bind(this, function() {
            Main.queueDeferredWork(this._allAppsWorkId);
        }));
        Main.overview.connect('showing', Lang.bind(this, function() {
@ -791,7 +807,8 @@ const AppDisplay = new Lang.Class({

        view.removeAll();

-        let tree = this._appSystem.get_tree();
+        let tree = new GMenu.Tree({ menu_basename: "applications.menu" });
+        tree.load_sync();
        let root = tree.get_root_directory();

        let iter = root.iter();
@ -800,8 +817,6 @@ const AppDisplay = new Lang.Class({
        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
            if (nextType == GMenu.TreeItemType.DIRECTORY) {
                let dir = iter.get_directory();
-                if (dir.get_is_nodisplay())
-                    continue;

                if (folderCategories.indexOf(dir.get_menu_id()) != -1)
                    view.addFolder(dir);
@ -849,8 +864,8 @@ const AppSearchProvider = new Lang.Class({
    getResultMetas: function(apps, callback) {
        let metas = [];
        for (let i = 0; i < apps.length; i++) {
-            let app = apps[i];
-            metas.push({ 'id': app,
+            let app = this._appSys.lookup_app(apps[i]);
+            metas.push({ 'id': app.get_id(),
                         'name': app.get_name(),
                         'createIcon': function(size) {
                             return app.create_icon_texture(size);
@ -860,15 +875,23 @@ const AppSearchProvider = new Lang.Class({
        callback(metas);
    },

+    _compareResults: function(a, b) {
+        let usage = Shell.AppUsage.get_default();
+        return usage.compare('', a, b);
+    },
+
    getInitialResultSet: function(terms) {
-        this.searchSystem.setResults(this, this._appSys.initial_search(terms));
+        let query = terms.join(' ');
+        let results = Gio.DesktopAppInfo.search(query, Lang.bind(this, this._compareResults), MAX_COLUMNS);
+        this.searchSystem.setResults(this, results);
    },

    getSubsearchResultSet: function(previousResults, terms) {
-        this.searchSystem.setResults(this, this._appSys.subsearch(previousResults, terms));
+        this.getInitialResultSet(terms);
    },

-    activateResult: function(app) {
+    activateResult: function(result) {
+        let app = this._appSys.lookup_app(result);
        let event = Clutter.get_current_event();
        let modifiers = event ? event.get_state() : 0;
        let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK;
@ -888,7 +911,7 @@ const AppSearchProvider = new Lang.Class({
    },

    createResultObject: function (resultMeta, terms) {
-        let app = resultMeta['id'];
+        let app = this._appSys.lookup_app(resultMeta['id']);
        return new AppIcon(app);
    }
 });
@ -962,11 +985,19 @@ const FolderView = new Lang.Class({

        this._grid.adaptToSize(width, height);

+        // To avoid the fade effect being applied to the unscrolled grid,
+        // the offset would need to be applied after adjusting the padding;
+        // however the final padding is expected to be too small for the
+        // effect to look good, so use the unadjusted padding
+        let fadeOffset = Math.min(this._grid.topPadding,
+                                  this._grid.bottomPadding);
+        this.actor.update_fade_effect(fadeOffset, 0);
+
        // Set extra padding to avoid popup or close button being cut off
        this._grid.topPadding = Math.max(this._grid.topPadding - this._offsetForEachSide, 0);
-        this._grid.bottomPadding = Math.max(this._grid.topPadding - this._offsetForEachSide, 0);
-        this._grid.leftPadding = Math.max(this._grid.topPadding - this._offsetForEachSide, 0);
-        this._grid.rightPadding = Math.max(this._grid.topPadding - this._offsetForEachSide, 0);
+        this._grid.bottomPadding = Math.max(this._grid.bottomPadding - this._offsetForEachSide, 0);
+        this._grid.leftPadding = Math.max(this._grid.leftPadding - this._offsetForEachSide, 0);
+        this._grid.rightPadding = Math.max(this._grid.rightPadding - this._offsetForEachSide, 0);

        this.actor.set_width(this.usedWidth());
        this.actor.set_height(this.usedHeight());
@ -1074,9 +1105,9 @@ const FolderIcon = new Lang.Class({
        // StWidget delays style calculation until needed, make sure we use the correct values
        this.view._grid.actor.ensure_style();

-        let offsetForEachSide = (this._popup.getOffset(St.Side.TOP) +
-                                 this._popup.getOffset(St.Side.BOTTOM) -
-                                 this._popup.getCloseButtonOverlap()) / 2;
+        let offsetForEachSide = Math.ceil((this._popup.getOffset(St.Side.TOP) +
+                                           this._popup.getOffset(St.Side.BOTTOM) -
+                                           this._popup.getCloseButtonOverlap()) / 2);
        // Add extra padding to prevent boxpointer decorations and close button being cut off
        this.view.setPaddingOffsets(offsetForEachSide);
        this.view.adaptToSize(this._parentAvailableWidth, this._parentAvailableHeight);
@ -1155,7 +1186,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.closeButton = Util.makeCloseButton(this._boxPointer);
        this.closeButton.connect('clicked', Lang.bind(this, this.popdown));
        this.actor.add_actor(this.closeButton);

--- 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._settings.connect('changed', Lang.bind(this, function() {
-                                   this.emit('changed');
-                               }));
+        this._settingsChangedSignalId = this._settings.connect('changed', Lang.bind(this, function() {
+                                            this.emit('changed');
+                                        }));

        this._load();
    },
@ -362,6 +362,10 @@ 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,8 +3,9 @@
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
-const St = imports.gi.St;
 const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const St = imports.gi.St;

 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@ -61,6 +62,10 @@ 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',
@ -612,6 +617,8 @@ const BoxPointer = new Lang.Class({
                this._container.queue_relayout();
                return false;
            }));
+
+            this.emit('arrow-side-changed');
        }
    },

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

    getPadding: function(side) {
@ -654,3 +663,4 @@ 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
@ -80,23 +80,26 @@ const KeyringDialog = new Lang.Class({
    },

    _buildControlTable: function() {
-        let table = new St.Table({ style_class: 'keyring-dialog-control-table' });
+        let layout = new Clutter.TableLayout();
+        let table = new St.Widget({ style_class: 'keyring-dialog-control-table',
+                                    layout_manager: layout });
+        layout.hookup_style(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:"));
-            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 });
+            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 });
            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));
-            table.add(this._passwordEntry, { row: row, col: 1, x_expand: true, x_fill: true, x_align: St.Align.START });
+            layout.pack(this._passwordEntry, 1, row);
            row++;
        } else {
            this._passwordEntry = null;
@ -105,17 +108,16 @@ 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:"));
-            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 });
+            layout.pack(label, 0, row);
+            layout.child_set(label, { x_expand: false, y_fill: false,
+                                      x_align: Clutter.TableAlignment.START });
            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));
-            table.add(this._confirmEntry, { row: row, col: 1, x_expand: true, x_fill: true, x_align: St.Align.START });
+            layout.pack(this._confirmEntry, 1, row);
            row++;
        } else {
            this._confirmEntry = null;
@ -128,14 +130,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);
-            table.add(choice.actor, { row: row, col: 1, x_expand: false, x_fill: true, x_align: St.Align.START });
+            layout.pack(choice.actor, 1, row);
            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;
-        table.add(warning, { row: row, col: 1, x_expand: false, x_fill: false, x_align: St.Align.START });
+        layout.pack(warning, 1, row);
        this.prompt.bind_property('warning-visible', warning, 'visible', GObject.BindingFlags.SYNC_CREATE);
        this.prompt.bind_property('warning', warning, 'text', GObject.BindingFlags.SYNC_CREATE);

@ -221,27 +223,50 @@ 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', function(prompter) {
-            let dialog = new KeyringDialog();
-            return dialog.prompt;
-        });
+        this._prompter.connect('new-prompt', Lang.bind(this,
+            function() {
+                let dialog = this._enabled ? new KeyringDialog()
+                                           : new KeyringDummyDialog();
+                return dialog.prompt;
+            }));
        this._dbusId = null;
+        this._registered = false;
+        this._enabled = false;
    },

    enable: function() {
-        this._prompter.register(Gio.DBus.session);
-        this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
-                                                 Gio.BusNameOwnerFlags.ALLOW_REPLACEMENT, null, null);
+        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;
    },

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

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

-        let secretTable = new St.Table({ style_class: 'network-dialog-secret-table' });
+        let layout = new Clutter.TableLayout();
+        let secretTable = new St.Widget({ style_class: 'network-dialog-secret-table',
+                                          layout_manager: layout });
+        layout.hookup_style(secretTable);
+
        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;

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

-            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 });
+            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);
            pos++;

            if (secret.password)
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -5,6 +5,7 @@ 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;
@ -27,9 +28,9 @@ const DragMotionResult = {
 };

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

 const DragDropResult = {
@ -85,11 +86,6 @@ 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();
@ -105,12 +101,6 @@ 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;
    },

@ -196,11 +186,6 @@ 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;
@ -244,7 +229,7 @@ const _Draggable = new Lang.Class({
        if (this._onEventId)
            this._ungrabActor();
        this._grabEvents();
-        global.set_cursor(Shell.Cursor.DND_IN_DRAG);
+        global.screen.set_cursor(Meta.Cursor.DND_IN_DRAG);

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

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

                    this._dragInProgress = false;
-                    global.unset_cursor();
+                    global.screen.set_cursor(Meta.Cursor.DEFAULT);
                    this.emit('drag-end', event.get_time(), true);
                    this._dragComplete();
                    return true;
@ -517,17 +502,12 @@ const _Draggable = new Lang.Class({
    },

    _cancelDrag: function(eventTime) {
-        if (this._updateHoverId) {
-            GLib.source_remove(this._updateHoverId);
-            this._updateHoverId = 0;
-        }
-
        this.emit('drag-cancelled', eventTime);
        this._dragInProgress = false;
        let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();

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

        this._animationInProgress = false;
@ -589,32 +569,16 @@ 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);
+            this._updateHoverId = 0;
        }

        this._dragActor = undefined;
--- a/js/ui/focusCaretTracker.js
+++ b/js/ui/focusCaretTracker.js
@ -0,0 +1,65 @@
+/** -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright 2012 Inclusive Design Research Centre, OCAD University.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Joseph Scheuhammer <clown@alum.mit.edu>
+ * Contributor:
+ *   Magdalen Berns <m.berns@sms.ed.ac.uk>
+ */
+
+const Atspi = imports.gi.Atspi;
+const Lang = imports.lang;
+const Signals = imports.signals;
+
+const CARETMOVED        = 'object:text-caret-moved';
+const STATECHANGED      = 'object:state-changed';
+
+const FocusCaretTracker = new Lang.Class({
+    Name: 'FocusCaretTracker',
+
+    _init: function() {
+        Atspi.init();
+        Atspi.set_timeout(250, 250);
+        this._atspiListener = Atspi.EventListener.new(Lang.bind(this, this._onChanged));
+    },
+
+    _onChanged: function(event) {
+        if (event.type.indexOf(STATECHANGED) == 0)
+            this.emit('focus-changed', event);
+        else if (event.type == CARETMOVED)
+            this.emit('caret-moved', event);
+    },
+
+    registerFocusListener: function() {
+        return this._atspiListener.register(STATECHANGED + ':focused') &&
+               this._atspiListener.register(STATECHANGED + ':selected');
+    },
+
+    registerCaretListener: function() {
+        return this._atspiListener.register(CARETMOVED);
+    },
+
+    deregisterFocusListener: function() {
+        return this._atspiListener.deregister(STATECHANGED + ':focused') &&
+               this._atspiListener.deregister(STATECHANGED + ':selected');
+    },
+
+    deregisterCaretListener: function() {
+        return this._atspiListener.deregister(CARETMOVED);
+    }
+});
+Signals.addSignalMethods(FocusCaretTracker.prototype);
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@ -533,6 +533,9 @@ const PaginatedIconGrid = new Lang.Class({
    _init: function(params) {
        this.parent(params);
        this._nPages = 0;
+        this._rowsPerPage = 0;
+        this._spaceBetweenPages = 0;
+        this._childrenPerPage = 0;
    },

    _getPreferredHeight: function (grid, forWidth, alloc) {
@ -697,7 +700,7 @@ const PaginatedIconGrid = new Lang.Class({
    },

    _translateChildren: function(children, direction, nRows) {
-        let translationY = nRows * (this._vItemSize + this._getSpacing());
+        let translationY = nRows * (this._getVItemSize() + this._getSpacing());
        if (translationY == 0)
            return;

--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@ -362,7 +362,7 @@ const LayoutManager = new Lang.Class({
                              BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
                          }));

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

        return bgManager.background;
    },
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -920,7 +920,7 @@ const LookingGlass = new Lang.Class({
            let text = o.get_text();
            // Ensure we don't get newlines in the command; the history file is
            // newline-separated.
-            text.replace('\n', ' ');
+            text = text.replace('\n', ' ');
            // Strip leading and trailing whitespace
            text = text.replace(/^\s+/g, '').replace(/\s+$/g, '');
            if (text == '')
@ -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.width - myWidth) / 2;
-        this._hiddenY = Main.layoutManager.panelBox.height - myHeight - 4; // -4 to hide the top corners
+        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._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(primary.x + this.actor.x + Math.floor(myWidth * 0.1),
-                                              primary.y + this._targetY + Math.floor(myHeight * 0.1));
+        this._objInspector.actor.set_position(this.actor.x + Math.floor(myWidth * 0.1),
+                                              this._targetY + Math.floor(myHeight * 0.1));
    },

    insertObject: function(obj) {
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@ -1,5 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

+const Atspi = imports.gi.Atspi;
 const Clutter = imports.gi.Clutter;
 const GDesktopEnums = imports.gi.GDesktopEnums;
 const Gio = imports.gi.Gio;
@ -10,6 +11,7 @@ const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;

+const FocusCaretTracker = imports.ui.focusCaretTracker;
 const Main = imports.ui.main;
 const MagnifierDBus = imports.ui.magnifierDBus;
 const Params = imports.misc.params;
@ -37,6 +39,8 @@ const CONTRAST_BLUE_KEY         = 'contrast-blue';
 const LENS_MODE_KEY             = 'lens-mode';
 const CLAMP_MODE_KEY            = 'scroll-at-edges';
 const MOUSE_TRACKING_KEY        = 'mouse-tracking';
+const FOCUS_TRACKING_KEY        = 'focus-tracking';
+const CARET_TRACKING_KEY        = 'caret-tracking';
 const SHOW_CROSS_HAIRS_KEY      = 'show-cross-hairs';
 const CROSS_HAIRS_THICKNESS_KEY = 'cross-hairs-thickness';
 const CROSS_HAIRS_COLOR_KEY     = 'cross-hairs-color';
@ -53,6 +57,20 @@ 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();
@ -68,15 +86,11 @@ const Magnifier = new Lang.Class({

        let aZoomRegion = new ZoomRegion(this, this._cursorRoot);
        this._zoomRegions.push(aZoomRegion);
-        let showAtLaunch = this._settingsInit(aZoomRegion);
+        this._settingsInitRegion(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);
    },

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

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

    /**
@ -101,6 +115,12 @@ 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);
        });
@ -113,7 +133,7 @@ const Magnifier = new Lang.Class({
        // Make sure system mouse pointer is shown when all zoom regions are
        // invisible.
        if (!activate)
-            global.stage.show_cursor();
+            this._cursorTracker.set_pointer_visible(true);

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

-    _settingsInit: function(zoomRegion) {
+    _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() {
        this._appSettings = new Gio.Settings({ schema: APPLICATIONS_SCHEMA });
        this._settings = new Gio.Settings({ schema: MAGNIFIER_SCHEMA });

-        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);
+        this._appSettings.connect('changed::' + SHOW_KEY, Lang.bind(this, function() {
+            let active = this._appSettings.get_boolean(SHOW_KEY);
+            this.setActive(active);
+        }));

-            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_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);
-        }
+        return this._appSettings.get_boolean(SHOW_KEY);
+    },

+    _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,
@ -488,6 +520,10 @@ const Magnifier = new Lang.Class({
                               Lang.bind(this, this._updateClampMode));
        this._settings.connect('changed::' + MOUSE_TRACKING_KEY,
                               Lang.bind(this, this._updateMouseTrackingMode));
+        this._settings.connect('changed::' + FOCUS_TRACKING_KEY,
+                               Lang.bind(this, this._updateFocusTrackingMode));
+        this._settings.connect('changed::' + CARET_TRACKING_KEY,
+                               Lang.bind(this, this._updateCaretTrackingMode));

        this._settings.connect('changed::' + INVERT_LIGHTNESS_KEY,
                               Lang.bind(this, this._updateInvertLightness));
@ -537,8 +573,6 @@ 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() {
@ -585,6 +619,24 @@ const Magnifier = new Lang.Class({
        }
    },

+    _updateFocusTrackingMode: function() {
+        // Applies only to the first zoom region.
+        if (this._zoomRegions.length) {
+            this._zoomRegions[0].setFocusTrackingMode(
+                this._settings.get_enum(FOCUS_TRACKING_KEY)
+            );
+        }
+    },
+
+    _updateCaretTrackingMode: function() {
+        // Applies only to the first zoom region.
+        if (this._zoomRegions.length) {
+            this._zoomRegions[0].setCaretTrackingMode(
+                this._settings.get_enum(CARET_TRACKING_KEY)
+            );
+        }
+    },
+
    _updateInvertLightness: function() {
        // Applies only to the first zoom region.
        if (this._zoomRegions.length) {
@ -623,7 +675,7 @@ const Magnifier = new Lang.Class({
            contrast.b = this._settings.get_double(CONTRAST_BLUE_KEY);
            this._zoomRegions[0].setContrast(contrast);
        }
-    },
+    }
 });
 Signals.addSignalMethods(Magnifier.prototype);

@ -632,8 +684,11 @@ const ZoomRegion = new Lang.Class({

    _init: function(magnifier, mouseSourceActor) {
        this._magnifier = magnifier;
+        this._focusCaretTracker = new FocusCaretTracker.FocusCaretTracker();

        this._mouseTrackingMode = GDesktopEnums.MagnifierMouseTrackingMode.NONE;
+        this._focusTrackingMode = GDesktopEnums.MagnifierFocusTrackingMode.NONE;
+        this._caretTrackingMode = GDesktopEnums.MagnifierCaretTrackingMode.NONE;
        this._clampScrollingAtEdges = false;
        this._lensMode = false;
        this._screenPosition = GDesktopEnums.MagnifierScreenPosition.FULL_SCREEN;
@ -659,9 +714,35 @@ const ZoomRegion = new Lang.Class({
        this._xMagFactor = 1;
        this._yMagFactor = 1;
        this._followingCursor = false;
+        this._xFocus = 0;
+        this._yFocus = 0;
+        this._xCaret = 0;
+        this._yCaret = 0;

        Main.layoutManager.connect('monitors-changed',
                                   Lang.bind(this, this._monitorsChanged));
+        this._focusCaretTracker.connect('caret-moved',
+                                    Lang.bind(this, this._updateCaret));
+        this._focusCaretTracker.connect('focus-changed',
+                                    Lang.bind(this, this._updateFocus));
+    },
+
+    _updateFocus: function(caller, event) {
+        let component = event.source.get_component_iface();
+        if (!component || event.detail1 != 1)
+            return;
+        let extents = component.get_extents(Atspi.CoordType.SCREEN);
+        [this._xFocus, this._yFocus] = [extents.x, extents.y]
+        this._centerFromFocusPosition();
+    },
+
+    _updateCaret: function(caller, event) {
+        let text = event.source.get_text_iface();
+        if (!text)
+            return;
+        let extents = text.get_character_extents(text.get_caret_offset(), 0);
+        [this._xCaret, this._yCaret] = [extents.x, extents.y];
+        this._centerFromCaretPosition();
    },

    /**
@ -669,14 +750,17 @@ const ZoomRegion = new Lang.Class({
     * @activate:   Boolean to show/hide the ZoomRegion.
     */
    setActive: function(activate) {
-        if (activate && !this.isActive()) {
+        if (activate == this.isActive())
+            return;
+
+        if (activate) {
            this._createActors();
            if (this._isMouseOverRegion())
                this._magnifier.hideSystemCursor();
            this._updateMagViewGeometry();
            this._updateCloneGeometry();
            this._updateMousePosition();
-        } else if (!activate && this.isActive()) {
+        } else {
            this._destroyActors();
        }
    },
@ -732,6 +816,30 @@ const ZoomRegion = new Lang.Class({
        return this._mouseTrackingMode;
    },

+    /**
+     * setFocusTrackingMode
+     * @mode:     One of the enum FocusTrackingMode values.
+     */
+    setFocusTrackingMode: function(mode) {
+        this._focusTrackingMode = mode;
+        if (this._focusTrackingMode == GDesktopEnums.MagnifierFocusTrackingMode.NONE)
+            this._focusCaretTracker.deregisterFocusListener();
+        else
+            this._focusCaretTracker.registerFocusListener();
+    },
+
+    /**
+     * setCaretTrackingMode
+     * @mode:     One of the enum CaretTrackingMode values.
+     */
+    setCaretTrackingMode: function(mode) {
+        this._caretTrackingMode = mode;
+        if (this._caretTrackingMode == GDesktopEnums.MagnifierCaretTrackingMode.NONE)
+            this._focusCaretTracker.deregisterCaretListener();
+        else
+            this._focusCaretTracker.registerCaretListener();
+    },
+
    /**
     * setViewPort
     * Sets the position and size of the ZoomRegion on screen.
@ -1023,20 +1131,6 @@ const ZoomRegion = new Lang.Class({
            this._magShaderEffects.setBrightness(this._brightness);
    },

-    /**
-     * getBrightness:
-     * Retrive the current brightness of the Zoom Region.
-     * @return  Object containing the brightness change for the red, green,
-     *          and blue channels.
-     */
-    getBrightness: function() {
-        let brightness = {};
-        brightness.r = this._brightness.r;
-        brightness.g = this._brightness.g;
-        brightness.b = this._brightness.b;
-        return brightness;
-    },
-
    /**
     * setContrast:
     * Alter the contrast of the magnified view.
@ -1243,19 +1337,47 @@ const ZoomRegion = new Lang.Class({
        let yMouse = this._magnifier.yMouse;

        if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PROPORTIONAL) {
-            return this._centerFromMouseProportional(xMouse, yMouse);
+            return this._centerFromPointProportional(xMouse, yMouse);
        }
        else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PUSH) {
-            return this._centerFromMousePush(xMouse, yMouse);
+            return this._centerFromPointPush(xMouse, yMouse);
        }
        else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.CENTERED) {
-            return this._centerFromMouseCentered(xMouse, yMouse);
+            return this._centerFromPointCentered(xMouse, yMouse);
        }

        return null; // Should never be hit
    },

-    _centerFromMousePush: function(xMouse, yMouse) {
+    _centerFromCaretPosition: function() {
+        let xCaret = this._xCaret;
+        let yCaret = this._yCaret;
+
+        if (this._caretTrackingMode == GDesktopEnums.MagnifierCaretTrackingMode.PROPORTIONAL)
+            [xCaret, yCaret] = this._centerFromPointProportional(xCaret, yCaret);
+        else if (this._caretTrackingMode == GDesktopEnums.MagnifierCaretTrackingMode.PUSH)
+            [xCaret, yCaret] = this._centerFromPointPush(xCaret, yCaret);
+        else if (this._caretTrackingMode == GDesktopEnums.MagnifierCaretTrackingMode.CENTERED)
+            [xCaret, yCaret] = this._centerFromPointCentered(xCaret, yCaret);
+
+        this.scrollContentsTo(xCaret, yCaret);
+    },
+
+    _centerFromFocusPosition: function() {
+        let xFocus = this._xFocus;
+        let yFocus = this._yFocus;
+
+        if (this._focusTrackingMode == GDesktopEnums.MagnifierFocusTrackingMode.PROPORTIONAL)
+            [xFocus, yFocus] = this._centerFromPointProportional(xFocus, yFocus);
+        else if (this._focusTrackingMode == GDesktopEnums.MagnifierFocusTrackingMode.PUSH)
+            [xFocus, yFocus] = this._centerFromPointPush(xFocus, yFocus);
+        else if (this._focusTrackingMode == GDesktopEnums.MagnifierFocusTrackingMode.CENTERED)
+            [xFocus, yFocus] = this._centerFromPointCentered(xFocus, yFocus);
+
+        this.scrollContentsTo(xFocus, yFocus);
+    },
+
+    _centerFromPointPush: function(xPoint, yPoint) {
        let [xRoi, yRoi, widthRoi, heightRoi] = this.getROI();
        let [cursorWidth, cursorHeight] = this._mouseSourceActor.get_size();
        let xPos = xRoi + widthRoi / 2;
@ -1263,20 +1385,20 @@ const ZoomRegion = new Lang.Class({
        let xRoiRight = xRoi + widthRoi - cursorWidth;
        let yRoiBottom = yRoi + heightRoi - cursorHeight;

-        if (xMouse < xRoi)
-            xPos -= (xRoi - xMouse);
-        else if (xMouse > xRoiRight)
-            xPos += (xMouse - xRoiRight);
+        if (xPoint < xRoi)
+            xPos -= (xRoi - xPoint);
+        else if (xPoint > xRoiRight)
+            xPos += (xPoint - xRoiRight);

-        if (yMouse < yRoi)
-            yPos -= (yRoi - yMouse);
-        else if (yMouse > yRoiBottom)
-            yPos += (yMouse - yRoiBottom);
+        if (yPoint < yRoi)
+            yPos -= (yRoi - yPoint);
+        else if (yPoint > yRoiBottom)
+            yPos += (yPoint - yRoiBottom);

        return [xPos, yPos];
    },

-    _centerFromMouseProportional: function(xMouse, yMouse) {
+    _centerFromPointProportional: function(xPoint, yPoint) {
        let [xRoi, yRoi, widthRoi, heightRoi] = this.getROI();
        let halfScreenWidth = global.screen_width / 2;
        let halfScreenHeight = global.screen_height / 2;
@ -1285,16 +1407,16 @@ const ZoomRegion = new Lang.Class({
        let unscaledPadding = Math.min(this._viewPortWidth, this._viewPortHeight) / 5;
        let xPadding = unscaledPadding / this._xMagFactor;
        let yPadding = unscaledPadding / this._yMagFactor;
-        let xProportion = (xMouse - halfScreenWidth) / halfScreenWidth;   // -1 ... 1
-        let yProportion = (yMouse - halfScreenHeight) / halfScreenHeight; // -1 ... 1
-        let xPos = xMouse - xProportion * (widthRoi / 2 - xPadding);
-        let yPos = yMouse - yProportion * (heightRoi /2 - yPadding);
+        let xProportion = (xPoint - halfScreenWidth) / halfScreenWidth;   // -1 ... 1
+        let yProportion = (yPoint - halfScreenHeight) / halfScreenHeight; // -1 ... 1
+        let xPos = xPoint - xProportion * (widthRoi / 2 - xPadding);
+        let yPos = yPoint - yProportion * (heightRoi /2 - yPadding);

        return [xPos, yPos];
    },

-    _centerFromMouseCentered: function(xMouse, yMouse) {
-        return [xMouse, yMouse];
+    _centerFromPointCentered: function(xPoint, yPoint) {
+        return [xPoint, yPoint];
    },

    _screenToViewPort: function(screenX, screenY) {
@ -1511,15 +1633,6 @@ const Crosshairs = new Lang.Class({
        this._vertBottomHair.set_opacity(opacity);
    },

-    /**
-     * getOpacity:
-     * Retriev how opaque the crosshairs are.
-     * @return: A value between 0 (transparent) and 255 (opaque).
-     */
-    getOpacity: function() {
-        return this._horizLeftHair.get_opacity();
-    },
-
    /**
     * setLength:
     * Set the length of the vertical and horizontal lines in the crosshairs.
@ -1563,15 +1676,6 @@ const Crosshairs = new Lang.Class({
        }
     },

-    /**
-     * getClip:
-     * Get the dimensions of the clip rectangle.
-     * @return:   An array of the form [width, height].
-     */
-    getClip: function() {
-        return this._clipSize;
-    },
-
    /**
     * show:
     * Show the crosshairs.
@ -1667,23 +1771,10 @@ const MagShaderEffects = new Lang.Class({
        this._inverse.set_enabled(invertFlag);
    },

-    /**
-     * getInvertLightness:
-     * Report whether the inversion effect is enabled.
-     * @return:     Boolean.
-     */
-    getInvertLightness: function() {
-        return this._inverse.get_enabled();
-    },
-
    setColorSaturation: function(factor) {
        this._colorDesaturation.set_factor(1.0 - factor);
    },

-    getColorSaturation: function() {
-        return 1.0 - this._colorDesaturation.get_factor();
-    },
-
    /**
     * setBrightness:
     * Set the brightness of the magnified view.
@ -1708,24 +1799,6 @@ const MagShaderEffects = new Lang.Class({
        );
    },

-    /**
-     * getBrightness:
-     * Retrieve current brightness of the magnified view.
-     * @return: Object containing the brightness for the red, green,
-     *          and blue channels.  Values of 0.0 represent "standard" 
-     *          brightness (no change), whereas values less or greater than
-     *          0.0 indicate decreased or incresaed brightness, respectively.
-     */
-    getBrightness: function() {
-        let result = {};
-        let [bRed, bGreen, bBlue] = this._brightnessContrast.get_brightness();
-        result.r = bRed;
-        result.g = bGreen;
-        result.b = bBlue;
-
-        return result;
-    },
-
    /**
     * Set the contrast of the magnified view.
     * @contrast:   Object containing the contrast for the red, green,
@ -1750,21 +1823,4 @@ const MagShaderEffects = new Lang.Class({
             bRed != NO_CHANGE || bGreen != NO_CHANGE || bBlue != NO_CHANGE
        );
    },
-
-    /**
-     * Retrieve current contrast of the magnified view.
-     * @return: Object containing the contrast for the red, green,
-     *          and blue channels.  Values of 0.0 represent "standard"
-     *          contrast (no change), whereas values less or greater than
-     *          0.0 indicate decreased or incresaed contrast, respectively.
-     */
-    getContrast: function() {
-        let resutl = {};
-        let [cRed, cGreen, cBlue] = this._brightnessContrast.get_contrast();
-        result.r = cRed;
-        result.g = cGreen;
-        result.b = cBlue;
-
-        return result;
-    }
 });
--- a/js/ui/magnifierDBus.js
+++ b/js/ui/magnifierDBus.js
@ -4,14 +4,12 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Main = imports.ui.main;

-const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
 const MAG_SERVICE_PATH = '/org/gnome/Magnifier';
-const ZOOM_SERVICE_NAME = 'org.gnome.Magnifier.ZoomRegion';
 const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';

 // Subset of gnome-mag's Magnifier dbus interface -- to be expanded.  See:
 // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
-const MagnifierIface = <interface name={MAG_SERVICE_NAME}>
+const MagnifierIface = <interface name="org.gnome.Magnifier">
 <method name="setActive">
    <arg type="b" direction="in" />
 </method>
@ -66,7 +64,7 @@ const MagnifierIface = <interface name={MAG_SERVICE_NAME}>

 // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded.  See:
 // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
-const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}>
+const ZoomRegionIface = <interface name="org.gnome.Magnifier.ZoomRegion">
 <method name="setMagFactor">
    <arg type="d" direction="in" />
    <arg type="d" direction="in" />
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -90,8 +90,12 @@ function _sessionUpdated() {
                                  Shell.KeyBindingMode.OVERVIEW,
                                  sessionMode.hasRunDialog ? openRunDialog : null);

-    if (!sessionMode.hasRunDialog && lookingGlass)
-        lookingGlass.close();
+    if (!sessionMode.hasRunDialog) {
+        if (runDialog)
+            runDialog.close();
+        if (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.set_cursor(Shell.Cursor.POINTING_HAND);
+                global.screen.set_cursor(Meta.Cursor.POINTING_HAND);
                this._cursorChanged = true;
            } else if (urlId == -1) {
-                global.unset_cursor();
+                global.screen.set_cursor(Meta.Cursor.DEFAULT);
                this._cursorChanged = false;
            }
            return false;
@ -229,7 +229,7 @@ const URLHighlighter = new Lang.Class({

            if (this._cursorChanged) {
                this._cursorChanged = false;
-                global.unset_cursor();
+                global.screen.set_cursor(Meta.Cursor.DEFAULT);
            }
        }));
    },
@ -1805,8 +1805,9 @@ const MessageTray = new Lang.Class({
    },

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

    _onSummaryBoxPointerUngrabbed: function() {
        this._summaryBoxPointerState = State.HIDING;
+        this._setClickedSummaryItem(null);

        if (this._summaryBoxPointerContentUpdatedId) {
            this._summaryBoxPointerItem.disconnect(this._summaryBoxPointerContentUpdatedId);
--- 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 });
-        this._stack.add_actor(this._coverPane);
+        Main.layoutManager.overviewGroup.add_child(this._coverPane);
        this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return true; }));

        this._stack.add_actor(this._overview);
@ -313,6 +313,9 @@ const Overview = new Lang.Class({
    },

    _onDragEnd: function(time) {
+        if (this.animationInProgress)
+            return;
+
        this._inXdndDrag = false;

        // In case the drag was canceled while in the overview
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@ -504,6 +504,17 @@ 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',

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

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

-        this._group.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesGeometry));
+        layout.connect('allocation-changed', 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
@ -249,6 +249,7 @@ const AppMenuButton = new Lang.Class({
        this._visible = true;
        this.actor.reactive = true;
        this.actor.show();
+        Tweener.removeTweens(this.actor);
        Tweener.addTween(this.actor,
                         { opacity: 255,
                           time: Overview.ANIMATION_TIME,
@ -261,6 +262,7 @@ const AppMenuButton = new Lang.Class({

        this._visible = false;
        this.actor.reactive = false;
+        Tweener.removeTweens(this.actor);
        Tweener.addTween(this.actor,
                         { opacity: 0,
                           time: Overview.ANIMATION_TIME,
@ -609,6 +611,7 @@ const ActivitiesButton = new Lang.Class({

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

    _onKeyRelease: function(actor, event) {
@ -802,14 +805,19 @@ const AggregateMenu = new Lang.Class({
    Extends: PanelMenu.Button,

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

        this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
        this.actor.add_child(this._indicators);

        this._network = new imports.ui.status.network.NMApplet();
-        this._bluetooth = new imports.ui.status.bluetooth.Indicator();
+        if (Config.HAVE_BLUETOOTH) {
+            this._bluetooth = new imports.ui.status.bluetooth.Indicator();
+        } else {
+            this._bluetooth = null;
+        }
+
        this._power = new imports.ui.status.power.Indicator();
        this._rfkill = new imports.ui.status.rfkill.Indicator();
        this._volume = new imports.ui.status.volume.Indicator();
@ -819,7 +827,9 @@ const AggregateMenu = new Lang.Class({

        this._indicators.add_child(this._screencast.indicators);
        this._indicators.add_child(this._network.indicators);
-        this._indicators.add_child(this._bluetooth.indicators);
+        if (this._bluetooth) {
+            this._indicators.add_child(this._bluetooth.indicators);
+        }
        this._indicators.add_child(this._rfkill.indicators);
        this._indicators.add_child(this._volume.indicators);
        this._indicators.add_child(this._power.indicators);
@ -831,7 +841,9 @@ const AggregateMenu = new Lang.Class({
        this.menu.addMenuItem(this._brightness.menu);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this.menu.addMenuItem(this._network.menu);
-        this.menu.addMenuItem(this._bluetooth.menu);
+        if (this._bluetooth) {
+            this.menu.addMenuItem(this._bluetooth.menu);
+        }
        this.menu.addMenuItem(this._rfkill.menu);
        this.menu.addMenuItem(this._power.menu);
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -35,6 +35,13 @@ function _ensureStyle(actor) {
        actor.ensure_style();
 }

+function isPopupMenuItemVisible(child) {
+    if (child._delegate instanceof PopupMenuSection)
+        if (child._delegate.isEmpty())
+            return false;
+    return child.visible;
+}
+
 const PopupBaseMenuItem = new Lang.Class({
    Name: 'PopupBaseMenuItem',

@ -437,7 +444,7 @@ const PopupMenuBase = new Lang.Class({
        let hasVisibleChildren = this.box.get_children().some(function(child) {
            if (child._delegate instanceof PopupSeparatorMenuItem)
                return false;
-            return child.visible;
+            return isPopupMenuItemVisible(child);
        });

        return !hasVisibleChildren;
@ -518,7 +525,7 @@ const PopupMenuBase = new Lang.Class({

        let childBeforeIndex = index - 1;

-        while (childBeforeIndex >= 0 && !children[childBeforeIndex].visible)
+        while (childBeforeIndex >= 0 && !isPopupMenuItemVisible(children[childBeforeIndex]))
            childBeforeIndex--;

        if (childBeforeIndex < 0
@ -529,7 +536,7 @@ const PopupMenuBase = new Lang.Class({

        let childAfterIndex = index + 1;

-        while (childAfterIndex < children.length && !children[childAfterIndex].visible)
+        while (childAfterIndex < children.length && !isPopupMenuItemVisible(children[childAfterIndex]))
            childAfterIndex++;

        if (childAfterIndex >= children.length
@ -921,19 +928,10 @@ const PopupMenuSection = new Lang.Class({
        this.isOpen = true;
    },

-    _syncVisibility: function() {
-        this.actor.visible = !this.isEmpty();
-    },
-
    // deliberately ignore any attempt to open() or close(), but emit the
    // corresponding signal so children can still pick it up
-    open: function() {
-        this._syncVisibility();
-        this.emit('open-state-changed', true);
-    },
-    close: function() {
-        this.emit('open-state-changed', false);
-    },
+    open: function() { this.emit('open-state-changed', true); },
+    close: function() { this.emit('open-state-changed', false); },
 });

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

-        this.label = new St.Label({ text: text });
+        this.label = new St.Label({ text: text,
+                                    y_expand: true,
+                                    y_align: Clutter.ActorAlign.CENTER });
        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' });
+        this.status = new St.Label({ style_class: 'popup-status-menu-item',
+                                     y_expand: true,
+                                     y_align: Clutter.ActorAlign.CENTER });
        this.actor.add_child(this.status);

        this._triangle = new St.Label({ text: '\u25B8',
@ -971,6 +973,7 @@ 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));
@ -992,9 +995,11 @@ 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);
        }
    },

--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -584,6 +584,7 @@ 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) {
@ -953,7 +954,7 @@ const ScreenShield = new Lang.Class({
            this._hideLockScreenComplete();
        }

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

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

        this._checkArrowAnimation();

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

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

        this._lockScreenState = MessageTray.State.SHOWN;
        this._lockScreenGroup.fixed_position_set = false;
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@ -6,6 +6,7 @@ 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;
@ -167,7 +168,7 @@ const SelectArea = new Lang.Class({
        if (!Main.pushModal(this._group) || this._group.visible)
            return;

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

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

                                   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(icon) {
-        this.emit('key-focus-in', icon);
+    _keyFocusIn: function(actor) {
+        this.emit('key-focus-in', actor);
    },

    _setMoreIconVisible: function(visible) {
@ -259,6 +259,7 @@ 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);
@ -404,8 +405,8 @@ const SearchResults = new Lang.Class({
        return false;
    },

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

    createProviderDisplay: function(provider) {
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@ -31,6 +31,7 @@ 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));
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -41,8 +41,7 @@ const MAX_INPUT_SOURCE_ACTIVATION_TIME = 4000; // ms
 const BUS_NAME = 'org.gnome.SettingsDaemon.Keyboard';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Keyboard';

-const KeyboardManagerInterface =
-<interface name="org.gnome.SettingsDaemon.Keyboard">
+const KeyboardManagerInterface = <interface name="org.gnome.SettingsDaemon.Keyboard">
 <method name="SetInputSource">
    <arg type="u" direction="in" />
 </method>
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -244,7 +244,7 @@ const NMConnectionSection = new Lang.Class({
            this.emit('activation-failed', reason);
        }));

-        let pos = Util.insertSorted(this._connections, connection, this._connectionSortFunction);
+        let pos = Util.insertSorted(this._connections, connection, Lang.bind(this, this._connectionSortFunction));
        this._labelSection.addMenuItem(item.labelItem, pos);
        this._switchSection.addMenuItem(item.switchItem, pos);
        this._connectionItems.set(connection.get_uuid(), item);
@ -547,18 +547,24 @@ 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._signalIcon.icon_name = this._getIcon();
+        this._sync();
    },

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

-    _getIcon: function() {
+    _getSignalIcon: function() {
        if (this._ap.mode == NM80211Mode.ADHOC)
            return 'network-workgroup-symbolic';
        else
@ -1117,6 +1123,7 @@ const NMVPNConnectionItem = new Lang.Class({
            this.emit('activation-failed', reason);
        }

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

@ -1287,6 +1294,7 @@ 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));
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@ -74,12 +74,12 @@ const Indicator = new Lang.Class({

        if (state == UPower.DeviceState.DISCHARGING) {
            // Translators: this is <hours>:<minutes> Remaining (<percentage>)
-            return _("%d\u2236%02d Remaining (%d%%)".format(hours, minutes, percentage));
+            return _("%d\u2236%02d Remaining (%d%%)").format(hours, minutes, percentage);
        }

        if (state == UPower.DeviceState.CHARGING) {
            // Translators: this is <hours>:<minutes> Until Full (<percentage>)
-            return _("%d\u2236%02d Until Full (%d%%)".format(hours, minutes, percentage));
+            return _("%d\u2236%02d Until Full (%d%%)").format(hours, minutes, percentage);
        }

        // state is one of PENDING_CHARGING, PENDING_DISCHARGING
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@ -372,7 +372,11 @@ const Indicator = new Lang.Class({
        Main.overview.hide();
        if (Main.screenShield)
            Main.screenShield.lock(false);
-        Gdm.goto_login_session_sync(null);
+
+        Clutter.threads_add_repaint_func_full(Clutter.RepaintFlags.POST_PAINT, function() {
+            Gdm.goto_login_session_sync(null);
+            return false;
+        });
    },

    _onQuitSessionActivate: function() {
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -85,8 +85,12 @@ const ViewSelector = new Lang.Class({

        this._entry.set_primary_icon(new St.Icon({ style_class: 'search-entry-icon',
                                                   icon_name: 'edit-find-symbolic' }));
-        this._clearIcon = new St.Icon({ style_class: 'search-entry-icon',
-                                        icon_name: 'edit-clear-symbolic' });
+        if (this._entry.get_text_direction() == Clutter.TextDirection.RTL)
+            this._clearIcon = new St.Icon({ style_class: 'search-entry-icon',
+                                            icon_name: 'edit-clear-rtl-symbolic' });
+        else
+            this._clearIcon = new St.Icon({ style_class: 'search-entry-icon',
+                                            icon_name: 'edit-clear-symbolic' });

        this._iconClickedId = 0;
        this._capturedEventId = 0;
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -20,8 +20,6 @@ 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;
@ -1434,6 +1432,10 @@ const Workspace = new Lang.Class({

        if (this._positionWindowsId > 0)
            Meta.later_remove(this._positionWindowsId);
+
+        if (this._actualGeometryLater > 0)
+            Meta.later_remove(this._actualGeometryLater);
+
        this._windows = [];
    },

--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -62,7 +62,6 @@ 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 });
@ -168,14 +167,6 @@ 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];
@ -433,10 +424,6 @@ const WorkspacesView = new Lang.Class({
            this._workspaces[i].actor.y += dy;
        }
    },
-
-    _getWorkspaceIndexToRemove: function() {
-        return global.screen.get_active_workspace_index();
-    }
 });
 Signals.addSignalMethods(WorkspacesView.prototype);

@ -540,12 +527,6 @@ const WorkspacesDisplay = new Lang.Class({
        for (let i = 0; i < this._workspacesViews.length; i++)
            this._workspacesViews[i].destroy();
        this._workspacesViews = [];
-
-        for (let i = 0; i < this._workspaces.length; i++)
-            for (let w = 0; w < this._workspaces[i].length; w++) {
-                this._workspaces[i][w].disconnectAll();
-                this._workspaces[i][w].destroy();
-            }
    },

    _workspacesOnlyOnPrimaryChanged: function() {
@ -561,10 +542,6 @@ const WorkspacesDisplay = new Lang.Class({
        for (let i = 0; i < this._workspacesViews.length; i++)
            this._workspacesViews[i].destroy();

-        for (let i = 0; i < this._workspaces.length; i++)
-            for (let w = 0; w < this._workspaces[i].length; w++)
-                this._workspaces[i][w].destroy();
-
        this._workspacesViews = [];
        this._workspaces = [];
        let monitors = Main.layoutManager.monitors;
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@ -3,6 +3,7 @@
 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;
@ -20,7 +21,8 @@ const XdndHandler = new Lang.Class({
        Main.uiGroup.add_actor(this._dummy);
        this._dummy.hide();

-        global.init_xdnd();
+        if (!Meta.is_wayland_compositor())
+            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,6 +4,7 @@
 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
@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: gnome-shell.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-31 16:55+0000\n"
+"POT-Creation-Date: 2013-09-23 13:35+0000\n"
 "PO-Revision-Date: 2012-10-16 12:05+0300\n"
 "Last-Translator: Kasia Bondarava <kasia.bondarava@gmail.com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
@ -47,6 +47,7 @@ msgid "GNOME Shell"
 msgstr "Абалонка GNOME"

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

@ -59,6 +60,10 @@ msgstr "Настройкі пашырэння абалонкі GNOME"
 msgid "Configure GNOME Shell Extensions"
 msgstr "Настройкі пашырэнняў абалонкі GNOME"

+#: ../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 ""
@ -258,6 +263,10 @@ 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:"
@ -273,10 +282,10 @@ msgstr ""
 "Абярыце пашырэнне, каб настроіць графу з выплыўным спісам, якая знаходзіцца "
 "вышэй."

-#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:132
+#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:136
 #: ../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:221 ../js/ui/status/network.js:686
+#: ../js/ui/status/bluetooth.js:222 ../js/ui/status/network.js:686
 msgid "Cancel"
 msgstr "Скасаваць"

@ -315,8 +324,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:255
-#: ../js/ui/components/networkAgent.js:273
+#: ../js/gdm/loginDialog.js:627 ../js/ui/components/networkAgent.js:259
+#: ../js/ui/components/networkAgent.js:277
 msgid "Username: "
 msgstr "Імя карыстальніка: "

@ -337,38 +346,42 @@ msgstr "Памылка ідэнтыфікацыі"
 msgid "(or swipe finger)"
 msgstr "(або правядзіце пальцам)"

-#: ../js/misc/util.js:97
+#: ../js/misc/util.js:98
 msgid "Command not found"
 msgstr "Загад не знойдзены"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:130
+#: ../js/misc/util.js:131
 msgid "Could not parse command:"
 msgstr "Не ўдалося разабраць загад:"

-#: ../js/misc/util.js:138
+#: ../js/misc/util.js:139
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Не ўдалося выканаць \"%s\":"

-#: ../js/ui/appDisplay.js:386
+#: ../js/ui/appDisplay.js:596
+msgid "Frequently used applications will appear here"
+msgstr "Тут размешчаныя часта ўжываныя праграмы"
+
+#: ../js/ui/appDisplay.js:712
 msgid "Frequent"
 msgstr "Часта"

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

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

-#: ../js/ui/appDisplay.js:994 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:1517 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Выдаліць са спіса ўпадабанага"

-#: ../js/ui/appDisplay.js:995
+#: ../js/ui/appDisplay.js:1518
 msgid "Add to Favorites"
 msgstr "Дадаць у спіс упадабанага"

@ -382,7 +395,8 @@ msgstr "%s дададзены ў ваш спіс упадабанага."
 msgid "%s has been removed from your favorites."
 msgstr "%s выдалены з вашага спіса ўпадабанага."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/status/system.js:325
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:807
+#: ../js/ui/status/system.js:325
 msgid "Settings"
 msgstr "Настройкі"

@ -568,50 +582,50 @@ msgstr "Адкрыць у %s"
 msgid "Eject"
 msgstr "Выняць"

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

-#: ../js/ui/components/keyring.js:107
+#: ../js/ui/components/keyring.js:110
 msgid "Type again:"
 msgstr "Паўтарыце пароль:"

-#: ../js/ui/components/networkAgent.js:127 ../js/ui/status/network.js:112
+#: ../js/ui/components/networkAgent.js:131 ../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: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
+#: ../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
 msgid "Password: "
 msgstr "Пароль: "

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

-#: ../js/ui/components/networkAgent.js:261
+#: ../js/ui/components/networkAgent.js:265
 msgid "Identity: "
 msgstr "Ідэнтычнасць: "

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

-#: ../js/ui/components/networkAgent.js:275
+#: ../js/ui/components/networkAgent.js:279
 msgid "Service: "
 msgstr "Паслуга: "

-#: ../js/ui/components/networkAgent.js:304
+#: ../js/ui/components/networkAgent.js:308
 msgid "Authentication required by wireless network"
 msgstr "Для бесправадной сеткі патрэбная ідэнтыфікацыя"

-#: ../js/ui/components/networkAgent.js:305
+#: ../js/ui/components/networkAgent.js:309
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@ -620,37 +634,37 @@ msgstr ""
 "Для доступу да бесправадной сеткі \"%s\" патрэбны пароль або ключы "
 "шыфравання."

-#: ../js/ui/components/networkAgent.js:309
+#: ../js/ui/components/networkAgent.js:313
 msgid "Wired 802.1X authentication"
 msgstr "Правадная ідэнтыфікацыя 802.1X"

-#: ../js/ui/components/networkAgent.js:311
+#: ../js/ui/components/networkAgent.js:315
 msgid "Network name: "
 msgstr "Назва сеткі: "

-#: ../js/ui/components/networkAgent.js:316
+#: ../js/ui/components/networkAgent.js:320
 msgid "DSL authentication"
 msgstr "DSL-ідэнтыфікацыя"

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

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

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

-#: ../js/ui/components/networkAgent.js:331
+#: ../js/ui/components/networkAgent.js:335
 msgid "Mobile broadband network password"
 msgstr "Пароль да шырокапалоснай мабільнай сеткі"

-#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:336
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Каб злучыцца з \"%s\", патрэбны пароль."
@ -912,7 +926,7 @@ msgstr "Праглядзець конт"
 msgid "Unknown reason"
 msgstr "Невядомая прычына"

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

@ -1023,9 +1037,12 @@ msgstr "Перазапуск і ўсталяванне абнаўленняў"
 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 секунду."
-msgstr[1] "Сістэма аўтаматычна перазапусціцца і ўсталюе абнаўленні праз %d секунды."
-msgstr[2] "Сістэма аўтаматычна перазапусціцца і ўсталюе абнаўленні праз %d секунд."
+msgstr[0] ""
+"Сістэма аўтаматычна перазапусціцца і ўсталюе абнаўленні праз %d секунду."
+msgstr[1] ""
+"Сістэма аўтаматычна перазапусціцца і ўсталюе абнаўленні праз %d секунды."
+msgstr[2] ""
+"Сістэма аўтаматычна перазапусціцца і ўсталюе абнаўленні праз %d секунд."

 #: ../js/ui/endSessionDialog.js:119
 msgctxt "button"
@ -1061,7 +1078,7 @@ msgstr "Усталяваць"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Сцягнуць і ўсталяваць \"%s\" з extensions.gnome.org?"

-#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:334
+#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:333
 msgid "Keyboard"
 msgstr "Клавіятура"

@ -1137,11 +1154,11 @@ msgstr "Меню трэя"
 msgid "No Messages"
 msgstr "Апавяшчэнні адсутнічаюць"

-#: ../js/ui/messageTray.js:1812
+#: ../js/ui/messageTray.js:1813
 msgid "Message Tray"
 msgstr "Абшар апавяшчэнняў"

-#: ../js/ui/messageTray.js:2786
+#: ../js/ui/messageTray.js:2788
 msgid "System Information"
 msgstr "Сістэмная інфармацыя"

@ -1174,21 +1191,17 @@ msgstr "Агляд"
 msgid "Type to search…"
 msgstr "Увядзіце тэкст для пошуку..."

-#: ../js/ui/panel.js:516
+#: ../js/ui/panel.js:518
 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:568
+#: ../js/ui/panel.js:570
 msgid "Activities"
 msgstr "Заняткі"

-#: ../js/ui/panel.js:805
-msgid "Settings Menu"
-msgstr "Меню настроек"
-
-#: ../js/ui/panel.js:892
+#: ../js/ui/panel.js:903
 msgid "Top Bar"
 msgstr "Верхняя панэль"

@ -1197,7 +1210,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:226
+#: ../js/ui/popupMenu.js:233
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

@ -1227,7 +1240,7 @@ msgstr[2] "%d новых апавяшчэнняў"
 msgid "Lock"
 msgstr "Заблакіраваць"

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

@ -1238,19 +1251,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:830 ../js/ui/screenShield.js:1296
+#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
 msgid "Unable to lock"
 msgstr "Не ўдалося заблакіраваць"

-#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
+#: ../js/ui/screenShield.js:832 ../js/ui/screenShield.js:1298
 msgid "Lock was blocked by an application"
 msgstr "Блакіраванне стрымана праграмай"

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

-#: ../js/ui/searchDisplay.js:489
+#: ../js/ui/searchDisplay.js:491
 msgid "No results."
 msgstr "Нічога не знойдзена."

@ -1324,9 +1337,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: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
+#: ../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
 msgid "Bluetooth"
 msgstr "Bluetooth"

@ -1339,7 +1352,7 @@ msgstr "Выключыць"
 msgid "Bluetooth Settings"
 msgstr "Настройкі Bluetooth"

-#: ../js/ui/status/bluetooth.js:57
+#: ../js/ui/status/bluetooth.js:58
 #, c-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
@ -1347,73 +1360,73 @@ msgstr[0] "%d злучанае прыстасаванне"
 msgstr[1] "%d злучаныя прыстасаванні"
 msgstr[2] "%d злучаных прыстасаванняў"

-#: ../js/ui/status/bluetooth.js:100 ../js/ui/status/bluetooth.js:128
+#: ../js/ui/status/bluetooth.js:101 ../js/ui/status/bluetooth.js:129
 #, c-format
 msgid "Authorization request from %s"
 msgstr "Запыт на ўпаўнаважанне ад %s"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/bluetooth.js:171
-#: ../js/ui/status/bluetooth.js:202
+#: ../js/ui/status/bluetooth.js:107 ../js/ui/status/bluetooth.js:172
+#: ../js/ui/status/bluetooth.js:203
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "Прыстасаванне %s хоча спарыцца з гэтым камп'ютарам"

-#: ../js/ui/status/bluetooth.js:108
+#: ../js/ui/status/bluetooth.js:109
 msgid "Allow"
 msgstr "Дазволіць"

-#: ../js/ui/status/bluetooth.js:109
+#: ../js/ui/status/bluetooth.js:110
 msgid "Deny"
 msgstr "Адмовіць"

-#: ../js/ui/status/bluetooth.js:134
+#: ../js/ui/status/bluetooth.js:135
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "Прыстасаванне %s хоча даступіцца да паслугі \"%s\""

-#: ../js/ui/status/bluetooth.js:136
+#: ../js/ui/status/bluetooth.js:137
 msgid "Always grant access"
 msgstr "Заўсёды даваць дазвол"

-#: ../js/ui/status/bluetooth.js:137
+#: ../js/ui/status/bluetooth.js:138
 msgid "Grant this time only"
 msgstr "Даць дазвол аднойчы"

-#: ../js/ui/status/bluetooth.js:138
+#: ../js/ui/status/bluetooth.js:139
 msgid "Reject"
 msgstr "Адмовіць"

 #. Translators: argument is the device short name
-#: ../js/ui/status/bluetooth.js:165
+#: ../js/ui/status/bluetooth.js:166
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Пацвярджэнне спарвання з %s"

-#: ../js/ui/status/bluetooth.js:172
+#: ../js/ui/status/bluetooth.js:173
 #, 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:175
+#: ../js/ui/status/bluetooth.js:176
 msgid "Matches"
 msgstr "Супадае"

-#: ../js/ui/status/bluetooth.js:176
+#: ../js/ui/status/bluetooth.js:177
 msgid "Does not match"
 msgstr "Не супадае"

-#: ../js/ui/status/bluetooth.js:195
+#: ../js/ui/status/bluetooth.js:196
 #, c-format
 msgid "Pairing request for %s"
 msgstr "Запыт на спарванне з %s"

-#: ../js/ui/status/bluetooth.js:203
+#: ../js/ui/status/bluetooth.js:204
 msgid "Please enter the PIN mentioned on the device."
 msgstr "Увядзіце PIN, які паказвае прыстасаванне."

-#: ../js/ui/status/bluetooth.js:220
+#: ../js/ui/status/bluetooth.js:221
 msgid "OK"
 msgstr "Добра"

@ -1421,7 +1434,7 @@ msgstr "Добра"
 msgid "Brightness"
 msgstr "Яркасць"

-#: ../js/ui/status/keyboard.js:404
+#: ../js/ui/status/keyboard.js:403
 msgid "Show Keyboard Layout"
 msgstr "Паказаць раскладку"

@ -1497,15 +1510,15 @@ msgstr "Уключыць"
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1306
+#: ../js/ui/status/network.js:1307
 msgid "Network Manager"
 msgstr "Сеткавы кіраўнік"

-#: ../js/ui/status/network.js:1345
+#: ../js/ui/status/network.js:1346
 msgid "Connection failed"
 msgstr "Не ўдалося злучыцца"

-#: ../js/ui/status/network.js:1346
+#: ../js/ui/status/network.js:1347
 msgid "Activation of network connection failed"
 msgstr "Не ўдалося ўключыць сеткавае злучэнне"

@ -1591,11 +1604,11 @@ msgstr "Увайсці іншым карыстальнікам"
 msgid "Unlock Window"
 msgstr "Акно блакіравання"

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

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

@ -1701,4 +1714,3 @@ msgstr "Пароль не можа быць пустым"
 #: ../src/shell-polkit-authentication-agent.c:343
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Карыстальнік праігнараваў дыялогавае акенца ідэнтыфікацыі"
-
--- 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/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
@ -10,8 +10,8 @@ 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-08-28 17:17+0000\n"
-"PO-Revision-Date: 2013-08-30 14:39+0700\n"
+"POT-Creation-Date: 2013-09-23 13:35+0000\n"
+"PO-Revision-Date: 2013-09-23 21:24+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
@ -51,6 +51,7 @@ 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 "Manajemen jendela dan peluncuran aplikasi"

@ -63,6 +64,10 @@ msgstr "Preferensi Ekstensi GNOME Shell"
 msgid "Configure GNOME Shell Extensions"
 msgstr "Konfigurasi Ekstensi GNOME Shell"

+#: ../data/gnome-shell-wayland.desktop.in.in.h:1
+msgid "GNOME Shell (wayland compositor)"
+msgstr "GNOME Shell (kompositor wayland)"
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
@ -265,6 +270,11 @@ msgstr "Ruang kerja dikelola secara dinamis"
 msgid "Workspaces only on primary monitor"
 msgstr "Ruang kerja hanya pada monitor primer"

+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr ""
+"Tunda perubahan fokus dalam mode tetikus sampai penunjuk berhenti bergerak"
+
 #: ../js/extensionPrefs/main.js:125
 #, c-format
 msgid "There was an error loading the preferences dialog for %s:"
@ -278,10 +288,10 @@ msgstr "Ekstensi"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Pilih ekstensi yang ingin dikonfigurasi pada kotak di atas."

-#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:132
-#: ../js/ui/components/polkitAgent.js:161 ../js/ui/endSessionDialog.js:347
+#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:136
+#: ../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:221 ../js/ui/status/network.js:679
+#: ../js/ui/status/bluetooth.js:222 ../js/ui/status/network.js:686
 msgid "Cancel"
 msgstr "Batal"

@ -303,20 +313,16 @@ msgstr "Masuk"
 msgid "Choose Session"
 msgstr "Pilih Sesi"

-#: ../js/gdm/loginDialog.js:312
-msgid "Session"
-msgstr "Sesi"
-
 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:458
+#: ../js/gdm/loginDialog.js:454
 msgid "Not listed?"
 msgstr "Tak masuk daftar?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: ../js/gdm/loginDialog.js:625
+#: ../js/gdm/loginDialog.js:622
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(cth., pengguna dari %s)"
@ -324,12 +330,12 @@ msgstr "(cth., pengguna dari %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:630 ../js/ui/components/networkAgent.js:255
-#: ../js/ui/components/networkAgent.js:273
+#: ../js/gdm/loginDialog.js:627 ../js/ui/components/networkAgent.js:259
+#: ../js/ui/components/networkAgent.js:277
 msgid "Username: "
 msgstr "Nama pengguna: "

-#: ../js/gdm/loginDialog.js:894
+#: ../js/gdm/loginDialog.js:891
 msgid "Login Window"
 msgstr "Jendela Log Masuk"

@ -346,38 +352,42 @@ msgstr "Galat otentikasi"
 msgid "(or swipe finger)"
 msgstr "(atau gesekkan jari)"

-#: ../js/misc/util.js:97
+#: ../js/misc/util.js:98
 msgid "Command not found"
 msgstr "Perintah tidak ditemukan"

 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:130
+#: ../js/misc/util.js:131
 msgid "Could not parse command:"
 msgstr "Tidak dapat mengurai perintah:"

-#: ../js/misc/util.js:138
+#: ../js/misc/util.js:139
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Eksekusi '%s' gagal:"

-#: ../js/ui/appDisplay.js:386
+#: ../js/ui/appDisplay.js:596
+msgid "Frequently used applications will appear here"
+msgstr "Aplikasi yang sering dipakai akan muncul di sini"
+
+#: ../js/ui/appDisplay.js:712
 msgid "Frequent"
 msgstr "Sering"

-#: ../js/ui/appDisplay.js:393
+#: ../js/ui/appDisplay.js:719
 msgid "All"
 msgstr "Semua"

-#: ../js/ui/appDisplay.js:991
+#: ../js/ui/appDisplay.js:1514
 msgid "New Window"
 msgstr "Jendela Baru"

-#: ../js/ui/appDisplay.js:994 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:1517 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Hapus dari Favorit"

-#: ../js/ui/appDisplay.js:995
+#: ../js/ui/appDisplay.js:1518
 msgid "Add to Favorites"
 msgstr "Tambah ke Favorit"

@ -391,7 +401,8 @@ msgstr "%s telah ditambahkan ke favorit Anda."
 msgid "%s has been removed from your favorites."
 msgstr "%s telah dihapus dari favorit Anda."

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

@ -577,50 +588,50 @@ msgstr "Buka dengan %s"
 msgid "Eject"
 msgstr "Keluarkan"

-#: ../js/ui/components/keyring.js:88 ../js/ui/components/polkitAgent.js:280
+#: ../js/ui/components/keyring.js:91 ../js/ui/components/polkitAgent.js:280
 msgid "Password:"
 msgstr "Sandi:"

-#: ../js/ui/components/keyring.js:107
+#: ../js/ui/components/keyring.js:110
 msgid "Type again:"
 msgstr "Ketik lagi:"

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

 #. Cisco LEAP
-#: ../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
+#: ../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
 msgid "Password: "
 msgstr "Sandi: "

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

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

-#: ../js/ui/components/networkAgent.js:263
+#: ../js/ui/components/networkAgent.js:267
 msgid "Private key password: "
 msgstr "Sandi kunci privat: "

-#: ../js/ui/components/networkAgent.js:275
+#: ../js/ui/components/networkAgent.js:279
 msgid "Service: "
 msgstr "Layanan: "

-#: ../js/ui/components/networkAgent.js:304
+#: ../js/ui/components/networkAgent.js:308
 msgid "Authentication required by wireless network"
 msgstr "Otentikasi dibutuhkan oleh jaringan nirkabel"

-#: ../js/ui/components/networkAgent.js:305
+#: ../js/ui/components/networkAgent.js:309
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@ -629,35 +640,35 @@ msgstr ""
 "Sandi atau kunci penyandian diperlukan untuk mengakses jaringan nirkabel "
 "'%s'."

-#: ../js/ui/components/networkAgent.js:309
+#: ../js/ui/components/networkAgent.js:313
 msgid "Wired 802.1X authentication"
 msgstr "Otentikasi 802.1X kabel"

-#: ../js/ui/components/networkAgent.js:311
+#: ../js/ui/components/networkAgent.js:315
 msgid "Network name: "
 msgstr "Nama jaringan: "

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

-#: ../js/ui/components/networkAgent.js:323
+#: ../js/ui/components/networkAgent.js:327
 msgid "PIN code required"
 msgstr "Perlu kode PIN"

-#: ../js/ui/components/networkAgent.js:324
+#: ../js/ui/components/networkAgent.js:328
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Kode PIN dibutuhkan untuk perangkat data seluler"

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

-#: ../js/ui/components/networkAgent.js:331
+#: ../js/ui/components/networkAgent.js:335
 msgid "Mobile broadband network password"
 msgstr "Sandi jaringan data seluler"

-#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:336
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Sebuah kata sandi dibutuhkan untuk menyambung ke '%s'."
@ -922,7 +933,7 @@ msgstr "Tilik akun"
 msgid "Unknown reason"
 msgstr "Alasan yang tidak diketahui"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:96
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:100
 msgid "Windows"
 msgstr "Jendela"

@ -932,7 +943,7 @@ msgstr "Tampilkan Aplikasi"

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

@ -983,44 +994,44 @@ msgctxt "button"
 msgid "Log Out"
 msgstr "Keluar"

-#: ../js/ui/endSessionDialog.js:80
+#: ../js/ui/endSessionDialog.js:81
 msgctxt "title"
 msgid "Power Off"
 msgstr "Matikan"

-#: ../js/ui/endSessionDialog.js:82
+#: ../js/ui/endSessionDialog.js:83
 #, c-format
 msgid "The system will power off automatically in %d second."
 msgid_plural "The system will power off automatically in %d seconds."
 msgstr[0] "Sistem ini akan otomatis dimatikan dalam %d detik."

-#: ../js/ui/endSessionDialog.js:87 ../js/ui/endSessionDialog.js:102
+#: ../js/ui/endSessionDialog.js:88 ../js/ui/endSessionDialog.js:104
 msgctxt "button"
 msgid "Restart"
 msgstr "Nyalakan Ulang"

-#: ../js/ui/endSessionDialog.js:89
+#: ../js/ui/endSessionDialog.js:90
 msgctxt "button"
 msgid "Power Off"
 msgstr "Matikan"

-#: ../js/ui/endSessionDialog.js:95
+#: ../js/ui/endSessionDialog.js:97
 msgctxt "title"
 msgid "Restart"
 msgstr "Nyalakan Ulang"

-#: ../js/ui/endSessionDialog.js:97
+#: ../js/ui/endSessionDialog.js:99
 #, c-format
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
 msgstr[0] "Sistem ini akan otomatis dimulai ulang dalam %d detik."

-#: ../js/ui/endSessionDialog.js:109
+#: ../js/ui/endSessionDialog.js:112
 msgctxt "title"
 msgid "Restart & Install Updates"
 msgstr "Start Ulang & Pasang Pemutakhiran"

-#: ../js/ui/endSessionDialog.js:111
+#: ../js/ui/endSessionDialog.js:114
 #, c-format
 msgid "The system will automatically restart and install updates in %d second."
 msgid_plural ""
@ -1029,27 +1040,27 @@ msgstr[0] ""
 "Sistem ini akan otomatis dimulai ulang dan memasang pemutakhiran dalam %d "
 "detik."

-#: ../js/ui/endSessionDialog.js:116
+#: ../js/ui/endSessionDialog.js:119
 msgctxt "button"
 msgid "Restart & Install"
 msgstr "Start Ulang & Pasang"

-#: ../js/ui/endSessionDialog.js:267
+#: ../js/ui/endSessionDialog.js:271
 msgid "Some applications are busy or have unsaved work."
 msgstr "Beberapa aplikasi sedang sibuk atau belum disimpan perubahannya."

-#: ../js/ui/endSessionDialog.js:273
+#: ../js/ui/endSessionDialog.js:277
 msgid "Other users are logged in."
 msgstr "Pengguna lain sedang log masuk."

 #. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/endSessionDialog.js:475
+#: ../js/ui/endSessionDialog.js:479
 #, c-format
 msgid "%s (remote)"
 msgstr "%s (jarak jauh)"

 #. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/endSessionDialog.js:478
+#: ../js/ui/endSessionDialog.js:482
 #, c-format
 msgid "%s (console)"
 msgstr "%s (konsol)"
@ -1063,7 +1074,7 @@ msgstr "Pasang"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Unduh dan pasang '%s' dari extensions.gnome.org?"

-#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:334
+#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:333
 msgid "Keyboard"
 msgstr "Papan Ketik"

@ -1139,11 +1150,11 @@ msgstr "Menu Baki"
 msgid "No Messages"
 msgstr "Tiada Pesan"

-#: ../js/ui/messageTray.js:1812
+#: ../js/ui/messageTray.js:1813
 msgid "Message Tray"
 msgstr "Baki Pesan"

-#: ../js/ui/messageTray.js:2786
+#: ../js/ui/messageTray.js:2788
 msgid "System Information"
 msgstr "Informasi Sistem"

@ -1174,21 +1185,17 @@ msgstr "Gambaran"
 msgid "Type to search…"
 msgstr "Ketik untuk mencari…"

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

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

-#: ../js/ui/panel.js:805
-msgid "Settings Menu"
-msgstr "Menu Pengaturan"
-
-#: ../js/ui/panel.js:892
+#: ../js/ui/panel.js:903
 msgid "Top Bar"
 msgstr "Bar Atas"

@ -1198,7 +1205,7 @@ msgstr "Bar Atas"
 #. "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:226
+#: ../js/ui/popupMenu.js:233
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

@ -1222,11 +1229,11 @@ msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d pemberitahuan baru"

-#: ../js/ui/screenShield.js:477 ../js/ui/status/system.js:331
+#: ../js/ui/screenShield.js:477 ../js/ui/status/system.js:333
 msgid "Lock"
 msgstr "Kunci"

-#: ../js/ui/screenShield.js:703
+#: ../js/ui/screenShield.js:704
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME perlu mengunci layar"

@ -1237,19 +1244,19 @@ msgstr "GNOME perlu mengunci layar"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:830 ../js/ui/screenShield.js:1296
+#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
 msgid "Unable to lock"
 msgstr "Tak bisa mengunci"

-#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
+#: ../js/ui/screenShield.js:832 ../js/ui/screenShield.js:1298
 msgid "Lock was blocked by an application"
 msgstr "Kunci diblokir oleh suatu aplikasi"

-#: ../js/ui/searchDisplay.js:445
+#: ../js/ui/searchDisplay.js:447
 msgid "Searching…"
 msgstr "Mencari…"

-#: ../js/ui/searchDisplay.js:489
+#: ../js/ui/searchDisplay.js:491
 msgid "No results."
 msgstr "Tidak ada yang cocok."

@ -1323,14 +1330,14 @@ msgstr "Teks Besar"

 #. 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: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
+#: ../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
 msgid "Bluetooth"
 msgstr "Bluetooth"

 #: ../js/ui/status/bluetooth.js:30 ../js/ui/status/network.js:112
-#: ../js/ui/status/network.js:1027 ../js/ui/status/rfkill.js:46
+#: ../js/ui/status/network.js:1034 ../js/ui/status/rfkill.js:46
 msgid "Turn Off"
 msgstr "Matikan"

@ -1338,55 +1345,55 @@ msgstr "Matikan"
 msgid "Bluetooth Settings"
 msgstr "Pengaturan Bluetooth"

-#: ../js/ui/status/bluetooth.js:57
+#: ../js/ui/status/bluetooth.js:58
 #, c-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d Perangkat Tersambung"

-#: ../js/ui/status/bluetooth.js:100 ../js/ui/status/bluetooth.js:128
+#: ../js/ui/status/bluetooth.js:101 ../js/ui/status/bluetooth.js:129
 #, c-format
 msgid "Authorization request from %s"
 msgstr "Permintaan otorisasi dari %s"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/bluetooth.js:171
-#: ../js/ui/status/bluetooth.js:202
+#: ../js/ui/status/bluetooth.js:107 ../js/ui/status/bluetooth.js:172
+#: ../js/ui/status/bluetooth.js:203
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "Perangkat %s ingin berpasangan dengan komputer ini"

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

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

-#: ../js/ui/status/bluetooth.js:134
+#: ../js/ui/status/bluetooth.js:135
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "Perangkat %s ingin mengakses layanan '%s'"

-#: ../js/ui/status/bluetooth.js:136
+#: ../js/ui/status/bluetooth.js:137
 msgid "Always grant access"
 msgstr "Selalu berikan akses"

-#: ../js/ui/status/bluetooth.js:137
+#: ../js/ui/status/bluetooth.js:138
 msgid "Grant this time only"
 msgstr "Hanya untuk saat ini"

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

 #. Translators: argument is the device short name
-#: ../js/ui/status/bluetooth.js:165
+#: ../js/ui/status/bluetooth.js:166
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Konfirmasi berpasangan untuk %s"

-#: ../js/ui/status/bluetooth.js:172
+#: ../js/ui/status/bluetooth.js:173
 #, c-format
 msgid ""
 "Please confirm whether the Passkey '%06d' matches the one on the device."
@ -1394,24 +1401,24 @@ msgstr ""
 "Harap konfirmasi apakah Passkey '%06d' sesuai dengan salah satu perangkat."

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

-#: ../js/ui/status/bluetooth.js:176
+#: ../js/ui/status/bluetooth.js:177
 msgid "Does not match"
 msgstr "Tidak cocok"

-#: ../js/ui/status/bluetooth.js:195
+#: ../js/ui/status/bluetooth.js:196
 #, c-format
 msgid "Pairing request for %s"
 msgstr "Permintaan berpasangan untuk %s"

-#: ../js/ui/status/bluetooth.js:203
+#: ../js/ui/status/bluetooth.js:204
 msgid "Please enter the PIN mentioned on the device."
 msgstr "Ketikkan PIN yang disebutkan oleh perangkat."

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

@ -1419,7 +1426,7 @@ msgstr "Oke"
 msgid "Brightness"
 msgstr "Kecerahan"

-#: ../js/ui/status/keyboard.js:404
+#: ../js/ui/status/keyboard.js:403
 msgid "Show Keyboard Layout"
 msgstr "Tampilkan Tata Letak Papan Tik"

@ -1427,83 +1434,83 @@ msgstr "Tampilkan Tata Letak Papan Tik"
 msgid "<unknown>"
 msgstr "<tak dikenal>"

-#: ../js/ui/status/network.js:196 ../js/ui/status/network.js:1042
+#: ../js/ui/status/network.js:203 ../js/ui/status/network.js:1049
 msgid "Off"
 msgstr "Mati"

-#: ../js/ui/status/network.js:269 ../js/ui/status/network.js:948
+#: ../js/ui/status/network.js:276 ../js/ui/status/network.js:955
 #: ../js/ui/status/rfkill.js:49
 msgid "Network Settings"
 msgstr "Pengaturan Jaringan"

 #. 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:357
+#: ../js/ui/status/network.js:364
 msgid "unmanaged"
 msgstr "tak dikelola"

-#: ../js/ui/status/network.js:359
+#: ../js/ui/status/network.js:366
 msgid "disconnecting..."
 msgstr "memutus..."

-#: ../js/ui/status/network.js:365 ../js/ui/status/network.js:1093
+#: ../js/ui/status/network.js:372 ../js/ui/status/network.js:1100
 msgid "connecting..."
 msgstr "menghubungi..."

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:368 ../js/ui/status/network.js:1096
+#: ../js/ui/status/network.js:375 ../js/ui/status/network.js:1103
 msgid "authentication required"
 msgstr "diperlukan otentikasi"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:376
+#: ../js/ui/status/network.js:383
 msgid "firmware missing"
 msgstr "firmware hilang"

 #. 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:380
+#: ../js/ui/status/network.js:387
 msgid "unavailable"
 msgstr "tidak tersedia"

-#: ../js/ui/status/network.js:382 ../js/ui/status/network.js:1098
+#: ../js/ui/status/network.js:389 ../js/ui/status/network.js:1105
 msgid "connection failed"
 msgstr "koneksi gagal"

-#: ../js/ui/status/network.js:647
+#: ../js/ui/status/network.js:654
 msgid "Wi-Fi Networks"
 msgstr "Jaringan Wi-Fi"

-#: ../js/ui/status/network.js:649
+#: ../js/ui/status/network.js:656
 msgid "Select a network"
 msgstr "Pilih jaringan"

-#: ../js/ui/status/network.js:673
+#: ../js/ui/status/network.js:680
 msgid "No Networks"
 msgstr "Tiada Jaringan"

-#: ../js/ui/status/network.js:942
+#: ../js/ui/status/network.js:949
 msgid "Select Network"
 msgstr "Pilih Jaringan"

-#: ../js/ui/status/network.js:1027
+#: ../js/ui/status/network.js:1034
 msgid "Turn On"
 msgstr "Nyalakan"

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

-#: ../js/ui/status/network.js:1296
+#: ../js/ui/status/network.js:1307
 msgid "Network Manager"
 msgstr "Manajer Jaringan"

-#: ../js/ui/status/network.js:1338
+#: ../js/ui/status/network.js:1346
 msgid "Connection failed"
 msgstr "Koneksi gagal"

-#: ../js/ui/status/network.js:1339
+#: ../js/ui/status/network.js:1347
 msgid "Activation of network connection failed"
 msgstr "Aktivasi koneksi jaringan gagal"

@ -1549,23 +1556,23 @@ msgstr "Mode Pesawat Terbang"
 msgid "On"
 msgstr "Nyala"

-#: ../js/ui/status/system.js:303
+#: ../js/ui/status/system.js:305
 msgid "Switch User"
 msgstr "Ganti Pengguna"

-#: ../js/ui/status/system.js:308
+#: ../js/ui/status/system.js:310
 msgid "Log Out"
 msgstr "Keluar"

-#: ../js/ui/status/system.js:327
+#: ../js/ui/status/system.js:329
 msgid "Orientation Lock"
 msgstr "Kunci Orientasi"

-#: ../js/ui/status/system.js:335
+#: ../js/ui/status/system.js:337
 msgid "Suspend"
 msgstr "Suspensi"

-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:340
 msgid "Power Off"
 msgstr "Matikan"

@ -1589,11 +1596,11 @@ msgstr "Masuk sebagai pengguna lain"
 msgid "Unlock Window"
 msgstr "Buka Kunci Jendela"

-#: ../js/ui/viewSelector.js:100
+#: ../js/ui/viewSelector.js:104
 msgid "Applications"
 msgstr "Aplikasi"

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

--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- 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-08-30 14:46+0000\n"
-"PO-Revision-Date: 2013-08-31 19:43+0600\n"
+"POT-Creation-Date: 2013-09-23 13:35+0000\n"
+"PO-Revision-Date: 2013-09-24 06:33+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
 "Language: kk\n"
@ -48,6 +48,7 @@ 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 "Терезелерді басқару мен қолданбаларды жөнелту"

@ -60,6 +61,10 @@ 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 ""
@ -85,6 +90,10 @@ 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"
@ -95,6 +104,8 @@ 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"
@ -105,6 +116,8 @@ 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"
@ -123,6 +136,8 @@ 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 ""
@ -138,6 +153,10 @@ 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"
@ -207,10 +226,13 @@ 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 ""
@ -234,6 +256,8 @@ 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"
@ -243,6 +267,10 @@ 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:"
@ -256,10 +284,10 @@ msgstr "Кеңейту"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Жоғарыдағы ашылмалы тізімнен баптау үшін кеңейтуді таңдаңыз."

-#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:132
+#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:136
 #: ../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:221 ../js/ui/status/network.js:679
+#: ../js/ui/status/bluetooth.js:222 ../js/ui/status/network.js:686
 msgid "Cancel"
 msgstr "Бас тарту"

@ -298,8 +326,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:255
-#: ../js/ui/components/networkAgent.js:273
+#: ../js/gdm/loginDialog.js:627 ../js/ui/components/networkAgent.js:259
+#: ../js/ui/components/networkAgent.js:277
 msgid "Username: "
 msgstr "Пайдаланушы аты:"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ../js/ui/components/networkAgent.js:127 ../js/ui/status/network.js:112
-#: ../js/ui/status/network.js:268 ../js/ui/status/network.js:682
+#: ../js/ui/components/networkAgent.js:131 ../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: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
+#: ../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
 msgid "Password: "
 msgstr "Пароль:"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -987,15 +1020,12 @@ 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."
@ -1037,7 +1067,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:334
+#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:333
 msgid "Keyboard"
 msgstr "Пернетақта"

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

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

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

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

-#: ../js/ui/panel.js:516
+#: ../js/ui/panel.js:518
 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:568
+#: ../js/ui/panel.js:570
 msgid "Activities"
 msgstr "Көрініс"

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

@ -1171,7 +1197,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:226
+#: ../js/ui/popupMenu.js:233
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

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

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

@ -1210,19 +1236,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:830 ../js/ui/screenShield.js:1296
+#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
 msgid "Unable to lock"
 msgstr "Блоктау мүмкін емес"

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

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

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

@ -1296,14 +1322,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: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
+#: ../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
 msgid "Bluetooth"
 msgstr "Bluetooth"

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

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

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

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

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

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

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

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

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

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

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

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

-#: ../js/ui/status/bluetooth.js:172
+#: ../js/ui/status/bluetooth.js:173
 #, 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:175
+#: ../js/ui/status/bluetooth.js:176
 msgid "Matches"
 msgstr "Сәйкес"

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

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

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

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

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

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

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

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

-#: ../js/ui/status/network.js:269 ../js/ui/status/network.js:948
+#: ../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:357
+#: ../js/ui/status/network.js:364
 msgid "unmanaged"
 msgstr "басқарылмайтын"

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

-#: ../js/ui/status/network.js:365 ../js/ui/status/network.js:1093
+#: ../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:368 ../js/ui/status/network.js:1096
+#: ../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:376
+#: ../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:380
+#: ../js/ui/status/network.js:387
 msgid "unavailable"
 msgstr "қолжетерсіз"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #: ../js/ui/windowAttentionHandler.js:19
 #, c-format
@ -1665,3 +1691,6 @@ 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
@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 3.9.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-27 20:18+0200\n"
-"PO-Revision-Date: 2013-08-27 20:19+0200\n"
+"POT-Creation-Date: 2013-09-29 11:27+0200\n"
+"PO-Revision-Date: 2013-09-24 19:38+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@ -47,6 +47,7 @@ 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 "Vindushåndtering og oppstart av programmer"

@ -59,6 +60,10 @@ msgstr "Brukervalg for GNOME Shell utvidelser"
 msgid "Configure GNOME Shell Extensions"
 msgstr "Konfigurer utvidelser for GNOME Shell"

+#: ../data/gnome-shell-wayland.desktop.in.in.h:1
+msgid "GNOME Shell (wayland compositor)"
+msgstr "GNOME Shell (wayland kompositør)"
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr "Aktiver interne verktøy for utviklere og testere fra Alt-F2"
@ -243,6 +248,10 @@ msgstr "Arbeidsområder håndteres dynamisk"
 msgid "Workspaces only on primary monitor"
 msgstr "Arbeidsområder vises kun på hovedskjerm"

+#: ../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:"
@ -256,10 +265,10 @@ msgstr "Utvidelse"
 msgid "Select an extension to configure using the combobox above."
 msgstr "Velg en utvidelse som skal konfigureres med komboboksen over."

-#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:132
-#: ../js/ui/components/polkitAgent.js:161 ../js/ui/endSessionDialog.js:347
+#: ../js/gdm/authPrompt.js:145 ../js/ui/components/networkAgent.js:136
+#: ../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:221 ../js/ui/status/network.js:679
+#: ../js/ui/status/bluetooth.js:222 ../js/ui/status/network.js:692
 msgid "Cancel"
 msgstr "Avbryt"

@ -281,20 +290,16 @@ msgstr "Logg inn"
 msgid "Choose Session"
 msgstr "Velg økt"

-#: ../js/gdm/loginDialog.js:312
-msgid "Session"
-msgstr "Økt"
-
 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:458
+#: ../js/gdm/loginDialog.js:454
 msgid "Not listed?"
 msgstr "Ikke listet?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: ../js/gdm/loginDialog.js:625
+#: ../js/gdm/loginDialog.js:622
 #, c-format
 msgid "(e.g., user or %s)"
 msgstr "(f.eks. bruker eller %s)"
@ -302,12 +307,12 @@ msgstr "(f.eks. bruker eller %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:630 ../js/ui/components/networkAgent.js:255
-#: ../js/ui/components/networkAgent.js:273
+#: ../js/gdm/loginDialog.js:627 ../js/ui/components/networkAgent.js:259
+#: ../js/ui/components/networkAgent.js:277
 msgid "Username: "
 msgstr "Brukernavn: "

-#: ../js/gdm/loginDialog.js:894
+#: ../js/gdm/loginDialog.js:891
 msgid "Login Window"
 msgstr "Innloggingsvindu"

@ -324,38 +329,42 @@ msgstr "Autentiseringsfeil"
 msgid "(or swipe finger)"
 msgstr "(eller dra finger)"

-#: ../js/misc/util.js:97
+#: ../js/misc/util.js:98
 msgid "Command not found"
 msgstr "Kommando ikke funnet"

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

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

-#: ../js/ui/appDisplay.js:386
+#: ../js/ui/appDisplay.js:596
+msgid "Frequently used applications will appear here"
+msgstr "Ofte brukte programmer vil vises her"
+
+#: ../js/ui/appDisplay.js:712
 msgid "Frequent"
 msgstr "Ofte"

-#: ../js/ui/appDisplay.js:393
+#: ../js/ui/appDisplay.js:719
 msgid "All"
 msgstr "Alle"

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

-#: ../js/ui/appDisplay.js:994 ../js/ui/dash.js:284
+#: ../js/ui/appDisplay.js:1517 ../js/ui/dash.js:284
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"

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

@ -369,7 +378,8 @@ msgstr "%s ble lagt til i dine favoritter."
 msgid "%s has been removed from your favorites."
 msgstr "%s ble fjernet fra dine favoritter."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/status/system.js:323
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:808
+#: ../js/ui/status/system.js:325
 msgid "Settings"
 msgstr "Innstillinger"

@ -493,36 +503,44 @@ msgctxt "list saturday"
 msgid "S"
 msgstr "Lø"

+#: ../js/ui/calendar.js:447
+msgid "Previous month"
+msgstr "Forrige måned"
+
+#: ../js/ui/calendar.js:457
+msgid "Next month"
+msgstr "Neste måned"
+
 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:750
+#: ../js/ui/calendar.js:753
 msgid "Nothing Scheduled"
 msgstr "Ingenting planlagt"

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

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

-#: ../js/ui/calendar.js:782
+#: ../js/ui/calendar.js:785
 msgid "Today"
 msgstr "I dag"

-#: ../js/ui/calendar.js:786
+#: ../js/ui/calendar.js:789
 msgid "Tomorrow"
 msgstr "I morgen"

-#: ../js/ui/calendar.js:797
+#: ../js/ui/calendar.js:800
 msgid "This week"
 msgstr "Denne uken"

-#: ../js/ui/calendar.js:805
+#: ../js/ui/calendar.js:808
 msgid "Next week"
 msgstr "Neste uke"

@ -547,50 +565,50 @@ msgstr "Åpne med %s"
 msgid "Eject"
 msgstr "Løs ut"

-#: ../js/ui/components/keyring.js:88 ../js/ui/components/polkitAgent.js:280
+#: ../js/ui/components/keyring.js:91 ../js/ui/components/polkitAgent.js:280
 msgid "Password:"
 msgstr "Passord:"

-#: ../js/ui/components/keyring.js:107
+#: ../js/ui/components/keyring.js:110
 msgid "Type again:"
 msgstr "Skriv på nytt:"

-#: ../js/ui/components/networkAgent.js:127 ../js/ui/status/network.js:112
-#: ../js/ui/status/network.js:268 ../js/ui/status/network.js:682
+#: ../js/ui/components/networkAgent.js:131 ../js/ui/status/network.js:112
+#: ../js/ui/status/network.js:275 ../js/ui/status/network.js:695
 msgid "Connect"
 msgstr "Koble til"

 #. Cisco LEAP
-#: ../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
+#: ../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
 msgid "Password: "
 msgstr "Passord: "

 #. static WEP
-#: ../js/ui/components/networkAgent.js:223
+#: ../js/ui/components/networkAgent.js:227
 msgid "Key: "
 msgstr "Nøkkel: "

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

-#: ../js/ui/components/networkAgent.js:263
+#: ../js/ui/components/networkAgent.js:267
 msgid "Private key password: "
 msgstr "Passord for privat nøkkel: "

-#: ../js/ui/components/networkAgent.js:275
+#: ../js/ui/components/networkAgent.js:279
 msgid "Service: "
 msgstr "Tjeneste: "

-#: ../js/ui/components/networkAgent.js:304
+#: ../js/ui/components/networkAgent.js:308
 msgid "Authentication required by wireless network"
 msgstr "Autentisering kreves av trådløst nettverk"

-#: ../js/ui/components/networkAgent.js:305
+#: ../js/ui/components/networkAgent.js:309
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@ -599,35 +617,35 @@ msgstr ""
 "Passord eller krypteringsnøkler kreves for å koble til trådløst nettverk "
 "«%s»."

-#: ../js/ui/components/networkAgent.js:309
+#: ../js/ui/components/networkAgent.js:313
 msgid "Wired 802.1X authentication"
 msgstr "802.1X autentisering for trådbundet nettverk"

-#: ../js/ui/components/networkAgent.js:311
+#: ../js/ui/components/networkAgent.js:315
 msgid "Network name: "
 msgstr "Navn på nettverk: "

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

-#: ../js/ui/components/networkAgent.js:323
+#: ../js/ui/components/networkAgent.js:327
 msgid "PIN code required"
 msgstr "PIN-kode kreves"

-#: ../js/ui/components/networkAgent.js:324
+#: ../js/ui/components/networkAgent.js:328
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kode kreves for mobil bredbåndsenhet"

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

-#: ../js/ui/components/networkAgent.js:331
+#: ../js/ui/components/networkAgent.js:335
 msgid "Mobile broadband network password"
 msgstr "Nettverkspassord for mobilt bredbånd"

-#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:336
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Et passord kreves for å koble til «%s»."
@ -891,7 +909,7 @@ msgstr "Vis konto"
 msgid "Unknown reason"
 msgstr "Ukjent årsak"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:96
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:100
 msgid "Windows"
 msgstr "Vinduer"

@ -901,7 +919,7 @@ msgstr "Vis programmer"

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

@ -954,74 +972,78 @@ msgctxt "button"
 msgid "Log Out"
 msgstr "Logg ut"

-#: ../js/ui/endSessionDialog.js:80
+#: ../js/ui/endSessionDialog.js:81
 msgctxt "title"
 msgid "Power Off"
 msgstr "Slå av"

-#: ../js/ui/endSessionDialog.js:82
+#: ../js/ui/endSessionDialog.js:83
 #, c-format
 msgid "The system will power off automatically in %d second."
 msgid_plural "The system will power off automatically in %d seconds."
 msgstr[0] "Systemet vil slås av automatisk om %d sekund."
 msgstr[1] "Systemet vil slås av automatisk om %d sekunder."

-#: ../js/ui/endSessionDialog.js:87 ../js/ui/endSessionDialog.js:102
+#: ../js/ui/endSessionDialog.js:88 ../js/ui/endSessionDialog.js:104
 msgctxt "button"
 msgid "Restart"
 msgstr "Start på nytt"

-#: ../js/ui/endSessionDialog.js:89
+#: ../js/ui/endSessionDialog.js:90
 msgctxt "button"
 msgid "Power Off"
 msgstr "Slå av"

-#: ../js/ui/endSessionDialog.js:95
+#: ../js/ui/endSessionDialog.js:97
 msgctxt "title"
 msgid "Restart"
 msgstr "Start på nytt"

-#: ../js/ui/endSessionDialog.js:97
+#: ../js/ui/endSessionDialog.js:99
 #, c-format
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
 msgstr[0] "Systemet vil starte på nytt automatisk om %d sekund."
 msgstr[1] "Systemet vil starte på nytt automatisk om %d sekunder."

-#: ../js/ui/endSessionDialog.js:109
+#: ../js/ui/endSessionDialog.js:112
 msgctxt "title"
 msgid "Restart & Install Updates"
 msgstr "Start på nytt og installer oppdateringer"

-#: ../js/ui/endSessionDialog.js:111
+#: ../js/ui/endSessionDialog.js:114
 #, c-format
 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] "Systemet vil starte på nytt og installere oppdateringer automatisk om %d sekund."
-msgstr[1] "Systemet vil starte på nytt og installere oppdateringer automatisk om %d sekunder."
+msgstr[0] ""
+"Systemet vil starte på nytt og installere oppdateringer automatisk om %d "
+"sekund."
+msgstr[1] ""
+"Systemet vil starte på nytt og installere oppdateringer automatisk om %d "
+"sekunder."

-#: ../js/ui/endSessionDialog.js:116
+#: ../js/ui/endSessionDialog.js:119
 msgctxt "button"
 msgid "Restart & Install"
 msgstr "Start på nytt og installer"

-#: ../js/ui/endSessionDialog.js:267
+#: ../js/ui/endSessionDialog.js:271
 msgid "Some applications are busy or have unsaved work."
 msgstr "Noen programmer er opptatt eller har arbeid som ikke er lagret."

-#: ../js/ui/endSessionDialog.js:273
+#: ../js/ui/endSessionDialog.js:277
 msgid "Other users are logged in."
 msgstr "Andre brukere er logget inn."

 #. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/endSessionDialog.js:475
+#: ../js/ui/endSessionDialog.js:479
 #, c-format
 msgid "%s (remote)"
 msgstr "%s (ekstern)"

 #. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/endSessionDialog.js:478
+#: ../js/ui/endSessionDialog.js:482
 #, c-format
 msgid "%s (console)"
 msgstr "%s (konsoll)"
@ -1035,7 +1057,7 @@ msgstr "Installer"
 msgid "Download and install '%s' from extensions.gnome.org?"
 msgstr "Last ned og installer «%s» fra extensions.gnome.org?"

-#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:334
+#: ../js/ui/keyboard.js:619 ../js/ui/status/keyboard.js:333
 msgid "Keyboard"
 msgstr "Tastatur"

@ -1111,11 +1133,11 @@ msgstr "Meny for varslingsområde"
 msgid "No Messages"
 msgstr "Ingen meldinger"

-#: ../js/ui/messageTray.js:1812
+#: ../js/ui/messageTray.js:1813
 msgid "Message Tray"
 msgstr "Meldingstrau"

-#: ../js/ui/messageTray.js:2786
+#: ../js/ui/messageTray.js:2788
 msgid "System Information"
 msgstr "Systeminformasjon"

@ -1147,21 +1169,17 @@ msgstr "Oversikt"
 msgid "Type to search…"
 msgstr "Skriv for å søke …"

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

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

-#: ../js/ui/panel.js:805
-msgid "Settings Menu"
-msgstr "Meny for innstillinger"
-
-#: ../js/ui/panel.js:892
+#: ../js/ui/panel.js:904
 msgid "Top Bar"
 msgstr "Topp-panel"

@ -1170,7 +1188,7 @@ msgstr "Topp-panel"
 #. "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:226
+#: ../js/ui/popupMenu.js:233
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"

@ -1195,11 +1213,11 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d ny varsling"
 msgstr[1] "%d nye varslinger"

-#: ../js/ui/screenShield.js:477 ../js/ui/status/system.js:331
+#: ../js/ui/screenShield.js:477 ../js/ui/status/system.js:333
 msgid "Lock"
 msgstr "Lås"

-#: ../js/ui/screenShield.js:703
+#: ../js/ui/screenShield.js:704
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME må låse skjermen"

@ -1210,19 +1228,19 @@ msgstr "GNOME må låse skjermen"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:830 ../js/ui/screenShield.js:1296
+#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
 msgid "Unable to lock"
 msgstr "Kan ikke låse"

-#: ../js/ui/screenShield.js:831 ../js/ui/screenShield.js:1297
+#: ../js/ui/screenShield.js:832 ../js/ui/screenShield.js:1298
 msgid "Lock was blocked by an application"
 msgstr "Låsing ble stoppet av et program"

-#: ../js/ui/searchDisplay.js:445
+#: ../js/ui/searchDisplay.js:448
 msgid "Searching…"
 msgstr "Søker …"

-#: ../js/ui/searchDisplay.js:489
+#: ../js/ui/searchDisplay.js:492
 msgid "No results."
 msgstr "Ingen resultater."

@ -1296,14 +1314,14 @@ msgstr "Stor tekst"

 #. 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: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
+#: ../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
 msgid "Bluetooth"
 msgstr "Bluetooth"

 #: ../js/ui/status/bluetooth.js:30 ../js/ui/status/network.js:112
-#: ../js/ui/status/network.js:1027 ../js/ui/status/rfkill.js:46
+#: ../js/ui/status/network.js:1040 ../js/ui/status/rfkill.js:46
 msgid "Turn Off"
 msgstr "Slå av"

@ -1311,80 +1329,80 @@ msgstr "Slå av"
 msgid "Bluetooth Settings"
 msgstr "Innstillinger for Bluetooth"

-#: ../js/ui/status/bluetooth.js:57
+#: ../js/ui/status/bluetooth.js:58
 #, c-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d tilkoblet enhet"
 msgstr[1] "%d tilkoblede enheter"

-#: ../js/ui/status/bluetooth.js:100 ../js/ui/status/bluetooth.js:128
+#: ../js/ui/status/bluetooth.js:101 ../js/ui/status/bluetooth.js:129
 #, c-format
 msgid "Authorization request from %s"
 msgstr "Forespørsel om autorisering fra %s"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/bluetooth.js:171
-#: ../js/ui/status/bluetooth.js:202
+#: ../js/ui/status/bluetooth.js:107 ../js/ui/status/bluetooth.js:172
+#: ../js/ui/status/bluetooth.js:203
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "Enhet %s vil koble seg sammen med denne datamaskinen"

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

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

-#: ../js/ui/status/bluetooth.js:134
+#: ../js/ui/status/bluetooth.js:135
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "Enhet %s vil ha tilgang til tjenesten «%s»"

-#: ../js/ui/status/bluetooth.js:136
+#: ../js/ui/status/bluetooth.js:137
 msgid "Always grant access"
 msgstr "Alltid gi tilgang"

-#: ../js/ui/status/bluetooth.js:137
+#: ../js/ui/status/bluetooth.js:138
 msgid "Grant this time only"
 msgstr "Gi tilgang kun denne ene gangen"

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

 #. Translators: argument is the device short name
-#: ../js/ui/status/bluetooth.js:165
+#: ../js/ui/status/bluetooth.js:166
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "Bekreftelse for tilkobling for %s"

-#: ../js/ui/status/bluetooth.js:172
+#: ../js/ui/status/bluetooth.js:173
 #, c-format
 msgid ""
 "Please confirm whether the Passkey '%06d' matches the one on the device."
 msgstr "Vennligst bekreft om passord «%06d» er lik den som brukes på enheten."

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

-#: ../js/ui/status/bluetooth.js:176
+#: ../js/ui/status/bluetooth.js:177
 msgid "Does not match"
 msgstr "Stemmer ikke overens"

-#: ../js/ui/status/bluetooth.js:195
+#: ../js/ui/status/bluetooth.js:196
 #, c-format
 msgid "Pairing request for %s"
 msgstr "Forespørsel om tilkobling for %s"

-#: ../js/ui/status/bluetooth.js:203
+#: ../js/ui/status/bluetooth.js:204
 msgid "Please enter the PIN mentioned on the device."
 msgstr "Vennligst oppgi PIN som oppgitt på enheten."

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

@ -1392,7 +1410,7 @@ msgstr "OK"
 msgid "Brightness"
 msgstr "Lysstyrke"

-#: ../js/ui/status/keyboard.js:404
+#: ../js/ui/status/keyboard.js:403
 msgid "Show Keyboard Layout"
 msgstr "Vis tastaturutforming"

@ -1400,83 +1418,83 @@ msgstr "Vis tastaturutforming"
 msgid "<unknown>"
 msgstr "<ukjent>"

-#: ../js/ui/status/network.js:196 ../js/ui/status/network.js:1042
+#: ../js/ui/status/network.js:203 ../js/ui/status/network.js:1055
 msgid "Off"
 msgstr "Av"

-#: ../js/ui/status/network.js:269 ../js/ui/status/network.js:948
+#: ../js/ui/status/network.js:276 ../js/ui/status/network.js:961
 #: ../js/ui/status/rfkill.js:49
 msgid "Network Settings"
 msgstr "Innstillinger for nettverk"

 #. 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:357
+#: ../js/ui/status/network.js:364
 msgid "unmanaged"
 msgstr "ikke håndtert"

-#: ../js/ui/status/network.js:359
+#: ../js/ui/status/network.js:366
 msgid "disconnecting..."
 msgstr "kobler fra …"

-#: ../js/ui/status/network.js:365 ../js/ui/status/network.js:1093
+#: ../js/ui/status/network.js:372 ../js/ui/status/network.js:1106
 msgid "connecting..."
 msgstr "kobler til …"

 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:368 ../js/ui/status/network.js:1096
+#: ../js/ui/status/network.js:375 ../js/ui/status/network.js:1109
 msgid "authentication required"
 msgstr "autentisering kreves"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:376
+#: ../js/ui/status/network.js:383
 msgid "firmware missing"
 msgstr "fastvare mangler"

 #. 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:380
+#: ../js/ui/status/network.js:387
 msgid "unavailable"
 msgstr "ikke tilgjengelig"

-#: ../js/ui/status/network.js:382 ../js/ui/status/network.js:1098
+#: ../js/ui/status/network.js:389 ../js/ui/status/network.js:1111
 msgid "connection failed"
 msgstr "tilkobling feilet"

-#: ../js/ui/status/network.js:647
+#: ../js/ui/status/network.js:660
 msgid "Wi-Fi Networks"
 msgstr "Wi-Fi nettverk"

-#: ../js/ui/status/network.js:649
+#: ../js/ui/status/network.js:662
 msgid "Select a network"
 msgstr "Velg et nettverk"

-#: ../js/ui/status/network.js:673
+#: ../js/ui/status/network.js:686
 msgid "No Networks"
 msgstr "Ingen nettverk"

-#: ../js/ui/status/network.js:942
+#: ../js/ui/status/network.js:955
 msgid "Select Network"
 msgstr "Velg nettverk"

-#: ../js/ui/status/network.js:1027
+#: ../js/ui/status/network.js:1040
 msgid "Turn On"
 msgstr "Slå på"

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

-#: ../js/ui/status/network.js:1296
+#: ../js/ui/status/network.js:1313
 msgid "Network Manager"
 msgstr "Nettverkshåndtering"

-#: ../js/ui/status/network.js:1338
+#: ../js/ui/status/network.js:1352
 msgid "Connection failed"
 msgstr "Tilkobling feilet"

-#: ../js/ui/status/network.js:1339
+#: ../js/ui/status/network.js:1353
 msgid "Activation of network connection failed"
 msgstr "Aktivering av nettverkstilkobling feilet"

@ -1522,23 +1540,23 @@ msgstr "Flymodus"
 msgid "On"
 msgstr "På"

-#: ../js/ui/status/system.js:303
+#: ../js/ui/status/system.js:305
 msgid "Switch User"
 msgstr "Bytt bruker"

-#: ../js/ui/status/system.js:308
+#: ../js/ui/status/system.js:310
 msgid "Log Out"
 msgstr "Logg ut"

-#: ../js/ui/status/system.js:327
+#: ../js/ui/status/system.js:329
 msgid "Orientation Lock"
 msgstr "Lås for orientering"

-#: ../js/ui/status/system.js:335
+#: ../js/ui/status/system.js:337
 msgid "Suspend"
 msgstr "Hvilemodus"

-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:340
 msgid "Power Off"
 msgstr "Slå av"

@ -1562,11 +1580,11 @@ msgstr "Logg inn som en annen bruker"
 msgid "Unlock Window"
 msgstr "Lås opp vindu"

-#: ../js/ui/viewSelector.js:100
+#: ../js/ui/viewSelector.js:104
 msgid "Applications"
 msgstr "Programmer"

-#: ../js/ui/viewSelector.js:104
+#: ../js/ui/viewSelector.js:108
 msgid "Search"
 msgstr "Søk"

@ -1669,3 +1687,6 @@ msgstr "Passordet kan ikke være tomt"
 #: ../src/shell-polkit-authentication-agent.c:343
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Autentiseringsdialogen ble lukket av brukeren"
+
+#~ msgid "Settings Menu"
+#~ msgstr "Meny for innstillinger"
--- 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/tg.po
+++ b/po/tg.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -186,7 +186,7 @@ gnome_shell_CPPFLAGS = \

 # Here, and after, we repeat mutter and bluetooth libraries just for the rpath
 # The dependency is already pulled in by libtool
-gnome_shell_LDADD = libgnome-shell.la libgnome-shell-js.la $(MUTTER_LIBS) $(BLUETOOTH_LIBS)
+gnome_shell_LDADD = libgnome-shell.la libgnome-shell-js.la $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) $(BLUETOOTH_LIBS)
 gnome_shell_DEPENDENCIES = libgnome-shell.la

 if HAVE_MUTTER_WAYLAND
@ -199,7 +199,7 @@ gnome_shell_wayland_CPPFLAGS = \
 	$(MUTTER_WAYLAND_CFLAGS) \
 	$(gnome_shell_cflags)

-gnome_shell_wayland_LDADD = libgnome-shell-wayland.la libgnome-shell-js.la $(MUTTER_WAYLAND_LIBS) $(BLUETOOTH_LIBS)
+gnome_shell_wayland_LDADD = libgnome-shell-wayland.la libgnome-shell-js.la $(GNOME_SHELL_LIBS) $(MUTTER_WAYLAND_LIBS) $(BLUETOOTH_LIBS)
 gnome_shell_wayland_DEPENDENCIES = libgnome-shell-wayland.la
 endif HAVE_MUTTER_WAYLAND

@ -229,7 +229,7 @@ shell_recorder_sources =        \
 # Custom element is an internal detail

 if BUILD_RECORDER
-libgnome_shell_la_SOURCES += $(shell_recorder_sources)
+libgnome_shell_sources += $(shell_recorder_sources)

 shell_recorder_private_sources =  \
 	shell-recorder-src.c	\
@ -253,7 +253,7 @@ gnome_shell_perf_helper_LDADD = $(SHELL_PERF_HELPER_LIBS)
 noinst_PROGRAMS += run-js-test

 run_js_test_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
-run_js_test_LDADD = libgnome-shell.la $(MUTTER_LIBS) $(BLUETOOTH_LIBS)
+run_js_test_LDADD = libgnome-shell.la $(GNOME_SHELL_JS_LIBS) $(MUTTER_LIBS) $(BLUETOOTH_LIBS)
 run_js_test_LDFLAGS = -export-dynamic

 run_js_test_SOURCES =			\
@ -293,6 +293,7 @@ libgnome_shell_libadd =		\
 	gvc/libgvc.la		\
 	$(NULL)

+libgnome_shell_menu_la_LDFLAGS = $(libgnome_shell_ldflags)
 libgnome_shell_menu_la_LIBADD = $(GNOME_SHELL_LIBS)
 libgnome_shell_menu_la_CPPFLAGS = $(GNOME_SHELL_CFLAGS)

@ -300,7 +301,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
 libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)

 libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
-libgnome_shell_la_LIBADD = $(MUTTER_LIBS) libgnome-shell-base.la
+libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) libgnome-shell-base.la
 libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)

 if HAVE_MUTTER_WAYLAND
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@ -35,6 +35,7 @@
 #include <gjs/gjs.h>
 #include <meta/display.h>
 #include <meta/meta-plugin.h>
+#include <meta/util.h>

 #include "shell-global-private.h"
 #include "shell-perf-log.h"
@ -324,7 +325,6 @@ static gboolean
 gnome_shell_plugin_xevent_filter (MetaPlugin *plugin,
                                  XEvent     *xev)
 {
-  MetaScreen *screen = meta_plugin_get_screen (plugin);
  GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);

 #ifdef GLX_INTEL_swap_event
@ -344,13 +344,18 @@ gnome_shell_plugin_xevent_filter (MetaPlugin *plugin,
    }
 #endif

+#ifdef HAVE_WAYLAND
+  if (meta_is_wayland_compositor ())
+    return FALSE;
+#endif
+
  /*
-   * Pass the event to shell-global
+   * Pass the event to shell-global for XDND
   */
  if (_shell_global_check_xdnd_event (shell_plugin->global, xev))
    return TRUE;

-  return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
+  return FALSE;
 }

 static gboolean
--- a/src/gvc
+++ b/src/gvc
--- a/src/shell-app-private.h
+++ b/src/shell-app-private.h
@ -12,9 +12,9 @@ G_BEGIN_DECLS

 ShellApp* _shell_app_new_for_window (MetaWindow *window);

-ShellApp* _shell_app_new (GMenuTreeEntry *entry);
+ShellApp* _shell_app_new (GDesktopAppInfo *info);

-void _shell_app_set_entry (ShellApp *app, GMenuTreeEntry *entry);
+void _shell_app_set_app_info (ShellApp *app, GDesktopAppInfo *info);

 void _shell_app_handle_startup_sequence (ShellApp *app, SnStartupSequence *sequence);

--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@ -38,18 +38,12 @@ enum {
 static guint signals[LAST_SIGNAL] = { 0 };

 struct _ShellAppSystemPrivate {
-  GMenuTree *apps_tree;
-
  GHashTable *running_apps;
-  GHashTable *visible_id_to_app;
  GHashTable *id_to_app;
-  GHashTable *startup_wm_class_to_app;
-
-  GSList *known_vendor_prefixes;
+  GHashTable *startup_wm_class_to_id;
 };

 static void shell_app_system_finalize (GObject *object);
-static void on_apps_tree_changed_cb (GMenuTree *tree, gpointer user_data);

 G_DEFINE_TYPE(ShellAppSystem, shell_app_system, G_TYPE_OBJECT);

@ -77,10 +71,45 @@ static void shell_app_system_class_init(ShellAppSystemClass *klass)
  g_type_class_add_private (gobject_class, sizeof (ShellAppSystemPrivate));
 }

+static void
+scan_startup_wm_class_to_id (ShellAppSystem *self)
+{
+  ShellAppSystemPrivate *priv = self->priv;
+  GList *apps, *l;
+
+  g_hash_table_remove_all (priv->startup_wm_class_to_id);
+
+  apps = g_app_info_get_all ();
+  for (l = apps; l != NULL; l = l->next)
+    {
+      GAppInfo *info = l->data;
+      const char *startup_wm_class, *id;
+
+      id = g_app_info_get_id (info);
+      startup_wm_class = g_desktop_app_info_get_startup_wm_class (G_DESKTOP_APP_INFO (info));
+      if (startup_wm_class != NULL)
+        g_hash_table_insert (priv->startup_wm_class_to_id, (char *) startup_wm_class, (char *) id);
+    }
+
+  g_list_free_full (apps, g_object_unref);
+}
+
+static void
+installed_changed (GAppInfoMonitor *monitor,
+                   gpointer         user_data)
+{
+  ShellAppSystem *self = user_data;
+
+  scan_startup_wm_class_to_id (self);
+
+  g_signal_emit (self, signals[INSTALLED_CHANGED], 0, NULL);
+}
+
 static void
 shell_app_system_init (ShellAppSystem *self)
 {
  ShellAppSystemPrivate *priv;
+  GAppInfoMonitor *monitor;

  self->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
                                                   SHELL_TYPE_APP_SYSTEM,
@ -91,19 +120,11 @@ shell_app_system_init (ShellAppSystem *self)
                                           NULL,
                                           (GDestroyNotify)g_object_unref);

-  /* All the objects in this hash table are owned by id_to_app */
-  priv->visible_id_to_app = g_hash_table_new (g_str_hash, g_str_equal);
+  priv->startup_wm_class_to_id = g_hash_table_new (g_str_hash, g_str_equal);

-  priv->startup_wm_class_to_app = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                         NULL,
-                                                         (GDestroyNotify)g_object_unref);
-
-  /* We want to track NoDisplay apps, so we add INCLUDE_NODISPLAY. We'll
-   * filter NoDisplay apps out when showing them to the user. */
-  priv->apps_tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
-  g_signal_connect (priv->apps_tree, "changed", G_CALLBACK (on_apps_tree_changed_cb), self);
-
-  on_apps_tree_changed_cb (priv->apps_tree, self);
+  monitor = g_app_info_monitor_get ();
+  g_signal_connect (monitor, "changed", G_CALLBACK (installed_changed), self);
+  installed_changed (monitor, self);
 }

 static void
@ -112,313 +133,13 @@ shell_app_system_finalize (GObject *object)
  ShellAppSystem *self = SHELL_APP_SYSTEM (object);
  ShellAppSystemPrivate *priv = self->priv;

-  g_object_unref (priv->apps_tree);
-
  g_hash_table_destroy (priv->running_apps);
  g_hash_table_destroy (priv->id_to_app);
-  g_hash_table_destroy (priv->visible_id_to_app);
-  g_hash_table_destroy (priv->startup_wm_class_to_app);
-
-  g_slist_free_full (priv->known_vendor_prefixes, g_free);
-  priv->known_vendor_prefixes = NULL;
+  g_hash_table_destroy (priv->startup_wm_class_to_id);

  G_OBJECT_CLASS (shell_app_system_parent_class)->finalize (object);
 }

-static char *
-get_prefix_for_entry (GMenuTreeEntry *entry)
-{
-  char *prefix = NULL, *file_prefix = NULL;
-  const char *id;
-  GFile *file;
-  char *name;
-  int i = 0;
-
-  id = gmenu_tree_entry_get_desktop_file_id (entry);
-  file = g_file_new_for_path (gmenu_tree_entry_get_desktop_file_path (entry));
-  name = g_file_get_basename (file);
-
-  if (!name)
-    {
-      g_object_unref (file);
-      return NULL;
-    }
-  for (i = 0; vendor_prefixes[i]; i++)
-    {
-      if (g_str_has_prefix (name, vendor_prefixes[i]))
-        {
-          file_prefix = g_strdup (vendor_prefixes[i]);
-          break;
-        }
-    }
-
-  while (strcmp (name, id) != 0)
-    {
-      char *t;
-      char *pname;
-      GFile *parent = g_file_get_parent (file);
-
-      if (!parent)
-        {
-          g_warn_if_reached ();
-          break;
-        }
-
-      pname = g_file_get_basename (parent);
-      if (!pname)
-        {
-          g_object_unref (parent);
-          break;
-        }
-      if (!g_strstr_len (id, -1, pname))
-        {
-          /* handle <LegacyDir prefix="..."> */
-          char *t;
-          size_t name_len = strlen (name);
-          size_t id_len = strlen (id);
-          char *t_id = g_strdup (id);
-
-          t_id[id_len - name_len] = '\0';
-          t = g_strdup(t_id);
-          g_free (prefix);
-          g_free (t_id);
-          g_free (name);
-          name = g_strdup (id);
-          prefix = t;
-
-          g_object_unref (file);
-          file = parent;
-          g_free (pname);
-          g_free (file_prefix);
-          file_prefix = NULL;
-          break;
-        }
-
-      t = g_strconcat (pname, "-", name, NULL);
-      g_free (name);
-      name = t;
-
-      t = g_strconcat (pname, "-", prefix, NULL);
-      g_free (prefix);
-      prefix = t;
-
-      g_object_unref (file);
-      file = parent;
-      g_free (pname);
-    }
-
-  if (file)
-    g_object_unref (file);
-
-  if (strcmp (name, id) == 0)
-    {
-      g_free (name);
-      if (file_prefix && !prefix)
-        return file_prefix;
-      if (file_prefix)
-        {
-          char *t = g_strconcat (prefix, "-", file_prefix, NULL);
-          g_free (prefix);
-          g_free (file_prefix);
-          prefix = t;
-        }
-      return prefix;
-    }
-
-  g_free (name);
-  g_free (prefix);
-  g_free (file_prefix);
-  g_return_val_if_reached (NULL);
-}
-
-static void
-get_flattened_entries_recurse (GMenuTreeDirectory *dir,
-                               GHashTable         *entry_set)
-{
-  GMenuTreeIter *iter = gmenu_tree_directory_iter (dir);
-  GMenuTreeItemType next_type;
-
-  while ((next_type = gmenu_tree_iter_next (iter)) != GMENU_TREE_ITEM_INVALID)
-    {
-      gpointer item = NULL;
-
-      switch (next_type)
-        {
-        case GMENU_TREE_ITEM_ENTRY:
-          {
-            GMenuTreeEntry *entry;
-            item = entry = gmenu_tree_iter_get_entry (iter);
-            /* Key is owned by entry */
-            g_hash_table_replace (entry_set,
-                                  (char*)gmenu_tree_entry_get_desktop_file_id (entry),
-                                  gmenu_tree_item_ref (entry));
-          }
-          break;
-        case GMENU_TREE_ITEM_DIRECTORY:
-          {
-            item = gmenu_tree_iter_get_directory (iter);
-            get_flattened_entries_recurse ((GMenuTreeDirectory*)item, entry_set);
-          }
-          break;
-        default:
-          break;
-        }
-      if (item != NULL)
-        gmenu_tree_item_unref (item);
-    }
-
-  gmenu_tree_iter_unref (iter);
-}
-
-static GHashTable *
-get_flattened_entries_from_tree (GMenuTree *tree)
-{
-  GHashTable *table;
-  GMenuTreeDirectory *root;
-
-  table = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                 (GDestroyNotify) NULL,
-                                 (GDestroyNotify) gmenu_tree_item_unref);
-
-  root = gmenu_tree_get_root_directory (tree);
-  
-  if (root != NULL)
-    get_flattened_entries_recurse (root, table);
-
-  gmenu_tree_item_unref (root);
-  
-  return table;
-}
-
-static void
-on_apps_tree_changed_cb (GMenuTree *tree,
-                         gpointer   user_data)
-{
-  ShellAppSystem *self = SHELL_APP_SYSTEM (user_data);
-  GError *error = NULL;
-  GHashTable *new_apps;
-  GHashTableIter iter;
-  gpointer key, value;
-
-  g_assert (tree == self->priv->apps_tree);
-
-  g_hash_table_remove_all (self->priv->visible_id_to_app);
-  g_slist_free_full (self->priv->known_vendor_prefixes, g_free);
-  self->priv->known_vendor_prefixes = NULL;
-
-  if (!gmenu_tree_load_sync (self->priv->apps_tree, &error))
-    {
-      if (error)
-        {
-          g_warning ("Failed to load apps: %s", error->message);
-          g_error_free (error);
-        }
-      else
-        {
-          g_warning ("Failed to load apps");
-        }
-      return;
-    }
-
-  new_apps = get_flattened_entries_from_tree (self->priv->apps_tree);
-  g_hash_table_iter_init (&iter, new_apps);
-  while (g_hash_table_iter_next (&iter, &key, &value))
-    {
-      const char *id = key;
-      GMenuTreeEntry *entry = value;
-      GMenuTreeEntry *old_entry;
-      char *prefix;
-      ShellApp *app;
-      GDesktopAppInfo *info;
-      const char *startup_wm_class;
-
-      prefix = get_prefix_for_entry (entry);
-
-      if (prefix != NULL
-          && !g_slist_find_custom (self->priv->known_vendor_prefixes, prefix,
-                                   (GCompareFunc)g_strcmp0))
-        self->priv->known_vendor_prefixes = g_slist_append (self->priv->known_vendor_prefixes,
-                                                            prefix);
-      else
-        g_free (prefix);
-
-      app = g_hash_table_lookup (self->priv->id_to_app, id);
-      if (app != NULL)
-        {
-          /* We hold a reference to the original entry temporarily,
-           * because otherwise the hash table would be referencing
-           * potentially free'd memory until we replace it below with
-           * the new data.
-           */
-          old_entry = shell_app_get_tree_entry (app);
-          gmenu_tree_item_ref (old_entry);
-          _shell_app_set_entry (app, entry);
-          g_object_ref (app);  /* Extra ref, removed in _replace below */
-        }
-      else
-        {
-          old_entry = NULL;
-          app = _shell_app_new (entry);
-        }
-      /* Note that "id" is owned by app->entry.  Since we're always
-       * setting a new entry, even if the app already exists in the
-       * hash table we need to replace the key so that the new id
-       * string is pointed to.
-       */
-      g_hash_table_replace (self->priv->id_to_app, (char*)id, app);
-      if (!gmenu_tree_entry_get_is_nodisplay_recurse (entry))
-        g_hash_table_replace (self->priv->visible_id_to_app, (char*)id, app);
-
-      if (old_entry)
-        {
-          GDesktopAppInfo *old_info;
-          const gchar *old_startup_wm_class;
-
-          old_info = gmenu_tree_entry_get_app_info (old_entry);
-          old_startup_wm_class = g_desktop_app_info_get_startup_wm_class (old_info);
-
-          if (old_startup_wm_class)
-            g_hash_table_remove (self->priv->startup_wm_class_to_app, old_startup_wm_class);
-        }
-
-      info = gmenu_tree_entry_get_app_info (entry);
-      startup_wm_class = g_desktop_app_info_get_startup_wm_class (info);
-      if (startup_wm_class)
-        g_hash_table_replace (self->priv->startup_wm_class_to_app,
-                              (char*)startup_wm_class, g_object_ref (app));
-
-      if (old_entry)
-        gmenu_tree_item_unref (old_entry);
-    }
-  /* Now iterate over the apps again; we need to unreference any apps
-   * which have been removed.  The JS code may still be holding a
-   * reference; that's fine.
-   */
-  g_hash_table_iter_init (&iter, self->priv->id_to_app);
-  while (g_hash_table_iter_next (&iter, &key, &value))
-    {
-      const char *id = key;
-      
-      if (!g_hash_table_lookup (new_apps, id))
-        g_hash_table_iter_remove (&iter);
-    }
-
-  g_hash_table_destroy (new_apps);
-
-  g_signal_emit (self, signals[INSTALLED_CHANGED], 0);
-}
-
-/**
- * shell_app_system_get_tree:
- *
- * Return Value: (transfer none): The #GMenuTree for apps
- */
-GMenuTree *
-shell_app_system_get_tree (ShellAppSystem *self)
-{
-  return self->priv->apps_tree;
-}
-
 /**
 * shell_app_system_get_default:
 *
@ -446,61 +167,20 @@ ShellApp *
 shell_app_system_lookup_app (ShellAppSystem   *self,
                             const char       *id)
 {
-  return g_hash_table_lookup (self->priv->id_to_app, id);
-}
-
-/**
- * shell_app_system_lookup_app_by_tree_entry:
- * @system: a #ShellAppSystem
- * @entry: a #GMenuTreeEntry
- *
- * Find a #ShellApp corresponding to a #GMenuTreeEntry.
- *
- * Return value: (transfer none): The #ShellApp for @entry, or %NULL if none
- */
-ShellApp *
-shell_app_system_lookup_app_by_tree_entry (ShellAppSystem  *self,
-                                           GMenuTreeEntry  *entry)
-{
-  /* If we looked up directly in ->entry_to_app, we'd lose the
-   * override of running apps.  Thus, indirect through the id.
-   */
-  return shell_app_system_lookup_app (self, gmenu_tree_entry_get_desktop_file_id (entry));
-}
-
-/**
- * shell_app_system_lookup_app_for_path:
- * @system: a #ShellAppSystem
- * @desktop_path: (type utf8): UTF-8 encoded absolute file name
- *
- * Find or create a #ShellApp corresponding to a given absolute file
- * name which must be in the standard paths (XDG_DATA_DIRS).  For
- * files outside the datadirs, this function returns %NULL.
- *
- * Return value: (transfer none): The #ShellApp for id, or %NULL if none
- */
-ShellApp *
-shell_app_system_lookup_app_for_path (ShellAppSystem   *system,
-                                      const char       *desktop_path)
-{
-  const char *basename;
-  const char *app_path;
+  ShellAppSystemPrivate *priv = self->priv;
  ShellApp *app;
+  GDesktopAppInfo *info;

-  basename = g_strrstr (desktop_path, "/");
-  if (basename)
-    basename += 1;
-  else
-    basename = desktop_path;
+  app = g_hash_table_lookup (priv->id_to_app, id);
+  if (app)
+    return app;

-  app = shell_app_system_lookup_app (system, basename);
-  if (!app)
-    return NULL;
-
-  app_path = g_desktop_app_info_get_filename (shell_app_get_app_info (app));
-  if (strcmp (desktop_path, app_path) != 0)
+  info = g_desktop_app_info_new (id);
+  if (!info)
    return NULL;

+  app = _shell_app_new (info);
+  g_hash_table_insert (priv->id_to_app, (char *) id, app);
  return app;
 }

@ -520,15 +200,15 @@ shell_app_system_lookup_heuristic_basename (ShellAppSystem *system,
                                            const char     *name)
 {
  ShellApp *result;
-  GSList *prefix;
+  const char *const *prefix;

  result = shell_app_system_lookup_app (system, name);
  if (result != NULL)
    return result;

-  for (prefix = system->priv->known_vendor_prefixes; prefix; prefix = g_slist_next (prefix))
+  for (prefix = vendor_prefixes; *prefix != NULL; prefix++)
    {
-      char *tmpid = g_strconcat ((char*)prefix->data, name, NULL);
+      char *tmpid = g_strconcat (*prefix, name, NULL);
      result = shell_app_system_lookup_app (system, tmpid);
      g_free (tmpid);
      if (result != NULL)
@ -603,10 +283,16 @@ ShellApp *
 shell_app_system_lookup_startup_wmclass (ShellAppSystem *system,
                                         const char     *wmclass)
 {
+  const char *id;
+
  if (wmclass == NULL)
    return NULL;

-  return g_hash_table_lookup (system->priv->startup_wm_class_to_app, wmclass);
+  id = g_hash_table_lookup (system->priv->startup_wm_class_to_id, wmclass);
+  if (id == NULL)
+    return NULL;
+
+  return shell_app_system_lookup_app (system, id);
 }

 void
@ -618,6 +304,7 @@ _shell_app_system_notify_app_state_changed (ShellAppSystem *self,
  switch (state)
    {
    case SHELL_APP_STATE_RUNNING:
+    case SHELL_APP_STATE_BUSY:
      g_hash_table_insert (self->priv->running_apps, g_object_ref (app), NULL);
      break;
    case SHELL_APP_STATE_STARTING:
@ -660,136 +347,3 @@ shell_app_system_get_running (ShellAppSystem *self)

  return ret;
 }
-
-
-static gint
-compare_apps_by_usage (gconstpointer a,
-                       gconstpointer b,
-                       gpointer      data)
-{
-  ShellAppUsage *usage = shell_app_usage_get_default ();
-
-  ShellApp *app_a = (ShellApp*)a;
-  ShellApp *app_b = (ShellApp*)b;
-
-  return shell_app_usage_compare (usage, "", app_a, app_b);
-}
-
-static GSList *
-sort_and_concat_results (ShellAppSystem *system,
-                         GSList         *prefix_matches,
-                         GSList         *substring_matches)
-{
-  prefix_matches = g_slist_sort_with_data (prefix_matches,
-                                           compare_apps_by_usage,
-                                           system);
-  substring_matches = g_slist_sort_with_data (substring_matches,
-                                              compare_apps_by_usage,
-                                              system);
-  return g_slist_concat (prefix_matches, substring_matches);
-}
-
-/**
- * normalize_terms:
- * @terms: (element-type utf8): Input search terms
- *
- * Returns: (element-type utf8) (transfer full): Unicode-normalized and lowercased terms
- */
-static GSList *
-normalize_terms (GSList *terms)
-{
-  GSList *normalized_terms = NULL;
-  GSList *iter;
-  for (iter = terms; iter; iter = iter->next)
-    {
-      const char *term = iter->data;
-      normalized_terms = g_slist_prepend (normalized_terms,
-                                          shell_util_normalize_casefold_and_unaccent (term));
-    }
-  return normalized_terms;
-}
-
-static GSList *
-search_tree (ShellAppSystem *self,
-             GSList         *terms,
-             GHashTable     *apps)
-{
-  GSList *prefix_results = NULL;
-  GSList *substring_results = NULL;
-  GSList *normalized_terms;
-  GHashTableIter iter;
-  gpointer key, value;
-
-  normalized_terms = normalize_terms (terms);
-
-  g_hash_table_iter_init (&iter, apps);
-  while (g_hash_table_iter_next (&iter, &key, &value))
-    {
-      ShellApp *app = value;
-      _shell_app_do_match (app, normalized_terms,
-                           &prefix_results,
-                           &substring_results);
-    }
-  g_slist_free_full (normalized_terms, g_free);
-
-  return sort_and_concat_results (self, prefix_results, substring_results);
-
-}
-
-/**
- * shell_app_system_initial_search:
- * @system: A #ShellAppSystem
- * @terms: (element-type utf8): List of terms, logical AND
- *
- * Search through applications for the given search terms.
- *
- * Returns: (transfer container) (element-type ShellApp): List of applications
- */
-GSList *
-shell_app_system_initial_search (ShellAppSystem  *self,
-                                 GSList          *terms)
-{
-  return search_tree (self, terms, self->priv->visible_id_to_app);
-}
-
-/**
- * shell_app_system_subsearch:
- * @system: A #ShellAppSystem
- * @previous_results: (element-type ShellApp): List of previous results
- * @terms: (element-type utf8): List of terms, logical AND
- *
- * Search through a previous result set; for more information, see
- * js/ui/search.js.  Note the value of @prefs must be
- * the same as passed to shell_app_system_initial_search().  Note that returned
- * strings are only valid until a return to the main loop.
- *
- * Returns: (transfer container) (element-type ShellApp): List of application identifiers
- */
-GSList *
-shell_app_system_subsearch (ShellAppSystem   *system,
-                            GSList           *previous_results,
-                            GSList           *terms)
-{
-  GSList *iter;
-  GSList *prefix_results = NULL;
-  GSList *substring_results = NULL;
-  GSList *normalized_terms = normalize_terms (terms);
-
-  previous_results = g_slist_reverse (previous_results);
-
-  for (iter = previous_results; iter; iter = iter->next)
-    {
-      ShellApp *app = iter->data;
-      
-      _shell_app_do_match (app, normalized_terms,
-                           &prefix_results,
-                           &substring_results);
-    }
-  g_slist_free_full (normalized_terms, g_free);
-
-  /* Note that a shorter term might have matched as a prefix, but
-     when extended only as a substring, so we have to redo the
-     sort rather than reusing the existing ordering */
-  return sort_and_concat_results (system, prefix_results, substring_results);
-}
-
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@ -5,8 +5,6 @@
 #include <gio/gio.h>
 #include <clutter/clutter.h>
 #include <meta/window.h>
-#define GMENU_I_KNOW_THIS_IS_UNSTABLE
-#include <gmenu-tree.h>

 #include "shell-app.h"

@ -39,14 +37,8 @@ struct _ShellAppSystemClass
 GType           shell_app_system_get_type    (void) G_GNUC_CONST;
 ShellAppSystem *shell_app_system_get_default (void);

-GMenuTree      *shell_app_system_get_tree                     (ShellAppSystem *system);
-
 ShellApp       *shell_app_system_lookup_app                   (ShellAppSystem  *system,
                                                               const char      *id);
-ShellApp       *shell_app_system_lookup_app_by_tree_entry     (ShellAppSystem  *system,
-                                                               GMenuTreeEntry  *entry);
-ShellApp       *shell_app_system_lookup_app_for_path          (ShellAppSystem  *system,
-                                                               const char      *desktop_path);
 ShellApp       *shell_app_system_lookup_heuristic_basename    (ShellAppSystem  *system,
                                                               const char      *id);

@ -57,10 +49,4 @@ ShellApp       *shell_app_system_lookup_desktop_wmclass       (ShellAppSystem *s

 GSList         *shell_app_system_get_running               (ShellAppSystem  *self);

-GSList         *shell_app_system_initial_search            (ShellAppSystem  *system,
-                                                            GSList          *terms);
-GSList         *shell_app_system_subsearch                 (ShellAppSystem  *system,
-                                                            GSList          *previous_results,
-                                                            GSList          *terms);
-
 #endif /* __SHELL_APP_SYSTEM_H__ */
--- a/src/shell-app-usage.c
+++ b/src/shell-app-usage.c
@ -527,19 +527,19 @@ shell_app_usage_get_most_used (ShellAppUsage   *self,
 * shell_app_usage_compare:
 * @self: the usage instance to request
 * @context: Activity identifier
- * @app_a: First app
- * @app_b: Second app
+ * @id_a: ID of first app
+ * @id_b: ID of second app
 *
- * Compare @app_a and @app_b based on frequency of use.
+ * Compare @id_a and @id_b based on frequency of use.
 *
- * Returns: -1 if @app_a ranks higher than @app_b, 1 if @app_b ranks higher
- *          than @app_a, and 0 if both rank equally.
+ * Returns: -1 if @id_a ranks higher than @id_b, 1 if @id_b ranks higher
+ *          than @id_a, and 0 if both rank equally.
 */
 int
 shell_app_usage_compare (ShellAppUsage *self,
                         const char    *context,
-                         ShellApp      *app_a,
-                         ShellApp      *app_b)
+                         const char    *id_a,
+                         const char    *id_b)
 {
  GHashTable *usages;
  UsageData *usage_a, *usage_b;
@ -548,8 +548,8 @@ shell_app_usage_compare (ShellAppUsage *self,
  if (usages == NULL)
    return 0;

-  usage_a = g_hash_table_lookup (usages, shell_app_get_id (app_a));
-  usage_b = g_hash_table_lookup (usages, shell_app_get_id (app_b));
+  usage_a = g_hash_table_lookup (usages, id_a);
+  usage_b = g_hash_table_lookup (usages, id_b);

  if (usage_a == NULL && usage_b == NULL)
    return 0;
--- a/src/shell-app-usage.h
+++ b/src/shell-app-usage.h
@ -31,8 +31,8 @@ GSList *shell_app_usage_get_most_used (ShellAppUsage *usage,
                                       const char    *context);
 int shell_app_usage_compare (ShellAppUsage *self,
                             const char    *context,
-                             ShellApp      *app_a,
-                             ShellApp      *app_b);
+                             const char    *id_a,
+                             const char    *id_b);

 G_END_DECLS

--- a/src/shell-app.c
+++ b/src/shell-app.c
@ -53,7 +53,7 @@ typedef struct {
 * SECTION:shell-app
 * @short_description: Object representing an application
 *
- * This object wraps a #GMenuTreeEntry, providing methods and signals
+ * This object wraps a #GDesktopAppInfo, providing methods and signals
 * primarily useful for running applications.
 */
 struct _ShellApp
@ -64,7 +64,7 @@ struct _ShellApp

  ShellAppState state;

-  GMenuTreeEntry *entry; /* If NULL, this app is backed by one or more
+  GDesktopAppInfo *info; /* If NULL, this app is backed by one or more
                          * MetaWindow.  For purposes of app title
                          * etc., we use the first window added,
                          * because it's most likely to be what we
@ -137,15 +137,15 @@ shell_app_get_property (GObject    *gobject,
 const char *
 shell_app_get_id (ShellApp *app)
 {
-  if (app->entry)
-    return gmenu_tree_entry_get_desktop_file_id (app->entry);
+  if (app->info)
+    return g_app_info_get_id (G_APP_INFO (app->info));
  return app->window_id_string;
 }

 static MetaWindow *
 window_backed_app_get_window (ShellApp     *app)
 {
-  g_assert (app->entry == NULL);
+  g_assert (app->info == NULL);
  g_assert (app->running_state);
  g_assert (app->running_state->windows);
  return app->running_state->windows->data;
@ -194,10 +194,10 @@ shell_app_create_icon_texture (ShellApp   *app,

  ret = NULL;

-  if (app->entry == NULL)
+  if (app->info == NULL)
    return window_backed_app_get_icon (app, size);

-  icon = g_app_info_get_icon (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
+  icon = g_app_info_get_icon (G_APP_INFO (app->info));
  if (icon != NULL)
    ret = st_texture_cache_load_gicon (st_texture_cache_get_default (), NULL, icon, size);

@ -245,7 +245,7 @@ shell_app_create_faded_icon_cpu (StTextureCache *cache,

  info = NULL;

-  icon = g_app_info_get_icon (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
+  icon = g_app_info_get_icon (G_APP_INFO (app->info));
  if (icon != NULL)
    {
      info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (),
@ -266,7 +266,7 @@ shell_app_create_faded_icon_cpu (StTextureCache *cache,
    return COGL_INVALID_HANDLE;

  pixbuf = gtk_icon_info_load_icon (info, NULL);
-  gtk_icon_info_free (info);
+  g_object_unref (info);

  if (pixbuf == NULL)
    return COGL_INVALID_HANDLE;
@ -347,7 +347,7 @@ shell_app_get_faded_icon (ShellApp *app, int size, ClutterTextDirection directio
   * property tracking bits, and this helps us visually distinguish
   * app-tracked from not.
   */
-  if (!app->entry)
+  if (!app->info)
    return window_backed_app_get_icon (app, size);

  /* Use icon: prefix so that we get evicted from the cache on
@ -384,8 +384,8 @@ shell_app_get_faded_icon (ShellApp *app, int size, ClutterTextDirection directio
 const char *
 shell_app_get_name (ShellApp *app)
 {
-  if (app->entry)
-    return g_app_info_get_name (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
+  if (app->info)
+    return g_app_info_get_name (G_APP_INFO (app->info));
  else
    {
      MetaWindow *window = window_backed_app_get_window (app);
@ -401,8 +401,8 @@ shell_app_get_name (ShellApp *app)
 const char *
 shell_app_get_description (ShellApp *app)
 {
-  if (app->entry)
-    return g_app_info_get_description (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
+  if (app->info)
+    return g_app_info_get_description (G_APP_INFO (app->info));
  else
    return NULL;
 }
@ -417,7 +417,7 @@ shell_app_get_description (ShellApp *app)
 gboolean
 shell_app_is_window_backed (ShellApp *app)
 {
-  return app->entry == NULL;
+  return app->info == NULL;
 }

 typedef struct {
@ -653,6 +653,7 @@ shell_app_activate_full (ShellApp      *app,
      case SHELL_APP_STATE_STARTING:
        break;
      case SHELL_APP_STATE_RUNNING:
+      case SHELL_APP_STATE_BUSY:
        shell_app_activate_window (app, NULL, timestamp);
        break;
    }
@ -669,7 +670,7 @@ void
 shell_app_open_new_window (ShellApp      *app,
                           int            workspace)
 {
-  g_return_if_fail (app->entry != NULL);
+  g_return_if_fail (app->info != NULL);

  /* Here we just always launch the application again, even if we know
   * it was already running.  For most applications this
@ -771,25 +772,6 @@ shell_app_get_n_windows (ShellApp *app)
  return g_slist_length (app->running_state->windows);
 }

-static gboolean
-shell_app_has_visible_windows (ShellApp   *app)
-{
-  GSList *iter;
-
-  if (app->running_state == NULL)
-    return FALSE;
-
-  for (iter = app->running_state->windows; iter; iter = iter->next)
-    {
-      MetaWindow *window = iter->data;
-
-      if (meta_window_showing_on_its_workspace (window))
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
 gboolean
 shell_app_is_on_workspace (ShellApp *app,
                           MetaWorkspace   *workspace)
@ -841,17 +823,13 @@ shell_app_get_last_user_time (ShellApp *app)
 *
 * Compare one #ShellApp instance to another, in the following way:
 *   - Running applications sort before not-running applications.
- *   - If one of them has visible windows and the other does not, the one
- *     with visible windows is first.
- *   - Finally, the application which the user interacted with most recently
+ *   - The application which the user interacted with most recently
 *     compares earlier.
 */
 int
 shell_app_compare (ShellApp *app,
                   ShellApp *other)
 {
-  gboolean vis_app, vis_other;
-
  if (app->state != other->state)
    {
      if (app->state == SHELL_APP_STATE_RUNNING)
@ -859,14 +837,6 @@ shell_app_compare (ShellApp *app,
      return 1;
    }

-  vis_app = shell_app_has_visible_windows (app);
-  vis_other = shell_app_has_visible_windows (other);
-
-  if (vis_app && !vis_other)
-    return -1;
-  else if (!vis_app && vis_other)
-    return 1;
-
  if (app->state == SHELL_APP_STATE_RUNNING)
    {
      if (app->running_state->windows && !other->running_state->windows)
@ -895,25 +865,24 @@ _shell_app_new_for_window (MetaWindow      *window)
 }

 ShellApp *
-_shell_app_new (GMenuTreeEntry *info)
+_shell_app_new (GDesktopAppInfo *info)
 {
  ShellApp *app;

  app = g_object_new (SHELL_TYPE_APP, NULL);

-  _shell_app_set_entry (app, info);
+  _shell_app_set_app_info (app, info);

  return app;
 }

 void
-_shell_app_set_entry (ShellApp       *app,
-                      GMenuTreeEntry *entry)
+_shell_app_set_app_info (ShellApp        *app,
+                         GDesktopAppInfo *info)
 {
-  if (app->entry != NULL)
-    gmenu_tree_item_unref (app->entry);
-  app->entry = gmenu_tree_item_ref (entry);
-  
+  g_clear_object (&app->info);
+  app->info = g_object_ref (info);
+
  if (app->name_collation_key != NULL)
    g_free (app->name_collation_key);
  app->name_collation_key = g_utf8_collate_key (shell_app_get_name (app), -1);
@ -991,10 +960,8 @@ application_properties_changed (GDBusConnection *connection,
 {
  ShellApp *app = user_data;
  GVariant *changed_properties;
-  GVariantIter iter;
  gboolean busy = FALSE;
-  const gchar *key, *interface_name_for_signal;
-  GVariant *value;
+  const gchar *interface_name_for_signal;

  g_variant_get (parameters,
                 "(&s@a{sv}as)",
@ -1005,19 +972,7 @@ application_properties_changed (GDBusConnection *connection,
  if (g_strcmp0 (interface_name_for_signal, "org.gtk.Application") != 0)
    return;

-  g_variant_iter_init (&iter, changed_properties);
-  while (g_variant_iter_next (&iter, "{&sv}", &key, &value))
-    {
-      if (g_strcmp0 (key, "Busy") != 0)
-        {
-          g_variant_unref (value);
-          continue;
-        }
-
-      busy = g_variant_get_boolean (value);
-      g_variant_unref (value);
-      break;
-    }
+  g_variant_lookup (changed_properties, "Busy", "b", &busy);

  if (busy)
    shell_app_state_transition (app, SHELL_APP_STATE_BUSY);
@ -1232,7 +1187,6 @@ shell_app_launch (ShellApp     *app,
                  char        **startup_id,
                  GError      **error)
 {
-  GDesktopAppInfo *gapp;
  GdkAppLaunchContext *context;
  gboolean ret;
  ShellGlobal *global;
@ -1242,7 +1196,7 @@ shell_app_launch (ShellApp     *app,
  if (startup_id)
    *startup_id = NULL;

-  if (app->entry == NULL)
+  if (app->info == NULL)
    {
      MetaWindow *window = window_backed_app_get_window (app);
      /* We can't pass URIs into a window; shouldn't hit this
@ -1268,8 +1222,7 @@ shell_app_launch (ShellApp     *app,
  gdk_app_launch_context_set_timestamp (context, timestamp);
  gdk_app_launch_context_set_desktop (context, workspace);

-  gapp = gmenu_tree_entry_get_app_info (app->entry);
-  ret = g_desktop_app_info_launch_uris_as_manager (gapp, uris,
+  ret = g_desktop_app_info_launch_uris_as_manager (app->info, uris,
                                                   G_APP_LAUNCH_CONTEXT (context),
                                                   G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
                                                   NULL, NULL,
@ -1289,21 +1242,7 @@ shell_app_launch (ShellApp     *app,
 GDesktopAppInfo *
 shell_app_get_app_info (ShellApp *app)
 {
-  if (app->entry)
-    return gmenu_tree_entry_get_app_info (app->entry);
-  return NULL;
-}
-
-/**
- * shell_app_get_tree_entry:
- * @app: a #ShellApp
- *
- * Returns: (transfer none): The #GMenuTreeEntry for this app, or %NULL if backed by a window
- */
-GMenuTreeEntry *
-shell_app_get_tree_entry (ShellApp *app)
-{
-  return app->entry;
+  return app->info;
 }

 static void
@ -1418,24 +1357,22 @@ shell_app_init_search_data (ShellApp *app)
  const char *exec;
  const char * const *keywords;
  char *normalized_exec;
-  GDesktopAppInfo *appinfo;

-  appinfo = gmenu_tree_entry_get_app_info (app->entry);
-  name = g_app_info_get_name (G_APP_INFO (appinfo));
+  name = g_app_info_get_name (G_APP_INFO (app->info));
  app->casefolded_name = shell_util_normalize_casefold_and_unaccent (name);

-  generic_name = g_desktop_app_info_get_generic_name (appinfo);
+  generic_name = g_desktop_app_info_get_generic_name (app->info);
  if (generic_name)
    app->casefolded_generic_name = shell_util_normalize_casefold_and_unaccent (generic_name);
  else
    app->casefolded_generic_name = NULL;

-  exec = g_app_info_get_executable (G_APP_INFO (appinfo));
+  exec = g_app_info_get_executable (G_APP_INFO (app->info));
  normalized_exec = shell_util_normalize_casefold_and_unaccent (exec);
  app->casefolded_exec = trim_exec_line (normalized_exec);
  g_free (normalized_exec);

-  keywords = g_desktop_app_info_get_keywords (appinfo);
+  keywords = g_desktop_app_info_get_keywords (app->info);

  if (keywords)
    {
@ -1556,16 +1493,14 @@ _shell_app_do_match (ShellApp         *app,
                     GSList          **substring_results)
 {
  ShellAppSearchMatch match;
-  GAppInfo *appinfo;

  g_assert (app != NULL);

  /* Skip window-backed apps */ 
-  appinfo = (GAppInfo*)shell_app_get_app_info (app);
-  if (appinfo == NULL)
+  if (app->info == NULL)
    return;
  /* Skip not-visible apps */ 
-  if (!g_app_info_should_show (appinfo))
+  if (!g_app_info_should_show (G_APP_INFO (app->info)))
    return;

  match = _shell_app_match_search_terms (app, terms);
@ -1594,11 +1529,7 @@ shell_app_dispose (GObject *object)
 {
  ShellApp *app = SHELL_APP (object);

-  if (app->entry)
-    {
-      gmenu_tree_item_unref (app->entry);
-      app->entry = NULL;
-    }
+  g_clear_object (&app->info);

  if (app->running_state)
    {
--- a/Show More
+++ b/Show More