Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master

[Marco Trevisan (Treviño)]

Added XUbuntuCancel method call for search providers

6b51176... by Marek Cernocky <email address hidden> on 2018-08-29

Updated Czech translation

e207b45... by =?utf-8?q?Florian_M=C3=BCllner?= <email address hidden> on 2018-08-29

Bump version to 3.29.92

Update NEWS.

8717cfc... by Marco Trevisan (Treviño) on 2018-08-30

New upstream version 3.29.92

f9c4674... by Marco Trevisan (Treviño) on 2018-08-30

Update upstream source from tag 'upstream/3.29.92'

Update to upstream version '3.29.92'
with Debian dir ae24138d736b24d6ba797946d36fed41bc714d8f

1b5b8ae... by Marco Trevisan (Treviño) on 2018-08-30

debian/changelog: new upstream release

3562ac2... by Marco Trevisan (Treviño) on 2018-08-30

debian/control{,.in}: (build-)depend on mutter 3.29.92

6e775aa... by Simon McVittie on 2018-08-30

Standards-Version: 4.2.1 (no changes required)

a998d58... by Simon McVittie on 2018-08-30

Add Breaks for extensions that rely on the old global.screen API

See:
https://udd.debian.org/cgi-bin/bts-usertags.cgi?tag=shell-3.30&user=pkg-gnome-maintainers%40lists.alioth.debian.org

0f83487... by Simon McVittie on 2018-08-30

3.29.92-1

[Didier Roche-Tolomelli (didrocks)]

Ok, this looks good to me, see some of my questions.

I saw that you made some changes on the MR after Florian's comment on your patches. Is there anything you can borrow and refresh here?

See as well my 2 questions/comments

review: Needs Information

[Marco Trevisan (Treviño) (3v1n0)]

> I saw that you made some changes on the MR after Florian's comment on your
> patches. Is there anything you can borrow and refresh here?

Yes, I wanted to refresh in case a review (like in this case) was coming in time, so nothing functional has been changed there, but I can refresh it on that.

As per the two questions, let me know if you want get rid of that variable or use a property bound to the cancellable instead.

[Didier Roche-Tolomelli (didrocks)]

For the variable, it's really up to you and what is the most readable in your eyes. I just wanted to trigger that question so that you can think about it, but I have no strong opinion :)

056d56f... by Marco Trevisan (Treviño) on 2018-08-30

Merge with 'debian/3.29.92-1'

gnome-shell Debian release 3.29.92-1

4f6c773... by Marco Trevisan (Treviño) on 2018-08-30

debian/patches: refresh (removed applied one)

js-ui-Choose-some-actors-to-cache-on-the-GPU.patch

Unmerged commits

c09ef9a... by Marco Trevisan (Treviño) on 2018-08-27

debian/patches: add support fo XUbuntuCancel on remote search provider

Fixes LP: #1756826

4f6c773... by Marco Trevisan (Treviño) on 2018-08-30

debian/patches: refresh (removed applied one)

js-ui-Choose-some-actors-to-cache-on-the-GPU.patch

056d56f... by Marco Trevisan (Treviño) on 2018-08-30

Merge with 'debian/3.29.92-1'

gnome-shell Debian release 3.29.92-1

ec0c385... by Marco Trevisan (Treviño) on 2018-08-27

d/p/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch

Updated as per upstream review

e18d810... by Marco Trevisan (Treviño) on 2018-08-27

debian/changelog: list remaning changes on debian merge

2868dcf... by Marco Trevisan (Treviño) on 2018-08-27

debian/patches/series: reorder patches for easier merging

14c47c2... by Marco Trevisan (Treviño) on 2018-08-27

Merge 'debian/3.29.91-1' into ubuntu/master

gnome-shell Debian release 3.29.91-1

0f83487... by Simon McVittie on 2018-08-30

3.29.92-1

a998d58... by Simon McVittie on 2018-08-30

Add Breaks for extensions that rely on the old global.screen API

See:
https://udd.debian.org/cgi-bin/bts-usertags.cgi?tag=shell-3.30&user=pkg-gnome-maintainers%40lists.alioth.debian.org

6e775aa... by Simon McVittie on 2018-08-30

Standards-Version: 4.2.1 (no changes required)

diff --git a/NEWS b/NEWS
index 448f031..a279db2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+3.29.92
+=======
+* Choose some actors to cache on the GPU [Daniel; #792633]
+* inputMethod: Hide preedit text if requested [Takao; #431]
+* Fix forced fallback app-menus on wayland [Jonas; #276]
+
+Contributors:
+  Jonas Ådahl, Takao Fujiwara, Mohammed Sadiq, Marco Trevisan (Treviño),
+  Daniel van Vugt
+
+Translators:
+  Baurzhan Muftakhidinov [kk], Kukuh Syafaat [id], Milo Casagrande [it],
+  Changwoo Ryu [ko], Marek Cernocky [cs]
+
 3.29.91
 =======
 * Fix handling of 0/false options in ShowOSD D-Bus API [Florian; #791669]
diff --git a/data/gnome-shell-osk-layouts.gresource.xml b/data/gnome-shell-osk-layouts.gresource.xml
index 86d6cb9..b7969c7 100644
--- a/data/gnome-shell-osk-layouts.gresource.xml
+++ b/data/gnome-shell-osk-layouts.gresource.xml
@@ -22,6 +22,7 @@
     <file>id.json</file>
     <file>il.json</file>
     <file>in+bolnagri.json</file>
+    <file>in+mal.json</file>
     <file>ir.json</file>
     <file>is.json</file>
     <file>it.json</file>
diff --git a/data/osk-layouts/in+mal.json b/data/osk-layouts/in+mal.json
new file mode 100644
index 0000000..bc153be
--- /dev/null
+++ b/data/osk-layouts/in+mal.json
@@ -0,0 +1,559 @@
+{
+  "levels": [
+    {
+      "level": "",
+      "mode": "default",
+      "rows": [
+        [
+          [
+            "െ"
+          ],
+          [
+            "ൌ"
+          ],
+          [
+            "ൈ"
+          ],
+          [
+            "ാ"
+          ],
+          [
+            "ീ"
+          ],
+          [
+            "ൂ"
+          ],
+          [
+            "ബ"
+          ],
+          [
+            "ഹ"
+          ],
+          [
+            "ഗ"
+          ],
+          [
+            "ദ"
+          ],
+          [
+            "ജ"
+          ],
+          [
+            "ഡ"
+          ],
+          [
+            "‍"
+          ]
+        ],
+        [
+          [
+            "ോ"
+          ],
+          [
+            "േ"
+          ],
+          [
+            "്"
+          ],
+          [
+            "ി"
+          ],
+          [
+            "ു"
+          ],
+          [
+            "പ"
+          ],
+          [
+            "ര"
+          ],
+          [
+            "ക"
+          ],
+          [
+            "ത"
+          ],
+          [
+            "ച"
+          ],
+          [
+            "ട"
+          ]
+        ],
+        [
+          [
+            "െ"
+          ],
+          [
+            "ം"
+          ],
+          [
+            "മ",
+            "ç"
+          ],
+          [
+            "ന"
+          ],
+          [
+            "വ"
+          ],
+          [
+            "ല",
+            "ñ"
+          ],
+          [
+            "സ"
+          ],
+          [
+            "ഷ"
+          ],
+          [
+            "യ"
+          ]
+        ],
+        [
+          [
+            ","
+          ],
+          [
+            " "
+          ],
+          [
+            ".",
+            "#",
+            "!",
+            ",",
+            "?",
+            "-",
+            ":",
+            "'",
+            "@"
+          ]
+        ]
+      ]
+    },
+    {
+      "level": "shift",
+      "mode": "latched",
+      "rows": [
+        [
+          [
+            "ഔ"
+          ],
+          [
+            "ഐ"
+          ],
+          [
+            "ആ"
+          ],
+          [
+            "ഈ"
+          ],
+          [
+            "ഊ"
+          ],
+          [
+            "ഭ"
+          ],
+          [
+            "ങ"
+          ],
+          [
+            "ഘ"
+          ],
+          [
+            "ധ"
+          ],
+          [
+            "ഝ"
+          ],
+          [
+            "ഢ"
+          ],
+          [
+            "ഞ"
+          ]
+        ],
+        [
+          [
+            "ഓ"
+          ],
+          [
+            "ഏ"
+          ],
+          [
+            "അ"
+          ],
+          [
+            "ഇ"
+          ],
+          [
+            "ഉ"
+          ],
+          [
+            "ഫ"
+          ],
+          [
+            "റ"
+          ],
+          [
+            "ഖ"
+          ],
+          [
+            "ഥ"
+          ],
+          [
+            "ഛ"
+          ],
+          [
+            "ഠ"
+          ]
+        ],
+        [
+          [
+            "എ"
+          ],
+          [
+            "​"
+          ],
+          [
+            "ണ"
+          ],
+          [
+            "ന"
+          ],
+          [
+            "ഴ"
+          ],
+          [
+            "ള"
+          ],
+          [
+            "ശ"
+          ],
+          [
+            "ഷ"
+          ],
+          [
+            "യ"
+          ]
+        ],
+        [
+          [
+            ","
+          ],
+          [
+            " "
+          ],
+          [
+            ".",
+            "#",
+            "!",
+            ",",
+            "?",
+            "-",
+            ":",
+            "'",
+            "@"
+          ]
+        ]
+      ]
+    },
+    {
+      "level": "opt",
+      "mode": "locked",
+      "rows": [
+        [
+          [
+            "൧",
+            "1",
+            "¹",
+            "½",
+            "⅓",
+            "¼",
+            "⅛"
+          ],
+          [
+            "൨",
+            "2",
+            "²",
+            "⅔"
+          ],
+          [
+            "൩",
+            "3",
+            "³",
+            "¾",
+            "⅜"
+          ],
+          [
+            "൪",
+            "4",
+            "⁴"
+          ],
+          [
+            "൫",
+            "5",
+            "⅝"
+          ],
+          [
+            "൬",
+            "6"
+          ],
+          [
+            "൭",
+            "7",
+            "⅞"
+          ],
+          [
+            "൮",
+            "8"
+          ],
+          [
+            "൯",
+            "9"
+          ],
+          [
+            "൦",
+            "0",
+            "ⁿ",
+            "∅"
+          ]
+        ],
+        [
+          [
+            "@"
+          ],
+          [
+            "#"
+          ],
+          [
+            "₹",
+            "$",
+            "¢",
+            "£",
+            "€",
+            "¥",
+            "₱"
+          ],
+          [
+            "%",
+            "‰"
+          ],
+          [
+            "&"
+          ],
+          [
+            "-",
+            "_",
+            "–",
+            "—",
+            "·"
+          ],
+          [
+            "+",
+            "±"
+          ],
+          [
+            "(",
+            "<",
+            "{",
+            "["
+          ],
+          [
+            ")",
+            ">",
+            "}",
+            "]"
+          ]
+        ],
+        [
+          [
+            "*",
+            "†",
+            "‡",
+            "★"
+          ],
+          [
+            "\"",
+            "“",
+            "”",
+            "«",
+            "»"
+          ],
+          [
+            "'",
+            "‘",
+            "’",
+            "‹",
+            "›"
+          ],
+          [
+            ":"
+          ],
+          [
+            ";"
+          ],
+          [
+            "!",
+            "¡"
+          ],
+          [
+            "?",
+            "¿"
+          ]
+        ],
+        [
+          [
+            "_"
+          ],
+          [
+            "/"
+          ],
+          [
+            " "
+          ],
+          [
+            ","
+          ],
+          [
+            ".",
+            "…"
+          ]
+        ]
+      ]
+    },
+    {
+      "level": "opt+shift",
+      "mode": "locked",
+      "rows": [
+        [
+          [
+            "~"
+          ],
+          [
+            "`"
+          ],
+          [
+            "|"
+          ],
+          [
+            "•",
+            "♪",
+            "♥",
+            "♠",
+            "♦",
+            "♣"
+          ],
+          [
+            "√"
+          ],
+          [
+            "Π",
+            "π"
+          ],
+          [
+            "÷"
+          ],
+          [
+            "×"
+          ],
+          [
+            "¶",
+            "§"
+          ],
+          [
+            "∆"
+          ]
+        ],
+        [
+          [
+            "£"
+          ],
+          [
+            "¢"
+          ],
+          [
+            "€"
+          ],
+          [
+            "¥"
+          ],
+          [
+            "^",
+            "↑",
+            "↓",
+            "←",
+            "→"
+          ],
+          [
+            "°",
+            "′",
+            "″"
+          ],
+          [
+            "=",
+            "≠",
+            "≈",
+            "∞"
+          ],
+          [
+            "{"
+          ],
+          [
+            "}"
+          ]
+        ],
+        [
+          [
+            "\\"
+          ],
+          [
+            "©"
+          ],
+          [
+            "®"
+          ],
+          [
+            "™"
+          ],
+          [
+            "℅"
+          ],
+          [
+            "["
+          ],
+          [
+            "]"
+          ]
+        ],
+        [
+          [
+            "<",
+            "‹",
+            "≤",
+            "«"
+          ],
+          [
+            ">",
+            "›",
+            "≥",
+            "»"
+          ],
+          [
+            " "
+          ],
+          [
+            ","
+          ],
+          [
+            ".",
+            "…"
+          ]
+        ]
+      ]
+    }
+  ],
+  "locale": "ml",
+  "name": "Malayalam"
+}
diff --git a/debian/changelog b/debian/changelog
index 3b2e50f..6e58525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gnome-shell (3.29.91-1ubuntu1) UNRELEASED; urgency=medium
+gnome-shell (3.29.92-1ubuntu1) UNRELEASED; urgency=medium
 
   * Merge with debian, remaining changes:
     + Replace gnome-backgrounds dep with ubuntu-wallpapers and Suggests
@@ -58,10 +58,45 @@ gnome-shell (3.29.91-1ubuntu1) UNRELEASED; urgency=medium
       - Run dh_translations and work around an issue with Rosetta and plural
         translations
       - Run dh_install with --fail-missing
+  * Refresh patches
   * d/p/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch:
     - Updated as per upstream review
+  * d/p/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch:
+    - Removed (applied upstream)
+  * d/p/js-viewSelector-Cancel-search-on-overview-hiding.patch,
+    d/p/search-Cancel-search-provider-operations-on-clear.patch,
+    d/p/ubuntu/search-call-Cancel-method-on-providers-when-no-data-is-ne.patch:
+    - Add support for cancelling remote search providers when the overlay
+      is closed (and actually stop searches when requested from UI, LP: #1756826)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Thu, 30 Aug 2018 09:08:20 -0500
+
+gnome-shell (3.29.92-1) experimental; urgency=medium
+
+  * Team upload
 
- -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 28 Aug 2018 00:35:19 +0200
+  [ Marco Trevisan (Treviño) ]
+  * New upstream development release
+  * Build-depend on mutter 3.29.92
+
+  [ Simon McVittie ]
+  * Standards-Version: 4.2.1 (no changes required)
+  * Add Breaks on older versions of extensions that needed updates for
+    this Shell version
+    - gnome-shell-extension-autohidetopbar (#905111)
+    - gnome-shell-extension-caffeine (#905108)
+    - gnome-shell-extension-dashtodock (#905106)
+    - gnome-shell-extension-top-icons-plus (#905115)
+  * Add Breaks on extensions that still need updates for this version,
+    using versions that assume they will be fixed in their next NMU or MU
+    - gnome-shell-extension-dash-to-panel (#905110)
+    - gnome-shell-extension-multi-monitors (#905114)
+    - gnome-shell-extension-pixelsaver (#905109)
+    - gnome-shell-extension-taskbar (#905113)
+    - gnome-shell-extension-workspaces-to-dock (#905112)
+    - gnome-shell-pomodoro (#905107)
+
+ -- Simon McVittie <[e-mail]>  Thu, 30 Aug 2018 09:20:35 +0100
 
 gnome-shell (3.29.91-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 62ffe3f..526848b 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Build-Depends: debhelper (>= 11.1.3),
                libgstreamer1.0-dev (>= 0.11.92),
                libgtk-3-dev (>= 3.21.6),
                libibus-1.0-dev,
-               libmutter-3-dev (>= 3.29.91),
+               libmutter-3-dev (>= 3.29.92),
                libnm-dev (>= 1.10.4) [linux-any],
                libpolkit-agent-1-dev (>= 0.100),
                libpulse-dev (>= 2.0),
@@ -54,7 +54,7 @@ Build-Depends: debhelper (>= 11.1.3),
                xauth <!nocheck>,
                xvfb <!nocheck>
 Rules-Requires-Root: no
-Standards-Version: 4.2.0
+Standards-Version: 4.2.1
 Homepage: https://wiki.gnome.org/Projects/GnomeShell
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell
 XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git -b debian/experimental
@@ -77,7 +77,7 @@ Depends: evolution-data-server (>= 3.17.2),
          gir1.2-gtk-3.0 (>= 3.16),
          gir1.2-gweather-3.0 (>= 3.25.91),
          gir1.2-ibus-1.0 (>= 1.5.2),
-         gir1.2-mutter-3 (>= 3.29.91),
+         gir1.2-mutter-3 (>= 3.29.92),
          gir1.2-nm-1.0 [linux-any],
          gir1.2-nma-1.0 [linux-any],
          gir1.2-pango-1.0,
@@ -91,7 +91,7 @@ Depends: evolution-data-server (>= 3.17.2),
          ubuntu-wallpapers,
          gsettings-desktop-schemas (>= 3.27.90),
          libglib2.0-bin (>= 2.53.0),
-         mutter (>= 3.29.91),
+         mutter (>= 3.29.92),
          python3,
          ${gir:Depends},
          ${misc:Depends},
@@ -113,8 +113,18 @@ Suggests: chrome-gnome-shell,
           gir1.2-telepathylogger-0.2 (>= 0.8.0)
 Breaks: gdm3 (<< 3.19.92),
         gnome-session (<< 3.19),
+        gnome-shell-extension-autohidetopbar (<< 20180511-2~),
+        gnome-shell-extension-caffeine (<< 0~git20171229-3~),
+        gnome-shell-extension-dash-to-panel (<< 15-1.1~),
+        gnome-shell-extension-dashtodock (<< 64),
+        gnome-shell-extension-multi-monitors (<< 0.00~git20171014.1.df5d6e4-1.1~),
+        gnome-shell-extension-pixelsaver (<< 1.10+git20161217-49f47bf-1.1~),
+        gnome-shell-extension-taskbar (<< 57.0-2.1~),
+        gnome-shell-extension-top-icons-plus (<< 21-4~),
         gnome-shell-extension-ubuntu-dock (<< 63ubuntu1),
-        yaru-theme (<< 18.10.1)
+        gnome-shell-extension-workspaces-to-dock (<< 45-1.1~),
+        gnome-shell-pomodoro (<< 0.13.4-2.1~),
+        yaru-theme (<< 18.10.1),
 Conflicts: gnome-screensaver (<< 3.6)
 Provides: notification-daemon,
           polkit-1-auth-agent
diff --git a/debian/control.in b/debian/control.in
index 13b8aac..b8ed60e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -33,7 +33,7 @@ Build-Depends: debhelper (>= 11.1.3),
                libgstreamer1.0-dev (>= 0.11.92),
                libgtk-3-dev (>= 3.21.6),
                libibus-1.0-dev,
-               libmutter-3-dev (>= 3.29.91),
+               libmutter-3-dev (>= 3.29.92),
                libnm-dev (>= 1.10.4) [linux-any],
                libpolkit-agent-1-dev (>= 0.100),
                libpulse-dev (>= 2.0),
@@ -50,7 +50,7 @@ Build-Depends: debhelper (>= 11.1.3),
                xauth <!nocheck>,
                xvfb <!nocheck>
 Rules-Requires-Root: no
-Standards-Version: 4.2.0
+Standards-Version: 4.2.1
 Homepage: https://wiki.gnome.org/Projects/GnomeShell
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell
 XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git -b debian/experimental
@@ -73,7 +73,7 @@ Depends: evolution-data-server (>= 3.17.2),
          gir1.2-gtk-3.0 (>= 3.16),
          gir1.2-gweather-3.0 (>= 3.25.91),
          gir1.2-ibus-1.0 (>= 1.5.2),
-         gir1.2-mutter-3 (>= 3.29.91),
+         gir1.2-mutter-3 (>= 3.29.92),
          gir1.2-nm-1.0 [linux-any],
          gir1.2-nma-1.0 [linux-any],
          gir1.2-pango-1.0,
@@ -87,7 +87,7 @@ Depends: evolution-data-server (>= 3.17.2),
          ubuntu-wallpapers,
          gsettings-desktop-schemas (>= 3.27.90),
          libglib2.0-bin (>= 2.53.0),
-         mutter (>= 3.29.91),
+         mutter (>= 3.29.92),
          python3,
          ${gir:Depends},
          ${misc:Depends},
@@ -109,8 +109,18 @@ Suggests: chrome-gnome-shell,
           gir1.2-telepathylogger-0.2 (>= 0.8.0)
 Breaks: gdm3 (<< 3.19.92),
         gnome-session (<< 3.19),
+        gnome-shell-extension-autohidetopbar (<< 20180511-2~),
+        gnome-shell-extension-caffeine (<< 0~git20171229-3~),
+        gnome-shell-extension-dash-to-panel (<< 15-1.1~),
+        gnome-shell-extension-dashtodock (<< 64),
+        gnome-shell-extension-multi-monitors (<< 0.00~git20171014.1.df5d6e4-1.1~),
+        gnome-shell-extension-pixelsaver (<< 1.10+git20161217-49f47bf-1.1~),
+        gnome-shell-extension-taskbar (<< 57.0-2.1~),
+        gnome-shell-extension-top-icons-plus (<< 21-4~),
         gnome-shell-extension-ubuntu-dock (<< 63ubuntu1),
-        yaru-theme (<< 18.10.1)
+        gnome-shell-extension-workspaces-to-dock (<< 45-1.1~),
+        gnome-shell-pomodoro (<< 0.13.4-2.1~),
+        yaru-theme (<< 18.10.1),
 Conflicts: gnome-screensaver (<< 3.6)
 Provides: notification-daemon,
           polkit-1-auth-agent
diff --git a/debian/patches/js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch b/debian/patches/js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch
index 98403a4..c246360 100644
--- a/debian/patches/js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch
+++ b/debian/patches/js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed, upstream does not support custom modes/themes officially.
  1 file changed, 3 insertions(+)
 
 diff --git a/js/ui/main.js b/js/ui/main.js
-index aa1de83..92e61c8 100644
+index 68c3a0c..ce57421 100644
 --- a/js/ui/main.js
 +++ b/js/ui/main.js
 @@ -346,6 +346,9 @@ function loadTheme() {
diff --git a/debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch b/debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
deleted file mode 100644
index f9971bf..0000000
--- a/debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From: Daniel van Vugt <[e-mail]>
-Date: Fri, 6 Apr 2018 12:26:58 +0200
-Subject: js/ui: Choose some actors to cache on the GPU
-
-Adds a wrapper function to flag actors that are good candidates for
-caching in texture memory (what Clutter calls "offscreen redirect"),
-thereby mostly eliminating their repaint overhead.
-
-This isn't exactly groundbreaking, it's how you're meant to use
-OpenGL in the first place. But the difficulty is in the design of
-Clutter which has some peculiarities making universal caching
-inefficient at the moment:
-
- * Repainting an offscreen actor is measurably slower than repainting
-   the same actor if it was uncached. But only by less than 100%,
-   so if an actor can avoid changing every frame then caching is usually
-   more efficient over that timeframe.
-
- * The cached painting from a container typically includes its children,
-   so you can't cache containers whose children are usually animating at
-   full frame rate. That results in a performance loss.
-     This could be remedied in future by Clutter explicitly separating a
-   container's background painting from its child painting and always
-   caching the background (as StWidget tries to in some cases already).
-
-So this commit selects just a few areas where caching has been verified
-to be beneficial, and many use cases now see their CPU usage halved:
-
-One small window active...... 10% -> 7% (-30%)
-...under a panel menu........ 23% -> 9% (-61%)
-One maximized window active.. 12% -> 9% (-25%)
-...under a panel menu........ 23% -> 11% (-52%)
-...under a shell dialog...... 22% -> 12% (-45%)
-...in activities overview.... 32% -> 17% (-47%)
-(on an i7-7700)
-
-Also a couple of bugs are fixed by this:
-
-https://bugzilla.gnome.org/show_bug.cgi?id=792634
-https://bugzilla.gnome.org/show_bug.cgi?id=792633
-
-Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792634
-Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=792633
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1744001
-Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/73
----
- js/ui/boxpointer.js |  1 +
- js/ui/dash.js       |  1 +
- js/ui/dialog.js     |  2 ++
- js/ui/main.js       | 16 ++++++++++++++++
- js/ui/panel.js      |  1 +
- 5 files changed, 21 insertions(+)
-
-diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
-index 47f718a..602646a 100644
---- a/js/ui/boxpointer.js
-+++ b/js/ui/boxpointer.js
-@@ -44,6 +44,7 @@ var BoxPointer = new Lang.Class({
-                                   y_fill: true });
-         this._container = new Shell.GenericContainer();
-         this.actor.set_child(this._container);
-+        Main.hintActorSeldomChanges(this.actor);
-         this._container.connect('get-preferred-width', this._getPreferredWidth.bind(this));
-         this._container.connect('get-preferred-height', this._getPreferredHeight.bind(this));
-         this._container.connect('allocate', this._allocate.bind(this));
-diff --git a/js/ui/dash.js b/js/ui/dash.js
-index 5ee2476..14864f1 100644
---- a/js/ui/dash.js
-+++ b/js/ui/dash.js
-@@ -402,6 +402,7 @@ var Dash = new Lang.Class({
-                                        clip_to_allocation: true });
-         this._box._delegate = this;
-         this._container.add_actor(this._box);
-+        Main.hintActorSeldomChanges(this._container);
- 
-         this._showAppsIcon = new ShowAppsIcon();
-         this._showAppsIcon.childScale = 1;
-diff --git a/js/ui/dialog.js b/js/ui/dialog.js
-index cfa192d..89db963 100644
---- a/js/ui/dialog.js
-+++ b/js/ui/dialog.js
-@@ -6,6 +6,7 @@ const GObject = imports.gi.GObject;
- const Pango = imports.gi.Pango;
- const St = imports.gi.St;
- const Lang = imports.lang;
-+const Main = imports.ui.main;
- 
- var Dialog = new Lang.Class({
-     Name: 'Dialog',
-@@ -40,6 +41,7 @@ var Dialog = new Lang.Class({
-         // mode accordingly so wrapped labels are handled correctly during
-         // size requests.
-         this._dialog.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH;
-+        Main.hintActorSeldomChanges(this._dialog);
- 
-         this.contentLayout = new St.BoxLayout({ vertical: true,
-                                                 style_class: "modal-dialog-content-box" });
-diff --git a/js/ui/main.js b/js/ui/main.js
-index e107de7..6e3c971 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -717,3 +717,19 @@ function showRestartMessage(message) {
-     let restartMessage = new RestartMessage(message);
-     restartMessage.open();
- }
-+
-+/**
-+ * hintActorSeldomChanges:
-+ * @actor: A clutter actor
-+ *
-+ * Flag an actor as known to not need repainting very often. Such actors can
-+ * have their painting cached in GPU memory so that future repaints triggered
-+ * by other actors don't incur a repaint of @actor. This can provide dramatic
-+ * performance benefits if used wisely.
-+ *
-+ * This hint needs to be provided manually because clutter presently lacks
-+ * a good enough heuristic to toggle the optimization automatically.
-+ */
-+function hintActorSeldomChanges(actor) {
-+    actor.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
-+}
-diff --git a/js/ui/panel.js b/js/ui/panel.js
-index 05241ab..513ad3e 100644
---- a/js/ui/panel.js
-+++ b/js/ui/panel.js
-@@ -776,6 +776,7 @@ var Panel = new Lang.Class({
-         this.actor = new Shell.GenericContainer({ name: 'panel',
-                                                   reactive: true });
-         this.actor._delegate = this;
-+        Main.hintActorSeldomChanges(this.actor);
- 
-         this._sessionStyle = null;
- 
diff --git a/debian/patches/search-Cancel-search-provider-operations-on-clear.patch b/debian/patches/search-Cancel-search-provider-operations-on-clear.patch
new file mode 100644
index 0000000..052ee8a
--- /dev/null
+++ b/debian/patches/search-Cancel-search-provider-operations-on-clear.patch
@@ -0,0 +1,29 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Thu, 23 Aug 2018 18:14:38 +0200
+Subject: search: Cancel search provider operations on clear
+
+Ensure that the search provider operations (just getResultMetas requests in the
+current implementation) in progress are properly cancelled when we clear the UI,
+otherwise returned results might still be added when not needed.
+
+This is triggered for each provider by the SearchResults reset.
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205
+---
+ js/ui/search.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/search.js b/js/ui/search.js
+index 1fb54b4..804be95 100644
+--- a/js/ui/search.js
++++ b/js/ui/search.js
+@@ -192,6 +192,7 @@ var SearchResultsBase = new Lang.Class({
+     },
+ 
+     clear() {
++        this._cancellable.cancel();
+         for (let resultId in this._resultDisplays)
+             this._resultDisplays[resultId].actor.destroy();
+         this._resultDisplays = {};
diff --git a/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch b/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch
new file mode 100644
index 0000000..27645a5
--- /dev/null
+++ b/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch
@@ -0,0 +1,30 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Thu, 30 Aug 2018 07:11:24 +0200
+Subject: search: Ignore search provider results metas if search is cancelled
+
+Call updateSearch callback with no results when the search provider has been
+cancelled, without doing any logging.
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205
+---
+ js/ui/search.js | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/search.js b/js/ui/search.js
+index 804be95..dd4bfad 100644
+--- a/js/ui/search.js
++++ b/js/ui/search.js
+@@ -227,8 +227,9 @@ var SearchResultsBase = new Lang.Class({
+ 
+             this.provider.getResultMetas(metasNeeded, metas => {
+                 if (metas.length != metasNeeded.length) {
+-                    log('Wrong number of result metas returned by search provider ' + this.provider.id +
+-                        ': expected ' + metasNeeded.length + ' but got ' + metas.length);
++                    if (!this._cancellable.is_cancelled())
++                        log(`Wrong number of result metas returned by search provider ${this.provider.id}` +
++                            `: expected ${metasNeeded.length} but got ${metas.length}`);
+                     callback(false);
+                     return;
+                 }
diff --git a/debian/patches/series b/debian/patches/series
index d38aac0..cbca12c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ ubuntu/block_mode_extension_update.patch
 optional-hot-corner.patch
 volume-Add-back-sound-feedback-on-scroll.patch
 st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
-js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
 main-show-an-error-message-on-gnome-shell-crash.patch
 global-make-possible-to-set-debug-flags-dynamically.patch
 main-increase-the-granularity-of-backtraces-in-SHELL_DEBU.patch
@@ -23,3 +22,7 @@ dnd-Nullify-_dragActor-after-we-ve-destroyed-it-and-avoid.patch
 messageList-stop-syncing-if-closeButton-has-been-destroye.patch
 automountManager-remove-allowAutorun-expire-timeout-on-vo.patch
 workaround_crasher_fractional_scaling.patch
+viewSelector-Cancel-search-on-overview-hidden.patch
+search-Cancel-search-provider-operations-on-clear.patch
+search-Ignore-search-provider-results-metas-if-search-is-.patch
+ubuntu/search-call-Cancel-method-on-providers-when-no-data-is-ne.patch
diff --git a/debian/patches/sessionMode-add-support-for-debugFlags-parameter.patch b/debian/patches/sessionMode-add-support-for-debugFlags-parameter.patch
index fec593e..afa4447 100644
--- a/debian/patches/sessionMode-add-support-for-debugFlags-parameter.patch
+++ b/debian/patches/sessionMode-add-support-for-debugFlags-parameter.patch
@@ -15,7 +15,7 @@ Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/6
  2 files changed, 4 insertions(+)
 
 diff --git a/js/ui/main.js b/js/ui/main.js
-index 6e3c971..aa1de83 100644
+index e107de7..68c3a0c 100644
 --- a/js/ui/main.js
 +++ b/js/ui/main.js
 @@ -111,6 +111,9 @@ function _sessionUpdated() {
diff --git a/debian/patches/ubuntu/lightdm-user-switching.patch b/debian/patches/ubuntu/lightdm-user-switching.patch
index 0ef5155..628934d 100644
--- a/debian/patches/ubuntu/lightdm-user-switching.patch
+++ b/debian/patches/ubuntu/lightdm-user-switching.patch
@@ -12,10 +12,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685794
  1 file changed, 27 insertions(+), 7 deletions(-)
 
 diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js
-index bf8b460..fffa567 100644
+index 434dd95..2be7c0e 100644
 --- a/js/misc/systemActions.js
 +++ b/js/misc/systemActions.js
-@@ -218,6 +218,21 @@ const SystemActions = new Lang.Class({
+@@ -219,6 +219,21 @@ const SystemActions = new Lang.Class({
          return this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName;
      },
  
@@ -37,7 +37,7 @@ index bf8b460..fffa567 100644
      _sensorProxyAppeared() {
          this._sensorProxy = new SensorProxy(Gio.DBus.system, SENSOR_BUS_NAME, SENSOR_OBJECT_PATH,
              (proxy, error)  => {
-@@ -313,7 +328,7 @@ const SystemActions = new Lang.Class({
+@@ -314,7 +329,7 @@ const SystemActions = new Lang.Class({
      _updateLockScreen() {
          let showLock = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
          let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
@@ -46,7 +46,7 @@ index bf8b460..fffa567 100644
          this.notify('can-lock-screen');
      },
  
-@@ -400,20 +415,25 @@ const SystemActions = new Lang.Class({
+@@ -401,20 +416,25 @@ const SystemActions = new Lang.Class({
          if (!this._actions.get(LOCK_SCREEN_ACTION_ID).available)
              throw new Error('The lock-screen action is not available!');
  
diff --git a/debian/patches/ubuntu/search-call-Cancel-method-on-providers-when-no-data-is-ne.patch b/debian/patches/ubuntu/search-call-Cancel-method-on-providers-when-no-data-is-ne.patch
new file mode 100644
index 0000000..00ff422
--- /dev/null
+++ b/debian/patches/ubuntu/search-call-Cancel-method-on-providers-when-no-data-is-ne.patch
@@ -0,0 +1,161 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Thu, 23 Aug 2018 20:00:57 +0200
+Subject: search: call XUbuntuCancel method on providers when no data is
+ needed
+
+Add XUbuntuCancel method to search providers and call it when a search provider
+is still doing operations.
+
+This will allow to stop operations on providers.
+
+Fixes LP: #1756826
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
+Forwarded: not-needed
+---
+ data/org.gnome.ShellSearchProvider.xml  |  6 ++++++
+ data/org.gnome.ShellSearchProvider2.xml |  6 ++++++
+ js/ui/remoteSearch.js                   | 13 +++++++++++++
+ js/ui/search.js                         | 31 +++++++++++++++++++++++++++++++
+ 4 files changed, 56 insertions(+)
+
+diff --git a/data/org.gnome.ShellSearchProvider.xml b/data/org.gnome.ShellSearchProvider.xml
+index 78ad305..393cb01 100644
+--- a/data/org.gnome.ShellSearchProvider.xml
++++ b/data/org.gnome.ShellSearchProvider.xml
+@@ -69,5 +69,11 @@
+     <method name="ActivateResult">
+       <arg type="s" name="identifier" direction="in" />
+     </method>
++
++    <!--
++        XUbuntuCancel:
++        Cancel the current search operation
++    -->
++    <method name="XUbuntuCancel" />
+   </interface>
+ </node>
+diff --git a/data/org.gnome.ShellSearchProvider2.xml b/data/org.gnome.ShellSearchProvider2.xml
+index 9502340..8141bc0 100644
+--- a/data/org.gnome.ShellSearchProvider2.xml
++++ b/data/org.gnome.ShellSearchProvider2.xml
+@@ -83,5 +83,11 @@
+       <arg type="as" name="terms" direction="in" />
+       <arg type="u" name="timestamp" direction="in" />
+     </method>
++
++    <!--
++        XUbuntuCancel:
++        Cancel the current search operation
++    -->
++    <method name="XUbuntuCancel" />
+   </interface>
+ </node>
+diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
+index 3b847af..7eaeb7b 100644
+--- a/js/ui/remoteSearch.js
++++ b/js/ui/remoteSearch.js
+@@ -31,6 +31,7 @@ const SearchProviderIface = `
+ <method name="ActivateResult">
+     <arg type="s" direction="in" />
+ </method>
++<method name="XUbuntuCancel" />
+ </interface>
+ </node>`;
+ 
+@@ -59,6 +60,7 @@ const SearchProvider2Iface = `
+     <arg type="as" direction="in" />
+     <arg type="u" direction="in" />
+ </method>
++<method name="XUbuntuCancel" />
+ </interface>
+ </node>`;
+ 
+@@ -312,6 +314,17 @@ var RemoteSearchProvider = new Lang.Class({
+                                         cancellable);
+     },
+ 
++    XUbuntuCancel(cancellable) {
++        this.proxy.XUbuntuCancelRemote((results, error) => {
++                if (error &&
++                    !error.matches(Gio.DBusError, Gio.DBusError.UNKNOWN_METHOD) &&
++                    !error.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
++                    log('Received error from DBus search provider %s during XUbuntuCancel: %s'.format(this.id, String(error)));
++                }
++            },
++            cancellable);
++    },
++
+     activateResult(id) {
+         this.proxy.ActivateResultRemote(id);
+     },
+diff --git a/js/ui/search.js b/js/ui/search.js
+index dd4bfad..13d733b 100644
+--- a/js/ui/search.js
++++ b/js/ui/search.js
+@@ -225,7 +225,9 @@ var SearchResultsBase = new Lang.Class({
+             this._cancellable.cancel();
+             this._cancellable.reset();
+ 
++            this.provider.resultsMetasInProgress = true;
+             this.provider.getResultMetas(metasNeeded, metas => {
++                this.provider.resultsMetasInProgress = false;
+                 if (metas.length != metasNeeded.length) {
+                     if (!this._cancellable.is_cancelled())
+                         log(`Wrong number of result metas returned by search provider ${this.provider.id}` +
+@@ -450,6 +452,10 @@ var SearchResults = new Lang.Class({
+ 
+         this._searchTimeoutId = 0;
+         this._cancellable = new Gio.Cancellable();
++        this._searchCancelCancellable = new Gio.Cancellable();
++        this._cancellable.connect(() => {
++            this._cancelSearchProviderRequest();
++        });
+ 
+         this._registerProvider(new AppDisplay.AppSearchProvider());
+         this._reloadRemoteProviders();
+@@ -491,11 +497,29 @@ var SearchResults = new Lang.Class({
+         }
+     },
+ 
++    _cancelSearchProviderRequest() {
++        if (this._terms.length != 0 || this._searchCancelTimeoutId > 0)
++            return;
++
++        this._searchCancelTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 100, () => {
++            this._providers.forEach(provider => {
++                if (provider.isRemoteProvider &&
++                    (provider.searchInProgress || provider.resultsMetasInProgress)) {
++                    provider.XUbuntuCancel(this._searchCancelCancellable);
++                }
++            });
++
++            delete this._searchCancelTimeoutId;
++            return GLib.SOURCE_REMOVE;
++        });
++    },
++
+     _reset() {
+         this._terms = [];
+         this._results = {};
+         this._clearDisplay();
+         this._clearSearchTimeout();
++        this._cancelSearchProviderRequest();
+         this._defaultResult = null;
+         this._startingSearch = false;
+ 
+@@ -562,6 +586,13 @@ var SearchResults = new Lang.Class({
+         if (this._terms.length > 0)
+             isSubSearch = searchString.indexOf(previousSearchString) == 0;
+ 
++        this._searchCancelCancellable.cancel();
++        this._searchCancelCancellable.reset();
++        if (this._searchCancelTimeoutId > 0) {
++            GLib.source_remove(this._searchCancelTimeoutId);
++            delete this._searchCancelTimeoutId;
++        }
++
+         this._terms = terms;
+         this._isSubSearch = isSubSearch;
+         this._updateSearchProgress();
diff --git a/debian/patches/viewSelector-Cancel-search-on-overview-hidden.patch b/debian/patches/viewSelector-Cancel-search-on-overview-hidden.patch
new file mode 100644
index 0000000..e69ae1e
--- /dev/null
+++ b/debian/patches/viewSelector-Cancel-search-on-overview-hidden.patch
@@ -0,0 +1,36 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Thu, 23 Aug 2018 16:11:10 +0200
+Subject: viewSelector: Cancel search on overview hidden
+
+Currently when the overview is hidden, any pending search is kept alive, not only
+at remote search provider level (as per issue #183), but even the shell providers
+proxies continue to get and process data. This happens even if this is not needed
+anymore, while the UI reset is performed only next time that the overview is
+shown (causing some more computation presentation time).
+
+In order to stop this to happen, when the overview is hidden, we have to unset
+the search entry to an empty value as this would make SearchResults to have empty
+terms list and that would make the proxies cancellable to be triggered (without
+causing any further search to start).
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205
+---
+ js/ui/viewSelector.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
+index 2d5c33f..c650886 100644
+--- a/js/ui/viewSelector.js
++++ b/js/ui/viewSelector.js
+@@ -311,6 +311,7 @@ var ViewSelector = new Lang.Class({
+     },
+ 
+     hide() {
++        this.reset();
+         this._workspacesDisplay.hide();
+     },
+ 
diff --git a/js/extensionPrefs/main.js b/js/extensionPrefs/main.js
index a30b46b..80b8d5c 100644
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@@ -14,15 +14,16 @@ const _ = Gettext.gettext;
 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
 
-const GnomeShellIface = '<node> \
-<interface name="org.gnome.Shell.Extensions"> \
-<signal name="ExtensionStatusChanged"> \
-    <arg type="s" name="uuid"/> \
-    <arg type="i" name="state"/> \
-    <arg type="s" name="error"/> \
-</signal> \
-</interface> \
-</node>';
+const GnomeShellIface = `
+<node>
+<interface name="org.gnome.Shell.Extensions">
+<signal name="ExtensionStatusChanged">
+    <arg type="s" name="uuid"/>
+    <arg type="i" name="state"/>
+    <arg type="s" name="error"/>
+</signal>
+</interface>
+</node>`;
 
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
 
diff --git a/js/gdm/fingerprint.js b/js/gdm/fingerprint.js
index 2aeb377..91025b9 100644
--- a/js/gdm/fingerprint.js
+++ b/js/gdm/fingerprint.js
@@ -5,13 +5,14 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const FprintManagerIface = '<node> \
-<interface name="net.reactivated.Fprint.Manager"> \
-<method name="GetDefaultDevice"> \
-    <arg type="o" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const FprintManagerIface = `
+<node>
+<interface name="net.reactivated.Fprint.Manager">
+<method name="GetDefaultDevice">
+    <arg type="o" direction="out" />
+</method>
+</interface>
+</node>`;
 
 const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface);
 
diff --git a/js/gdm/oVirt.js b/js/gdm/oVirt.js
index 8a6a545..8194c20 100644
--- a/js/gdm/oVirt.js
+++ b/js/gdm/oVirt.js
@@ -4,13 +4,13 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 
-const OVirtCredentialsIface = '<node> \
-<interface name="org.ovirt.vdsm.Credentials"> \
-<signal name="UserAuthenticated"> \
-    <arg type="s" name="token"/> \
-</signal> \
-</interface> \
-</node>';
+const OVirtCredentialsIface =`<node>
+<interface name="org.ovirt.vdsm.Credentials">
+<signal name="UserAuthenticated">
+    <arg type="s" name="token"/>
+</signal>
+</interface>
+</node>`;
 
 const OVirtCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(OVirtCredentialsIface);
 
diff --git a/js/gdm/realmd.js b/js/gdm/realmd.js
index 9aa27d9..ae87aa1 100644
--- a/js/gdm/realmd.js
+++ b/js/gdm/realmd.js
@@ -5,58 +5,61 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const ProviderIface = '<node> \
-<interface name="org.freedesktop.realmd.Provider"> \
-    <property name="Name" type="s" access="read"/> \
-    <property name="Version" type="s" access="read"/> \
-    <property name="Realms" type="ao" access="read"/> \
-    <method name="Discover"> \
-        <arg name="string" type="s" direction="in"/> \
-        <arg name="options" type="a{sv}" direction="in"/> \
-        <arg name="relevance" type="i" direction="out"/> \
-        <arg name="realm" type="ao" direction="out"/> \
-    </method> \
-</interface> \
-</node>';
+const ProviderIface = `
+<node>
+<interface name="org.freedesktop.realmd.Provider">
+    <property name="Name" type="s" access="read"/>
+    <property name="Version" type="s" access="read"/>
+    <property name="Realms" type="ao" access="read"/>
+    <method name="Discover">
+        <arg name="string" type="s" direction="in"/>
+        <arg name="options" type="a{sv}" direction="in"/>
+        <arg name="relevance" type="i" direction="out"/>
+        <arg name="realm" type="ao" direction="out"/>
+    </method>
+</interface>
+</node>`;
 const Provider = Gio.DBusProxy.makeProxyWrapper(ProviderIface);
 
-const ServiceIface = '<node> \
-<interface name="org.freedesktop.realmd.Service"> \
-    <method name="Cancel"> \
-        <arg name="operation" type="s" direction="in"/> \
-    </method> \
-    <method name="Release" /> \
-    <method name="SetLocale"> \
-        <arg name="locale" type="s" direction="in"/> \
-    </method> \
-    <signal name="Diagnostics"> \
-        <arg name="data" type="s"/> \
-        <arg name="operation" type="s"/> \
-    </signal> \
-</interface> \
-</node>';
+const ServiceIface = `
+<node>
+<interface name="org.freedesktop.realmd.Service">
+    <method name="Cancel">
+        <arg name="operation" type="s" direction="in"/>
+    </method>
+    <method name="Release" />
+    <method name="SetLocale">
+        <arg name="locale" type="s" direction="in"/>
+    </method>
+    <signal name="Diagnostics">
+        <arg name="data" type="s"/>
+        <arg name="operation" type="s"/>
+    </signal>
+</interface>
+</node>`;
 const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface);
 
-const RealmIface = '<node> \
-<interface name="org.freedesktop.realmd.Realm"> \
-    <property name="Name" type="s" access="read"/> \
-    <property name="Configured" type="s" access="read"/> \
-    <property name="Details" type="a(ss)" access="read"/> \
-    <property name="LoginFormats" type="as" access="read"/> \
-    <property name="LoginPolicy" type="s" access="read"/> \
-    <property name="PermittedLogins" type="as" access="read"/> \
-    <property name="SupportedInterfaces" type="as" access="read"/> \
-    <method name="ChangeLoginPolicy"> \
-        <arg name="login_policy" type="s" direction="in"/> \
-        <arg name="permitted_add" type="as" direction="in"/> \
-        <arg name="permitted_remove" type="as" direction="in"/> \
-        <arg name="options" type="a{sv}" direction="in"/> \
-    </method> \
-    <method name="Deconfigure"> \
-        <arg name="options" type="a{sv}" direction="in"/> \
-    </method> \
-</interface> \
-</node>';
+const RealmIface = `
+<node>
+<interface name="org.freedesktop.realmd.Realm">
+    <property name="Name" type="s" access="read"/>
+    <property name="Configured" type="s" access="read"/>
+    <property name="Details" type="a(ss)" access="read"/>
+    <property name="LoginFormats" type="as" access="read"/>
+    <property name="LoginPolicy" type="s" access="read"/>
+    <property name="PermittedLogins" type="as" access="read"/>
+    <property name="SupportedInterfaces" type="as" access="read"/>
+    <method name="ChangeLoginPolicy">
+        <arg name="login_policy" type="s" direction="in"/>
+        <arg name="permitted_add" type="as" direction="in"/>
+        <arg name="permitted_remove" type="as" direction="in"/>
+        <arg name="options" type="a{sv}" direction="in"/>
+    </method>
+    <method name="Deconfigure">
+        <arg name="options" type="a{sv}" direction="in"/>
+    </method>
+</interface>
+</node>`;
 const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface);
 
 var Manager = new Lang.Class({
diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js
index 4c5d7f2..15a2202 100644
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@@ -4,17 +4,18 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 
-const PresenceIface = '<node> \
-<interface name="org.gnome.SessionManager.Presence"> \
-<method name="SetStatus"> \
-    <arg type="u" direction="in"/> \
-</method> \
-<property name="status" type="u" access="readwrite"/> \
-<signal name="StatusChanged"> \
-    <arg type="u" direction="out"/> \
-</signal> \
-</interface> \
-</node>';
+const PresenceIface = `
+<node>
+<interface name="org.gnome.SessionManager.Presence">
+<method name="SetStatus">
+    <arg type="u" direction="in"/>
+</method>
+<property name="status" type="u" access="readwrite"/>
+<signal name="StatusChanged">
+    <arg type="u" direction="out"/>
+</signal>
+</interface>
+</node>`;
 
 var PresenceStatus = {
     AVAILABLE: 0,
@@ -32,16 +33,17 @@ function Presence(initCallback, cancellable) {
 // Note inhibitors are immutable objects, so they don't
 // change at runtime (changes always come in the form
 // of new inhibitors)
-const InhibitorIface = '<node> \
-<interface name="org.gnome.SessionManager.Inhibitor"> \
-<method name="GetAppId"> \
-    <arg type="s" direction="out" /> \
-</method> \
-<method name="GetReason"> \
-    <arg type="s" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const InhibitorIface = `
+<node>
+<interface name="org.gnome.SessionManager.Inhibitor">
+<method name="GetAppId">
+    <arg type="s" direction="out" />
+</method>
+<method name="GetReason">
+    <arg type="s" direction="out" />
+</method>
+</interface>
+</node>`;
 
 var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);
 function Inhibitor(objectPath, initCallback, cancellable) {
@@ -49,29 +51,30 @@ function Inhibitor(objectPath, initCallback, cancellable) {
 }
 
 // Not the full interface, only the methods we use
-const SessionManagerIface = '<node> \
-<interface name="org.gnome.SessionManager"> \
-<method name="Logout"> \
-    <arg type="u" direction="in" /> \
-</method> \
-<method name="Shutdown" /> \
-<method name="Reboot" /> \
-<method name="CanShutdown"> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="IsInhibited"> \
-    <arg type="u" direction="in" /> \
-    <arg type="b" direction="out" /> \
-</method> \
-<property name="SessionIsActive" type="b" access="read"/> \
-<signal name="InhibitorAdded"> \
-    <arg type="o" direction="out"/> \
-</signal> \
-<signal name="InhibitorRemoved"> \
-    <arg type="o" direction="out"/> \
-</signal> \
-</interface> \
-</node>';
+const SessionManagerIface = `
+<node>
+<interface name="org.gnome.SessionManager">
+<method name="Logout">
+    <arg type="u" direction="in" />
+</method>
+<method name="Shutdown" />
+<method name="Reboot" />
+<method name="CanShutdown">
+    <arg type="b" direction="out" />
+</method>
+<method name="IsInhibited">
+    <arg type="u" direction="in" />
+    <arg type="b" direction="out" />
+</method>
+<property name="SessionIsActive" type="b" access="read"/>
+<signal name="InhibitorAdded">
+    <arg type="o" direction="out"/>
+</signal>
+<signal name="InhibitorRemoved">
+    <arg type="o" direction="out"/>
+</signal>
+</interface>
+</node>`;
 
 var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface);
 function SessionManager(initCallback, cancellable) {
diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
index 59b3d78..320a6cc 100644
--- a/js/misc/inputMethod.js
+++ b/js/misc/inputMethod.js
@@ -17,6 +17,8 @@ var InputMethod = new Lang.Class({
         this._currentFocus = null;
         this._currentEvent = null;
         this._doForwardEvent = false;
+        this._preeditStr = '';
+        this._preeditPos = 0;
         this._ibus = IBus.Bus.new_async();
         this._ibus.connect('connected', this._onConnected.bind(this));
         this._ibus.connect('disconnected', this._clear.bind(this));
@@ -69,6 +71,8 @@ var InputMethod = new Lang.Class({
         this._context.connect('commit-text', this._onCommitText.bind(this));
         this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
         this._context.connect('update-preedit-text', this._onUpdatePreeditText.bind(this));
+        this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this));
+        this._context.connect('hide-preedit-text', this._onHidePreeditText.bind(this));
         this._context.connect('forward-key-event', this._onForwardKeyEvent.bind(this));
 
         this._updateCapabilities();
@@ -79,6 +83,8 @@ var InputMethod = new Lang.Class({
         this._hints = 0;
         this._purpose = 0;
         this._enabled = false;
+        this._preeditStr = ''
+        this._preeditPos = 0;
     },
 
     _emitRequestSurrounding() {
@@ -95,11 +101,22 @@ var InputMethod = new Lang.Class({
     },
 
     _onUpdatePreeditText(context, text, pos, visible) {
-        let str = null;
-        if (visible && text != null)
-            str = text.get_text();
+        if (text == null)
+            return;
+        this._preeditStr = text.get_text();
+        this._preeditPos = pos;
+        if (visible)
+            this.set_preedit_text(this._preeditStr, pos);
+        else
+            this.set_preedit_text(null, pos);
+    },
+
+    _onShowPreeditText(context) {
+        this.set_preedit_text(this._preeditStr, this._preeditPos);
+    },
 
-        this.set_preedit_text(str, pos);
+    _onHidePreeditText(context) {
+        this.set_preedit_text(null, this._preeditPos);
     },
 
     _onForwardKeyEvent(context, keyval, keycode, state) {
diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js
index ccda382..b5891a3 100644
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@@ -7,53 +7,56 @@ const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const SystemdLoginManagerIface = '<node> \
-<interface name="org.freedesktop.login1.Manager"> \
-<method name="Suspend"> \
-    <arg type="b" direction="in"/> \
-</method> \
-<method name="CanSuspend"> \
-    <arg type="s" direction="out"/> \
-</method> \
-<method name="Inhibit"> \
-    <arg type="s" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="h" direction="out"/> \
-</method> \
-<method name="GetSession"> \
-    <arg type="s" direction="in"/> \
-    <arg type="o" direction="out"/> \
-</method> \
-<method name="ListSessions"> \
-    <arg name="sessions" type="a(susso)" direction="out"/> \
-</method> \
-<signal name="PrepareForSleep"> \
-    <arg type="b" direction="out"/> \
-</signal> \
-</interface> \
-</node>';
-
-const SystemdLoginSessionIface = '<node> \
-<interface name="org.freedesktop.login1.Session"> \
-<signal name="Lock" /> \
-<signal name="Unlock" /> \
-<property name="Active" type="b" access="read" /> \
-<property name="Class" type="s" access="read" /> \
-<property name="Id" type="s" access="read" /> \
-<method name="SetLockedHint"> \
-    <arg type="b" direction="in"/> \
-</method> \
-</interface> \
-</node>';
-
-const SystemdLoginUserIface = '<node> \
-<interface name="org.freedesktop.login1.User"> \
-<property name="Display" type="(so)" access="read" /> \
-<property name="Sessions" type="a(so)" access="read" /> \
-</interface> \
-</node>';
+const SystemdLoginManagerIface = `
+<node>
+<interface name="org.freedesktop.login1.Manager">
+<method name="Suspend">
+    <arg type="b" direction="in"/>
+</method>
+<method name="CanSuspend">
+    <arg type="s" direction="out"/>
+</method>
+<method name="Inhibit">
+    <arg type="s" direction="in"/>
+    <arg type="s" direction="in"/>
+    <arg type="s" direction="in"/>
+    <arg type="s" direction="in"/>
+    <arg type="h" direction="out"/>
+</method>
+<method name="GetSession">
+    <arg type="s" direction="in"/>
+    <arg type="o" direction="out"/>
+</method>
+<method name="ListSessions">
+    <arg name="sessions" type="a(susso)" direction="out"/>
+</method>
+<signal name="PrepareForSleep">
+    <arg type="b" direction="out"/>
+</signal>
+</interface>
+</node>`;
+
+const SystemdLoginSessionIface = `
+<node>
+<interface name="org.freedesktop.login1.Session">
+<signal name="Lock" />
+<signal name="Unlock" />
+<property name="Active" type="b" access="read" />
+<property name="Class" type="s" access="read" />
+<property name="Id" type="s" access="read" />
+<method name="SetLockedHint">
+    <arg type="b" direction="in"/>
+</method>
+</interface>
+</node>`;
+
+const SystemdLoginUserIface = `
+<node>
+<interface name="org.freedesktop.login1.User">
+<property name="Display" type="(so)" access="read" />
+<property name="Sessions" type="a(so)" access="read" />
+</interface>
+</node>`;
 
 const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
 const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
index 7ef265a..c473937 100644
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -92,41 +92,43 @@ function _findProviderForSid(sid) {
 // The following are not the complete interfaces, just the methods we need
 // (or may need in the future)
 
-const ModemGsmNetworkInterface = '<node> \
-<interface name="org.freedesktop.ModemManager.Modem.Gsm.Network"> \
-<method name="GetRegistrationInfo"> \
-    <arg type="(uss)" direction="out" /> \
-</method> \
-<method name="GetSignalQuality"> \
-    <arg type="u" direction="out" /> \
-</method> \
-<property name="AccessTechnology" type="u" access="read" /> \
-<signal name="SignalQuality"> \
-    <arg type="u" direction="out" /> \
-</signal> \
-<signal name="RegistrationInfo"> \
-    <arg type="u" direction="out" /> \
-    <arg type="s" direction="out" /> \
-    <arg type="s" direction="out" /> \
-</signal> \
-</interface> \
-</node>';
+const ModemGsmNetworkInterface = `
+<node>
+<interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
+<method name="GetRegistrationInfo">
+    <arg type="(uss)" direction="out" />
+</method>
+<method name="GetSignalQuality">
+    <arg type="u" direction="out" />
+</method>
+<property name="AccessTechnology" type="u" access="read" />
+<signal name="SignalQuality">
+    <arg type="u" direction="out" />
+</signal>
+<signal name="RegistrationInfo">
+    <arg type="u" direction="out" />
+    <arg type="s" direction="out" />
+    <arg type="s" direction="out" />
+</signal>
+</interface>
+</node>`;
 
 const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface);
 
-const ModemCdmaInterface = '<node> \
-<interface name="org.freedesktop.ModemManager.Modem.Cdma"> \
-<method name="GetSignalQuality"> \
-    <arg type="u" direction="out" /> \
-</method> \
-<method name="GetServingSystem"> \
-    <arg type="(usu)" direction="out" /> \
-</method> \
-<signal name="SignalQuality"> \
-    <arg type="u" direction="out" /> \
-</signal> \
-</interface> \
-</node>';
+const ModemCdmaInterface = `
+<node>
+<interface name="org.freedesktop.ModemManager.Modem.Cdma">
+<method name="GetSignalQuality">
+    <arg type="u" direction="out" />
+</method>
+<method name="GetServingSystem">
+    <arg type="(usu)" direction="out" />
+</method>
+<signal name="SignalQuality">
+    <arg type="u" direction="out" />
+</signal>
+</interface>
+</node>`;
 
 const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
 
@@ -222,26 +224,29 @@ Signals.addSignalMethods(ModemCdma.prototype);
 // Support for the new ModemManager1 interface (MM >= 0.7)
 //------------------------------------------------------------------------------
 
-const BroadbandModemInterface = '<node> \
-<interface name="org.freedesktop.ModemManager1.Modem"> \
-<property name="SignalQuality" type="(ub)" access="read" /> \
-</interface> \
-</node>';
+const BroadbandModemInterface = `
+<node>
+<interface name="org.freedesktop.ModemManager1.Modem">
+<property name="SignalQuality" type="(ub)" access="read" />
+</interface>
+</node>`;
 const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface);
 
-const BroadbandModem3gppInterface = '<node> \
-<interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp"> \
-<property name="OperatorCode" type="s" access="read" /> \
-<property name="OperatorName" type="s" access="read" /> \
-</interface> \
-</node>';
+const BroadbandModem3gppInterface = `
+<node>
+<interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp">
+<property name="OperatorCode" type="s" access="read" />
+<property name="OperatorName" type="s" access="read" />
+</interface>
+</node>`;
 const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gppInterface);
 
-const BroadbandModemCdmaInterface = '<node> \
-<interface name="org.freedesktop.ModemManager1.Modem.ModemCdma"> \
-<property name="Sid" type="u" access="read" /> \
-</interface> \
-</node>';
+const BroadbandModemCdmaInterface = `
+<node>
+<interface name="org.freedesktop.ModemManager1.Modem.ModemCdma">
+<property name="Sid" type="u" access="read" />
+</interface>
+</node>`;
 const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface);
 
 var BroadbandModem = new Lang.Class({
diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index 1ce4f83..efe669b 100644
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -8,21 +8,22 @@ const Signals = imports.signals;
 
 // Specified in the D-Bus specification here:
 // http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager
-const ObjectManagerIface = '<node> \
-<interface name="org.freedesktop.DBus.ObjectManager"> \
-  <method name="GetManagedObjects"> \
-    <arg name="objects" type="a{oa{sa{sv}}}" direction="out"/> \
-  </method> \
-  <signal name="InterfacesAdded"> \
-    <arg name="objectPath" type="o"/> \
-    <arg name="interfaces" type="a{sa{sv}}" /> \
-  </signal> \
-  <signal name="InterfacesRemoved"> \
-    <arg name="objectPath" type="o"/> \
-    <arg name="interfaces" type="as" /> \
-  </signal> \
-</interface> \
-</node>';
+const ObjectManagerIface = `
+<node>
+<interface name="org.freedesktop.DBus.ObjectManager">
+  <method name="GetManagedObjects">
+    <arg name="objects" type="a{oa{sa{sv}}}" direction="out"/>
+  </method>
+  <signal name="InterfacesAdded">
+    <arg name="objectPath" type="o"/>
+    <arg name="interfaces" type="a{sa{sv}}" />
+  </signal>
+  <signal name="InterfacesRemoved">
+    <arg name="objectPath" type="o"/>
+    <arg name="interfaces" type="as" />
+  </signal>
+</interface>
+</node>`;
 
 const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface);
 
diff --git a/js/misc/permissionStore.js b/js/misc/permissionStore.js
index 86c0cd8..6126e1f 100644
--- a/js/misc/permissionStore.js
+++ b/js/misc/permissionStore.js
@@ -2,30 +2,31 @@
 
 const Gio = imports.gi.Gio;
 
-const PermissionStoreIface = '<node> \
-  <interface name="org.freedesktop.impl.portal.PermissionStore"> \
-    <method name="Lookup"> \
-      <arg name="table" type="s" direction="in"/> \
-      <arg name="id" type="s" direction="in"/> \
-      <arg name="permissions" type="a{sas}" direction="out"/> \
-      <arg name="data" type="v" direction="out"/> \
-    </method> \
-    <method name="Set"> \
-      <arg name="table" type="s" direction="in"/> \
-      <arg name="create" type="b" direction="in"/> \
-      <arg name="id" type="s" direction="in"/> \
-      <arg name="app_permissions" type="a{sas}" direction="in"/> \
-      <arg name="data" type="v" direction="in"/> \
-    </method> \
-    <signal name="Changed"> \
-      <arg name="table" type="s" direction="out"/> \
-      <arg name="id" type="s" direction="out"/> \
-      <arg name="deleted" type="b" direction="out"/> \
-      <arg name="data" type="v" direction="out"/> \
-      <arg name="permissions" type="a{sas}" direction="out"/> \
-    </signal> \
-  </interface> \
-</node>';
+const PermissionStoreIface = `
+<node>
+  <interface name="org.freedesktop.impl.portal.PermissionStore">
+    <method name="Lookup">
+      <arg name="table" type="s" direction="in"/>
+      <arg name="id" type="s" direction="in"/>
+      <arg name="permissions" type="a{sas}" direction="out"/>
+      <arg name="data" type="v" direction="out"/>
+    </method>
+    <method name="Set">
+      <arg name="table" type="s" direction="in"/>
+      <arg name="create" type="b" direction="in"/>
+      <arg name="id" type="s" direction="in"/>
+      <arg name="app_permissions" type="a{sas}" direction="in"/>
+      <arg name="data" type="v" direction="in"/>
+    </method>
+    <signal name="Changed">
+      <arg name="table" type="s" direction="out"/>
+      <arg name="id" type="s" direction="out"/>
+      <arg name="deleted" type="b" direction="out"/>
+      <arg name="data" type="v" direction="out"/>
+      <arg name="permissions" type="a{sas}" direction="out"/>
+    </signal>
+  </interface>
+</node>`;
 
 const PermissionStoreProxy = Gio.DBusProxy.makeProxyWrapper(PermissionStoreIface);
 
diff --git a/js/misc/smartcardManager.js b/js/misc/smartcardManager.js
index 60808b3..51d2ea9 100644
--- a/js/misc/smartcardManager.js
+++ b/js/misc/smartcardManager.js
@@ -7,14 +7,15 @@ const Signals = imports.signals;
 
 const ObjectManager = imports.misc.objectManager;
 
-const SmartcardTokenIface = '<node> \
-<interface name="org.gnome.SettingsDaemon.Smartcard.Token"> \
-  <property name="Name" type="s" access="read"/> \
-  <property name="Driver" type="o" access="read"/> \
-  <property name="IsInserted" type="b" access="read"/> \
-  <property name="UsedToLogin" type="b" access="read"/> \
-</interface> \
-</node>';
+const SmartcardTokenIface = `
+<node>
+<interface name="org.gnome.SettingsDaemon.Smartcard.Token">
+  <property name="Name" type="s" access="read"/>
+  <property name="Driver" type="o" access="read"/>
+  <property name="IsInserted" type="b" access="read"/>
+  <property name="UsedToLogin" type="b" access="read"/>
+</interface>
+</node>`;
 
 let _smartcardManager = null;
 
diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js
index bf8b460..434dd95 100644
--- a/js/misc/systemActions.js
+++ b/js/misc/systemActions.js
@@ -22,11 +22,12 @@ const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';
 const SENSOR_BUS_NAME = 'net.hadess.SensorProxy';
 const SENSOR_OBJECT_PATH = '/net/hadess/SensorProxy';
 
-const SensorProxyInterface = '<node> \
-<interface name="net.hadess.SensorProxy"> \
-  <property name="HasAccelerometer" type="b" access="read"/> \
-</interface> \
-</node>';
+const SensorProxyInterface = `
+<node>
+<interface name="net.hadess.SensorProxy">
+  <property name="HasAccelerometer" type="b" access="read"/>
+</interface>
+</node>`;
 
 const POWER_OFF_ACTION_ID        = 'power-off';
 const LOCK_SCREEN_ACTION_ID      = 'lock-screen';
diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js
index 838af46..e112f82 100644
--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -30,25 +30,26 @@ const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org';
 const CONNECTIVITY_CHECK_URI = 'http://' + CONNECTIVITY_CHECK_HOST;
 const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
 
-const HelperDBusInterface = '<node> \
-<interface name="org.gnome.Shell.PortalHelper"> \
-<method name="Authenticate"> \
-    <arg type="o" direction="in" name="connection" /> \
-    <arg type="s" direction="in" name="url" /> \
-    <arg type="u" direction="in" name="timestamp" /> \
-</method> \
-<method name="Close"> \
-    <arg type="o" direction="in" name="connection" /> \
-</method> \
-<method name="Refresh"> \
-    <arg type="o" direction="in" name="connection" /> \
-</method> \
-<signal name="Done"> \
-    <arg type="o" name="connection" /> \
-    <arg type="u" name="result" /> \
-</signal> \
-</interface> \
-</node>';
+const HelperDBusInterface = `
+<node>
+<interface name="org.gnome.Shell.PortalHelper">
+<method name="Authenticate">
+    <arg type="o" direction="in" name="connection" />
+    <arg type="s" direction="in" name="url" />
+    <arg type="u" direction="in" name="timestamp" />
+</method>
+<method name="Close">
+    <arg type="o" direction="in" name="connection" />
+</method>
+<method name="Refresh">
+    <arg type="o" direction="in" name="connection" />
+</method>
+<signal name="Done">
+    <arg type="o" name="connection" />
+    <arg type="u" name="result" />
+</signal>
+</interface>
+</node>`;
 
 var PortalHeaderBar = new Lang.Class({
     Name: 'PortalHeaderBar',
diff --git a/js/ui/accessDialog.js b/js/ui/accessDialog.js
index 1bd9004..bb59ee5 100644
--- a/js/ui/accessDialog.js
+++ b/js/ui/accessDialog.js
@@ -10,27 +10,29 @@ const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;
 
-const RequestIface = '<node> \
-<interface name="org.freedesktop.impl.portal.Request"> \
-<method name="Close"/> \
-</interface> \
-</node>';
-
-const AccessIface = '<node> \
-<interface name="org.freedesktop.impl.portal.Access"> \
-<method name="AccessDialog"> \
-  <arg type="o" name="handle" direction="in"/> \
-  <arg type="s" name="app_id" direction="in"/> \
-  <arg type="s" name="parent_window" direction="in"/> \
-  <arg type="s" name="title" direction="in"/> \
-  <arg type="s" name="subtitle" direction="in"/> \
-  <arg type="s" name="body" direction="in"/> \
-  <arg type="a{sv}" name="options" direction="in"/> \
-  <arg type="u" name="response" direction="out"/> \
-  <arg type="a{sv}" name="results" direction="out"/> \
-</method> \
-</interface> \
-</node>';
+const RequestIface = `
+<node>
+<interface name="org.freedesktop.impl.portal.Request">
+<method name="Close"/>
+</interface>
+</node>`;
+
+const AccessIface = `
+<node>
+<interface name="org.freedesktop.impl.portal.Access">
+<method name="AccessDialog">
+  <arg type="o" name="handle" direction="in"/>
+  <arg type="s" name="app_id" direction="in"/>
+  <arg type="s" name="parent_window" direction="in"/>
+  <arg type="s" name="title" direction="in"/>
+  <arg type="s" name="subtitle" direction="in"/>
+  <arg type="s" name="body" direction="in"/>
+  <arg type="a{sv}" name="options" direction="in"/>
+  <arg type="u" name="response" direction="out"/>
+  <arg type="a{sv}" name="results" direction="out"/>
+</method>
+</interface>
+</node>`;
 
 var DialogResponse = {
     OK: 0,
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 785b9f7..623dc6f 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -66,11 +66,12 @@ var PAGE_SWITCH_TIME = 0.3;
 const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl';
 const SWITCHEROO_OBJECT_PATH = '/net/hadess/SwitcherooControl';
 
-const SwitcherooProxyInterface = '<node> \
-<interface name="net.hadess.SwitcherooControl"> \
-  <property name="HasDualGpu" type="b" access="read"/> \
-</interface> \
-</node>';
+const SwitcherooProxyInterface = `
+<node>
+<interface name="net.hadess.SwitcherooControl">
+  <property name="HasDualGpu" type="b" access="read"/>
+</interface>
+</node>`;
 
 const SwitcherooProxy = Gio.DBusProxy.makeProxyWrapper(SwitcherooProxyInterface);
 let discreteGpuAvailable = false;
diff --git a/js/ui/audioDeviceSelection.js b/js/ui/audioDeviceSelection.js
index de8af09..8010ec1 100644
--- a/js/ui/audioDeviceSelection.js
+++ b/js/ui/audioDeviceSelection.js
@@ -15,18 +15,19 @@ var AudioDevice = {
     MICROPHONE: 1 << 2
 };
 
-const AudioDeviceSelectionIface = '<node> \
-<interface name="org.gnome.Shell.AudioDeviceSelection"> \
-<method name="Open"> \
-    <arg name="devices" direction="in" type="as" /> \
-</method> \
-<method name="Close"> \
-</method> \
-<signal name="DeviceSelected"> \
-    <arg name="device" type="s" /> \
-</signal> \
-</interface> \
-</node>';
+const AudioDeviceSelectionIface = `
+<node>
+<interface name="org.gnome.Shell.AudioDeviceSelection">
+<method name="Open">
+    <arg name="devices" direction="in" type="as" />
+</method>
+<method name="Close">
+</method>
+<signal name="DeviceSelected">
+    <arg name="device" type="s" />
+</signal>
+</interface>
+</node>`;
 
 var AudioDeviceSelectionDialog = new Lang.Class({
     Name: 'AudioDeviceSelectionDialog',
diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index 47f718a..d51877d 100644
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -44,6 +44,7 @@ var BoxPointer = new Lang.Class({
                                   y_fill: true });
         this._container = new Shell.GenericContainer();
         this.actor.set_child(this._container);
+        this.actor.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
         this._container.connect('get-preferred-width', this._getPreferredWidth.bind(this));
         this._container.connect('get-preferred-height', this._getPreferredHeight.bind(this));
         this._container.connect('allocate', this._allocate.bind(this));
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 651aac6..990cac2 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -134,18 +134,19 @@ var EmptyEventSource = new Lang.Class({
 });
 Signals.addSignalMethods(EmptyEventSource.prototype);
 
-const CalendarServerIface = '<node> \
-<interface name="org.gnome.Shell.CalendarServer"> \
-<method name="GetEvents"> \
-    <arg type="x" direction="in" /> \
-    <arg type="x" direction="in" /> \
-    <arg type="b" direction="in" /> \
-    <arg type="a(sssbxxa{sv})" direction="out" /> \
-</method> \
-<property name="HasCalendars" type="b" access="read" /> \
-<signal name="Changed" /> \
-</interface> \
-</node>';
+const CalendarServerIface = `
+<node>
+<interface name="org.gnome.Shell.CalendarServer">
+<method name="GetEvents">
+    <arg type="x" direction="in" />
+    <arg type="x" direction="in" />
+    <arg type="b" direction="in" />
+    <arg type="a(sssbxxa{sv})" direction="out" />
+</method>
+<property name="HasCalendars" type="b" access="read" />
+<signal name="Changed" />
+</interface>
+</node>`;
 
 const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);
 
diff --git a/js/ui/components/autorunManager.js b/js/ui/components/autorunManager.js
index bbd7328..37c774c 100644
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -74,14 +74,15 @@ function startAppForMount(app, mount) {
 
 /******************************************/
 
-const HotplugSnifferIface = '<node> \
-<interface name="org.gnome.Shell.HotplugSniffer"> \
-<method name="SniffURI"> \
-    <arg type="s" direction="in" /> \
-    <arg type="as" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const HotplugSnifferIface = `
+<node>
+<interface name="org.gnome.Shell.HotplugSniffer">
+<method name="SniffURI">
+    <arg type="s" direction="in" />
+    <arg type="as" direction="out" />
+</method>
+</interface>
+</node>`;
 
 const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
 function HotplugSniffer() {
diff --git a/js/ui/dash.js b/js/ui/dash.js
index 5ee2476..9b8bfdd 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -402,6 +402,7 @@ var Dash = new Lang.Class({
                                        clip_to_allocation: true });
         this._box._delegate = this;
         this._container.add_actor(this._box);
+        this._container.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._showAppsIcon = new ShowAppsIcon();
         this._showAppsIcon.childScale = 1;
diff --git a/js/ui/dialog.js b/js/ui/dialog.js
index cfa192d..0dd3370 100644
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -40,6 +40,7 @@ var Dialog = new Lang.Class({
         // mode accordingly so wrapped labels are handled correctly during
         // size requests.
         this._dialog.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH;
+        this._dialog.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this.contentLayout = new St.BoxLayout({ vertical: true,
                                                 style_class: "modal-dialog-content-box" });
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 5491fbb..a6b928c 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -43,22 +43,23 @@ const _DIALOG_ICON_SIZE = 48;
 
 var GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
 
-const EndSessionDialogIface = '<node> \
-<interface name="org.gnome.SessionManager.EndSessionDialog"> \
-<method name="Open"> \
-    <arg type="u" direction="in" /> \
-    <arg type="u" direction="in" /> \
-    <arg type="u" direction="in" /> \
-    <arg type="ao" direction="in" /> \
-</method> \
-<method name="Close" /> \
-<signal name="ConfirmedLogout" /> \
-<signal name="ConfirmedReboot" /> \
-<signal name="ConfirmedShutdown" /> \
-<signal name="Canceled" /> \
-<signal name="Closed" /> \
-</interface> \
-</node>';
+const EndSessionDialogIface = `
+<node>
+<interface name="org.gnome.SessionManager.EndSessionDialog">
+<method name="Open">
+    <arg type="u" direction="in" />
+    <arg type="u" direction="in" />
+    <arg type="u" direction="in" />
+    <arg type="ao" direction="in" />
+</method>
+<method name="Close" />
+<signal name="ConfirmedLogout" />
+<signal name="ConfirmedReboot" />
+<signal name="ConfirmedShutdown" />
+<signal name="Canceled" />
+<signal name="Closed" />
+</interface>
+</node>`;
 
 const logoutDialogContent = {
     subjectWithUser: C_("title", "Log Out %s"),
@@ -168,39 +169,42 @@ const DialogContent = {
 
 var MAX_USERS_IN_SESSION_DIALOG = 5;
 
-const LogindSessionIface = '<node> \
-<interface name="org.freedesktop.login1.Session"> \
-    <property name="Id" type="s" access="read"/> \
-    <property name="Remote" type="b" access="read"/> \
-    <property name="Class" type="s" access="read"/> \
-    <property name="Type" type="s" access="read"/> \
-    <property name="State" type="s" access="read"/> \
-</interface> \
-</node>';
+const LogindSessionIface = `
+<node>
+<interface name="org.freedesktop.login1.Session">
+    <property name="Id" type="s" access="read"/>
+    <property name="Remote" type="b" access="read"/>
+    <property name="Class" type="s" access="read"/>
+    <property name="Type" type="s" access="read"/>
+    <property name="State" type="s" access="read"/>
+</interface>
+</node>`;
 
 const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface);
 
-const PkOfflineIface = '<node> \
-<interface name="org.freedesktop.PackageKit.Offline"> \
-    <property name="UpdatePrepared" type="b" access="read"/> \
-    <property name="UpdateTriggered" type="b" access="read"/> \
-    <property name="UpgradePrepared" type="b" access="read"/> \
-    <property name="UpgradeTriggered" type="b" access="read"/> \
-    <property name="PreparedUpgrade" type="a{sv}" access="read"/> \
-    <method name="Trigger"> \
-        <arg type="s" name="action" direction="in"/> \
-    </method> \
-    <method name="Cancel"/> \
-</interface> \
-</node>';
+const PkOfflineIface = `
+<node>
+<interface name="org.freedesktop.PackageKit.Offline">
+    <property name="UpdatePrepared" type="b" access="read"/>
+    <property name="UpdateTriggered" type="b" access="read"/>
+    <property name="UpgradePrepared" type="b" access="read"/>
+    <property name="UpgradeTriggered" type="b" access="read"/>
+    <property name="PreparedUpgrade" type="a{sv}" access="read"/>
+    <method name="Trigger">
+        <arg type="s" name="action" direction="in"/>
+    </method>
+    <method name="Cancel"/>
+</interface>
+</node>`;
 
 const PkOfflineProxy = Gio.DBusProxy.makeProxyWrapper(PkOfflineIface);
 
-const UPowerIface = '<node> \
-<interface name="org.freedesktop.UPower"> \
-    <property name="OnBattery" type="b" access="read"/> \
-</interface> \
-</node>';
+const UPowerIface = `
+<node>
+<interface name="org.freedesktop.UPower">
+    <property name="OnBattery" type="b" access="read"/>
+</interface>
+</node>`;
 
 const UPowerProxy = Gio.DBusProxy.makeProxyWrapper(UPowerIface);
 
diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js
index cf8b430..c796d07 100644
--- a/js/ui/magnifierDBus.js
+++ b/js/ui/magnifierDBus.js
@@ -9,89 +9,91 @@ 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 = '<node> \
-<interface name="org.gnome.Magnifier"> \
-<method name="setActive"> \
-    <arg type="b" direction="in" /> \
-</method> \
-<method name="isActive"> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="showCursor" /> \
-<method name="hideCursor" /> \
-<method name="createZoomRegion"> \
-    <arg type="d" direction="in" /> \
-    <arg type="d" direction="in" /> \
-    <arg type="ai" direction="in" /> \
-    <arg type="ai" direction="in" /> \
-    <arg type="o" direction="out" /> \
-</method> \
-<method name="addZoomRegion"> \
-    <arg type="o" direction="in" /> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="getZoomRegions"> \
-    <arg type="ao" direction="out" /> \
-</method> \
-<method name="clearAllZoomRegions" /> \
-<method name="fullScreenCapable"> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="setCrosswireSize"> \
-    <arg type="i" direction="in" /> \
-</method> \
-<method name="getCrosswireSize"> \
-    <arg type="i" direction="out" /> \
-</method> \
-<method name="setCrosswireLength"> \
-    <arg type="i" direction="in" /> \
-</method> \
-<method name="getCrosswireLength"> \
-    <arg type="i" direction="out" /> \
-</method> \
-<method name="setCrosswireClip"> \
-    <arg type="b" direction="in" /> \
-</method> \
-<method name="getCrosswireClip"> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="setCrosswireColor"> \
-    <arg type="u" direction="in" /> \
-</method> \
-<method name="getCrosswireColor"> \
-    <arg type="u" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const MagnifierIface = `
+<node>
+<interface name="org.gnome.Magnifier">
+<method name="setActive">
+    <arg type="b" direction="in" />
+</method>
+<method name="isActive">
+    <arg type="b" direction="out" />
+</method>
+<method name="showCursor" />
+<method name="hideCursor" />
+<method name="createZoomRegion">
+    <arg type="d" direction="in" />
+    <arg type="d" direction="in" />
+    <arg type="ai" direction="in" />
+    <arg type="ai" direction="in" />
+    <arg type="o" direction="out" />
+</method>
+<method name="addZoomRegion">
+    <arg type="o" direction="in" />
+    <arg type="b" direction="out" />
+</method>
+<method name="getZoomRegions">
+    <arg type="ao" direction="out" />
+</method>
+<method name="clearAllZoomRegions" />
+<method name="fullScreenCapable">
+    <arg type="b" direction="out" />
+</method>
+<method name="setCrosswireSize">
+    <arg type="i" direction="in" />
+</method>
+<method name="getCrosswireSize">
+    <arg type="i" direction="out" />
+</method>
+<method name="setCrosswireLength">
+    <arg type="i" direction="in" />
+</method>
+<method name="getCrosswireLength">
+    <arg type="i" direction="out" />
+</method>
+<method name="setCrosswireClip">
+    <arg type="b" direction="in" />
+</method>
+<method name="getCrosswireClip">
+    <arg type="b" direction="out" />
+</method>
+<method name="setCrosswireColor">
+    <arg type="u" direction="in" />
+</method>
+<method name="getCrosswireColor">
+    <arg type="u" direction="out" />
+</method>
+</interface>
+</node>`;
 
 // 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 = '<node> \
-<interface name="org.gnome.Magnifier.ZoomRegion"> \
-<method name="setMagFactor"> \
-    <arg type="d" direction="in" /> \
-    <arg type="d" direction="in" /> \
-</method> \
-<method name="getMagFactor"> \
-    <arg type="d" direction="out" /> \
-    <arg type="d" direction="out" /> \
-</method> \
-<method name="setRoi"> \
-    <arg type="ai" direction="in" /> \
-</method> \
-<method name="getRoi"> \
-    <arg type="ai" direction="out" /> \
-</method> \
-<method name="shiftContentsTo"> \
-    <arg type="i" direction="in" /> \
-    <arg type="i" direction="in" /> \
-    <arg type="b" direction="out" /> \
-</method> \
-<method name="moveResize"> \
-    <arg type="ai" direction="in" /> \
-</method> \
-</interface> \
-</node>';
+const ZoomRegionIface = `
+<node>
+<interface name="org.gnome.Magnifier.ZoomRegion">
+<method name="setMagFactor">
+    <arg type="d" direction="in" />
+    <arg type="d" direction="in" />
+</method>
+<method name="getMagFactor">
+    <arg type="d" direction="out" />
+    <arg type="d" direction="out" />
+</method>
+<method name="setRoi">
+    <arg type="ai" direction="in" />
+</method>
+<method name="getRoi">
+    <arg type="ai" direction="out" />
+</method>
+<method name="shiftContentsTo">
+    <arg type="i" direction="in" />
+    <arg type="i" direction="in" />
+    <arg type="b" direction="out" />
+</method>
+<method name="moveResize">
+    <arg type="ai" direction="in" />
+</method>
+</interface>
+</node>`;
 
 // For making unique ZoomRegion DBus proxy object paths of the form:
 // '/org/gnome/Magnifier/ZoomRegion/zoomer0',
diff --git a/js/ui/mpris.js b/js/ui/mpris.js
index 2e80e99..a3b369c 100644
--- a/js/ui/mpris.js
+++ b/js/ui/mpris.js
@@ -8,41 +8,44 @@ const Calendar = imports.ui.calendar;
 const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;
 
-const DBusIface = '<node> \
-<interface name="org.freedesktop.DBus"> \
-  <method name="ListNames"> \
-    <arg type="as" direction="out" name="names" /> \
-  </method> \
-  <signal name="NameOwnerChanged"> \
-    <arg type="s" direction="out" name="name" /> \
-    <arg type="s" direction="out" name="oldOwner" /> \
-    <arg type="s" direction="out" name="newOwner" /> \
-  </signal> \
-</interface> \
-</node>';
+const DBusIface = `
+<node>
+<interface name="org.freedesktop.DBus">
+  <method name="ListNames">
+    <arg type="as" direction="out" name="names" />
+  </method>
+  <signal name="NameOwnerChanged">
+    <arg type="s" direction="out" name="name" />
+    <arg type="s" direction="out" name="oldOwner" />
+    <arg type="s" direction="out" name="newOwner" />
+  </signal>
+</interface>
+</node>`;
 const DBusProxy = Gio.DBusProxy.makeProxyWrapper(DBusIface);
 
-const MprisIface = '<node> \
-<interface name="org.mpris.MediaPlayer2"> \
-  <method name="Raise" /> \
-  <property name="CanRaise" type="b" access="read" /> \
-  <property name="DesktopEntry" type="s" access="read" /> \
-</interface> \
-</node>';
+const MprisIface = `
+<node>
+<interface name="org.mpris.MediaPlayer2">
+  <method name="Raise" />
+  <property name="CanRaise" type="b" access="read" />
+  <property name="DesktopEntry" type="s" access="read" />
+</interface>
+</node>`;
 const MprisProxy = Gio.DBusProxy.makeProxyWrapper(MprisIface);
 
-const MprisPlayerIface = '<node> \
-<interface name="org.mpris.MediaPlayer2.Player"> \
-  <method name="PlayPause" /> \
-  <method name="Next" /> \
-  <method name="Previous" /> \
-  <property name="CanGoNext" type="b" access="read" /> \
-  <property name="CanGoPrevious" type="b" access="read" /> \
-  <property name="CanPlay" type="b" access="read" /> \
-  <property name="Metadata" type="a{sv}" access="read" /> \
-  <property name="PlaybackStatus" type="s" access="read" /> \
-</interface> \
-</node>';
+const MprisPlayerIface = `
+<node>
+<interface name="org.mpris.MediaPlayer2.Player">
+  <method name="PlayPause" />
+  <method name="Next" />
+  <method name="Previous" />
+  <property name="CanGoNext" type="b" access="read" />
+  <property name="CanGoPrevious" type="b" access="read" />
+  <property name="CanPlay" type="b" access="read" />
+  <property name="Metadata" type="a{sv}" access="read" />
+  <property name="PlaybackStatus" type="s" access="read" />
+</interface>
+</node>`;
 const MprisPlayerProxy = Gio.DBusProxy.makeProxyWrapper(MprisPlayerIface);
 
 const MPRIS_PLAYER_PREFIX = 'org.mpris.MediaPlayer2.';
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 2b5a453..19d23da 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -17,55 +17,57 @@ const Params = imports.misc.params;
 const Util = imports.misc.util;
 
 // Should really be defined in Gio.js
-const BusIface = '<node> \
-<interface name="org.freedesktop.DBus"> \
-<method name="GetConnectionUnixProcessID"> \
-    <arg type="s" direction="in" /> \
-    <arg type="u" direction="out" /> \
-</method> \
-</interface> \
-</node>';
+const BusIface = `
+<node>
+<interface name="org.freedesktop.DBus">
+<method name="GetConnectionUnixProcessID">
+    <arg type="s" direction="in" />
+    <arg type="u" direction="out" />
+</method>
+</interface>
+</node>`;
 
 var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface);
 function Bus() {
     return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
 }
 
-const FdoNotificationsIface = '<node> \
-<interface name="org.freedesktop.Notifications"> \
-<method name="Notify"> \
-    <arg type="s" direction="in"/> \
-    <arg type="u" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="s" direction="in"/> \
-    <arg type="as" direction="in"/> \
-    <arg type="a{sv}" direction="in"/> \
-    <arg type="i" direction="in"/> \
-    <arg type="u" direction="out"/> \
-</method> \
-<method name="CloseNotification"> \
-    <arg type="u" direction="in"/> \
-</method> \
-<method name="GetCapabilities"> \
-    <arg type="as" direction="out"/> \
-</method> \
-<method name="GetServerInformation"> \
-    <arg type="s" direction="out"/> \
-    <arg type="s" direction="out"/> \
-    <arg type="s" direction="out"/> \
-    <arg type="s" direction="out"/> \
-</method> \
-<signal name="NotificationClosed"> \
-    <arg type="u"/> \
-    <arg type="u"/> \
-</signal> \
-<signal name="ActionInvoked"> \
-    <arg type="u"/> \
-    <arg type="s"/> \
-</signal> \
-</interface> \
-</node>';
+const FdoNotificationsIface = `
+<node>
+<interface name="org.freedesktop.Notifications">
+<method name="Notify">
+    <arg type="s" direction="in"/>
+    <arg type="u" direction="in"/>
+    <arg type="s" direction="in"/>
+    <arg type="s" direction="in"/>
+    <arg type="s" direction="in"/>
+    <arg type="as" direction="in"/>
+    <arg type="a{sv}" direction="in"/>
+    <arg type="i" direction="in"/>
+    <arg type="u" direction="out"/>
+</method>
+<method name="CloseNotification">
+    <arg type="u" direction="in"/>
+</method>
+<method name="GetCapabilities">
+    <arg type="as" direction="out"/>
+</method>
+<method name="GetServerInformation">
+    <arg type="s" direction="out"/>
+    <arg type="s" direction="out"/>
+    <arg type="s" direction="out"/>
+    <arg type="s" direction="out"/>
+</method>
+<signal name="NotificationClosed">
+    <arg type="u"/>
+    <arg type="u"/>
+</signal>
+<signal name="ActionInvoked">
+    <arg type="u"/>
+    <arg type="s"/>
+</signal>
+</interface>
+</node>`;
 
 var NotificationClosedReason = {
     EXPIRED: 1,
@@ -654,18 +656,19 @@ var GtkNotificationDaemonNotification = new Lang.Class({
     },
 });
 
-const FdoApplicationIface = '<node> \
-<interface name="org.freedesktop.Application"> \
-<method name="ActivateAction"> \
-    <arg type="s" direction="in" /> \
-    <arg type="av" direction="in" /> \
-    <arg type="a{sv}" direction="in" /> \
-</method> \
-<method name="Activate"> \
-    <arg type="a{sv}" direction="in" /> \
-</method> \
-</interface> \
-</node>';
+const FdoApplicationIface = `
+<node>
+<interface name="org.freedesktop.Application">
+<method name="ActivateAction">
+    <arg type="s" direction="in" />
+    <arg type="av" direction="in" />
+    <arg type="a{sv}" direction="in" />
+</method>
+<method name="Activate">
+    <arg type="a{sv}" direction="in" />
+</method>
+</interface>
+</node>`;
 const FdoApplicationProxy = Gio.DBusProxy.makeProxyWrapper(FdoApplicationIface);
 
 function objectPathFromAppId(appId) {
@@ -774,19 +777,20 @@ var GtkNotificationDaemonAppSource = new Lang.Class({
     },
 });
 
-const GtkNotificationsIface = '<node> \
-<interface name="org.gtk.Notifications"> \
-<method name="AddNotification"> \
-    <arg type="s" direction="in" /> \
-    <arg type="s" direction="in" /> \
-    <arg type="a{sv}" direction="in" /> \
-</method> \
-<method name="RemoveNotification"> \
-    <arg type="s" direction="in" /> \
-    <arg type="s" direction="in" /> \
-</method> \
-</interface> \
-</node>';
+const GtkNotificationsIface = `
+<node>
+<interface name="org.gtk.Notifications">
+<method name="AddNotification">
+    <arg type="s" direction="in" />
+    <arg type="s" direction="in" />
+    <arg type="a{sv}" direction="in" />
+</method>
+<method name="RemoveNotification">
+    <arg type="s" direction="in" />
+    <arg type="s" direction="in" />
+</method>
+</interface>
+</node>`;
 
 var GtkNotificationDaemon = new Lang.Class({
     Name: 'GtkNotificationDaemon',
diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index 8ef20b6..76321f5 100644
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -962,14 +962,15 @@ var PadOsd = new Lang.Class({
 });
 Signals.addSignalMethods(PadOsd.prototype);
 
-const PadOsdIface = '<node> \
-<interface name="org.gnome.Shell.Wacom.PadOsd"> \
-<method name="Show"> \
-    <arg name="device_node" direction="in" type="o"/> \
-    <arg name="edition_mode" direction="in" type="b"/> \
-</method> \
-</interface> \
-</node>';
+const PadOsdIface = `
+<node>
+<interface name="org.gnome.Shell.Wacom.PadOsd">
+<method name="Show">
+    <arg name="device_node" direction="in" type="o"/>
+    <arg name="edition_mode" direction="in" type="b"/>
+</method>
+</interface>
+</node>`;
 
 var PadOsdService = new Lang.Class({
     Name: 'PadOsdService',
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 05241ab..3726b84 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -307,8 +307,11 @@ var AppMenuButton = new Lang.Class({
             }
         }
 
+        let shellShowsAppMenu = this._gtkSettings.gtk_shell_shows_app_menu;
+        Meta.prefs_set_show_fallback_app_menu(!shellShowsAppMenu);
+
         let visible = (this._targetApp != null &&
-                       this._gtkSettings.gtk_shell_shows_app_menu &&
+                       shellShowsAppMenu &&
                        !Main.overview.visibleTarget);
         if (visible)
             this.show();
@@ -776,6 +779,7 @@ var Panel = new Lang.Class({
         this.actor = new Shell.GenericContainer({ name: 'panel',
                                                   reactive: true });
         this.actor._delegate = this;
+        this.actor.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._sessionStyle = null;
 
diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
index c6c5a29..3b847af 100644
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -12,53 +12,55 @@ const Search = imports.ui.search;
 
 const KEY_FILE_GROUP = 'Shell Search Provider';
 
-const SearchProviderIface = '<node> \
-<interface name="org.gnome.Shell.SearchProvider"> \
-<method name="GetInitialResultSet"> \
-    <arg type="as" direction="in" /> \
-    <arg type="as" direction="out" /> \
-</method> \
-<method name="GetSubsearchResultSet"> \
-    <arg type="as" direction="in" /> \
-    <arg type="as" direction="in" /> \
-    <arg type="as" direction="out" /> \
-</method> \
-<method name="GetResultMetas"> \
-    <arg type="as" direction="in" /> \
-    <arg type="aa{sv}" direction="out" /> \
-</method> \
-<method name="ActivateResult"> \
-    <arg type="s" direction="in" /> \
-</method> \
-</interface> \
-</node>';
-
-const SearchProvider2Iface = '<node> \
-<interface name="org.gnome.Shell.SearchProvider2"> \
-<method name="GetInitialResultSet"> \
-    <arg type="as" direction="in" /> \
-    <arg type="as" direction="out" /> \
-</method> \
-<method name="GetSubsearchResultSet"> \
-    <arg type="as" direction="in" /> \
-    <arg type="as" direction="in" /> \
-    <arg type="as" direction="out" /> \
-</method> \
-<method name="GetResultMetas"> \
-    <arg type="as" direction="in" /> \
-    <arg type="aa{sv}" direction="out" /> \
-</method> \
-<method name="ActivateResult"> \
-    <arg type="s" direction="in" /> \
-    <arg type="as" direction="in" /> \
-    <arg type="u" direction="in" /> \
-</method> \
-<method name="LaunchSearch"> \
-    <arg type="as" direction="in" /> \
-    <arg type="u" direction="in" /> \
-</method> \
-</interface> \
-</node>';
+const SearchProviderIface = `
+<node>
+<interface name="org.gnome.Shell.SearchProvider">
+<method name="GetInitialResultSet">
+    <arg type="as" direction="in" />
+    <arg type="as" direction="out" />
+</method>
+<method name="GetSubsearchResultSet">
+    <arg type="as" direction="in" />
+    <arg type="as" direction="in" />
+    <arg type="as" direction="out" />
+</method>
+<method name="GetResultMetas">
+    <arg type="as" direction="in" />
+    <arg type="aa{sv}" direction="out" />
+</method>
+<method name="ActivateResult">
+    <arg type="s" direction="in" />
+</method>
+</interface>
+</node>`;
+
+const SearchProvider2Iface = `
+<node>
+<interface name="org.gnome.Shell.SearchProvider2">
+<method name="GetInitialResultSet">
+    <arg type="as" direction="in" />
+    <arg type="as" direction="out" />
+</method>
+<method name="GetSubsearchResultSet">
+    <arg type="as" direction="in" />
+    <arg type="as" direction="in" />
+    <arg type="as" direction="out" />
+</method>
+<method name="GetResultMetas">
+    <arg type="as" direction="in" />
+    <arg type="aa{sv}" direction="out" />
+</method>
+<method name="ActivateResult">
+    <arg type="s" direction="in" />
+    <arg type="as" direction="in" />
+    <arg type="u" direction="in" />
+</method>
+<method name="LaunchSearch">
+    <arg type="as" direction="in" />
+    <arg type="u" direction="in" />
+</method>
+</interface>
+</node>`;
 
 var SearchProviderProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProviderIface);
 var SearchProvider2ProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProvider2Iface);
diff --git a/js/ui/screencast.js b/js/ui/screencast.js
index bf5d954..91514e3 100644
--- a/js/ui/screencast.js
+++ b/js/ui/screencast.js
@@ -8,29 +8,30 @@ const Signals = imports.signals;
 
 const Main = imports.ui.main;
 
-const ScreencastIface = '<node> \
-<interface name="org.gnome.Shell.Screencast"> \
-<method name="Screencast"> \
-    <arg type="s" direction="in" name="file_template"/> \
-    <arg type="a{sv}" direction="in" name="options"/> \
-    <arg type="b" direction="out" name="success"/> \
-    <arg type="s" direction="out" name="filename_used"/> \
-</method> \
-<method name="ScreencastArea"> \
-    <arg type="i" direction="in" name="x"/> \
-    <arg type="i" direction="in" name="y"/> \
-    <arg type="i" direction="in" name="width"/> \
-    <arg type="i" direction="in" name="height"/> \
-    <arg type="s" direction="in" name="file_template"/> \
-    <arg type="a{sv}" direction="in" name="options"/> \
-    <arg type="b" direction="out" name="success"/> \
-    <arg type="s" direction="out" name="filename_used"/> \
-</method> \
-<method name="StopScreencast"> \
-    <arg type="b" direction="out" name="success"/> \
-</method> \
-</interface> \
-</node>';
+const ScreencastIface = `
+<node>
+<interface name="org.gnome.Shell.Screencast">
+<method name="Screencast">
+    <arg type="s" direction="in" name="file_template"/>
+    <arg type="a{sv}" direction="in" name="options"/>
+    <arg type="b" direction="out" name="success"/>
+    <arg type="s" direction="out" name="filename_used"/>
+</method>
+<method name="ScreencastArea">
+    <arg type="i" direction="in" name="x"/>
+    <arg type="i" direction="in" name="y"/>
+    <arg type="i" direction="in" name="width"/>
+    <arg type="i" direction="in" name="height"/>
+    <arg type="s" direction="in" name="file_template"/>
+    <arg type="a{sv}" direction="in" name="options"/>
+    <arg type="b" direction="out" name="success"/>
+    <arg type="s" direction="out" name="filename_used"/>
+</method>
+<method name="StopScreencast">
+    <arg type="b" direction="out" name="success"/>
+</method>
+</interface>
+</node>`;
 
 var ScreencastService = new Lang.Class({
     Name: 'ScreencastService',
diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index 356a8cc..6534542 100644
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -16,50 +16,51 @@ const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
-const ScreenshotIface = '<node> \
-<interface name="org.gnome.Shell.Screenshot"> \
-<method name="ScreenshotArea"> \
-    <arg type="i" direction="in" name="x"/> \
-    <arg type="i" direction="in" name="y"/> \
-    <arg type="i" direction="in" name="width"/> \
-    <arg type="i" direction="in" name="height"/> \
-    <arg type="b" direction="in" name="flash"/> \
-    <arg type="s" direction="in" name="filename"/> \
-    <arg type="b" direction="out" name="success"/> \
-    <arg type="s" direction="out" name="filename_used"/> \
-</method> \
-<method name="ScreenshotWindow"> \
-    <arg type="b" direction="in" name="include_frame"/> \
-    <arg type="b" direction="in" name="include_cursor"/> \
-    <arg type="b" direction="in" name="flash"/> \
-    <arg type="s" direction="in" name="filename"/> \
-    <arg type="b" direction="out" name="success"/> \
-    <arg type="s" direction="out" name="filename_used"/> \
-</method> \
-<method name="Screenshot"> \
-    <arg type="b" direction="in" name="include_cursor"/> \
-    <arg type="b" direction="in" name="flash"/> \
-    <arg type="s" direction="in" name="filename"/> \
-    <arg type="b" direction="out" name="success"/> \
-    <arg type="s" direction="out" name="filename_used"/> \
-</method> \
-<method name="SelectArea"> \
-    <arg type="i" direction="out" name="x"/> \
-    <arg type="i" direction="out" name="y"/> \
-    <arg type="i" direction="out" name="width"/> \
-    <arg type="i" direction="out" name="height"/> \
-</method> \
-<method name="FlashArea"> \
-    <arg type="i" direction="in" name="x"/> \
-    <arg type="i" direction="in" name="y"/> \
-    <arg type="i" direction="in" name="width"/> \
-    <arg type="i" direction="in" name="height"/> \
-</method> \
-<method name="PickColor"> \
-    <arg type="a{sv}" direction="out" name="result"/> \
-</method> \
-</interface> \
-</node>';
+const ScreenshotIface = `
+<node>
+<interface name="org.gnome.Shell.Screenshot">
+<method name="ScreenshotArea">
+    <arg type="i" direction="in" name="x"/>
+    <arg type="i" direction="in" name="y"/>
+    <arg type="i" direction="in" name="width"/>
+    <arg type="i" direction="in" name="height"/>
+    <arg type="b" direction="in" name="flash"/>
+    <arg type="s" direction="in" name="filename"/>
+    <arg type="b" direction="out" name="success"/>
+    <arg type="s" direction="out" name="filename_used"/>
+</method>
+<method name="ScreenshotWindow">
+    <arg type="b" direction="in" name="include_frame"/>
+    <arg type="b" direction="in" name="include_cursor"/>
+    <arg type="b" direction="in" name="flash"/>
+    <arg type="s" direction="in" name="filename"/>
+    <arg type="b" direction="out" name="success"/>
+    <arg type="s" direction="out" name="filename_used"/>
+</method>
+<method name="Screenshot">
+    <arg type="b" direction="in" name="include_cursor"/>
+    <arg type="b" direction="in" name="flash"/>
+    <arg type="s" direction="in" name="filename"/>
+    <arg type="b" direction="out" name="success"/>
+    <arg type="s" direction="out" name="filename_used"/>
+</method>
+<method name="SelectArea">
+    <arg type="i" direction="out" name="x"/>
+    <arg type="i" direction="out" name="y"/>
+    <arg type="i" direction="out" name="width"/>
+    <arg type="i" direction="out" name="height"/>
+</method>
+<method name="FlashArea">
+    <arg type="i" direction="in" name="x"/>
+    <arg type="i" direction="in" name="y"/>
+    <arg type="i" direction="in" name="width"/>
+    <arg type="i" direction="in" name="height"/>
+</method>
+<method name="PickColor">
+    <arg type="a{sv}" direction="out" name="result"/>
+</method>
+</interface>
+</node>`;
 
 var ScreenshotService = new Lang.Class({
     Name: 'ScreenshotService',
diff --git a/js/ui/scripting.js b/js/ui/scripting.js
index c96ebd1..b325eb1 100644
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -68,19 +68,20 @@ function waitLeisure() {
     return callback => { cb = callback; };
 }
 
-const PerfHelperIface = '<node> \
-<interface name="org.gnome.Shell.PerfHelper"> \
-<method name="CreateWindow"> \
-    <arg type="i" direction="in" /> \
-    <arg type="i" direction="in" /> \
-    <arg type="b" direction="in" /> \
-    <arg type="b" direction="in" /> \
-    <arg type="b" direction="in" /> \
-</method> \
-<method name="WaitWindows" /> \
-<method name="DestroyWindows" /> \
-</interface> \
-</node>';
+const PerfHelperIface = `
+<node>
+<interface name="org.gnome.Shell.PerfHelper">
+<method name="CreateWindow">
+    <arg type="i" direction="in" />
+    <arg type="i" direction="in" />
+    <arg type="b" direction="in" />
+    <arg type="b" direction="in" />
+    <arg type="b" direction="in" />
+</method>
+<method name="WaitWindows" />
+<method name="DestroyWindows" />
+</interface>
+</node>`;
 
 var PerfHelperProxy = Gio.DBusProxy.makeProxyWrapper(PerfHelperIface);
 function PerfHelper() {
diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 4d60ef4..871fe99 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -14,70 +14,72 @@ const Main = imports.ui.main;
 const Screenshot = imports.ui.screenshot;
 const ViewSelector = imports.ui.viewSelector;
 
-const GnomeShellIface = '<node> \
-<interface name="org.gnome.Shell"> \
-<method name="Eval"> \
-    <arg type="s" direction="in" name="script" /> \
-    <arg type="b" direction="out" name="success" /> \
-    <arg type="s" direction="out" name="result" /> \
-</method> \
-<method name="FocusSearch"/> \
-<method name="ShowOSD"> \
-    <arg type="a{sv}" direction="in" name="params"/> \
-</method> \
-<method name="ShowMonitorLabels"> \
-    <arg type="a{uv}" direction="in" name="params" /> \
-</method> \
-<method name="ShowMonitorLabels2"> \
-    <arg type="a{sv}" direction="in" name="params" /> \
-</method> \
-<method name="HideMonitorLabels" /> \
-<method name="FocusApp"> \
-    <arg type="s" direction="in" name="id"/> \
-</method> \
-<method name="ShowApplications" /> \
-<method name="GrabAccelerator"> \
-    <arg type="s" direction="in" name="accelerator"/> \
-    <arg type="u" direction="in" name="flags"/> \
-    <arg type="u" direction="out" name="action"/> \
-</method> \
-<method name="GrabAccelerators"> \
-    <arg type="a(su)" direction="in" name="accelerators"/> \
-    <arg type="au" direction="out" name="actions"/> \
-</method> \
-<method name="UngrabAccelerator"> \
-    <arg type="u" direction="in" name="action"/> \
-    <arg type="b" direction="out" name="success"/> \
-</method> \
-<signal name="AcceleratorActivated"> \
-    <arg name="action" type="u" /> \
-    <arg name="parameters" type="a{sv}" /> \
-</signal> \
-<property name="Mode" type="s" access="read" /> \
-<property name="OverviewActive" type="b" access="readwrite" /> \
-<property name="ShellVersion" type="s" access="read" /> \
-</interface> \
-</node>';
-
-const ScreenSaverIface = '<node> \
-<interface name="org.gnome.ScreenSaver"> \
-<method name="Lock"> \
-</method> \
-<method name="GetActive"> \
-    <arg name="active" direction="out" type="b" /> \
-</method> \
-<method name="SetActive"> \
-    <arg name="value" direction="in" type="b" /> \
-</method> \
-<method name="GetActiveTime"> \
-    <arg name="value" direction="out" type="u" /> \
-</method> \
-<signal name="ActiveChanged"> \
-    <arg name="new_value" type="b" /> \
-</signal> \
-<signal name="WakeUpScreen" /> \
-</interface> \
-</node>';
+const GnomeShellIface = `
+<node>
+<interface name="org.gnome.Shell">
+<method name="Eval">
+    <arg type="s" direction="in" name="script" />
+    <arg type="b" direction="out" name="success" />
+    <arg type="s" direction="out" name="result" />
+</method>
+<method name="FocusSearch"/>
+<method name="ShowOSD">
+    <arg type="a{sv}" direction="in" name="params"/>
+</method>
+<method name="ShowMonitorLabels">
+    <arg type="a{uv}" direction="in" name="params" />
+</method>
+<method name="ShowMonitorLabels2">
+    <arg type="a{sv}" direction="in" name="params" />
+</method>
+<method name="HideMonitorLabels" />
+<method name="FocusApp">
+    <arg type="s" direction="in" name="id"/>
+</method>
+<method name="ShowApplications" />
+<method name="GrabAccelerator">
+    <arg type="s" direction="in" name="accelerator"/>
+    <arg type="u" direction="in" name="flags"/>
+    <arg type="u" direction="out" name="action"/>
+</method>
+<method name="GrabAccelerators">
+    <arg type="a(su)" direction="in" name="accelerators"/>
+    <arg type="au" direction="out" name="actions"/>
+</method>
+<method name="UngrabAccelerator">
+    <arg type="u" direction="in" name="action"/>
+    <arg type="b" direction="out" name="success"/>
+</method>
+<signal name="AcceleratorActivated">
+    <arg name="action" type="u" />
+    <arg name="parameters" type="a{sv}" />
+</signal>
+<property name="Mode" type="s" access="read" />
+<property name="OverviewActive" type="b" access="readwrite" />
+<property name="ShellVersion" type="s" access="read" />
+</interface>
+</node>`;
+
+const ScreenSaverIface = `
+<node>
+<interface name="org.gnome.ScreenSaver">
+<method name="Lock">
+</method>
+<method name="GetActive">
+    <arg name="active" direction="out" type="b" />
+</method>
+<method name="SetActive">
+    <arg name="value" direction="in" type="b" />
+</method>
+<method name="GetActiveTime">
+    <arg name="value" direction="out" type="u" />
+</method>
+<signal name="ActiveChanged">
+    <arg name="new_value" type="b" />
+</signal>
+<signal name="WakeUpScreen" />
+</interface>
+</node>`;
 
 var GnomeShell = new Lang.Class({
     Name: 'GnomeShellDBus',
@@ -293,43 +295,44 @@ var GnomeShell = new Lang.Class({
     ShellVersion: Config.PACKAGE_VERSION
 });
 
-const GnomeShellExtensionsIface = '<node> \
-<interface name="org.gnome.Shell.Extensions"> \
-<method name="ListExtensions"> \
-    <arg type="a{sa{sv}}" direction="out" name="extensions" /> \
-</method> \
-<method name="GetExtensionInfo"> \
-    <arg type="s" direction="in" name="extension" /> \
-    <arg type="a{sv}" direction="out" name="info" /> \
-</method> \
-<method name="GetExtensionErrors"> \
-    <arg type="s" direction="in" name="extension" /> \
-    <arg type="as" direction="out" name="errors" /> \
-</method> \
-<signal name="ExtensionStatusChanged"> \
-    <arg type="s" name="uuid"/> \
-    <arg type="i" name="state"/> \
-    <arg type="s" name="error"/> \
-</signal> \
-<method name="InstallRemoteExtension"> \
-    <arg type="s" direction="in" name="uuid"/> \
-    <arg type="s" direction="out" name="result"/> \
-</method> \
-<method name="UninstallExtension"> \
-    <arg type="s" direction="in" name="uuid"/> \
-    <arg type="b" direction="out" name="success"/> \
-</method> \
-<method name="LaunchExtensionPrefs"> \
-    <arg type="s" direction="in" name="uuid"/> \
-</method> \
-<method name="ReloadExtension"> \
-    <arg type="s" direction="in" name="uuid"/> \
-</method> \
-<method name="CheckForUpdates"> \
-</method> \
-<property name="ShellVersion" type="s" access="read" /> \
-</interface> \
-</node>';
+const GnomeShellExtensionsIface = `
+<node>
+<interface name="org.gnome.Shell.Extensions">
+<method name="ListExtensions">
+    <arg type="a{sa{sv}}" direction="out" name="extensions" />
+</method>
+<method name="GetExtensionInfo">
+    <arg type="s" direction="in" name="extension" />
+    <arg type="a{sv}" direction="out" name="info" />
+</method>
+<method name="GetExtensionErrors">
+    <arg type="s" direction="in" name="extension" />
+    <arg type="as" direction="out" name="errors" />
+</method>
+<signal name="ExtensionStatusChanged">
+    <arg type="s" name="uuid"/>
+    <arg type="i" name="state"/>
+    <arg type="s" name="error"/>
+</signal>
+<method name="InstallRemoteExtension">
+    <arg type="s" direction="in" name="uuid"/>
+    <arg type="s" direction="out" name="result"/>
+</method>
+<method name="UninstallExtension">
+    <arg type="s" direction="in" name="uuid"/>
+    <arg type="b" direction="out" name="success"/>
+</method>
+<method name="LaunchExtensionPrefs">
+    <arg type="s" direction="in" name="uuid"/>
+</method>
+<method name="ReloadExtension">
+    <arg type="s" direction="in" name="uuid"/>
+</method>
+<method name="CheckForUpdates">
+</method>
+<property name="ShellVersion" type="s" access="read" />
+</interface>
+</node>`;
 
 var GnomeShellExtensions = new Lang.Class({
     Name: 'GnomeShellExtensionsDBus',
diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index dee7799..9be0a46 100644
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -436,38 +436,39 @@ var ShellProcessesDialog = new Lang.Class({
 });
 Signals.addSignalMethods(ShellProcessesDialog.prototype);
 
-const GnomeShellMountOpIface = '<node> \
-<interface name="org.Gtk.MountOperationHandler"> \
-<method name="AskPassword"> \
-    <arg type="s" direction="in" name="object_id"/> \
-    <arg type="s" direction="in" name="message"/> \
-    <arg type="s" direction="in" name="icon_name"/> \
-    <arg type="s" direction="in" name="default_user"/> \
-    <arg type="s" direction="in" name="default_domain"/> \
-    <arg type="u" direction="in" name="flags"/> \
-    <arg type="u" direction="out" name="response"/> \
-    <arg type="a{sv}" direction="out" name="response_details"/> \
-</method> \
-<method name="AskQuestion"> \
-    <arg type="s" direction="in" name="object_id"/> \
-    <arg type="s" direction="in" name="message"/> \
-    <arg type="s" direction="in" name="icon_name"/> \
-    <arg type="as" direction="in" name="choices"/> \
-    <arg type="u" direction="out" name="response"/> \
-    <arg type="a{sv}" direction="out" name="response_details"/> \
-</method> \
-<method name="ShowProcesses"> \
-    <arg type="s" direction="in" name="object_id"/> \
-    <arg type="s" direction="in" name="message"/> \
-    <arg type="s" direction="in" name="icon_name"/> \
-    <arg type="ai" direction="in" name="application_pids"/> \
-    <arg type="as" direction="in" name="choices"/> \
-    <arg type="u" direction="out" name="response"/> \
-    <arg type="a{sv}" direction="out" name="response_details"/> \
-</method> \
-<method name="Close"/> \
-</interface> \
-</node>';
+const GnomeShellMountOpIface = `
+<node>
+<interface name="org.Gtk.MountOperationHandler">
+<method name="AskPassword">
+    <arg type="s" direction="in" name="object_id"/>
+    <arg type="s" direction="in" name="message"/>
+    <arg type="s" direction="in" name="icon_name"/>
+    <arg type="s" direction="in" name="default_user"/>
+    <arg type="s" direction="in" name="default_domain"/>
+    <arg type="u" direction="in" name="flags"/>
+    <arg type="u" direction="out" name="response"/>
+    <arg type="a{sv}" direction="out" name="response_details"/>
+</method>
+<method name="AskQuestion">
+    <arg type="s" direction="in" name="object_id"/>
+    <arg type="s" direction="in" name="message"/>
+    <arg type="s" direction="in" name="icon_name"/>
+    <arg type="as" direction="in" name="choices"/>
+    <arg type="u" direction="out" name="response"/>
+    <arg type="a{sv}" direction="out" name="response_details"/>
+</method>
+<method name="ShowProcesses">
+    <arg type="s" direction="in" name="object_id"/>
+    <arg type="s" direction="in" name="message"/>
+    <arg type="s" direction="in" name="icon_name"/>
+    <arg type="ai" direction="in" name="application_pids"/>
+    <arg type="as" direction="in" name="choices"/>
+    <arg type="u" direction="out" name="response"/>
+    <arg type="a{sv}" direction="out" name="response_details"/>
+</method>
+<method name="Close"/>
+</interface>
+</node>`;
 
 var ShellMountOperationType = {
     NONE: 0,
diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index 7ffc8f7..c81f836 100644
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -11,13 +11,14 @@ const PopupMenu = imports.ui.popupMenu;
 const BUS_NAME = 'org.gnome.SettingsDaemon.Rfkill';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Rfkill';
 
-const RfkillManagerInterface = '<node> \
-<interface name="org.gnome.SettingsDaemon.Rfkill"> \
-<property name="BluetoothAirplaneMode" type="b" access="readwrite" /> \
-<property name="BluetoothHasAirplaneMode" type="b" access="read" /> \
-<property name="BluetoothHardwareAirplaneMode" type="b" access="readwrite" /> \
-</interface> \
-</node>';
+const RfkillManagerInterface = `
+<node>
+<interface name="org.gnome.SettingsDaemon.Rfkill">
+<property name="BluetoothAirplaneMode" type="b" access="readwrite" />
+<property name="BluetoothHasAirplaneMode" type="b" access="read" />
+<property name="BluetoothHardwareAirplaneMode" type="b" access="readwrite" />
+</interface>
+</node>`;
 
 const RfkillManagerProxy = Gio.DBusProxy.makeProxyWrapper(RfkillManagerInterface);
 
diff --git a/js/ui/status/brightness.js b/js/ui/status/brightness.js
index 55c5b0f..50640d2 100644
--- a/js/ui/status/brightness.js
+++ b/js/ui/status/brightness.js
@@ -11,11 +11,12 @@ const Slider = imports.ui.slider;
 const BUS_NAME = 'org.gnome.SettingsDaemon.Power';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Power';
 
-const BrightnessInterface = '<node> \
-<interface name="org.gnome.SettingsDaemon.Power.Screen"> \
-<property name="Brightness" type="i" access="readwrite"/> \
-</interface> \
-</node>';
+const BrightnessInterface = `
+<node>
+<interface name="org.gnome.SettingsDaemon.Power.Screen">
+<property name="Brightness" type="i" access="readwrite"/>
+</interface>
+</node>`;
 
 const BrightnessProxy = Gio.DBusProxy.makeProxyWrapper(BrightnessInterface);
 
diff --git a/js/ui/status/location.js b/js/ui/status/location.js
index e59a503..b5d6c7d 100644
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -40,29 +40,31 @@ function accuracyLevelToString(accuracyLevel) {
     return 'NONE';
 }
 
-var GeoclueIface = '<node> \
-  <interface name="org.freedesktop.GeoClue2.Manager"> \
-    <property name="InUse" type="b" access="read"/> \
-    <property name="AvailableAccuracyLevel" type="u" access="read"/> \
-    <method name="AddAgent"> \
-      <arg name="id" type="s" direction="in"/> \
-    </method> \
-  </interface> \
-</node>';
+var GeoclueIface = `
+<node>
+  <interface name="org.freedesktop.GeoClue2.Manager">
+    <property name="InUse" type="b" access="read"/>
+    <property name="AvailableAccuracyLevel" type="u" access="read"/>
+    <method name="AddAgent">
+      <arg name="id" type="s" direction="in"/>
+    </method>
+  </interface>
+</node>`;
 
 const GeoclueManager = Gio.DBusProxy.makeProxyWrapper(GeoclueIface);
 
-var AgentIface = '<node> \
-  <interface name="org.freedesktop.GeoClue2.Agent"> \
-    <property name="MaxAccuracyLevel" type="u" access="read"/> \
-    <method name="AuthorizeApp"> \
-      <arg name="desktop_id" type="s" direction="in"/> \
-      <arg name="req_accuracy_level" type="u" direction="in"/> \
-      <arg name="authorized" type="b" direction="out"/> \
-      <arg name="allowed_accuracy_level" type="u" direction="out"/> \
-    </method> \
-  </interface> \
-</node>';
+var AgentIface = `
+<node>
+  <interface name="org.freedesktop.GeoClue2.Agent">
+    <property name="MaxAccuracyLevel" type="u" access="read"/>
+    <method name="AuthorizeApp">
+      <arg name="desktop_id" type="s" direction="in"/>
+      <arg name="req_accuracy_level" type="u" direction="in"/>
+      <arg name="authorized" type="b" direction="out"/>
+      <arg name="allowed_accuracy_level" type="u" direction="out"/>
+    </method>
+  </interface>
+</node>`;
 
 var Indicator = new Lang.Class({
     Name: 'LocationIndicator',
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index bf3a2ba..3e3d0d1 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -51,25 +51,26 @@ var PortalHelperResult = {
     RECHECK: 2
 };
 
-const PortalHelperIface = '<node> \
-<interface name="org.gnome.Shell.PortalHelper"> \
-<method name="Authenticate"> \
-    <arg type="o" direction="in" name="connection" /> \
-    <arg type="s" direction="in" name="url" /> \
-    <arg type="u" direction="in" name="timestamp" /> \
-</method> \
-<method name="Close"> \
-    <arg type="o" direction="in" name="connection" /> \
-</method> \
-<method name="Refresh"> \
-    <arg type="o" direction="in" name="connection" /> \
-</method> \
-<signal name="Done"> \
-    <arg type="o" name="connection" /> \
-    <arg type="u" name="result" /> \
-</signal> \
-</interface> \
-</node>';
+const PortalHelperIface = `
+<node>
+<interface name="org.gnome.Shell.PortalHelper">
+<method name="Authenticate">
+    <arg type="o" direction="in" name="connection" />
+    <arg type="s" direction="in" name="url" />
+    <arg type="u" direction="in" name="timestamp" />
+</method>
+<method name="Close">
+    <arg type="o" direction="in" name="connection" />
+</method>
+<method name="Refresh">
+    <arg type="o" direction="in" name="connection" />
+</method>
+<signal name="Done">
+    <arg type="o" name="connection" />
+    <arg type="u" name="result" />
+</signal>
+</interface>
+</node>`;
 const PortalHelperProxy = Gio.DBusProxy.makeProxyWrapper(PortalHelperIface);
 
 function signalToIcon(value) {
diff --git a/js/ui/status/nightLight.js b/js/ui/status/nightLight.js
index f2523b5..f369d3d 100644
--- a/js/ui/status/nightLight.js
+++ b/js/ui/status/nightLight.js
@@ -10,12 +10,13 @@ const PopupMenu = imports.ui.popupMenu;
 const BUS_NAME = 'org.gnome.SettingsDaemon.Color';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Color';
 
-const ColorInterface = '<node> \
-<interface name="org.gnome.SettingsDaemon.Color"> \
-  <property name="DisabledUntilTomorrow" type="b" access="readwrite"/> \
-  <property name="NightLightActive" type="b" access="read"/> \
-</interface> \
-</node>';
+const ColorInterface = `
+<node>
+<interface name="org.gnome.SettingsDaemon.Color">
+  <property name="DisabledUntilTomorrow" type="b" access="readwrite"/>
+  <property name="NightLightActive" type="b" access="read"/>
+</interface>
+</node>`;
 
 const ColorProxy = Gio.DBusProxy.makeProxyWrapper(ColorInterface);
 
diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index a2bfd75..cf57d8c 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -13,17 +13,18 @@ const PopupMenu = imports.ui.popupMenu;
 const BUS_NAME = 'org.freedesktop.UPower';
 const OBJECT_PATH = '/org/freedesktop/UPower/devices/DisplayDevice';
 
-const DisplayDeviceInterface = '<node> \
-<interface name="org.freedesktop.UPower.Device"> \
-  <property name="Type" type="u" access="read"/> \
-  <property name="State" type="u" access="read"/> \
-  <property name="Percentage" type="d" access="read"/> \
-  <property name="TimeToEmpty" type="x" access="read"/> \
-  <property name="TimeToFull" type="x" access="read"/> \
-  <property name="IsPresent" type="b" access="read"/> \
-  <property name="IconName" type="s" access="read"/> \
-</interface> \
-</node>';
+const DisplayDeviceInterface = `
+<node>
+<interface name="org.freedesktop.UPower.Device">
+  <property name="Type" type="u" access="read"/>
+  <property name="State" type="u" access="read"/>
+  <property name="Percentage" type="d" access="read"/>
+  <property name="TimeToEmpty" type="x" access="read"/>
+  <property name="TimeToFull" type="x" access="read"/>
+  <property name="IsPresent" type="b" access="read"/>
+  <property name="IconName" type="s" access="read"/>
+</interface>
+</node>`;
 
 const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(DisplayDeviceInterface);
 
diff --git a/js/ui/status/rfkill.js b/js/ui/status/rfkill.js
index 989a4f9..ecc8745 100644
--- a/js/ui/status/rfkill.js
+++ b/js/ui/status/rfkill.js
@@ -11,13 +11,14 @@ const PopupMenu = imports.ui.popupMenu;
 const BUS_NAME = 'org.gnome.SettingsDaemon.Rfkill';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Rfkill';
 
-const RfkillManagerInterface = '<node> \
-<interface name="org.gnome.SettingsDaemon.Rfkill"> \
-<property name="AirplaneMode" type="b" access="readwrite" /> \
-<property name="HardwareAirplaneMode" type="b" access="read" /> \
-<property name="ShouldShowAirplaneMode" type="b" access="read" /> \
-</interface> \
-</node>';
+const RfkillManagerInterface = `
+<node>
+<interface name="org.gnome.SettingsDaemon.Rfkill">
+<property name="AirplaneMode" type="b" access="readwrite" />
+<property name="HardwareAirplaneMode" type="b" access="read" />
+<property name="ShouldShowAirplaneMode" type="b" access="read" />
+</interface>
+</node>`;
 
 const RfkillManagerProxy = Gio.DBusProxy.makeProxyWrapper(RfkillManagerInterface);
 
diff --git a/js/ui/status/thunderbolt.js b/js/ui/status/thunderbolt.js
index 0c54319..efb401a 100644
--- a/js/ui/status/thunderbolt.js
+++ b/js/ui/status/thunderbolt.js
@@ -14,40 +14,42 @@ const PanelMenu = imports.ui.panelMenu;
 
 /* Keep in sync with data/org.freedesktop.bolt.xml */
 
-const BoltClientInterface = '<node> \
-  <interface name="org.freedesktop.bolt1.Manager"> \
-    <property name="Probing" type="b" access="read"></property> \
-    <property name="AuthMode" type="s" access="readwrite"></property> \
-    <method name="EnrollDevice"> \
-      <arg type="s" name="uid" direction="in"> </arg> \
-      <arg type="s" name="policy" direction="in"> </arg> \
-      <arg type="s" name="flags" direction="in"> </arg> \
-      <arg name="device" direction="out" type="o"> </arg> \
-    </method> \
-    <signal name="DeviceAdded"> \
-      <arg name="device" type="o"> </arg> \
-    </signal> \
-  </interface> \
-</node>';
-
-const BoltDeviceInterface = '<node> \
-  <interface name="org.freedesktop.bolt1.Device"> \
-    <property name="Uid" type="s" access="read"></property> \
-    <property name="Name" type="s" access="read"></property> \
-    <property name="Vendor" type="s" access="read"></property> \
-    <property name="Type" type="s" access="read"></property> \
-    <property name="Status" type="s" access="read"></property> \
-    <property name="Parent" type="s" access="read"></property> \
-    <property name="SysfsPath" type="s" access="read"></property> \
-    <property name="Stored" type="b" access="read"></property> \
-    <property name="Policy" type="s" access="read"></property> \
-    <property name="Key" type="s" access="read"></property> \
-    <property name="Label" type="s" access="read"></property> \
-    <property name="ConnectTime" type="t" access="read"></property> \
-    <property name="AuthorizeTime" type="t" access="read"></property> \
-    <property name="StoreTime" type="t" access="read"></property> \
-  </interface> \
-</node>';
+const BoltClientInterface = `
+<node>
+  <interface name="org.freedesktop.bolt1.Manager">
+    <property name="Probing" type="b" access="read"></property>
+    <property name="AuthMode" type="s" access="readwrite"></property>
+    <method name="EnrollDevice">
+      <arg type="s" name="uid" direction="in"> </arg>
+      <arg type="s" name="policy" direction="in"> </arg>
+      <arg type="s" name="flags" direction="in"> </arg>
+      <arg name="device" direction="out" type="o"> </arg>
+    </method>
+    <signal name="DeviceAdded">
+      <arg name="device" type="o"> </arg>
+    </signal>
+  </interface>
+</node>`;
+
+const BoltDeviceInterface = `
+<node>
+  <interface name="org.freedesktop.bolt1.Device">
+    <property name="Uid" type="s" access="read"></property>
+    <property name="Name" type="s" access="read"></property>
+    <property name="Vendor" type="s" access="read"></property>
+    <property name="Type" type="s" access="read"></property>
+    <property name="Status" type="s" access="read"></property>
+    <property name="Parent" type="s" access="read"></property>
+    <property name="SysfsPath" type="s" access="read"></property>
+    <property name="Stored" type="b" access="read"></property>
+    <property name="Policy" type="s" access="read"></property>
+    <property name="Key" type="s" access="read"></property>
+    <property name="Label" type="s" access="read"></property>
+    <property name="ConnectTime" type="t" access="read"></property>
+    <property name="AuthorizeTime" type="t" access="read"></property>
+    <property name="StoreTime" type="t" access="read"></property>
+  </interface>
+</node>`;
 
 const BoltDeviceProxy = Gio.DBusProxy.makeProxyWrapper(BoltDeviceInterface);
 
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 36d8a9f..b6627e2 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -42,19 +42,20 @@ var ONE_SECOND = 1000; // in ms
 const GSD_WACOM_BUS_NAME = 'org.gnome.SettingsDaemon.Wacom';
 const GSD_WACOM_OBJECT_PATH = '/org/gnome/SettingsDaemon/Wacom';
 
-const GsdWacomIface = '<node name="/org/gnome/SettingsDaemon/Wacom"> \
-<interface name="org.gnome.SettingsDaemon.Wacom"> \
-  <method name="SetGroupModeLED"> \
-    <arg name="device_path" direction="in" type="s"/> \
-    <arg name="group" direction="in" type="u"/> \
-    <arg name="mode" direction="in" type="u"/> \
-  </method> \
-  <method name="SetOLEDLabels"> \
-    <arg name="device_path" direction="in" type="s"/> \
-    <arg name="labels" direction="in" type="as"/> \
-  </method> \
-  </interface> \
-</node>';
+const GsdWacomIface = `
+<node name="/org/gnome/SettingsDaemon/Wacom">
+<interface name="org.gnome.SettingsDaemon.Wacom">
+  <method name="SetGroupModeLED">
+    <arg name="device_path" direction="in" type="s"/>
+    <arg name="group" direction="in" type="u"/>
+    <arg name="mode" direction="in" type="u"/>
+  </method>
+  <method name="SetOLEDLabels">
+    <arg name="device_path" direction="in" type="s"/>
+    <arg name="labels" direction="in" type="as"/>
+  </method>
+  </interface>
+</node>`;
 
 const GsdWacomProxy = Gio.DBusProxy.makeProxyWrapper(GsdWacomIface);
 
diff --git a/meson.build b/meson.build
index 00dd966..47d1bc3 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.29.91',
+  version: '3.29.92',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )
@@ -23,7 +23,7 @@ gi_req = '>= 1.49.1'
 gjs_req = '>= 1.47.0'
 gtk_req = '>= 3.15.0'
 json_glib_req = '>= 0.13.2'
-mutter_req = '>= 3.29.91'
+mutter_req = '>= 3.29.92'
 polkit_req = '>= 0.100'
 schemas_req = '>= 3.27.90'
 startup_req = '>= 0.11'
diff --git a/po/cs.po b/po/cs.po
index 8169e52..38eec1c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2018-04-13 19:54+0000\n"
-"PO-Revision-Date: 2018-04-24 17:32+0200\n"
+"POT-Creation-Date: 2018-08-27 17:24+0000\n"
+"PO-Revision-Date: 2018-08-29 07:16+0200\n"
 "Last-Translator: Marek Černocký <[e-mail]>\n"
 "Language-Team: čeština <[e-mail]>\n"
 "Language: cs\n"
@@ -48,7 +48,7 @@ msgid "Open the application menu"
 msgstr "Otevřít nabídku aplikací"
 
 #: data/gnome-shell-extension-prefs.desktop.in.in:4
-#: js/extensionPrefs/main.js:150
+#: js/extensionPrefs/main.js:151
 msgid "Shell Extensions"
 msgstr "Rozšíření pro Shell"
 
@@ -287,32 +287,32 @@ msgstr ""
 "Je-li zapnuto, objeví se v přepínači oken jen ty, co jsou na aktuální "
 "pracovní ploše. V opačném případě jsou zahrnuta všechna okna."
 
-#: data/org.gnome.shell.gschema.xml.in:197
+#: data/org.gnome.shell.gschema.xml.in:198
 msgid "Attach modal dialog to the parent window"
 msgstr "Modální dialogová okna připojovat k rodičovskému oknu"
 
-#: data/org.gnome.shell.gschema.xml.in:198
-#: data/org.gnome.shell.gschema.xml.in:207
-#: data/org.gnome.shell.gschema.xml.in:215
-#: data/org.gnome.shell.gschema.xml.in:223
-#: data/org.gnome.shell.gschema.xml.in:231
+#: data/org.gnome.shell.gschema.xml.in:199
+#: data/org.gnome.shell.gschema.xml.in:208
+#: data/org.gnome.shell.gschema.xml.in:216
+#: data/org.gnome.shell.gschema.xml.in:224
+#: data/org.gnome.shell.gschema.xml.in:232
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr "Když běží GNOME Shell, tento klíč přepíše klíč v org.gnome.mutter"
 
-#: data/org.gnome.shell.gschema.xml.in:206
+#: data/org.gnome.shell.gschema.xml.in:207
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Okna upuštěná u okraje obrazovky nechat řadit jako dlaždice"
 
-#: data/org.gnome.shell.gschema.xml.in:214
+#: data/org.gnome.shell.gschema.xml.in:215
 msgid "Workspaces are managed dynamically"
 msgstr "Pracovní plochy jsou spravovány dynamicky"
 
-#: data/org.gnome.shell.gschema.xml.in:222
+#: data/org.gnome.shell.gschema.xml.in:223
 msgid "Workspaces only on primary monitor"
 msgstr "Pracovní plochy jen na hlavním monitoru"
 
-#: data/org.gnome.shell.gschema.xml.in:230
+#: data/org.gnome.shell.gschema.xml.in:231
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Se změnou zaměření v režimu myši čekat na zastavení pohybu ukazatele"
 
@@ -325,16 +325,16 @@ msgstr "Přihlášení do sítě"
 msgid "network-workgroup"
 msgstr "network-workgroup"
 
-#: js/extensionPrefs/main.js:120
+#: js/extensionPrefs/main.js:121
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
 "Nastala chyba při načítání dialogového okna předvoleb pro rozšíření %s:"
 
-#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
-#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153
-#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
-#: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
+#: js/gdm/authPrompt.js:147 js/ui/components/networkAgent.js:117
+#: js/ui/components/polkitAgent.js:153 js/ui/endSessionDialog.js:486
+#: js/ui/extensionDownloader.js:197 js/ui/shellMountOperation.js:343
+#: js/ui/status/network.js:920
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -352,20 +352,20 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Přihlásit se"
 
-#: js/gdm/loginDialog.js:315
+#: js/gdm/loginDialog.js:319
 msgid "Choose Session"
 msgstr "Vybrat sezení"
 
 #. 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:462
 msgid "Not listed?"
 msgstr "Nejste na seznamu?"
 
 #. 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:887
+#: js/gdm/loginDialog.js:891
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(např. uživatel nebo %s)"
@@ -373,12 +373,12 @@ msgstr "(např. uživatel nebo %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:892 js/ui/components/networkAgent.js:243
+#: js/gdm/loginDialog.js:896 js/ui/components/networkAgent.js:243
 #: js/ui/components/networkAgent.js:261
 msgid "Username: "
 msgstr "Uživatelské jméno: "
 
-#: js/gdm/loginDialog.js:1228
+#: js/gdm/loginDialog.js:1234
 msgid "Login Window"
 msgstr "Přihlašovací okno"
 
@@ -391,86 +391,10 @@ msgstr "Chyba ověření"
 #. as a cue to display our own message.
 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: js/gdm/util.js:482
+#: js/gdm/util.js:485
 msgid "(or swipe finger)"
 msgstr "(nebo otiskněte prst)"
 
-#. Translators: The name of the power-off action in search
-#: js/misc/systemActions.js:99
-msgctxt "search-result"
-msgid "Power Off"
-msgstr "Vypnout"
-
-#. Translators: A list of keywords that match the power-off action, separated by semicolons
-#: js/misc/systemActions.js:102
-msgid "power off;shutdown;reboot;restart"
-msgstr ""
-"vypnout;vypnutí;restart;restartování;restartovat;reboot;znovu zavést systém;"
-"zavedení systému;natažení systému;"
-
-#. Translators: The name of the lock screen action in search
-#: js/misc/systemActions.js:106
-msgctxt "search-result"
-msgid "Lock Screen"
-msgstr "Zamknout obrazovku"
-
-#. Translators: A list of keywords that match the lock screen action, separated by semicolons
-#: js/misc/systemActions.js:109
-msgid "lock screen"
-msgstr ""
-"zamknout obrazovku;zamknout počítač;uzamknout obrazovku;uzamknout počítač;"
-"zamčít obrazovku;zamčít počítač;uzamčít obrazovku;uzamčít počítač;zamknutí "
-"obrazovky;zamknutí počítače;uzamknutí obrazovky;uzamknutí počítače;zamčení "
-"obrazovky;zamčení počítače;uzamčení obrazovky;uzamčení počítače;"
-
-#. Translators: The name of the logout action in search
-#: js/misc/systemActions.js:113
-msgctxt "search-result"
-msgid "Log Out"
-msgstr "Odhlásit se"
-
-#. Translators: A list of keywords that match the logout action, separated by semicolons
-#: js/misc/systemActions.js:116
-msgid "logout;sign off"
-msgstr "odhlásit se;odhlášení;odlogovat se;odlogování;"
-
-#. Translators: The name of the suspend action in search
-#: js/misc/systemActions.js:120
-msgctxt "search-result"
-msgid "Suspend"
-msgstr "Uspat do paměti"
-
-#. Translators: A list of keywords that match the suspend action, separated by semicolons
-#: js/misc/systemActions.js:123
-msgid "suspend;sleep"
-msgstr "uspat do paměti;režim spánku;"
-
-#. Translators: The name of the switch user action in search
-#: js/misc/systemActions.js:127
-msgctxt "search-result"
-msgid "Switch User"
-msgstr "Přepnout uživatele"
-
-#. Translators: A list of keywords that match the switch user action, separated by semicolons
-#: js/misc/systemActions.js:130
-msgid "switch user"
-msgstr "přepnout uživatele;přepnutí uživatele;"
-
-#. Translators: The name of the lock orientation action in search
-#: js/misc/systemActions.js:134
-msgctxt "search-result"
-msgid "Lock Orientation"
-msgstr "Zamknout otočení"
-
-#. Translators: A list of keywords that match the lock orientation action, separated by semicolons
-#: js/misc/systemActions.js:137
-msgid "lock orientation;screen;rotation"
-msgstr ""
-"zamknout otočení;zamknout orientaci;uzamknout otočení;uzamknout orientaci;"
-"zamčít otočení;zamčít orientaci;uzamčít otočení;uzamčít orientaci;zamknutí "
-"otočení;zamknutí orientace;uzamknutí otočení;uzamknutí orientace;zamčení "
-"otočení;zamčení orientace;uzamčení otočení;uzamčení orientace;"
-
 #: js/misc/util.js:122
 msgid "Command not found"
 msgstr "Příkaz nenalezen"
@@ -612,58 +536,35 @@ msgstr "%e. %B %l∶%M %p"
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%e. %B %Y, %l∶%M %p"
 
-#. TRANSLATORS: this is the title of the wifi captive portal login window
-#: js/portalHelper/main.js:66
-msgid "Hotspot Login"
-msgstr "Přihlášení k přístupovému bodu"
-
-#: js/portalHelper/main.js:112
-msgid ""
-"Your connection to this hotspot login is not secure. Passwords or other "
-"information you enter on this page can be viewed by people nearby."
-msgstr ""
-"Vaše připojení k tomuto přístupovému bodu není bezpečné. Hesla a další "
-"informace, které zadáte na této stránce mohou vidět ostatní lidé v okolí."
-
-#. No support for non-modal system dialogs, so ignore the option
-#. let modal = options['modal'] || true;
-#: js/ui/accessDialog.js:63 js/ui/status/location.js:393
-msgid "Deny Access"
-msgstr "Zamítnout přístup"
-
-#: js/ui/accessDialog.js:64 js/ui/status/location.js:396
-msgid "Grant Access"
-msgstr "Schválit přístup"
-
-#: js/ui/appDisplay.js:793
+#: js/ui/appDisplay.js:794
 msgid "Frequently used applications will appear here"
 msgstr "Zde se objeví často používané aplikace"
 
-#: js/ui/appDisplay.js:914
+#: js/ui/appDisplay.js:915
 msgid "Frequent"
 msgstr "Časté"
 
-#: js/ui/appDisplay.js:921
+#: js/ui/appDisplay.js:922
 msgid "All"
 msgstr "Všechny"
 
-#: js/ui/appDisplay.js:1886
+#: js/ui/appDisplay.js:1891
 msgid "New Window"
 msgstr "Nové okno"
 
-#: js/ui/appDisplay.js:1900
+#: js/ui/appDisplay.js:1905
 msgid "Launch using Dedicated Graphics Card"
 msgstr "Spustit pomocí vyhrazené grafické karty"
 
-#: js/ui/appDisplay.js:1927 js/ui/dash.js:285
+#: js/ui/appDisplay.js:1932 js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Odstranit z oblíbených"
 
-#: js/ui/appDisplay.js:1933
+#: js/ui/appDisplay.js:1938
 msgid "Add to Favorites"
 msgstr "Přidat mezi oblíbené"
 
-#: js/ui/appDisplay.js:1943
+#: js/ui/appDisplay.js:1948
 msgid "Show Details"
 msgstr "Zobrazit podrobnosti"
 
@@ -677,35 +578,15 @@ msgstr "%s byl přidán mezi oblíbené."
 msgid "%s has been removed from your favorites."
 msgstr "%s byl odstraněn z oblíbených."
 
-#: js/ui/audioDeviceSelection.js:59
-msgid "Select Audio Device"
-msgstr "Výběr zvukového zařízení"
-
-#: js/ui/audioDeviceSelection.js:69
-msgid "Sound Settings"
-msgstr "Nastavení zvuku"
-
-#: js/ui/audioDeviceSelection.js:78
-msgid "Headphones"
-msgstr "Sluchátka"
-
-#: js/ui/audioDeviceSelection.js:80
-msgid "Headset"
-msgstr "Sluchátka s mikrofonem"
-
-#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:221
-msgid "Microphone"
-msgstr "Mikrofon"
-
 #: js/ui/backgroundMenu.js:19
 msgid "Change Background…"
 msgstr "Změnit pozadí…"
 
-#: js/ui/backgroundMenu.js:21 js/ui/status/nightLight.js:51
+#: js/ui/backgroundMenu.js:21 js/ui/status/nightLight.js:52
 msgid "Display Settings"
 msgstr "Nastavení displeje"
 
-#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:264
+#: js/ui/backgroundMenu.js:22
 msgid "Settings"
 msgstr "Nastavení"
 
@@ -767,7 +648,7 @@ msgstr "So"
 #. * "%OB" is the new format specifier introduced in glibc 2.27,
 #. * in most cases you should not change it.
 #.
-#: js/ui/calendar.js:379
+#: js/ui/calendar.js:380
 msgid "%OB"
 msgstr "%OB"
 
@@ -780,65 +661,65 @@ msgstr "%OB"
 #. * in most cases you should not use the old "%B" here unless you
 #. * absolutely know what you are doing.
 #.
-#: js/ui/calendar.js:389
+#: js/ui/calendar.js:390
 msgid "%OB %Y"
 msgstr "%OB %Y"
 
-#: js/ui/calendar.js:446
+#: js/ui/calendar.js:447
 msgid "Previous month"
 msgstr "Předchozí měsíc"
 
-#: js/ui/calendar.js:456
+#: js/ui/calendar.js:457
 msgid "Next month"
 msgstr "Následující měsíc"
 
-#: js/ui/calendar.js:609
+#: js/ui/calendar.js:610
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%e"
 
-#: js/ui/calendar.js:664
+#: js/ui/calendar.js:665
 msgid "Week %V"
 msgstr "%V. týden"
 
 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
 #.
-#: js/ui/calendar.js:733
+#: js/ui/calendar.js:734
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Celý den"
 
-#: js/ui/calendar.js:864
+#: js/ui/calendar.js:867
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"
 
-#: js/ui/calendar.js:868
+#: js/ui/calendar.js:871
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e. %B %Y"
 
-#: js/ui/calendar.js:1086
+#: js/ui/calendar.js:1101
 msgid "No Notifications"
 msgstr "Nejsou žádná upozornění"
 
-#: js/ui/calendar.js:1089
+#: js/ui/calendar.js:1104
 msgid "No Events"
 msgstr "Nejsou žádné události"
 
-#: js/ui/calendar.js:1117
+#: js/ui/calendar.js:1132
 msgid "Clear All"
 msgstr "Vymazat vše"
 
 #. Translators: %s is an application name
-#: js/ui/closeDialog.js:44
+#: js/ui/closeDialog.js:47
 #, javascript-format
 msgid "“%s” is not responding."
 msgstr "Aplikace „%s“ neodpovídá."
 
-#: js/ui/closeDialog.js:45
+#: js/ui/closeDialog.js:48
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -846,11 +727,11 @@ msgstr ""
 "Můžete si vybrat, jestli chvilku počkat, zda bude normálně pokračovat, nebo "
 "ji násilně celou ukončit."
 
-#: js/ui/closeDialog.js:61
+#: js/ui/closeDialog.js:64
 msgid "Force Quit"
 msgstr "Vynutit ukončení"
 
-#: js/ui/closeDialog.js:64
+#: js/ui/closeDialog.js:67
 msgid "Wait"
 msgstr "Počkat"
 
@@ -862,12 +743,12 @@ msgstr "Externí svazek připojen"
 msgid "External drive disconnected"
 msgstr "Externí svazek odpojen"
 
-#: js/ui/components/autorunManager.js:354
+#: js/ui/components/autorunManager.js:355
 #, javascript-format
 msgid "Open with %s"
 msgstr "Otevřít pomocí %s"
 
-#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:297
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -875,8 +756,7 @@ msgstr "Heslo:"
 msgid "Type again:"
 msgstr "Napište znovu:"
 
-#: js/ui/components/networkAgent.js:112 js/ui/status/network.js:245
-#: js/ui/status/network.js:336 js/ui/status/network.js:922
+#: js/ui/components/networkAgent.js:112 js/ui/status/network.js:923
 msgid "Connect"
 msgstr "Připojit"
 
@@ -904,11 +784,11 @@ msgstr "Heslo soukromého klíče: "
 msgid "Service: "
 msgstr "Služba: "
 
-#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:659
+#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:668
 msgid "Authentication required by wireless network"
 msgstr "K bezdrátové síti je vyžadováno ověření"
 
-#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:660
+#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:669
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -917,7 +797,7 @@ msgstr ""
 "Pro přístup k bezdrátové síti „%s“ jsou vyžadována hesla nebo šifrovací "
 "klíče."
 
-#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:663
+#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:672
 msgid "Wired 802.1X authentication"
 msgstr "Ověření připojení po drátu 802.1X"
 
@@ -925,15 +805,15 @@ msgstr "Ověření připojení po drátu 802.1X"
 msgid "Network name: "
 msgstr "Název sítě: "
 
-#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:667
+#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:676
 msgid "DSL authentication"
 msgstr "Ověření DSL"
 
-#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:673
+#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:682
 msgid "PIN code required"
 msgstr "Požadován kód PIN"
 
-#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:674
+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:683
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Pro mobilní širokopásmové zařízení je vyžadován kód PIN"
 
@@ -941,17 +821,17 @@ msgstr "Pro mobilní širokopásmové zařízení je vyžadován kód PIN"
 msgid "PIN: "
 msgstr "PIN: "
 
-#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:680
+#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:689
 msgid "Mobile broadband network password"
 msgstr "Heslo k mobilní širokopásmové síti"
 
-#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:664
-#: js/ui/components/networkAgent.js:668 js/ui/components/networkAgent.js:681
+#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:673
+#: js/ui/components/networkAgent.js:677 js/ui/components/networkAgent.js:690
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Pro připojení k „%s“ je vyžadováno heslo."
 
-#: js/ui/components/networkAgent.js:648 js/ui/status/network.js:1691
+#: js/ui/components/networkAgent.js:657 js/ui/status/network.js:1705
 msgid "Network Manager"
 msgstr "Network Manager"
 
@@ -971,7 +851,7 @@ msgstr "Ověřit"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327
+#: js/ui/components/polkitAgent.js:283 js/ui/shellMountOperation.js:327
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Ověření bohužel nebylo úspěšné. Zkuste to prosím znovu."
 
@@ -992,7 +872,7 @@ msgstr "Zobrazit aplikace"
 
 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: js/ui/dash.js:443
+#: js/ui/dash.js:444
 msgid "Dash"
 msgstr "Oblíbené"
 
@@ -1074,158 +954,27 @@ msgstr "Připojit se kvůli informacím o počasí"
 msgid "Weather information is currently unavailable"
 msgstr "Informace o počasí nejsou nyní dostupné"
 
-#: js/ui/endSessionDialog.js:64
-#, javascript-format
-msgctxt "title"
-msgid "Log Out %s"
-msgstr "Odhlásit uživatele %s"
-
-#: js/ui/endSessionDialog.js:65
-msgctxt "title"
-msgid "Log Out"
-msgstr "Odhlášení"
-
-#: js/ui/endSessionDialog.js:67
-#, javascript-format
-msgid "%s will be logged out automatically in %d second."
-msgid_plural "%s will be logged out automatically in %d seconds."
-msgstr[0] "Uživatel %s bude automaticky odhlášen za %d sekundu."
-msgstr[1] "Uživatel %s bude automaticky odhlášen za %d sekundy."
-msgstr[2] "Uživatel %s bude automaticky odhlášen za %d sekund."
-
-#: js/ui/endSessionDialog.js:72
-#, javascript-format
-msgid "You will be logged out automatically in %d second."
-msgid_plural "You will be logged out automatically in %d seconds."
-msgstr[0] "Budete automaticky odhlášeni za %d sekundu."
-msgstr[1] "Budete automaticky odhlášeni za %d sekundy."
-msgstr[2] "Budete automaticky odhlášeni za %d sekund."
-
-#: js/ui/endSessionDialog.js:78
-msgctxt "button"
-msgid "Log Out"
-msgstr "Odhlásit"
-
-#: js/ui/endSessionDialog.js:84
-msgctxt "title"
-msgid "Power Off"
-msgstr "Vypnutí"
-
-#: js/ui/endSessionDialog.js:85
-msgctxt "title"
-msgid "Install Updates & Power Off"
-msgstr "Nainstalovat aktualizace a vypnout"
-
-#: js/ui/endSessionDialog.js:87
-#, javascript-format
-msgid "The system will power off automatically in %d second."
-msgid_plural "The system will power off automatically in %d seconds."
-msgstr[0] "Systém bude automaticky vypnut za %d sekundu."
-msgstr[1] "Systém bude automaticky vypnut za %d sekundy."
-msgstr[2] "Systém bude automaticky vypnut za %d sekund."
-
-#: js/ui/endSessionDialog.js:91
-msgctxt "checkbox"
-msgid "Install pending software updates"
-msgstr "Nainstalovat čekající aktualizace softwaru"
-
-#: js/ui/endSessionDialog.js:94 js/ui/endSessionDialog.js:111
-msgctxt "button"
-msgid "Restart"
-msgstr "Restartovat"
-
-#: js/ui/endSessionDialog.js:96
-msgctxt "button"
-msgid "Power Off"
-msgstr "Vypnout"
-
-#: js/ui/endSessionDialog.js:103
-msgctxt "title"
-msgid "Restart"
-msgstr "Restart"
-
-#: js/ui/endSessionDialog.js:105
-#, javascript-format
-msgid "The system will restart automatically in %d second."
-msgid_plural "The system will restart automatically in %d seconds."
-msgstr[0] "Systém bude automaticky restartován za %d sekundu."
-msgstr[1] "Systém bude automaticky restartován za %d sekundy."
-msgstr[2] "Systém bude automaticky restartován za %d sekund."
-
-#: js/ui/endSessionDialog.js:119
-msgctxt "title"
-msgid "Restart & Install Updates"
-msgstr "Restartovat a nainstalovat aktualizace"
-
-#: js/ui/endSessionDialog.js:121
-#, javascript-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] ""
-"Systém bude automaticky restartován za %d sekundu a poté se nainstalují "
-"aktualizace."
-msgstr[1] ""
-"Systém bude automaticky restartován za %d sekundy a poté se nainstalují "
-"aktualizace."
-msgstr[2] ""
-"Systém bude automaticky restartován za %d sekund a poté se nainstalují "
-"aktualizace."
-
-#: js/ui/endSessionDialog.js:127 js/ui/endSessionDialog.js:147
-msgctxt "button"
-msgid "Restart &amp; Install"
-msgstr "Restartovat a nainstalovat"
-
-#: js/ui/endSessionDialog.js:128
-msgctxt "button"
-msgid "Install &amp; Power Off"
-msgstr "Nainstalovat a vypnout"
-
-#: js/ui/endSessionDialog.js:129
-msgctxt "checkbox"
-msgid "Power off after updates are installed"
-msgstr "Po nainstalování aktualizací vypnout"
-
-#: js/ui/endSessionDialog.js:137
-msgctxt "title"
-msgid "Restart & Install Upgrade"
-msgstr "Restartovat a nainstalovat povýšení"
-
-#. Translators: This is the text displayed for system upgrades in the
-#. shut down dialog. First %s gets replaced with the distro name and
-#. second %s with the distro version to upgrade to
-#: js/ui/endSessionDialog.js:142
-#, javascript-format
-msgid ""
-"%s %s will be installed after restart. Upgrade installation can take a long "
-"time: ensure that you have backed up and that the computer is plugged in."
-msgstr ""
-"Verze %2s distribuce %1s bude nainstalována po restartu. Instalace povýšení "
-"může zabrat hodně času: zkontrolujte, že máte vše zazálohováno a že počítač "
-"je připojen do elektriky."
-
-#: js/ui/endSessionDialog.js:361
+#: js/ui/endSessionDialog.js:365
 msgid "Running on battery power: please plug in before installing updates."
 msgstr ""
 "Počítač běží na baterii: před instalací jej prosím připojte k napájení."
 
-#: js/ui/endSessionDialog.js:378
+#: js/ui/endSessionDialog.js:382
 msgid "Some applications are busy or have unsaved work."
 msgstr "Některé aplikace jsou zaneprázdněny nebo obsahují neuloženou práci."
 
-#: js/ui/endSessionDialog.js:385
+#: js/ui/endSessionDialog.js:389
 msgid "Other users are logged in."
 msgstr "Jsou přihlášeni jiní uživatelé."
 
 #. Translators: Remote here refers to a remote session, like a ssh login
-#: js/ui/endSessionDialog.js:666
+#: js/ui/endSessionDialog.js:670
 #, javascript-format
 msgid "%s (remote)"
 msgstr "%s (vzdálený)"
 
 #. Translators: Console here refers to a tty like a VT console
-#: js/ui/endSessionDialog.js:669
+#: js/ui/endSessionDialog.js:673
 #, javascript-format
 msgid "%s (console)"
 msgstr "%s (konzola)"
@@ -1311,16 +1060,12 @@ msgstr ""
 msgid "Leave On"
 msgstr "Ponechat zapnuté"
 
-#: js/ui/kbdA11yDialog.js:59 js/ui/status/bluetooth.js:143
-#: js/ui/status/network.js:1281
+#: js/ui/kbdA11yDialog.js:59 js/ui/status/network.js:1295
 msgid "Turn On"
 msgstr "Zapnout"
 
-#: js/ui/kbdA11yDialog.js:67 js/ui/status/bluetooth.js:143
-#: js/ui/status/network.js:154 js/ui/status/network.js:337
-#: js/ui/status/network.js:1281 js/ui/status/network.js:1396
-#: js/ui/status/nightLight.js:47 js/ui/status/rfkill.js:90
-#: js/ui/status/rfkill.js:117
+#: js/ui/kbdA11yDialog.js:67 js/ui/status/network.js:1295
+#: js/ui/status/network.js:1410 js/ui/status/nightLight.js:48
 msgid "Turn Off"
 msgstr "Vypnout"
 
@@ -1380,18 +1125,22 @@ msgstr "Zobrazit zdroj"
 msgid "Web Page"
 msgstr "Webová stránka"
 
-#: js/ui/messageTray.js:1493
+#: js/ui/messageTray.js:1495
 msgid "System Information"
 msgstr "Informace o systému"
 
-#: js/ui/mpris.js:211
+#: js/ui/mpris.js:214
 msgid "Unknown artist"
 msgstr "Neznámý umělec"
 
-#: js/ui/mpris.js:212
+#: js/ui/mpris.js:215
 msgid "Unknown title"
 msgstr "Neznámý název"
 
+#: js/ui/osdWindow.js:32 js/ui/status/volume.js:204
+msgid "Volume"
+msgstr "Hlasitost"
+
 #: js/ui/overview.js:83
 msgid "Undo"
 msgstr "Zpět"
@@ -1434,42 +1183,42 @@ msgstr "Přířadit klávesu"
 msgid "Done"
 msgstr "Hotovo"
 
-#: js/ui/padOsd.js:740
+#: js/ui/padOsd.js:742
 msgid "Edit…"
 msgstr "Upravit…"
 
-#: js/ui/padOsd.js:782 js/ui/padOsd.js:887
+#: js/ui/padOsd.js:784 js/ui/padOsd.js:889
 msgid "None"
 msgstr "Źádná"
 
-#: js/ui/padOsd.js:841
+#: js/ui/padOsd.js:843
 msgid "Press a button to configure"
 msgstr "Zmáčkněte tlačítko pro nastavení"
 
-#: js/ui/padOsd.js:842
+#: js/ui/padOsd.js:844
 msgid "Press Esc to exit"
 msgstr "Zmáčknutím Esc ukončíte"
 
-#: js/ui/padOsd.js:845
+#: js/ui/padOsd.js:847
 msgid "Press any key to exit"
 msgstr "Zmáčknutím klávesy ukončíte"
 
-#: js/ui/panel.js:355
+#: js/ui/panel.js:356
 msgid "Quit"
 msgstr "Ukončit"
 
 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview".
-#: js/ui/panel.js:411
+#: js/ui/panel.js:412
 msgid "Activities"
 msgstr "Činnosti"
 
-#: js/ui/panel.js:692
+#: js/ui/panel.js:693
 msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "Systém"
 
-#: js/ui/panel.js:811
+#: js/ui/panel.js:817
 msgid "Top Bar"
 msgstr "Horní lišta"
 
@@ -1478,23 +1227,23 @@ msgstr "Horní lišta"
 #. "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:291
+#: js/ui/popupMenu.js:300
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
-#: js/ui/runDialog.js:70
+#: js/ui/runDialog.js:74
 msgid "Enter a Command"
 msgstr "Zadejte příkaz:"
 
-#: js/ui/runDialog.js:110 js/ui/windowMenu.js:175
+#: js/ui/runDialog.js:114 js/ui/windowMenu.js:174
 msgid "Close"
 msgstr "Zavřít"
 
-#: js/ui/runDialog.js:273
+#: js/ui/runDialog.js:276
 msgid "Restart is not available on Wayland"
 msgstr "Restart není na Waylandu k dispozici"
 
-#: js/ui/runDialog.js:278
+#: js/ui/runDialog.js:281
 msgid "Restarting…"
 msgstr "Restartuje se…"
 
@@ -1520,7 +1269,7 @@ msgstr[0] "%d nové upozornění"
 msgstr[1] "%d nová upozornění"
 msgstr[2] "%d nových upozornění"
 
-#: js/ui/screenShield.js:451 js/ui/status/system.js:283
+#: js/ui/screenShield.js:451 js/ui/status/system.js:294
 msgid "Lock"
 msgstr "Uzamknout"
 
@@ -1627,35 +1376,6 @@ msgstr "Vysoký kontrast"
 msgid "Large Text"
 msgstr "Styl velkého textu"
 
-#: js/ui/status/bluetooth.js:48
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: js/ui/status/bluetooth.js:57 js/ui/status/network.js:614
-msgid "Bluetooth Settings"
-msgstr "Nastavení Bluetooth"
-
-#. Translators: this is the number of connected bluetooth devices
-#: js/ui/status/bluetooth.js:137
-#, javascript-format
-msgid "%d Connected"
-msgid_plural "%d Connected"
-msgstr[0] "%d připojené"
-msgstr[1] "%d připojená"
-msgstr[2] "%d připojených"
-
-#: js/ui/status/bluetooth.js:139
-msgid "Off"
-msgstr "Vypnuto"
-
-#: js/ui/status/bluetooth.js:141
-msgid "On"
-msgstr "Zapnuto"
-
-#: js/ui/status/brightness.js:44
-msgid "Brightness"
-msgstr "Jas"
-
 #: js/ui/status/keyboard.js:781
 msgid "Keyboard"
 msgstr "Klávesnice"
@@ -1664,219 +1384,173 @@ msgstr "Klávesnice"
 msgid "Show Keyboard Layout"
 msgstr "Zobrazit rozložení klávesnice"
 
-#: js/ui/status/location.js:89 js/ui/status/location.js:197
+#: js/ui/status/location.js:91 js/ui/status/location.js:199
 msgid "Location Enabled"
 msgstr "Zjišťování polohy je povoleno"
 
-#: js/ui/status/location.js:90 js/ui/status/location.js:198
+#: js/ui/status/location.js:92 js/ui/status/location.js:200
 msgid "Disable"
 msgstr "Zakázát"
 
-#: js/ui/status/location.js:91
+#: js/ui/status/location.js:93
 msgid "Privacy Settings"
 msgstr "Nastavení ochrany osobních údajů"
 
-#: js/ui/status/location.js:196
+#: js/ui/status/location.js:198
 msgid "Location In Use"
 msgstr "Zjišťování polohy se používá"
 
-#: js/ui/status/location.js:200
+#: js/ui/status/location.js:202
 msgid "Location Disabled"
 msgstr "Zjišťování polohy je zakázáno"
 
-#: js/ui/status/location.js:201
+#: js/ui/status/location.js:203
 msgid "Enable"
 msgstr "Povolit"
 
 #. Translators: %s is an application name
-#: js/ui/status/location.js:386
+#: js/ui/status/location.js:388
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr "Schválit pro %s přístup k vaší poloze?"
 
-#: js/ui/status/location.js:387
+#: js/ui/status/location.js:389
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr ""
 "Přístup ke službám pro určování polohy lze kdykoliv změnit v nastavení "
 "soukromí."
 
-#: js/ui/status/network.js:90
-msgid "<unknown>"
-msgstr "<neznámé>"
-
-#. Translators: %s is a network identifier
-#: js/ui/status/network.js:441 js/ui/status/network.js:1310
-#, javascript-format
-msgid "%s Off"
-msgstr "%s je vypnuto"
-
-#. Translators: %s is a network identifier
-#: js/ui/status/network.js:444
-#, javascript-format
-msgid "%s Connected"
-msgstr "%s je připojeno"
-
-#. 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);
-#. %s is a network identifier
-#: js/ui/status/network.js:449
-#, javascript-format
-msgid "%s Unmanaged"
-msgstr "%s není spravováno"
-
-#. Translators: %s is a network identifier
-#: js/ui/status/network.js:452
-#, javascript-format
-msgid "%s Disconnecting"
-msgstr "%s se odpojuje"
-
-#. Translators: %s is a network identifier
-#: js/ui/status/network.js:459 js/ui/status/network.js:1302
-#, javascript-format
-msgid "%s Connecting"
-msgstr "%s se připojuje"
-
-#. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
-#: js/ui/status/network.js:462
-#, javascript-format
-msgid "%s Requires Authentication"
-msgstr "%s požaduje ověření"
-
-#. Translators: this is for devices that require some kind of firmware or kernel
-#. module, which is missing; %s is a network identifier
-#: js/ui/status/network.js:470
-#, javascript-format
-msgid "Firmware Missing For %s"
-msgstr "Schází firmware pro %s"
-
-#. Translators: this is for a network device that cannot be activated (for example it
-#. is disabled by rfkill, or it has no coverage; %s is a network identifier
-#: js/ui/status/network.js:474
-#, javascript-format
-msgid "%s Unavailable"
-msgstr "%s je nedostupné"
-
-#. Translators: %s is a network identifier
-#: js/ui/status/network.js:477
-#, javascript-format
-msgid "%s Connection Failed"
-msgstr "%s selhalo připojení"
-
-#: js/ui/status/network.js:493
-msgid "Wired Settings"
-msgstr "Nastavení připojení po drátu"
+#: js/ui/status/location.js:395
+msgid "Deny Access"
+msgstr "Zamítnout přístup"
 
-#: js/ui/status/network.js:535
-msgid "Mobile Broadband Settings"
-msgstr "Nastavení mobilní širokopásmové sítě"
+#: js/ui/status/location.js:398
+msgid "Grant Access"
+msgstr "Schválit přístup"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:578 js/ui/status/network.js:1307
+#: js/ui/status/network.js:579 js/ui/status/network.js:1321
 #, javascript-format
 msgid "%s Hardware Disabled"
 msgstr "%s je hardwarově zakázáno"
 
 #. Translators: this is for a network device that cannot be activated
 #. because it's disabled by rfkill (airplane mode); %s is a network identifier
-#: js/ui/status/network.js:582
+#: js/ui/status/network.js:583
 #, javascript-format
 msgid "%s Disabled"
 msgstr "%s je zakázáno"
 
-#: js/ui/status/network.js:622
+#: js/ui/status/network.js:615
+msgid "Bluetooth Settings"
+msgstr "Nastavení Bluetooth"
+
+#: js/ui/status/network.js:623
 msgid "Connect to Internet"
 msgstr "Připojit k Internetu"
 
-#: js/ui/status/network.js:816
+#: js/ui/status/network.js:817
 msgid "Airplane Mode is On"
 msgstr "Režim „letadlo“ je zapnutý"
 
-#: js/ui/status/network.js:817
+#: js/ui/status/network.js:818
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Když je zapnutý režim „letadlo“, je WiFi zakázána."
 
-#: js/ui/status/network.js:818
+#: js/ui/status/network.js:819
 msgid "Turn Off Airplane Mode"
 msgstr "Vypnout režim „letadlo“"
 
-#: js/ui/status/network.js:827
+#: js/ui/status/network.js:828
 msgid "Wi-Fi is Off"
 msgstr "WiFi je vypnutá"
 
-#: js/ui/status/network.js:828
+#: js/ui/status/network.js:829
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Abyste se připojili k síti, je zapotřebí zapnout WiFi."
 
-#: js/ui/status/network.js:829
+#: js/ui/status/network.js:830
 msgid "Turn On Wi-Fi"
 msgstr "Zapnout WiFi"
 
-#: js/ui/status/network.js:854
+#: js/ui/status/network.js:855
 msgid "Wi-Fi Networks"
 msgstr "Sítě WiFi"
 
-#: js/ui/status/network.js:856
+#: js/ui/status/network.js:857
 msgid "Select a network"
 msgstr "Vyberte síť"
 
-#: js/ui/status/network.js:886
+#: js/ui/status/network.js:887
 msgid "No Networks"
 msgstr "Žádné sítě"
 
-#: js/ui/status/network.js:907 js/ui/status/rfkill.js:115
+#: js/ui/status/network.js:908
 msgid "Use hardware switch to turn off"
 msgstr "K vypnutí použijte fyzický vypínač"
 
-#: js/ui/status/network.js:1173
+#: js/ui/status/network.js:1187
 msgid "Select Network"
 msgstr "Vybrat síť"
 
-#: js/ui/status/network.js:1179
+#: js/ui/status/network.js:1193
 msgid "Wi-Fi Settings"
 msgstr "Nastavení WiFi"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1298
+#: js/ui/status/network.js:1312
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "%s je aktivní přístupový bod"
 
 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1313
+#: js/ui/status/network.js:1316
+#, javascript-format
+msgid "%s Connecting"
+msgstr "%s se připojuje"
+
+#. Translators: %s is a network identifier
+#: js/ui/status/network.js:1324
+#, javascript-format
+msgid "%s Off"
+msgstr "%s je vypnuto"
+
+#. Translators: %s is a network identifier
+#: js/ui/status/network.js:1327
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "%s není připojeno"
 
-#: js/ui/status/network.js:1413
+#: js/ui/status/network.js:1427
 msgid "connecting…"
 msgstr "připojuje se…"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: js/ui/status/network.js:1416
+#: js/ui/status/network.js:1430
 msgid "authentication required"
 msgstr "je požadováno ověření"
 
-#: js/ui/status/network.js:1418
+#: js/ui/status/network.js:1432
 msgid "connection failed"
 msgstr "připojení selhalo"
 
-#: js/ui/status/network.js:1472
+#: js/ui/status/network.js:1486
 msgid "VPN Settings"
 msgstr "Nastavení VPN"
 
-#: js/ui/status/network.js:1485
+#: js/ui/status/network.js:1499
 msgid "VPN"
 msgstr "VPN"
 
-#: js/ui/status/network.js:1495
+#: js/ui/status/network.js:1509
 msgid "VPN Off"
 msgstr "VPN je vypnuta"
 
-#: js/ui/status/network.js:1559 js/ui/status/rfkill.js:93
+#: js/ui/status/network.js:1573