Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master-3.29.92 into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master

[Marco Trevisan (Treviño)]

Merged with debian 3.29.92-1 and some cleanups and patch refresh.

[Didier Roche-Tolomelli (didrocks)]

See my comment for the dep, the rest looks good to me :)

review: Needs Fixing

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

> See my comment for the dep, the rest looks good to me :)

Ack, good catch... Sorry, the merge made me loose track of it.

Thanks (and fixed)

[Didier Roche-Tolomelli (didrocks)]

LGTM now! Thanks for fixing the dep :)

review: Approve

diff --git a/NEWS b/NEWS
index fb971a6..a279db2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,37 @@
+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]
+* overview: Fix handling of confirmation dialogs on wayland [verdre; !180]
+* Avoid some full relayout/redraws [Carlos; !197]
+* Keep workspace switcher slid out when workspaces are in use [Florian; !161]
+* Ignore auto-repeat for some keybindings [Andrea; #373]
+* Misc. bug fixes [Carlos, Florian, Pascal; #464, !189, !191, !192, !162]
+
+Contributors:
+  Andrea Azzarone, Olivier Blin, Carlos Garnacho, Florian Müllner,
+  Pascal Nowack, verdre
+
+Translators:
+  Bruno Lopes da Silva [pt_BR], Matej Urban�i� [sl], Piotr Drąg [pl],
+  Aurimas Černius [lt], Emin Tufan Çetin [tr], Fabio Tomat [fur],
+  Alexandre Franke [fr], Yi-Jyun Pan [zh_TW], Bernd Homuth [de],
+  Andre Klapper [cs], Jordi Mas [ca], Daniel Șerbănescu [ro],
+  Bruce Cowan [en_GB]
+
 3.29.90
 =======
 * Add remote access indication on wayland [Jonas; !160]
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/gnome-shell-overrides-migration.desktop.in b/data/gnome-shell-overrides-migration.desktop.in
index 8ef86ac..99452e6 100644
--- a/data/gnome-shell-overrides-migration.desktop.in
+++ b/data/gnome-shell-overrides-migration.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=Application
 Name=GNOME settings overrides migration
-NoDisplay=True
+NoDisplay=true
 Exec=@libexecdir@/gnome-shell-overrides-migration.sh
diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
index 4ec01a4..a7251cd 100644
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@@ -190,7 +190,7 @@
     </key>
   </schema>
 
-  <!-- unused, change 00_org.gnome.shell.gschema.override instead --!>
+  <!-- unused, change 00_org.gnome.shell.gschema.override instead -->
   <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
 	  gettext-domain="@GETTEXT_PACKAGE@">
     <key name="attach-modal-dialogs" type="b">
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 4e24541..6fbc804 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,111 @@
+gnome-shell (3.29.92-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with debian, remaining changes:
+    + Replace gnome-backgrounds dep with ubuntu-wallpapers and Suggests
+      gnome-themes-standard-data, gnome-backgrounds
+    + Add some Recommends:
+      - ubuntu-session (| gnome-session) to have the ubuntu session available
+      - xserver-xorg-legacy
+      - yaru-theme-gnome-shell for the default ubuntu theming
+    + Update debian/gbp.conf with Ubuntu settings
+    + gnome-shell-common.install: Install Ubuntu mode
+    + gnome-shell-common.prerm: Remove deprecated ubuntu theme alternative
+    + ubuntu/desktop_detect.patch:
+      - add caching for desktop detection to avoid querying the current
+        desktop env variable as iterate through the list each time. For the
+        time of the Shell process, we can expect this env variable to stay
+        stable.
+    + ubuntu/smarter_alt_tab.patch:
+      - quick alt-tab (without showing up the switcher) switch only between
+        the last window of the last 2 applications to be focused instead of
+        raising all windows of those apps.
+    + ubuntu/lightdm-user-switching.patch:
+      - Allow user switching when using LightDM.
+    + ubuntu/lock_on_suspend.patch
+      - Respect Ubuntu's lock-on-suspend setting.
+    + ubuntu/gdm.patch
+      - as gdm is system-wide and not session-wide, ensure gdm has an ubuntu
+        styling by default, not impacting the gnome user session though.
+    + ubuntu/background_login.patch
+      - Change default background color as we modified the default GDM color
+        for our ubuntu session. Change it as well here, still applying the
+        background noise loading.
+    + ubuntu/gdm_alternatives.patch
+      - Add support for GDM3 theme alternatives
+    + ubuntu/block_mode_extension_update.patch
+      - Don't allow ubuntu mode extension to update
+    + optional-hot-corner.patch
+      - enable patch proposed by upstream developer already in package (but
+        not in series) to add a settings for optional hot corner activation.
+    + volume-Add-back-sound-feedback-on-scroll.patch
+      - Fix regression causing missing feedback on volume slider scroll
+    + st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
+      - Fix possible crash on cache loading
+    + js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
+      - Improve rendering of shell elements moving rendering to GPU
+    + 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,
+      main-add-backtrace-crashes-all-and-backtrace-all.patch,
+      sessionMode-add-support-for-debugFlags-parameter.patch:
+      - Improve debug JS tracing for crash reports
+    + st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch,
+      st-scroll-view-Remove-scrollbars-references-on-dispose.patch:
+      - Fix crash on theme changes
+    + js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch:
+      - Show errors if no stylesheet is found
+    + debian/rules:
+      - 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)
+
+ -- 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) ]
+  * 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
+
+  * Team upload
+  * New upstream development release
+  * Build-depend on mutter 3.29.91
+  * Build-depend on Meson 0.47.0
+  * Rebase patch series, dropping patches that were applied upstream
+  * Normalize package lists with wrap-and-sort -ab
+  * d/gnome-shell-common.install: Remove commented-out entry
+  * Standards-Version: 4.2.0 (no changes required)
+
+ -- Simon McVittie <[e-mail]>  Mon, 20 Aug 2018 21:32:20 +0100
+
 gnome-shell (3.29.90-2ubuntu1) cosmic; urgency=medium
 
   * Merge with debian, remaining changes
diff --git a/debian/control b/debian/control
index 9e7f7c0..526848b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,11 @@ Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Iain Lane <[e-mail]>, Jeremy Bicha <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: debhelper (>= 11.1.3),
+               gir1.2-accountsservice-1.0 <!nocheck>,
+               gir1.2-gdm-1.0 (>= 3.18.2) <!nocheck>,
+               gir1.2-geoclue-2.0 <!nocheck>,
+               gir1.2-gweather-3.0 (>= 3.25.91) <!nocheck>,
+               gir1.2-rsvg-2.0 <!nocheck>,
                gnome-control-center-dev (>= 1:3.4),
                gnome-pkg-tools (>= 0.11),
                gobject-introspection (>= 1.49.1),
@@ -24,6 +29,7 @@ Build-Depends: debhelper (>= 11.1.3),
                libgcr-3-dev (>= 3.7.5),
                libgirepository1.0-dev (>= 1.29.15),
                libgjs-dev (>= 1.50.2-3~),
+               libgl1-mesa-dri <!nocheck>,
                libglib2.0-dev (>= 2.57.2),
                libgnome-bluetooth-dev (>= 3.9.0) [linux-any],
                libgnome-desktop-3-dev (>= 3.27.90),
@@ -31,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.90),
+               libmutter-3-dev (>= 3.29.92),
                libnm-dev (>= 1.10.4) [linux-any],
                libpolkit-agent-1-dev (>= 0.100),
                libpulse-dev (>= 2.0),
@@ -42,19 +48,13 @@ Build-Depends: debhelper (>= 11.1.3),
                libxfixes-dev,
                libxml2-dev,
                mesa-common-dev,
-               meson (>= 0.42),
+               meson (>= 0.47.0),
                pkg-config (>= 0.22),
                sassc,
-               gir1.2-accountsservice-1.0 <!nocheck>,
-               gir1.2-gdm-1.0 (>= 3.18.2) <!nocheck>,
-               gir1.2-geoclue-2.0 <!nocheck>,
-               gir1.2-gweather-3.0 (>= 3.25.91) <!nocheck>,
-               gir1.2-rsvg-2.0 <!nocheck>,
-               libgl1-mesa-dri <!nocheck>,
                xauth <!nocheck>,
                xvfb <!nocheck>
 Rules-Requires-Root: no
-Standards-Version: 4.1.5
+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
@@ -63,24 +63,21 @@ Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shel
 
 Package: gnome-shell
 Architecture: linux-any
-Depends: ${gir:Depends},
-         ${misc:Depends},
-         ${shlibs:Depends},
-         evolution-data-server (>= 3.17.2),
-         gir1.2-gdm-1.0 (>= 3.18.2),
+Depends: evolution-data-server (>= 3.17.2),
          gir1.2-accountsservice-1.0,
          gir1.2-atspi-2.0 (>= 2.9.91),
          gir1.2-freedesktop,
+         gir1.2-gcr-3 (>= 3.7.5),
          gir1.2-gdesktopenums-3.0 (>= 3.12),
+         gir1.2-gdm-1.0 (>= 3.18.2),
          gir1.2-geoclue-2.0,
-         gir1.2-gcr-3 (>= 3.7.5),
          gir1.2-glib-2.0 (>= 1.56.0),
          gir1.2-gnomebluetooth-1.0 (>= 3.12.0) [linux-any],
          gir1.2-gnomedesktop-3.0 (>= 3.27.90),
          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.90),
+         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,
@@ -93,14 +90,17 @@ Depends: ${gir:Depends},
          gnome-shell-common (= ${source:Version}),
          ubuntu-wallpapers,
          gsettings-desktop-schemas (>= 3.27.90),
-         mutter (>= 3.29.90),
-         python3,
          libglib2.0-bin (>= 2.53.0),
+         mutter (>= 3.29.92),
+         python3,
+         ${gir:Depends},
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: bolt (>= 0.3),
+            gdm3 (>= 3.10.0.1-3~),
             gkbd-capplet,
             gnome-control-center (>= 1:3.25.2),
             gnome-user-docs,
-            gdm3 (>= 3.10.0.1-3~),
             iio-sensor-proxy,
             switcheroo-control,
             ubuntu-session | gnome-session,
@@ -113,10 +113,21 @@ 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
+Provides: notification-daemon,
+          polkit-1-auth-agent
 Description: graphical shell for the GNOME desktop
  The GNOME Shell provides core interface functions like switching
  windows, launching applications or see your notifications. It takes
@@ -129,7 +140,7 @@ Package: gnome-shell-common
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: yaru-theme-gnome-shell
-Breaks: gnome-tweak-tool (<< 3.21.91),
-        gnome-calendar (<< 3.21.4)
+Breaks: gnome-calendar (<< 3.21.4),
+        gnome-tweak-tool (<< 3.21.91)
 Description: common files for the GNOME graphical shell
  This package contains translations and data files for the GNOME shell.
diff --git a/debian/control.in b/debian/control.in
index 6d5740c..b8ed60e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,6 +5,11 @@ Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 11.1.3),
+               gir1.2-accountsservice-1.0 <!nocheck>,
+               gir1.2-gdm-1.0 (>= 3.18.2) <!nocheck>,
+               gir1.2-geoclue-2.0 <!nocheck>,
+               gir1.2-gweather-3.0 (>= 3.25.91) <!nocheck>,
+               gir1.2-rsvg-2.0 <!nocheck>,
                gnome-control-center-dev (>= 1:3.4),
                gnome-pkg-tools (>= 0.11),
                gobject-introspection (>= 1.49.1),
@@ -20,6 +25,7 @@ Build-Depends: debhelper (>= 11.1.3),
                libgcr-3-dev (>= 3.7.5),
                libgirepository1.0-dev (>= 1.29.15),
                libgjs-dev (>= 1.50.2-3~),
+               libgl1-mesa-dri <!nocheck>,
                libglib2.0-dev (>= 2.57.2),
                libgnome-bluetooth-dev (>= 3.9.0) [linux-any],
                libgnome-desktop-3-dev (>= 3.27.90),
@@ -27,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.90),
+               libmutter-3-dev (>= 3.29.92),
                libnm-dev (>= 1.10.4) [linux-any],
                libpolkit-agent-1-dev (>= 0.100),
                libpulse-dev (>= 2.0),
@@ -38,19 +44,13 @@ Build-Depends: debhelper (>= 11.1.3),
                libxfixes-dev,
                libxml2-dev,
                mesa-common-dev,
-               meson (>= 0.42),
+               meson (>= 0.47.0),
                pkg-config (>= 0.22),
                sassc,
-               gir1.2-accountsservice-1.0 <!nocheck>,
-               gir1.2-gdm-1.0 (>= 3.18.2) <!nocheck>,
-               gir1.2-geoclue-2.0 <!nocheck>,
-               gir1.2-gweather-3.0 (>= 3.25.91) <!nocheck>,
-               gir1.2-rsvg-2.0 <!nocheck>,
-               libgl1-mesa-dri <!nocheck>,
                xauth <!nocheck>,
                xvfb <!nocheck>
 Rules-Requires-Root: no
-Standards-Version: 4.1.5
+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
@@ -59,24 +59,21 @@ Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shel
 
 Package: gnome-shell
 Architecture: linux-any
-Depends: ${gir:Depends},
-         ${misc:Depends},
-         ${shlibs:Depends},
-         evolution-data-server (>= 3.17.2),
-         gir1.2-gdm-1.0 (>= 3.18.2),
+Depends: evolution-data-server (>= 3.17.2),
          gir1.2-accountsservice-1.0,
          gir1.2-atspi-2.0 (>= 2.9.91),
          gir1.2-freedesktop,
+         gir1.2-gcr-3 (>= 3.7.5),
          gir1.2-gdesktopenums-3.0 (>= 3.12),
+         gir1.2-gdm-1.0 (>= 3.18.2),
          gir1.2-geoclue-2.0,
-         gir1.2-gcr-3 (>= 3.7.5),
          gir1.2-glib-2.0 (>= 1.56.0),
          gir1.2-gnomebluetooth-1.0 (>= 3.12.0) [linux-any],
          gir1.2-gnomedesktop-3.0 (>= 3.27.90),
          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.90),
+         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,
@@ -89,14 +86,17 @@ Depends: ${gir:Depends},
          gnome-shell-common (= ${source:Version}),
          ubuntu-wallpapers,
          gsettings-desktop-schemas (>= 3.27.90),
-         mutter (>= 3.29.90),
-         python3,
          libglib2.0-bin (>= 2.53.0),
+         mutter (>= 3.29.92),
+         python3,
+         ${gir:Depends},
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: bolt (>= 0.3),
+            gdm3 (>= 3.10.0.1-3~),
             gkbd-capplet,
             gnome-control-center (>= 1:3.25.2),
             gnome-user-docs,
-            gdm3 (>= 3.10.0.1-3~),
             iio-sensor-proxy,
             switcheroo-control,
             ubuntu-session | gnome-session,
@@ -109,10 +109,21 @@ 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
+Provides: notification-daemon,
+          polkit-1-auth-agent
 Description: graphical shell for the GNOME desktop
  The GNOME Shell provides core interface functions like switching
  windows, launching applications or see your notifications. It takes
@@ -125,7 +136,7 @@ Package: gnome-shell-common
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: yaru-theme-gnome-shell
-Breaks: gnome-tweak-tool (<< 3.21.91),
-        gnome-calendar (<< 3.21.4)
+Breaks: gnome-calendar (<< 3.21.4),
+        gnome-tweak-tool (<< 3.21.91)
 Description: common files for the GNOME graphical shell
  This package contains translations and data files for the GNOME shell.
diff --git a/debian/gnome-shell-common.install b/debian/gnome-shell-common.install
index 9d0117e..29e682c 100644
--- a/debian/gnome-shell-common.install
+++ b/debian/gnome-shell-common.install
@@ -4,7 +4,6 @@ usr/share/GConf
 usr/share/glib-2.0
 usr/share/gnome-control-center
 usr/share/gnome-shell
-#usr/share/gtk-doc
 usr/share/locale
 debian/ubuntu-session-mods/ubuntu.json usr/share/gnome-shell/modes/
 # install upstream theme for gdm if vanilla gnome theme is selected
diff --git a/debian/patches/Update-Brazilian-Portuguese-translation.patch b/debian/patches/Update-Brazilian-Portuguese-translation.patch
deleted file mode 100644
index 8f0015a..0000000
--- a/debian/patches/Update-Brazilian-Portuguese-translation.patch
+++ /dev/null
@@ -1,1190 +0,0 @@
-From: Bruno Lopes da Silva <[e-mail]>
-Date: Wed, 1 Aug 2018 10:15:51 +0000
-Subject: Update Brazilian Portuguese translation
-
-Origin: upstream, 3.29.91, commit:eeda54f24d4f14aabedb1a2febbcee2a54db7a5d
----
- po/pt_BR.po | 703 +++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 334 insertions(+), 369 deletions(-)
-
-diff --git a/po/pt_BR.po b/po/pt_BR.po
-index 4895ab9..5bb28a1 100644
---- a/po/pt_BR.po
-+++ b/po/pt_BR.po
-@@ -17,20 +17,21 @@
- # Artur de Aquino Morais <[e-mail]>, 2016.
- # Rafael Fontenelle <[e-mail]>, 2013-2018.
- # Enrico Nicoletto <[e-mail]>, 2013-2018.
-+# Bruno Lopes da Silva <[e-mail]>, 2018.
- 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 18:31+0000\n"
--"PO-Revision-Date: 2018-05-02 15:45-0200\n"
--"Last-Translator: Rafael Fontenelle <[e-mail]>\n"
-+"POT-Creation-Date: 2018-07-31 18:38+0000\n"
-+"PO-Revision-Date: 2018-08-01 06:56-0300\n"
-+"Last-Translator: Bruno Lopes da Silva <[e-mail]>\n"
- "Language-Team: Brazilian Portuguese <[e-mail]>\n"
- "Language: pt_BR\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=2; plural=(n > 1);\n"
--"X-Generator: Virtaal 1.0.0-beta1\n"
-+"X-Generator: Virtaal 0.7.1\n"
- "X-Project-Style: gnome\n"
- 
- #: data/50-gnome-shell-system.xml:6
-@@ -74,273 +75,6 @@ msgstr "GNOME Shell"
- msgid "Window management and application launching"
- msgstr "Gerenciamento de janelas e lançador de aplicativos"
- 
--#: data/org.gnome.shell.gschema.xml.in:6
--msgid "Enable internal tools useful for developers and testers from Alt-F2"
--msgstr ""
--"Habilitar ferramentas internas úteis para desenvolvedores e testadores a "
--"partir do Alt-F2"
--
--#: data/org.gnome.shell.gschema.xml.in:9
--msgid ""
--"Allows access to internal debugging and monitoring tools using the Alt-F2 "
--"dialog."
--msgstr ""
--"Permite acesso a ferramentas internas de depuração e monitoramento usando o "
--"diálogo Alt-F2."
--
--#: data/org.gnome.shell.gschema.xml.in:16
--msgid "UUIDs of extensions to enable"
--msgstr "UUIDs das extensões para habilitar"
--
--#: data/org.gnome.shell.gschema.xml.in:17
--msgid ""
--"GNOME Shell extensions have a UUID property; this key lists extensions which "
--"should be loaded. Any extension that wants to be loaded needs to be in this "
--"list. You can also manipulate this list with the EnableExtension and "
--"DisableExtension D-Bus methods on org.gnome.Shell."
--msgstr ""
--"As extensões do GNOME Shell possuem uma propriedade UUID; esta chave lista "
--"as extensões que devem ser carregadas. Qualquer extensão que quiser ser "
--"carregada precisa estar nesta lista. Você também pode manipular esta lista "
--"com os métodos do DBus EnableExtension e DisableExtensions em org.gnome."
--"Shell."
--
--#: data/org.gnome.shell.gschema.xml.in:26
--msgid "Disable user extensions"
--msgstr "Desabilitar extensões do usuário"
--
--#: data/org.gnome.shell.gschema.xml.in:27
--msgid ""
--"Disable all extensions the user has enabled without affecting the “enabled-"
--"extension� setting."
--msgstr ""
--"Desabilita todas as extensões que o usuário habilitou sem afetar a definição "
--"de “enabled-extension�."
--
--#: data/org.gnome.shell.gschema.xml.in:34
--msgid "Disables the validation of extension version compatibility"
--msgstr "Desabilita a validação de compatibilidade da versão da extensão"
--
--#: data/org.gnome.shell.gschema.xml.in:35
--msgid ""
--"GNOME Shell will only load extensions that claim to support the current "
--"running version. Enabling this option will disable this check and try to "
--"load all extensions regardless of the versions they claim to support."
--msgstr ""
--"O GNOME Shell somente carregará extensões que declaram possuir suporte a "
--"versão atual em execução. Ao habilitar esta opção, esta verificação será "
--"desabilitada e haverá tentativas de carregar todas as extensões independente "
--"das versões que estas declaram suportar."
--
--#: data/org.gnome.shell.gschema.xml.in:43
--msgid "List of desktop file IDs for favorite applications"
--msgstr ""
--"Lista dos IDs de arquivo de área de trabalho para os aplicativos favoritos"
--
--#: data/org.gnome.shell.gschema.xml.in:44
--msgid ""
--"The applications corresponding to these identifiers will be displayed in the "
--"favorites area."
--msgstr ""
--"Os aplicativos correspondentes a estes identificadores serão exibidos na "
--"área de favoritos."
--
--#: data/org.gnome.shell.gschema.xml.in:51
--msgid "App Picker View"
--msgstr "Visualização do seletor de aplicativos"
--
--#: data/org.gnome.shell.gschema.xml.in:52
--msgid "Index of the currently selected view in the application picker."
--msgstr ""
--"�ndice da visualização atualmente selecionada no seletor de aplicativos."
--
--#: data/org.gnome.shell.gschema.xml.in:58
--msgid "History for command (Alt-F2) dialog"
--msgstr "Histórico do diálogo de comandos (Alt-F2)"
--
--#. Translators: looking glass is a debugger and inspector tool, see https://wiki.gnome.org/Projects/GnomeShell/LookingGlass
--#: data/org.gnome.shell.gschema.xml.in:63
--msgid "History for the looking glass dialog"
--msgstr "Histórico do diálogo do shell looking glass"
--
--#: data/org.gnome.shell.gschema.xml.in:67
--msgid "Always show the “Log out� menu item in the user menu."
--msgstr "Sempre mostrar o item de menu “Encerrar sessão� no menu de usuário."
--
--#: data/org.gnome.shell.gschema.xml.in:68
--msgid ""
--"This key overrides the automatic hiding of the “Log out� menu item in single-"
--"user, single-session situations."
--msgstr ""
--"Essa chave sobrescreve a ocultação automática do item de menu “Encerrar "
--"sessão� quando houver somente um usuário, em situações de somente uma sessão."
--
--#: data/org.gnome.shell.gschema.xml.in:75
--msgid ""
--"Whether to remember password for mounting encrypted or remote filesystems"
--msgstr ""
--"Se lembra ou não as senhas para montar sistemas de arquivos criptografados "
--"ou remotos"
--
--#: data/org.gnome.shell.gschema.xml.in:76
--msgid ""
--"The shell will request a password when an encrypted device or a remote "
--"filesystem is mounted. If the password can be saved for future use a "
--"“Remember Password� checkbox will be present. This key sets the default "
--"state of the checkbox."
--msgstr ""
--"O shell irá pedir uma senha quando um dispositivo criptografado ou um "
--"sistema de arquivo remoto for montado. Caso a senha possa ser salva para uso "
--"posterior, a caixa de seleção “Lembrar senha� estará presente. Esta chave "
--"ajusta o estado padrão da caixa de seleção."
--
--#: data/org.gnome.shell.gschema.xml.in:85
--msgid ""
--"Whether the default Bluetooth adapter had set up devices associated to it"
--msgstr ""
--"Se o adaptador Bluetooth padrão configurou, ou não, dispositivos associados "
--"a ele"
--
--#: data/org.gnome.shell.gschema.xml.in:86
--msgid ""
--"The shell will only show a Bluetooth menu item if a Bluetooth adapter is "
--"powered, or if there were devices set up associated with the default "
--"adapter. This will be reset if the default adapter is ever seen not to have "
--"devices associated to it."
--msgstr ""
--"O shell irá mostrar apenas um item de menu Bluetooth se um adaptador "
--"Bluetooth estiver ligado ou se existirem dispositivos configurados "
--"associados ao adaptador padrão. Isto será redefinido caso o adaptador padrão "
--"sempre seja visto sem possuir dispositivos associados a ele."
--
--#: data/org.gnome.shell.gschema.xml.in:101
--msgid "Keybinding to open the application menu"
--msgstr "Atalho de teclado para abrir um menu de aplicativo"
--
--#: data/org.gnome.shell.gschema.xml.in:102
--msgid "Keybinding to open the application menu."
--msgstr "Atalho de teclado para abrir um menu de aplicativo."
--
--#: data/org.gnome.shell.gschema.xml.in:108
--msgid "Keybinding to open the “Show Applications� view"
--msgstr "Atalho de teclado para abrir a visualização “Mostrar aplicativos�"
--
--#: data/org.gnome.shell.gschema.xml.in:109
--msgid ""
--"Keybinding to open the “Show Applications� view of the Activities Overview."
--msgstr ""
--"Atalho de teclado para abrir a visualização “Mostrar aplicativos� do "
--"panorama de atividades."
--
--#: data/org.gnome.shell.gschema.xml.in:116
--msgid "Keybinding to open the overview"
--msgstr "Atalho de teclado para abrir o panorama"
--
--#: data/org.gnome.shell.gschema.xml.in:117
--msgid "Keybinding to open the Activities Overview."
--msgstr "Atalho de teclado para abrir o panorama de atividades."
--
--#: data/org.gnome.shell.gschema.xml.in:123
--msgid "Keybinding to toggle the visibility of the notification list"
--msgstr "Atalho de teclado para alternar a visibilidade da lista de notificação"
--
--#: data/org.gnome.shell.gschema.xml.in:124
--msgid "Keybinding to toggle the visibility of the notification list."
--msgstr ""
--"Atalho de teclado para alternar a visibilidade da lista de notificação."
--
--#: data/org.gnome.shell.gschema.xml.in:130
--msgid "Keybinding to focus the active notification"
--msgstr "Atalho de teclado para ativar a notificação ativa"
--
--#: data/org.gnome.shell.gschema.xml.in:131
--msgid "Keybinding to focus the active notification."
--msgstr "Atalho de teclado para ativar a notificação ativa."
--
--# Tween pode significar uma contração de Between ou se referir a um termo "in-between" usado em animação gráfica. -- Enrico
--#: data/org.gnome.shell.gschema.xml.in:137
--msgid ""
--"Keybinding that pauses and resumes all running tweens, for debugging purposes"
--msgstr ""
--"Atalho de teclado que pausa e continua todos os intermediários em execução, "
--"a fim de depuração"
--
--#: data/org.gnome.shell.gschema.xml.in:146
--msgid "Which keyboard to use"
--msgstr "Qual teclado usar"
--
--#: data/org.gnome.shell.gschema.xml.in:147
--msgid "The type of keyboard to use."
--msgstr "O tipo do teclado para usar."
--
--#: data/org.gnome.shell.gschema.xml.in:158
--#: data/org.gnome.shell.gschema.xml.in:185
--msgid "Limit switcher to current workspace."
--msgstr "Limitar o alternador ao espaço de trabalho atual."
--
--#: data/org.gnome.shell.gschema.xml.in:159
--msgid ""
--"If true, only applications that have windows on the current workspace are "
--"shown in the switcher. Otherwise, all applications are included."
--msgstr ""
--"Se verdadeiro, o alternador mostrará somente os aplicativos que possuem "
--"janelas no espaço de trabalho atual. Caso contrário, todos os aplicativos "
--"serão incluídos."
--
--#: data/org.gnome.shell.gschema.xml.in:176
--msgid "The application icon mode."
--msgstr "O modo ícone do aplicativo."
--
--#: data/org.gnome.shell.gschema.xml.in:177
--msgid ""
--"Configures how the windows are shown in the switcher. Valid possibilities "
--"are “thumbnail-only� (shows a thumbnail of the window), “app-icon-"
--"only� (shows only the application icon) or “both�."
--msgstr ""
--"Configura como as janelas são mostradas no alternador. As possibilidades "
--"válidas são “thumbnail-only� (mostra uma miniatura da janela), “app-icon-"
--"only� (mostra apenas o ícone do aplicativo) ou “both�."
--
--#: data/org.gnome.shell.gschema.xml.in:186
--msgid ""
--"If true, only windows from the current workspace are shown in the switcher. "
--"Otherwise, all windows are included."
--msgstr ""
--"Se verdadeiro, o alternador mostrará somente as janelas do espaço de "
--"trabalho atual. Caso contrário, todos as janelas serão incluídas."
--
--#: data/org.gnome.shell.gschema.xml.in:197
--msgid "Attach modal dialog to the parent window"
--msgstr "Anexar diálogo modal à janela pai"
--
--#: 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
--msgid ""
--"This key overrides the key in org.gnome.mutter when running GNOME Shell."
--msgstr ""
--"Esta chave sobrescreve a chave em org.gnome.mutter ao executar o Shell do "
--"GNOME."
--
--#: data/org.gnome.shell.gschema.xml.in:206
--msgid "Enable edge tiling when dropping windows on screen edges"
--msgstr ""
--"Habilitar contorno ladrilhado ao arrastar janelas sobre as bordas da tela"
--
--#: data/org.gnome.shell.gschema.xml.in:214
--msgid "Workspaces are managed dynamically"
--msgstr "Espaços de trabalho são gerenciados dinamicamente"
--
--#: data/org.gnome.shell.gschema.xml.in:222
--msgid "Workspaces only on primary monitor"
--msgstr "Espaços de trabalho apenas no monitor primário"
--
--#: data/org.gnome.shell.gschema.xml.in:230
--msgid "Delay focus changes in mouse mode until the pointer stops moving"
--msgstr "Atrasar foco altera o modo do mouse até o ponteiro parar de mover"
--
- #: data/org.gnome.Shell.PortalHelper.desktop.in.in:3
- msgid "Network Login"
- msgstr "Sessão de Rede"
-@@ -376,20 +110,20 @@ msgctxt "button"
- msgid "Sign In"
- msgstr "Entrar"
- 
--#: js/gdm/loginDialog.js:315
-+#: js/gdm/loginDialog.js:319
- msgid "Choose Session"
- msgstr "Escolher sessão"
- 
- #. 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 "Não está listado?"
- 
- #. 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 "(ex.: usuário ou %s)"
-@@ -397,12 +131,12 @@ msgstr "(ex.: usuário ou %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 "Nome de usuário: "
- 
--#: js/gdm/loginDialog.js:1228
-+#: js/gdm/loginDialog.js:1234
- msgid "Login Window"
- msgstr "Janela de sessão"
- 
-@@ -415,7 +149,7 @@ msgstr "Erro de autenticação"
- #. 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 "(ou deslize o dedo)"
- 
-@@ -656,23 +390,23 @@ msgstr "Frequente"
- msgid "All"
- msgstr "Todos"
- 
--#: js/ui/appDisplay.js:1886
-+#: js/ui/appDisplay.js:1890
- msgid "New Window"
- msgstr "Nova janela"
- 
--#: js/ui/appDisplay.js:1900
-+#: js/ui/appDisplay.js:1904
- msgid "Launch using Dedicated Graphics Card"
- msgstr "Inicia usando placa de vídeo dedicada"
- 
--#: js/ui/appDisplay.js:1927 js/ui/dash.js:285
-+#: js/ui/appDisplay.js:1931 js/ui/dash.js:285
- msgid "Remove from Favorites"
- msgstr "Remover dos favoritos"
- 
--#: js/ui/appDisplay.js:1933
-+#: js/ui/appDisplay.js:1937
- msgid "Add to Favorites"
- msgstr "Adicionar aos favoritos"
- 
--#: js/ui/appDisplay.js:1943
-+#: js/ui/appDisplay.js:1947
- msgid "Show Details"
- msgstr "Mostrar detalhes"
- 
-@@ -702,7 +436,7 @@ msgstr "Fones de ouvido"
- msgid "Headset"
- msgstr "Fone de ouvido com microfone"
- 
--#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:221
-+#: js/ui/audioDeviceSelection.js:82 js/ui/status/volume.js:255
- msgid "Microphone"
- msgstr "Microfone"
- 
-@@ -714,7 +448,7 @@ msgstr "Alterar plano de fundo…"
- msgid "Display Settings"
- msgstr "Configurações de exibição"
- 
--#: js/ui/backgroundMenu.js:22 js/ui/status/system.js:264
-+#: js/ui/backgroundMenu.js:22
- msgid "Settings"
- msgstr "Configurações"
- 
-@@ -819,35 +553,35 @@ msgctxt "event list time"
- msgid "All Day"
- msgstr "Dia todo"
- 
--#: js/ui/calendar.js:864
-+#: js/ui/calendar.js:866
- msgctxt "calendar heading"
- msgid "%A, %B %d"
- msgstr "%A, %d de %B"
- 
--#: js/ui/calendar.js:868
-+#: js/ui/calendar.js:870
- msgctxt "calendar heading"
- msgid "%A, %B %d, %Y"
- msgstr "%A, %d de %B de %Y"
- 
--#: js/ui/calendar.js:1086
-+#: js/ui/calendar.js:1100
- msgid "No Notifications"
- msgstr "Nenhuma notificação"
- 
--#: js/ui/calendar.js:1089
-+#: js/ui/calendar.js:1103
- msgid "No Events"
- msgstr "Nenhum evento"
- 
--#: js/ui/calendar.js:1117
-+#: js/ui/calendar.js:1131
- msgid "Clear All"
- msgstr "Limpar tudo"
- 
- #. Translators: %s is an application name
--#: js/ui/closeDialog.js:44
-+#: js/ui/closeDialog.js:47
- #, javascript-format
- msgid "“%s� is not responding."
- msgstr "“%s� não está respondendo."
- 
--#: 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."
-@@ -855,11 +589,11 @@ msgstr ""
- "Você pode escolher esperar por um breve tempo para que continue ou force o "
- "aplicativo a sair totalmente."
- 
--#: js/ui/closeDialog.js:61
-+#: js/ui/closeDialog.js:64
- msgid "Force Quit"
- msgstr "Forçar sair"
- 
--#: js/ui/closeDialog.js:64
-+#: js/ui/closeDialog.js:67
- msgid "Wait"
- msgstr "Esperar"
- 
-@@ -876,7 +610,7 @@ msgstr "Unidade externa desconectada"
- msgid "Open with %s"
- msgstr "Abrir com %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 "Senha:"
- 
-@@ -913,11 +647,11 @@ msgstr "Senha da chave privada: "
- msgid "Service: "
- msgstr "Serviço: "
- 
--#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:659
-+#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:664
- msgid "Authentication required by wireless network"
- msgstr "Autenticação requisitada pela rede sem fio"
- 
--#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:660
-+#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:665
- #, javascript-format
- msgid ""
- "Passwords or encryption keys are required to access the wireless network "
-@@ -926,7 +660,7 @@ msgstr ""
- "Senhas ou chaves criptografadas são necessárias para acessar a rede sem fio "
- "“%s�."
- 
--#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:663
-+#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:668
- msgid "Wired 802.1X authentication"
- msgstr "Autenticação 802.1X cabeada"
- 
-@@ -934,15 +668,15 @@ msgstr "Autenticação 802.1X cabeada"
- msgid "Network name: "
- msgstr "Nome da rede: "
- 
--#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:667
-+#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:672
- msgid "DSL authentication"
- msgstr "Autenticação DSL"
- 
--#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:673
-+#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:678
- msgid "PIN code required"
- msgstr "Código PIN requisitado"
- 
--#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:674
-+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:679
- msgid "PIN code is needed for the mobile broadband device"
- msgstr "O código PIN é necessário para o dispositivo móvel de banda larga"
- 
-@@ -950,17 +684,17 @@ msgstr "O código PIN é necessário para o dispositivo móvel de banda larga"
- 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:685
- msgid "Mobile broadband network password"
- msgstr "Senha da rede de banda larga móvel"
- 
--#: 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:669
-+#: js/ui/components/networkAgent.js:673 js/ui/components/networkAgent.js:686
- #, javascript-format
- msgid "A password is required to connect to “%s�."
- msgstr "Uma senha é necessária para se conectar a “%s�."
- 
--#: js/ui/components/networkAgent.js:648 js/ui/status/network.js:1691
-+#: js/ui/components/networkAgent.js:653 js/ui/status/network.js:1704
- msgid "Network Manager"
- msgstr "Gerenciador de rede"
- 
-@@ -980,7 +714,7 @@ msgstr "Autenticação"
- #. * 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 "Desculpe, isto não funcionou. Por favor, tente novamente."
- 
-@@ -1313,13 +1047,13 @@ msgid "Leave On"
- msgstr "Deixar ativado"
- 
- #: js/ui/kbdA11yDialog.js:59 js/ui/status/bluetooth.js:143
--#: js/ui/status/network.js:1281
-+#: js/ui/status/network.js:1294
- msgid "Turn On"
- msgstr "Ligar"
- 
- #: 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/network.js:1294 js/ui/status/network.js:1409
- #: js/ui/status/nightLight.js:47 js/ui/status/rfkill.js:90
- #: js/ui/status/rfkill.js:117
- msgid "Turn Off"
-@@ -1381,7 +1115,7 @@ msgstr "Ver fonte"
- msgid "Web Page"
- msgstr "Página web"
- 
--#: js/ui/messageTray.js:1493
-+#: js/ui/messageTray.js:1495
- msgid "System Information"
- msgstr "Informações do sistema"
- 
-@@ -1435,42 +1169,42 @@ msgstr "Atribuir atalho"
- msgid "Done"
- msgstr "Concluído"
- 
--#: js/ui/padOsd.js:740
-+#: js/ui/padOsd.js:742
- msgid "Edit…"
- msgstr "Editar…"
- 
--#: js/ui/padOsd.js:782 js/ui/padOsd.js:887
-+#: js/ui/padOsd.js:784 js/ui/padOsd.js:889
- msgid "None"
- msgstr "Nenhum"
- 
--#: js/ui/padOsd.js:841
-+#: js/ui/padOsd.js:843
- msgid "Press a button to configure"
- msgstr "Pressione um botão para configurar"
- 
--#: js/ui/padOsd.js:842
-+#: js/ui/padOsd.js:844
- msgid "Press Esc to exit"
- msgstr "Pressione Esc para sair"
- 
--#: js/ui/padOsd.js:845
-+#: js/ui/padOsd.js:847
- msgid "Press any key to exit"
- msgstr "Pressione qualquer tecla para sair"
- 
--#: js/ui/panel.js:355
-+#: js/ui/panel.js:356
- msgid "Quit"
- msgstr "Sair"
- 
- #. 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 "Atividades"
- 
--#: js/ui/panel.js:692
-+#: js/ui/panel.js:693
- msgctxt "System menu in the top bar"
- msgid "System"
- msgstr "Sistema"
- 
--#: js/ui/panel.js:811
-+#: js/ui/panel.js:816
- msgid "Top Bar"
- msgstr "Barra superior"
- 
-@@ -1479,23 +1213,23 @@ msgstr "Barra superior"
- #. "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 "Digite um comando"
- 
--#: js/ui/runDialog.js:110 js/ui/windowMenu.js:175
-+#: js/ui/runDialog.js:114 js/ui/windowMenu.js:174
- msgid "Close"
- msgstr "Fechar"
- 
--#: js/ui/runDialog.js:273
-+#: js/ui/runDialog.js:278
- msgid "Restart is not available on Wayland"
- msgstr "Reinício não está disponível no Wayland"
- 
--#: js/ui/runDialog.js:278
-+#: js/ui/runDialog.js:283
- msgid "Restarting…"
- msgstr "Reiniciando…"
- 
-@@ -1519,7 +1253,7 @@ msgid_plural "%d new notifications"
- msgstr[0] "%d nova notificação"
- msgstr[1] "%d novas notificações"
- 
--#: 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 "Bloquear"
- 
-@@ -1702,7 +1436,7 @@ msgid "<unknown>"
- msgstr "<desconhecido>"
- 
- #. Translators: %s is a network identifier
--#: js/ui/status/network.js:441 js/ui/status/network.js:1310
-+#: js/ui/status/network.js:441 js/ui/status/network.js:1323
- #, javascript-format
- msgid "%s Off"
- msgstr "%s desligado"
-@@ -1729,7 +1463,7 @@ msgid "%s Disconnecting"
- msgstr "Desconectando de %s"
- 
- #. Translators: %s is a network identifier
--#: js/ui/status/network.js:459 js/ui/status/network.js:1302
-+#: js/ui/status/network.js:459 js/ui/status/network.js:1315
- #, javascript-format
- msgid "%s Connecting"
- msgstr "Conectando a %s"
-@@ -1769,7 +1503,7 @@ msgid "Mobile Broadband Settings"
- msgstr "Configurações de banda larga móvel"
- 
- #. Translators: %s is a network identifier
--#: js/ui/status/network.js:578 js/ui/status/network.js:1307
-+#: js/ui/status/network.js:578 js/ui/status/network.js:1320
- #, javascript-format
- msgid "%s Hardware Disabled"
- msgstr "Hardware de %s desabilitado"
-@@ -1825,81 +1559,81 @@ msgstr "Nenhuma rede"
- msgid "Use hardware switch to turn off"
- msgstr "Usar alternador de hardware para desligar"
- 
--#: js/ui/status/network.js:1173
-+#: js/ui/status/network.js:1186
- msgid "Select Network"
- msgstr "Selecione a rede"
- 
--#: js/ui/status/network.js:1179
-+#: js/ui/status/network.js:1192
- msgid "Wi-Fi Settings"
- msgstr "Configurações de Wi-Fi"
- 
- #. Translators: %s is a network identifier
--#: js/ui/status/network.js:1298
-+#: js/ui/status/network.js:1311
- #, javascript-format
- msgid "%s Hotspot Active"
- msgstr "Ponto de acesso %s está ativo"
- 
- #. Translators: %s is a network identifier
--#: js/ui/status/network.js:1313
-+#: js/ui/status/network.js:1326
- #, javascript-format
- msgid "%s Not Connected"
- msgstr "%s não está conectado"
- 
--#: js/ui/status/network.js:1413
-+#: js/ui/status/network.js:1426
- msgid "connecting…"
- msgstr "conectando…"
- 
- #. 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:1429
- msgid "authentication required"
- msgstr "autenticação necessária"
- 
--#: js/ui/status/network.js:1418
-+#: js/ui/status/network.js:1431
- msgid "connection failed"
- msgstr "conexão falhou"
- 
--#: js/ui/status/network.js:1472
-+#: js/ui/status/network.js:1485
- msgid "VPN Settings"
- msgstr "Configurações de VPN"
- 
--#: js/ui/status/network.js:1485
-+#: js/ui/status/network.js:1498
- msgid "VPN"
- msgstr "VPN"
- 
--#: js/ui/status/network.js:1495
-+#: js/ui/status/network.js:1508
- msgid "VPN Off"
- msgstr "VPN desligada"
- 
--#: js/ui/status/network.js:1559 js/ui/status/rfkill.js:93
-+#: js/ui/status/network.js:1572 js/ui/status/rfkill.js:93
- msgid "Network Settings"
- msgstr "Configurações de rede"
- 
--#: js/ui/status/network.js:1588
-+#: js/ui/status/network.js:1601
- #, javascript-format
- msgid "%s Wired Connection"
- msgid_plural "%s Wired Connections"
- msgstr[0] "%s conexão cabeada"
- msgstr[1] "%s conexões cabeadas"
- 
--#: js/ui/status/network.js:1592
-+#: js/ui/status/network.js:1605
- #, javascript-format
- msgid "%s Wi-Fi Connection"
- msgid_plural "%s Wi-Fi Connections"
- msgstr[0] "%s conexão Wi-Fi"
- msgstr[1] "%s conexões Wi-Fi"
- 
--#: js/ui/status/network.js:1596
-+#: js/ui/status/network.js:1609
- #, javascript-format
- msgid "%s Modem Connection"
- msgid_plural "%s Modem Connections"
- msgstr[0] "%s conexão por modem"
- msgstr[1] "%s conexões por modems"
- 
--#: js/ui/status/network.js:1728
-+#: js/ui/status/network.js:1741
- msgid "Connection failed"
- msgstr "Falha de conexão"
- 
--#: js/ui/status/network.js:1729
-+#: js/ui/status/network.js:1742
- msgid "Activation of network connection failed"
- msgstr "Falha ao ativar a conexão da rede"
- 
-@@ -1950,6 +1684,15 @@ msgstr "%d:%02d até completamente carregada (%d %%)"
- msgid "%d %%"
- msgstr "%d %%"
- 
-+#: js/ui/status/remoteAccess.js:46
-+msgid "Screen is Being Shared"
-+msgstr "A tela está sendo compartilhada"
-+
-+#: js/ui/status/remoteAccess.js:48
-+#| msgid "Turn Off"
-+msgid "Turn off"
-+msgstr "Desativar"
-+
- #. The menu only appears when airplane mode is on, so just
- #. statically build it as if it was on, rather than dynamically
- #. changing the menu contents.
-@@ -1969,28 +1712,28 @@ msgstr "Encerrar sessão"
- msgid "Account Settings"
- msgstr "Configurações de conta"
- 
--#: js/ui/status/system.js:268
-+#: js/ui/status/system.js:279
- msgid "Orientation Lock"
- msgstr "Bloqueio de orientação"
- 
--#: js/ui/status/system.js:294
-+#: js/ui/status/system.js:305
- msgid "Suspend"
- msgstr "Suspender"
- 
--#: js/ui/status/system.js:304
-+#: js/ui/status/system.js:315
- msgid "Power Off"
- msgstr "Desligar"
- 
--#: js/ui/status/thunderbolt.js:294
-+#: js/ui/status/thunderbolt.js:298
- msgid "Thunderbolt"
- msgstr "Thunderbolt"
- 
- #. we are done
--#: js/ui/status/thunderbolt.js:350
-+#: js/ui/status/thunderbolt.js:354
- msgid "Unknown Thunderbolt device"
- msgstr "Dispositivo Thunderbolt desconhecido"
- 
--#: js/ui/status/thunderbolt.js:351
-+#: js/ui/status/thunderbolt.js:355
- msgid ""
- "New device has been detected while you were away. Please disconnect and "
- "reconnect the device to start using it."
-@@ -1998,20 +1741,21 @@ msgstr ""
- "Um novo dispositivo foi detectado enquanto você estava ausente. Por "
- "gentileza, desconecte e reconecte o dispositivo para começar a usá-lo."
- 
--#: js/ui/status/thunderbolt.js:356
-+#: js/ui/status/thunderbolt.js:360
- msgid "Thunderbolt authorization error"
- msgstr "Erro de autorização de thunderbolt"
- 
--#: js/ui/status/thunderbolt.js:357
-+#: js/ui/status/thunderbolt.js:361
- #, javascript-format
--msgid "Could not authorize the thunderbolt device: %s"
--msgstr "Não foi possível autorizar o dispositivo thunderbolt: %s"
-+#| msgid "Could not authorize the thunderbolt device: %s"
-+msgid "Could not authorize the Thunderbolt device: %s"
-+msgstr "Não foi possível autorizar o dispositivo Thunderbolt: %s"
- 
--#: js/ui/status/volume.js:128
-+#: js/ui/status/volume.js:135
- msgid "Volume changed"
- msgstr "Volume alterado"
- 
--#: js/ui/status/volume.js:170
-+#: js/ui/status/volume.js:204
- msgid "Volume"
- msgstr "Volume"
- 
-@@ -2066,22 +1810,22 @@ msgstr "“%s� está pronto"
- 
- # Título de janela de confirmação; Se grande demais, pode ser exibida com "..."
- # Vide: https://bugzilla.gnome.org/show_bug.cgi?id=786331
--#: js/ui/windowManager.js:72
-+#: js/ui/windowManager.js:74
- msgid "Do you want to keep these display settings?"
- msgstr "Deseja manter essas configurações da tela?"
- 
- #. Translators: this and the following message should be limited in lenght,
- #. to avoid ellipsizing the labels.
- #.
--#: js/ui/windowManager.js:84
-+#: js/ui/windowManager.js:86
- msgid "Revert Settings"
- msgstr "Reverter configurações"
- 
--#: js/ui/windowManager.js:87
-+#: js/ui/windowManager.js:89
- msgid "Keep Changes"
- msgstr "Manter alterações"
- 
--#: js/ui/windowManager.js:105
-+#: js/ui/windowManager.js:107
- #, javascript-format
- msgid "Settings changes will revert in %d second"
- msgid_plural "Settings changes will revert in %d seconds"
-@@ -2090,7 +1834,7 @@ msgstr[1] "Alterações nas configurações serão revertidas em %d segundos"
- 
- #. Translators: This represents the size of a window. The first number is
- #. * the width of the window and the second is the height.
--#: js/ui/windowManager.js:660
-+#: js/ui/windowManager.js:689
- #, javascript-format
- msgid "%d × %d"
- msgstr "%d × %d"
-@@ -2143,19 +1887,19 @@ msgstr "Mover para a área de trabalho acima"
- msgid "Move to Workspace Down"
- msgstr "Mover para a área de trabalho abaixo"
- 
--#: js/ui/windowMenu.js:140
-+#: js/ui/windowMenu.js:139
- msgid "Move to Monitor Up"
- msgstr "Mover para o monitor acima"
- 
--#: js/ui/windowMenu.js:149
-+#: js/ui/windowMenu.js:148
- msgid "Move to Monitor Down"
- msgstr "Mover para o monitor abaixo"
- 
--#: js/ui/windowMenu.js:158
-+#: js/ui/windowMenu.js:157
- msgid "Move to Monitor Left"
- msgstr "Mover para o monitor à esquerda"
- 
--#: js/ui/windowMenu.js:167
-+#: js/ui/windowMenu.js:166
- msgid "Move to Monitor Right"
- msgstr "Mover para o monitor à direita"
- 
-@@ -2168,29 +1912,29 @@ msgstr "Agenda do Evolution"
- msgid "evolution"
- msgstr "evolution"
- 
--#: src/main.c:432
-+#: src/main.c:410
- msgid "Print version"
- msgstr "Versão de impressão"
- 
--#: src/main.c:438
-+#: src/main.c:416
- msgid "Mode used by GDM for login screen"
- msgstr "Modo usado pelo GDM para a tela de início de sessão"
- 
--#: src/main.c:444
-+#: src/main.c:422
- msgid "Use a specific mode, e.g. “gdm� for login screen"
- msgstr ""
- "Utilizar um modo específico, ex.: “gdm� para a tela de início de sessão"
- 
--#: src/main.c:450
-+#: src/main.c:428
- msgid "List possible modes"
- msgstr "Listar modos possíveis"
- 
--#: src/shell-app.c:270
-+#: src/shell-app.c:272
- msgctxt "program"
- msgid "Unknown"
- msgstr "Desconhecido"
- 
--#: src/shell-app.c:511
-+#: src/shell-app.c:523
- #, c-format
- msgid "Failed to launch “%s�"
- msgstr "Erro ao lançar “%s�"
-@@ -2229,6 +1973,227 @@ msgstr[1] "%u entradas"
- msgid "System Sounds"
- msgstr "Sons do sistema"
- 
-+#~ msgid "Enable internal tools useful for developers and testers from Alt-F2"
-+#~ msgstr ""
-+#~ "Habilitar ferramentas internas úteis para desenvolvedores e testadores a "
-+#~ "partir do Alt-F2"
-+
-+#~ msgid ""
-+#~ "Allows access to internal debugging and monitoring tools using the Alt-F2 "
-+#~ "dialog."
-+#~ msgstr ""
-+#~ "Permite acesso a ferramentas internas de depuração e monitoramento usando "
-+#~ "o diálogo Alt-F2."
-+
-+#~ msgid "UUIDs of extensions to enable"
-+#~ msgstr "UUIDs das extensões para habilitar"
-+
-+#~ msgid ""
-+#~ "GNOME Shell extensions have a UUID property; this key lists extensions "
-+#~ "which should be loaded. Any extension that wants to be loaded needs to be "
-+#~ "in this list. You can also manipulate this list with the EnableExtension "
-+#~ "and DisableExtension D-Bus methods on org.gnome.Shell."
-+#~ msgstr ""
-+#~ "As extensões do GNOME Shell possuem uma propriedade UUID; esta chave "
-+#~ "lista as extensões que devem ser carregadas. Qualquer extensão que quiser "
-+#~ "ser carregada precisa estar nesta lista. Você também pode manipular esta "
-+#~ "lista com os métodos do DBus EnableExtension e DisableExtensions em org."
-+#~ "gnome.Shell."
-+
-+#~ msgid "Disable user extensions"
-+#~ msgstr "Desabilitar extensões do usuário"
-+
-+#~ msgid ""
-+#~ "Disable all extensions the user has enabled without affecting the "
-+#~ "“enabled-extension� setting."
-+#~ msgstr ""
-+#~ "Desabilita todas as extensões que o usuário habilitou sem afetar a "
-+#~ "definição de “enabled-extension�."
-+
-+#~ msgid "Disables the validation of extension version compatibility"
-+#~ msgstr "Desabilita a validação de compatibilidade da versão da extensão"
-+
-+#~ msgid ""
-+#~ "GNOME Shell will only load extensions that claim to support the current "
-+#~ "running version. Enabling this option will disable this check and try to "
-+#~ "load all extensions regardless of the versions they claim to support."
-+#~ msgstr ""
-+#~ "O GNOME Shell somente carregará extensões que declaram possuir suporte a "
-+#~ "versão atual em execução. Ao habilitar esta opção, esta verificação será "
-+#~ "desabilitada e haverá tentativas de carregar todas as extensões "
-+#~ "independente das versões que estas declaram suportar."
-+
-+#~ msgid "List of desktop file IDs for favorite applications"
-+#~ msgstr ""
-+#~ "Lista dos IDs de arquivo de área de trabalho para os aplicativos favoritos"
-+
-+#~ msgid ""
-+#~ "The applications corresponding to these identifiers will be displayed in "
-+#~ "the favorites area."
-+#~ msgstr ""
-+#~ "Os aplicativos correspondentes a estes identificadores serão exibidos na "
-+#~ "área de favoritos."
-+
-+#~ msgid "App Picker View"
-+#~ msgstr "Visualização do seletor de aplicativos"
-+
-+#~ msgid "Index of the currently selected view in the application picker."
-+#~ msgstr ""
-+#~ "�ndice da visualização atualmente selecionada no seletor de aplicativos."
-+
-+#~ msgid "History for command (Alt-F2) dialog"
-+#~ msgstr "Histórico do diálogo de comandos (Alt-F2)"
-+
-+#~ msgid "History for the looking glass dialog"
-+#~ msgstr "Histórico do diálogo do shell looking glass"
-+
-+#~ msgid "Always show the “Log out� menu item in the user menu."
-+#~ msgstr "Sempre mostrar o item de menu “Encerrar sessão� no menu de usuário."
-+
-+#~ msgid ""
-+#~ "This key overrides the automatic hiding of the “Log out� menu item in "
-+#~ "single-user, single-session situations."
-+#~ msgstr ""
-+#~ "Essa chave sobrescreve a ocultação automática do item de menu “Encerrar "
-+#~ "sessão� quando houver somente um usuário, em situações de somente uma "
-+#~ "sessão."
-+
-+#~ msgid ""
-+#~ "Whether to remember password for mounting encrypted or remote filesystems"
-+#~ msgstr ""
-+#~ "Se lembra ou não as senhas para montar sistemas de arquivos "
-+#~ "criptografados ou remotos"
-+
-+#~ msgid ""
-+#~ "The shell will request a password when an encrypted device or a remote "
-+#~ "filesystem is mounted. If the password can be saved for future use a "
-+#~ "“Remember Password� checkbox will be present. This key sets the default "
-+#~ "state of the checkbox."
-+#~ msgstr ""
-+#~ "O shell irá pedir uma senha quando um dispositivo criptografado ou um "
-+#~ "sistema de arquivo remoto for montado. Caso a senha possa ser salva para "
-+#~ "uso posterior, a caixa de seleção “Lembrar senha� estará presente. Esta "
-+#~ "chave ajusta o estado padrão da caixa de seleção."
-+
-+#~ msgid ""
-+#~ "Whether the default Bluetooth adapter had set up devices associated to it"
-+#~ msgstr ""
-+#~ "Se o adaptador Bluetooth padrão configurou, ou não, dispositivos "
-+#~ "associados a ele"
-+
-+#~ msgid ""
-+#~ "The shell will only show a Bluetooth menu item if a Bluetooth adapter is "
-+#~ "powered, or if there were devices set up associated with the default "
-+#~ "adapter. This will be reset if the default adapter is ever seen not to "
-+#~ "have devices associated to it."
-+#~ msgstr ""
-+#~ "O shell irá mostrar apenas um item de menu Bluetooth se um adaptador "
-+#~ "Bluetooth estiver ligado ou se existirem dispositivos configurados "
-+#~ "associados ao adaptador padrão. Isto será redefinido caso o adaptador "
-+#~ "padrão sempre seja visto sem possuir dispositivos associados a ele."
-+
-+#~ msgid "Keybinding to open the application menu"
-+#~ msgstr "Atalho de teclado para abrir um menu de aplicativo"
-+
-+#~ msgid "Keybinding to open the application menu."
-+#~ msgstr "Atalho de teclado para abrir um menu de aplicativo."
-+
-+#~ msgid "Keybinding to open the “Show Applications� view"
-+#~ msgstr "Atalho de teclado para abrir a visualização “Mostrar aplicativos�"
-+
-+#~ msgid ""
-+#~ "Keybinding to open the “Show Applications� view of the Activities "
-+#~ "Overview."
-+#~ msgstr ""
-+#~ "Atalho de teclado para abrir a visualização “Mostrar aplicativos� do "
-+#~ "panorama de atividades."
-+
-+#~ msgid "Keybinding to open the overview"
-+#~ msgstr "Atalho de teclado para abrir o panorama"
-+
-+#~ msgid "Keybinding to open the Activities Overview."
-+#~ msgstr "Atalho de teclado para abrir o panorama de atividades."
-+
-+#~ msgid "Keybinding to toggle the visibility of the notification list"
-+#~ msgstr ""
-+#~ "Atalho de teclado para alternar a visibilidade da lista de notificação"
-+
-+#~ msgid "Keybinding to toggle the visibility of the notification list."
-+#~ msgstr ""
-+#~ "Atalho de teclado para alternar a visibilidade da lista de notificação."
-+
-+#~ msgid "Keybinding to focus the active notification"
-+#~ msgstr "Atalho de teclado para ativar a notificação ativa"
-+
-+#~ msgid "Keybinding to focus the active notification."
-+#~ msgstr "Atalho de teclado para ativar a notificação ativa."
-+
-+# Tween pode significar uma contração de Between ou se referir a um termo "in-between" usado em animação gráfica. -- Enrico
-+#~ msgid ""
-+#~ "Keybinding that pauses and resumes all running tweens, for debugging "
-+#~ "purposes"
-+#~ msgstr ""
-+#~ "Atalho de teclado que pausa e continua todos os intermediários em "
-+#~ "execução, a fim de depuração"
-+
-+#~ msgid "Which keyboard to use"
-+#~ msgstr "Qual teclado usar"
-+
-+#~ msgid "The type of keyboard to use."
-+#~ msgstr "O tipo do teclado para usar."
-+
-+#~ msgid "Limit switcher to current workspace."
-+#~ msgstr "Limitar o alternador ao espaço de trabalho atual."
-+
-+#~ msgid ""
-+#~ "If true, only applications that have windows on the current workspace are "
-+#~ "shown in the switcher. Otherwise, all applications are included."
-+#~ msgstr ""
-+#~ "Se verdadeiro, o alternador mostrará somente os aplicativos que possuem "
-+#~ "janelas no espaço de trabalho atual. Caso contrário, todos os aplicativos "
-+#~ "serão incluídos."
-+
-+#~ msgid "The application icon mode."
-+#~ msgstr "O modo ícone do aplicativo."
-+
-+#~ msgid ""
-+#~ "Configures how the windows are shown in the switcher. Valid possibilities "
-+#~ "are “thumbnail-only� (shows a thumbnail of the window), “app-icon-"
-+#~ "only� (shows only the application icon) or “both�."
-+#~ msgstr ""
-+#~ "Configura como as janelas são mostradas no alternador. As possibilidades "
-+#~ "válidas são “thumbnail-only� (mostra uma miniatura da janela), “app-icon-"
-+#~ "only� (mostra apenas o ícone do aplicativo) ou “both�."
-+
-+#~ msgid ""
-+#~ "If true, only windows from the current workspace are shown in the "
-+#~ "switcher. Otherwise, all windows are included."
-+#~ msgstr ""
-+#~ "Se verdadeiro, o alternador mostrará somente as janelas do espaço de "
-+#~ "trabalho atual. Caso contrário, todos as janelas serão incluídas."
-+
-+#~ msgid "Attach modal dialog to the parent window"
-+#~ msgstr "Anexar diálogo modal à janela pai"
-+
-+#~ msgid ""
-+#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-+#~ msgstr ""
-+#~ "Esta chave sobrescreve a chave em org.gnome.mutter ao executar o Shell do "
-+#~ "GNOME."
-+
-+#~ msgid "Enable edge tiling when dropping windows on screen edges"
-+#~ msgstr ""
-+#~ "Habilitar contorno ladrilhado ao arrastar janelas sobre as bordas da tela"
-+
-+#~ msgid "Workspaces are managed dynamically"
-+#~ msgstr "Espaços de trabalho são gerenciados dinamicamente"
-+
-+#~ msgid "Workspaces only on primary monitor"
-+#~ msgstr "Espaços de trabalho apenas no monitor primário"
-+
-+#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-+#~ msgstr "Atrasar foco altera o modo do mouse até o ponteiro parar de mover"
-+
- #~| msgid "Power Off"
- #~ msgctxt "search-result"
- #~ msgid "Power off"
diff --git a/debian/patches/Updated-Slovenian-translation.patch b/debian/patches/Updated-Slovenian-translation.patch
deleted file mode 100644
index 9f8881d..0000000
--- a/debian/patches/Updated-Slovenian-translation.patch
+++ /dev/null
@@ -1,545 +0,0 @@
-From: =?utf-8?q?Matej_Urban=C4=8Di=C4=8D?= <[e-mail]>
-Date: Fri, 3 Aug 2018 11:17:49 +0200
-Subject: Updated Slovenian translation
-
-Origin: upstream, 3.29.91, commit:6b41f823464380c2018f3431edf61bc6ff11354f
----
- po/sl.po | 160 +++++++++++++++++++++++++++++++++------------------------------
- 1 file changed, 84 insertions(+), 76 deletions(-)
-
-diff --git a/po/sl.po b/po/sl.po
-index b943c4a..2d37f35 100644
---- a/po/sl.po
-+++ b/po/sl.po
-@@ -8,8 +8,8 @@ msgid ""
- msgstr ""
- "Project-Id-Version: gnome-shell master\n"
- "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
--"POT-Creation-Date: 2018-04-17 15:11+0000\n"
--"PO-Revision-Date: 2018-04-17 18:32+0200\n"
-+"POT-Creation-Date: 2018-07-30 17:00+0000\n"
-+"PO-Revision-Date: 2018-07-30 22:14+0200\n"
- "Last-Translator: Matej Urban�i� <[e-mail]>\n"
- "Language-Team: Slovenian GNOME Translation Team <[e-mail]>\n"
- "Language: sl\n"
-@@ -352,20 +352,20 @@ msgctxt "button"
- msgid "Sign In"
- msgstr "Prijava"
- 
--#: js/gdm/loginDialog.js:315
-+#: js/gdm/loginDialog.js:319
- msgid "Choose Session"
- msgstr "Izbor seje"
- 
- #. 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 "Ali uporabniškega imena ni 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 "(na primer, uporabnika ali %s)"
-@@ -373,12 +373,12 @@ msgstr "(na primer, uporabnika ali %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 "Uporabniško ime: "
- 
--#: js/gdm/loginDialog.js:1228
-+#: js/gdm/loginDialog.js:1234
- msgid "Login Window"
- msgstr "Prijavno okno"
- 
-@@ -391,7 +391,7 @@ msgstr "Napaka overitve"
- #. 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 "(ali pa povlecite prst)"
- 
-@@ -643,23 +643,23 @@ msgstr "Pogosti"
- msgid "All"
- msgstr "Vsi"
- 
--#: js/ui/appDisplay.js:1886
-+#: js/ui/appDisplay.js:1890
- msgid "New Window"
- msgstr "Novo okno"
- 
--#: js/ui/appDisplay.js:1900
-+#: js/ui/appDisplay.js:1904
- msgid "Launch using Dedicated Graphics Card"
- msgstr "Zaženi z uporabo dolo�ene grafi�ne kartice"
- 
--#: js/ui/appDisplay.js:1927 js/ui/dash.js:285
-+#: js/ui/appDisplay.js:1931 js/ui/dash.js:285
- msgid "Remove from Favorites"
- msgstr "Odstrani iz priljubljenih"
- 
--#: js/ui/appDisplay.js:1933
-+#: js/ui/appDisplay.js:1937
- msgid "Add to Favorites"
- msgstr "Dodaj med priljubljene"
- 
--#: js/ui/appDisplay.js:1943
-+#: js/ui/appDisplay.js:1947
- msgid "Show Details"
- msgstr "Pokaži besedilo"
- 
-@@ -806,35 +806,35 @@ msgctxt "event list time"
- msgid "All Day"
- msgstr "Celodnevno"
- 
--#: js/ui/calendar.js:864
-+#: js/ui/calendar.js:866
- msgctxt "calendar heading"
- msgid "%A, %B %d"
- msgstr "%A, %d. %m."
- 
--#: js/ui/calendar.js:868
-+#: js/ui/calendar.js:870
- msgctxt "calendar heading"
- msgid "%A, %B %d, %Y"
- msgstr "%A, %d %B %Y"
- 
--#: js/ui/calendar.js:1086
-+#: js/ui/calendar.js:1100
- msgid "No Notifications"
- msgstr "Ni obvestil"
- 
--#: js/ui/calendar.js:1089
-+#: js/ui/calendar.js:1103
- msgid "No Events"
- msgstr "Ni dogodkov"
- 
--#: js/ui/calendar.js:1117
-+#: js/ui/calendar.js:1131
- msgid "Clear All"
- msgstr "Po�isti vse"
- 
- #. Translators: %s is an application name
--#: js/ui/closeDialog.js:44
-+#: js/ui/closeDialog.js:47
- #, javascript-format
- msgid "“%s� is not responding."
- msgstr "Program »%s« se ne odziva."
- 
--#: 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."
-@@ -842,11 +842,11 @@ msgstr ""
- "Lahko po�akate, �e se program morda za�ne spet odzivati, lahko pa vsilite "
- "kon�anje delovanja."
- 
--#: js/ui/closeDialog.js:61
-+#: js/ui/closeDialog.js:64
- msgid "Force Quit"
- msgstr "Vsili kon�anje"
- 
--#: js/ui/closeDialog.js:64
-+#: js/ui/closeDialog.js:67
- msgid "Wait"
- msgstr "Po�akaj"
- 
-@@ -863,7 +863,7 @@ msgstr "Zunanji pogon je odklopljen"
- msgid "Open with %s"
- msgstr "Odpri s programom %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 "Geslo:"
- 
-@@ -900,11 +900,11 @@ msgstr "Geslo zasebnega klju�a: "
- msgid "Service: "
- msgstr "Storitev: "
- 
--#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:659
-+#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:664
- msgid "Authentication required by wireless network"
- msgstr "Zahtevana overitev za brezži�no omrežje"
- 
--#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:660
-+#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:665
- #, javascript-format
- msgid ""
- "Passwords or encryption keys are required to access the wireless network "
-@@ -913,7 +913,7 @@ msgstr ""
- "Za povezavo v brezži�no omrežje »%s« je zahtevano geslo oziroma šifrirni "
- "klju�."
- 
--#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:663
-+#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:668
- msgid "Wired 802.1X authentication"
- msgstr "Ži�na overitev 802.1X"
- 
-@@ -921,15 +921,15 @@ msgstr "Ži�na overitev 802.1X"
- msgid "Network name: "
- msgstr "Naziv omrežja: "
- 
--#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:667
-+#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:672
- msgid "DSL authentication"
- msgstr "Overitev DSL"
- 
--#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:673
-+#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:678
- msgid "PIN code required"
- msgstr "Zahtevana koda PIN"
- 
--#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:674
-+#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:679
- msgid "PIN code is needed for the mobile broadband device"
- msgstr "Za napravo mobilnega Å¡irokopasovnega dostopa je zahtevana koda PIN."
- 
-@@ -937,17 +937,17 @@ msgstr "Za napravo mobilnega Å¡irokopasovnega dostopa je zahtevana koda PIN."
- msgid "PIN: "
- msgstr "Koda PIN: "
- 
--#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:680
-+#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:685
- msgid "Mobile broadband network password"
- msgstr "Geslo mobilnega Å¡irokopasovnega dostopa"
- 
--#: 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:669
-+#: js/ui/components/networkAgent.js:673 js/ui/components/networkAgent.js:686
- #, javascript-format
- msgid "A password is required to connect to “%s�."
- msgstr "Za povezavo z omrežjem »%s« je zahtevano geslo."
- 
--#: js/ui/components/networkAgent.js:648 js/ui/status/network.js:1691
-+#: js/ui/components/networkAgent.js:653 js/ui/status/network.js:1704
- msgid "Network Manager"
- msgstr "Upravljalnik omrežij"
- 
-@@ -967,7 +967,7 @@ msgstr "Overi"
- #. * 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 "Overitev je spodletela.. Poskusite znova."
- 
-@@ -1309,13 +1309,13 @@ msgid "Leave On"
- msgstr "Pusti omogo�eno"
- 
- #: js/ui/kbdA11yDialog.js:59 js/ui/status/bluetooth.js:143
--#: js/ui/status/network.js:1281
-+#: js/ui/status/network.js:1294
- msgid "Turn On"
- msgstr "Omogo�i"
- 
- #: 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/network.js:1294 js/ui/status/network.js:1409
- #: js/ui/status/nightLight.js:47 js/ui/status/rfkill.js:90
- #: js/ui/status/rfkill.js:117
- msgid "Turn Off"
-@@ -1377,7 +1377,7 @@ msgstr "Poglej vir"
- msgid "Web Page"
- msgstr "Spletna stran"
- 
--#: js/ui/messageTray.js:1493
-+#: js/ui/messageTray.js:1495
- msgid "System Information"
- msgstr "Podrobnosti sistema"
- 
-@@ -1451,22 +1451,22 @@ msgstr "Pritisnite tipko Esc za kon�anje"
- msgid "Press any key to exit"
- msgstr "Pritisnite katerokoli tipko za kon�anje"
- 
--#: js/ui/panel.js:355
-+#: js/ui/panel.js:356
- msgid "Quit"
- msgstr "Kon�aj"
- 
- #. 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 "Dejavnosti"
- 
--#: js/ui/panel.js:692
-+#: js/ui/panel.js:693
- msgctxt "System menu in the top bar"
- msgid "System"
- msgstr "Sistem"
- 
--#: js/ui/panel.js:811
-+#: js/ui/panel.js:816
- msgid "Top Bar"
- msgstr "Vrhnja vrstica"
- 
-@@ -1475,7 +1475,7 @@ msgstr "Vrhnja vrstica"
- #. "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"
- 
-@@ -1483,15 +1483,15 @@ msgstr "toggle-switch-intl"
- msgid "Enter a Command"
- msgstr "Vnos ukaza"
- 
--#: js/ui/runDialog.js:110 js/ui/windowMenu.js:175
-+#: js/ui/runDialog.js:110 js/ui/windowMenu.js:174
- msgid "Close"
- msgstr "Zapri"
- 
--#: js/ui/runDialog.js:273
-+#: js/ui/runDialog.js:274
- msgid "Restart is not available on Wayland"
- msgstr "Na sistemu Wayland je na voljo ponovni zagon"
- 
--#: js/ui/runDialog.js:278
-+#: js/ui/runDialog.js:279
- msgid "Restarting…"
- msgstr "Ponovno zaganjanje ...."
- 
-@@ -1706,7 +1706,7 @@ msgid "<unknown>"
- msgstr "<neznano>"
- 
- #. Translators: %s is a network identifier
--#: js/ui/status/network.js:441 js/ui/status/network.js:1310
-+#: js/ui/status/network.js:441 js/ui/status/network.js:1323
- #, javascript-format
- msgid "%s Off"
- msgstr "%s izklopljeno"
-@@ -1732,7 +1732,7 @@ msgid "%s Disconnecting"
- msgstr "%s poteka prekinjanje povezave"
- 
- #. Translators: %s is a network identifier
--#: js/ui/status/network.js:459 js/ui/status/network.js:1302
-+#: js/ui/status/network.js:459 js/ui/status/network.js:1315
- #, javascript-format
- msgid "%s Connecting"
- msgstr "%s poteka vzpostavljanje povezave"
-@@ -1772,7 +1772,7 @@ msgid "Mobile Broadband Settings"
- msgstr "Nastavitve mobilnega Å¡irokopasovnega dostopa"
- 
- #. Translators: %s is a network identifier
--#: js/ui/status/network.js:578 js/ui/status/network.js:1307
-+#: js/ui/status/network.js:578 js/ui/status/network.js:1320
- #, javascript-format
- msgid "%s Hardware Disabled"
- msgstr "%s strojno onemogo�eno"
-@@ -1828,56 +1828,56 @@ msgstr "Ni zaznanih omrežij"
- msgid "Use hardware switch to turn off"
- msgstr "Uporabite strojni gumb za izklop"
- 
--#: js/ui/status/network.js:1173
-+#: js/ui/status/network.js:1186
- msgid "Select Network"
- msgstr "Izbor omrežja"
- 
--#: js/ui/status/network.js:1179
-+#: js/ui/status/network.js:1192
- msgid "Wi-Fi Settings"
- msgstr "Nastavitve Wi-Fi"
- 
- #. Translators: %s is a network identifier
--#: js/ui/status/network.js:1298
-+#: js/ui/status/network.js:1311
- #, javascript-format
- msgid "%s Hotspot Active"
- msgstr "%s vro�a to�ka je dejavna"
- 
- #. Translators: %s is a network identifier
--#: js/ui/status/network.js:1313
-+#: js/ui/status/network.js:1326
- #, javascript-format
- msgid "%s Not Connected"
- msgstr "%s brez povezave"
- 
--#: js/ui/status/network.js:1413
-+#: js/ui/status/network.js:1426
- msgid "connecting…"
- msgstr "vzpostavljanje povezave …"
- 
- #. 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:1429
- msgid "authentication required"
- msgstr "zahtevana je overitev"
- 
--#: js/ui/status/network.js:1418
-+#: js/ui/status/network.js:1431
- msgid "connection failed"
- msgstr "povezovanje je spodletelo"
- 
--#: js/ui/status/network.js:1472
-+#: js/ui/status/network.js:1485
- msgid "VPN Settings"
- msgstr "Nastavitve VPN"
- 
--#: js/ui/status/network.js:1485
-+#: js/ui/status/network.js:1498
- msgid "VPN"
- msgstr "VPN"
- 
--#: js/ui/status/network.js:1495
-+#: js/ui/status/network.js:1508
- msgid "VPN Off"
- msgstr "Onemogo�en VPN"
- 
--#: js/ui/status/network.js:1559 js/ui/status/rfkill.js:93
-+#: js/ui/status/network.js:1572 js/ui/status/rfkill.js:93
- msgid "Network Settings"
- msgstr "Omrežne nastavitve"
- 
--#: js/ui/status/network.js:1588
-+#: js/ui/status/network.js:1601
- #, javascript-format
- msgid "%s Wired Connection"
- msgid_plural "%s Wired Connections"
-@@ -1886,7 +1886,7 @@ msgstr[1] "%s ži�na povezava"
- msgstr[2] "%s ži�ni povezavi"
- msgstr[3] "%s ži�ne povezave"
- 
--#: js/ui/status/network.js:1592
-+#: js/ui/status/network.js:1605
- #, javascript-format
- msgid "%s Wi-Fi Connection"
- msgid_plural "%s Wi-Fi Connections"
-@@ -1895,7 +1895,7 @@ msgstr[1] "%s povezava Wi-Fi"
- msgstr[2] "%s povezavi Wi-Fi"
- msgstr[3] "%s povezave Wi-Fi"
- 
--#: js/ui/status/network.js:1596
-+#: js/ui/status/network.js:1609
- #, javascript-format
- msgid "%s Modem Connection"
- msgid_plural "%s Modem Connections"
-@@ -1904,11 +1904,11 @@ msgstr[1] "%s modemska povezava"
- msgstr[2] "%s modemski povezavi"
- msgstr[3] "%s modemske povezave"
- 
--#: js/ui/status/network.js:1728
-+#: js/ui/status/network.js:1741
- msgid "Connection failed"
- msgstr "Povezovanje je spodletelo"
- 
--#: js/ui/status/network.js:1729
-+#: js/ui/status/network.js:1742
- msgid "Activation of network connection failed"
- msgstr "Omogo�anje omrežne povezave je spodletelo."
- 
-@@ -1959,6 +1959,14 @@ msgstr "%d∶%02d do polnosti (%d %%)"
- msgid "%d %%"
- msgstr "%d %%"
- 
-+#: js/ui/status/remoteAccess.js:46
-+msgid "Screen is Being Shared"
-+msgstr "Zaslon je v na�inu souporabe"
-+
-+#: js/ui/status/remoteAccess.js:48
-+msgid "Turn off"
-+msgstr "Izklopi"
-+
- #. The menu only appears when airplane mode is on, so just
- #. statically build it as if it was on, rather than dynamically
- #. changing the menu contents.
-@@ -1990,16 +1998,16 @@ msgstr "V pripravljenost"
- msgid "Power Off"
- msgstr "Izklop"
- 
--#: js/ui/status/thunderbolt.js:294
-+#: js/ui/status/thunderbolt.js:298
- msgid "Thunderbolt"
- msgstr "Thunderbolt"
- 
- #. we are done
--#: js/ui/status/thunderbolt.js:350
-+#: js/ui/status/thunderbolt.js:354
- msgid "Unknown Thunderbolt device"
- msgstr "Neznana naprava Thunderbolt"
- 
--#: js/ui/status/thunderbolt.js:351
-+#: js/ui/status/thunderbolt.js:355
- msgid ""
- "New device has been detected while you were away. Please disconnect and "
- "reconnect the device to start using it."
-@@ -2007,11 +2015,11 @@ msgstr ""
- "Med nedejavnostjo je bila zaznana nova. Odklopite napravo in jo znova "
- "priklopite za uporabo."
- 
--#: js/ui/status/thunderbolt.js:356
-+#: js/ui/status/thunderbolt.js:360
- msgid "Thunderbolt authorization error"
- msgstr "Napaka overitve naprave Thunderbolt"
- 
--#: js/ui/status/thunderbolt.js:357
-+#: js/ui/status/thunderbolt.js:361
- #, javascript-format
- msgid "Could not authorize the Thunderbolt device: %s"
- msgstr "Naprave Thunderbolt ni mogo�e overiti: %s"
-@@ -2099,7 +2107,7 @@ msgstr[3] "Spremembe nastavitev bodo povrnjene v %d sekundah."
- 
- #. Translators: This represents the size of a window. The first number is
- #. * the width of the window and the second is the height.
--#: js/ui/windowManager.js:660
-+#: js/ui/windowManager.js:668
- #, javascript-format
- msgid "%d × %d"
- msgstr "%d × %d"
-@@ -2152,19 +2160,19 @@ msgstr "Premakni na zgornjo delovno površino"
- msgid "Move to Workspace Down"
- msgstr "Premakni na spodnjo delovno površino"
- 
--#: js/ui/windowMenu.js:140
-+#: js/ui/windowMenu.js:139
- msgid "Move to Monitor Up"
- msgstr "Premakni na zaslon zgoraj"
- 
--#: js/ui/windowMenu.js:149
-+#: js/ui/windowMenu.js:148
- msgid "Move to Monitor Down"
- msgstr "Premakni na zaslon spodaj"
- 
--#: js/ui/windowMenu.js:158
-+#: js/ui/windowMenu.js:157
- msgid "Move to Monitor Left"
- msgstr "Premakni na zaslon levo"
- 
--#: js/ui/windowMenu.js:167
-+#: js/ui/windowMenu.js:166
- msgid "Move to Monitor Right"
- msgstr "Premakni na zaslon desno"
- 
-@@ -2193,12 +2201,12 @@ msgstr "Uporabi poseben na�in, na primer »gdm« za prijavni zaslon"
- msgid "List possible modes"
- msgstr "Seznam mogo�ih na�inov"
- 
--#: src/shell-app.c:270
-+#: src/shell-app.c:272
- msgctxt "program"
- msgid "Unknown"
- msgstr "Neznano"
- 
--#: src/shell-app.c:511
-+#: src/shell-app.c:523
- #, c-format
- msgid "Failed to launch “%s�"
- msgstr "Zaganjanje »%s« je spodletelo"
diff --git a/debian/patches/data-Fix-comment-in-schema.patch b/debian/patches/data-Fix-comment-in-schema.patch
deleted file mode 100644
index cfc1170..0000000
--- a/debian/patches/data-Fix-comment-in-schema.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Wed, 1 Aug 2018 20:03:03 +0200
-Subject: data: Fix comment in schema
-
-Origin: upstream, 3.29.91, commit:9f436ce3734b889afcff1880f6fed884196b92c5
----
- data/org.gnome.shell.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
-index 3e258e2..8e6b990 100644
---- a/data/org.gnome.shell.gschema.xml.in
-+++ b/data/org.gnome.shell.gschema.xml.in
-@@ -198,7 +198,7 @@
-     </key>
-   </schema>
- 
--  <!-- unused, change 00_org.gnome.shell.gschema.override instead --!>
-+  <!-- unused, change 00_org.gnome.shell.gschema.override instead -->
-   <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
- 	  gettext-domain="@GETTEXT_PACKAGE@">
-     <key name="attach-modal-dialogs" type="b">
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/keyboard-Refactor-code-resetting-IM-on-window-drags.patch b/debian/patches/keyboard-Refactor-code-resetting-IM-on-window-drags.patch
deleted file mode 100644
index 63d72a6..0000000
--- a/debian/patches/keyboard-Refactor-code-resetting-IM-on-window-drags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Carlos Garnacho <[e-mail]>
-Date: Fri, 3 Aug 2018 16:01:48 +0200
-Subject: keyboard: Refactor code resetting IM on window drags
-
-When a window is dragged, the OSK should get hidden. Just
-do this in a nicer way.
-
-Origin: upstream, 3.29.91, commit:6b610b26f8bc2a9ef2ab121a1c6a55bf277d52b7
----
- js/ui/keyboard.js | 16 ++++++----------
- 1 file changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
-index 4a24940..5d5f0e2 100644
---- a/js/ui/keyboard.js
-+++ b/js/ui/keyboard.js
-@@ -492,13 +492,18 @@ var FocusTracker = new Lang.Class({
- 
-     _init() {
-         this._currentWindow = null;
--        this._currentWindowPositionId = 0;
- 
-         global.display.connect('notify::focus-window', () => {
-             this._setCurrentWindow(global.display.focus_window);
-             this.emit('window-changed', this._currentWindow);
-         });
- 
-+        global.display.connect('grab-op-begin', (display, window, op) => {
-+            if (window == this._currentWindow &&
-+                (op == Meta.GrabOp.MOVING || op == Meta.GrabOp.KEYBOARD_MOVING))
-+                this.emit('reset');
-+        });
-+
-         /* Valid for wayland clients */
-         Main.inputMethod.connect('cursor-location-changed', (o, rect) => {
-             let newRect = { x: rect.get_x(), y: rect.get_y(), width: rect.get_width(), height: rect.get_height() };
-@@ -520,16 +525,7 @@ var FocusTracker = new Lang.Class({
-     },
- 
-     _setCurrentWindow(window) {
--        if (this._currentWindow)
--            this._currentWindow.disconnect(this._currentWindowPositionId);
--
-         this._currentWindow = window;
--        if (window) {
--            this._currentWindowPositionId = this._currentWindow.connect('position-changed', () => {
--                if (global.display.get_grab_op() != Meta.GrabOp.NONE)
--                    this.emit('reset');
--            });
--        }
-     },
- 
-     _setCurrentRect(rect) {
diff --git a/debian/patches/keyboard-defer-position-changed-till-we-have-a-rect.patch b/debian/patches/keyboard-defer-position-changed-till-we-have-a-rect.patch
deleted file mode 100644
index e44c1bf..0000000
--- a/debian/patches/keyboard-defer-position-changed-till-we-have-a-rect.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Carlos Garnacho <[e-mail]>
-Date: Sat, 14 Jul 2018 00:14:07 +0200
-Subject: keyboard: defer position-changed till we have a rect
-
-Emitting it that soon results in JS warnings, as we don't have
-everything in place yet. The position-changed signal will be
-emitted from other locations as soon as we have it.
-
-Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/464
-Origin: upstream, 3.29.91, commit:81956e9b84a751e0aae739ef08017d3bfef907c8
----
- js/ui/keyboard.js | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
-index 1666a50..4a24940 100644
---- a/js/ui/keyboard.js
-+++ b/js/ui/keyboard.js
-@@ -526,9 +526,7 @@ var FocusTracker = new Lang.Class({
-         this._currentWindow = window;
-         if (window) {
-             this._currentWindowPositionId = this._currentWindow.connect('position-changed', () => {
--                if (global.display.get_grab_op() == Meta.GrabOp.NONE)
--                    this.emit('position-changed');
--                else
-+                if (global.display.get_grab_op() != Meta.GrabOp.NONE)
-                     this.emit('reset');
-             });
-         }
diff --git a/debian/patches/optional-hot-corner.patch b/debian/patches/optional-hot-corner.patch
index f26f031..b5b8a2b 100644
--- a/debian/patches/optional-hot-corner.patch
+++ b/debian/patches/optional-hot-corner.patch
@@ -14,7 +14,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=688320
  2 files changed, 16 insertions(+)
 
 diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
-index 4ec01a4..3e258e2 100644
+index a7251cd..8e6b990 100644
 --- a/data/org.gnome.shell.gschema.xml.in
 +++ b/data/org.gnome.shell.gschema.xml.in
 @@ -38,6 +38,14 @@
@@ -33,10 +33,10 @@ index 4ec01a4..3e258e2 100644
        <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
        <summary>List of desktop file IDs for favorite applications</summary>
 diff --git a/js/ui/layout.js b/js/ui/layout.js
-index 210fb66..eb8a6e1 100644
+index 7a3cb22..08e7495 100644
 --- a/js/ui/layout.js
 +++ b/js/ui/layout.js
-@@ -269,6 +269,9 @@ var LayoutManager = new Lang.Class({
+@@ -270,6 +270,9 @@ var LayoutManager = new Lang.Class({
          this._backgroundGroup.lower_bottom();
          this._bgManagers = [];
  
@@ -46,7 +46,7 @@ index 210fb66..eb8a6e1 100644
          // Need to update struts on new workspaces when they are added
          let workspaceManager = global.workspace_manager;
          workspaceManager.connect('notify::n-workspaces',
-@@ -370,6 +373,11 @@ var LayoutManager = new Lang.Class({
+@@ -371,6 +374,11 @@ var LayoutManager = new Lang.Class({
          });
          this.hotCorners = [];
  
diff --git a/debian/patches/series b/debian/patches/series
index b0aa083..c198fe6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,22 +8,7 @@ ubuntu/gdm_alternatives.patch
 ubuntu/block_mode_extension_update.patch
 optional-hot-corner.patch
 volume-Add-back-sound-feedback-on-scroll.patch
-Update-Brazilian-Portuguese-translation.patch
-showOSD-Fix-handling-of-defined-falsy-parameters.patch
-data-Fix-comment-in-schema.patch
-workspace-Fix-infinite-loop-when-finding-parent-window-of.patch
-workspace-Simplify-detecting-added-dialogs-after-closing-.patch
-tools-fix-XDG-desktop-syntax-in-gnome-shell-overrides-mig.patch
-Updated-Slovenian-translation.patch
-keyboard-defer-position-changed-till-we-have-a-rect.patch
-keyboard-Refactor-code-resetting-IM-on-window-drags.patch
-tweener-Save-handlers-on-target-and-remove-them-on-destro.patch
-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
 st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
-js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
-workaround_crasher_fractional_scaling.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
@@ -32,4 +17,8 @@ sessionMode-add-support-for-debugFlags-parameter.patch
 st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
 st-scroll-view-Remove-scrollbars-references-on-dispose.patch
 js-main-Throw-error-if-no-valid-default-stylesheet-is-fou.patch
-
+tweener-Save-handlers-on-target-and-remove-them-on-destro.patch
+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
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/showOSD-Fix-handling-of-defined-falsy-parameters.patch b/debian/patches/showOSD-Fix-handling-of-defined-falsy-parameters.patch
deleted file mode 100644
index d2613a0..0000000
--- a/debian/patches/showOSD-Fix-handling-of-defined-falsy-parameters.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
-Date: Wed, 1 Aug 2018 13:27:07 +0200
-Subject: showOSD: Fix handling of defined 'falsy' parameters
-
-For the OSD, all parameters except for the icon are optional - if the
-caller doesn't include the 'label' option, the OSD won't show a label
-etc.
-
-While this makes sense for an API, it means that we have to be careful
-to correctly differentiate an option that was omitted and an option
-that has a 'falsy' value like false or 0.
-
-Unfortunately since commit ccaae5d3c we no longer do, with the result
-that OSDs meant for the first monitor will show up on all, and a level
-of 0 is presented as no level bar instead of an empty one, whoops.
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=791669
-Origin: upstream, 3.29.91, commit:d908940ef37dd6a5b72148ded8b995c17a01604a
----
- js/ui/shellDBus.js | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
-index 55e1e57..4d60ef4 100644
---- a/js/ui/shellDBus.js
-+++ b/js/ui/shellDBus.js
-@@ -145,14 +145,18 @@ var GnomeShell = new Lang.Class({
-         for (let param in params)
-             params[param] = params[param].deep_unpack();
- 
--        let monitorIndex = params['monitor'] || -1;
--        let label = params['label'] || undefined;
--        let level = params['level'] || undefined;
--        let maxLevel = params['max_level'] || undefined;
-+        let { monitor: monitorIndex,
-+              label,
-+              level,
-+              max_level: maxLevel,
-+              icon: serializedIcon } = params;
-+
-+        if (monitorIndex === undefined)
-+            monitorIndex = -1;
- 
-         let icon = null;
--        if (params['icon'])
--            icon = Gio.Icon.new_for_string(params['icon']);
-+        if (serializedIcon)
-+            icon = Gio.Icon.new_for_string(serializedIcon);
- 
-         Main.osdWindowManager.show(monitorIndex, icon, label, level, maxLevel);
-     },
diff --git a/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch b/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
index fce7e26..0c5e93d 100644
--- a/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
+++ b/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
@@ -6,9 +6,8 @@ The scrollbars actors in a scroll view can be NULL, in case they get removed
 with a call to `clutter_actor_remove_child` on a scroll-view (and this is
 implemented in st_scroll_view_remove).
 
-So, we should support the case where `priv->{h,v}scroll` are NULL, without
-relying on called functions, as they might spam the log with unexpected
-warnings or at worse, crashing (as it happens with `st_widget_style_changed`).
+So, we should support the case where `priv->{h,v}scroll` are NULL, not to crash
+in `st_widget_style_changed`.
 
 Fixes #467
 
@@ -16,76 +15,14 @@ Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/467
 BUG-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1725312
 Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/190
 ---
- src/st/st-scroll-view.c | 25 +++++++++++++++----------
- 1 file changed, 15 insertions(+), 10 deletions(-)
+ src/st/st-scroll-view.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
-index fc0db1c..b9aaff2 100644
+index fc0db1c..a8b6d2e 100644
 --- a/src/st/st-scroll-view.c
 +++ b/src/st/st-scroll-view.c
-@@ -281,9 +281,9 @@ st_scroll_view_paint (ClutterActor *actor)
- 
-   if (priv->child)
-     clutter_actor_paint (priv->child);
--  if (priv->hscrollbar_visible)
-+  if (priv->hscroll && priv->hscrollbar_visible)
-     clutter_actor_paint (priv->hscroll);
--  if (priv->vscrollbar_visible)
-+  if (priv->vscroll && priv->vscrollbar_visible)
-     clutter_actor_paint (priv->vscroll);
- }
- 
-@@ -298,9 +298,9 @@ st_scroll_view_pick (ClutterActor       *actor,
- 
-   if (priv->child)
-     clutter_actor_paint (priv->child);
--  if (priv->hscrollbar_visible)
-+  if (priv->hscroll && priv->hscrollbar_visible)
-     clutter_actor_paint (priv->hscroll);
--  if (priv->vscrollbar_visible)
-+  if (priv->vscroll && priv->vscrollbar_visible)
-     clutter_actor_paint (priv->vscroll);
- }
- 
-@@ -317,7 +317,7 @@ get_scrollbar_width (StScrollView *scroll,
- {
-   StScrollViewPrivate *priv = scroll->priv;
- 
--  if (clutter_actor_is_visible (priv->vscroll))
-+  if (priv->vscroll && clutter_actor_is_visible (priv->vscroll))
-     {
-       gfloat min_size;
- 
-@@ -335,7 +335,7 @@ get_scrollbar_height (StScrollView *scroll,
- {
-   StScrollViewPrivate *priv = scroll->priv;
- 
--  if (clutter_actor_is_visible (priv->hscroll))
-+  if (priv->hscroll && clutter_actor_is_visible (priv->hscroll))
-     {
-       gfloat min_size;
- 
-@@ -637,7 +637,8 @@ st_scroll_view_allocate (ClutterActor          *actor,
-   child_box.y1 = content_box.y1;
-   child_box.y2 = content_box.y2 - (hscrollbar_visible ? sb_height : 0);
- 
--  clutter_actor_allocate (priv->vscroll, &child_box, flags);
-+  if (priv->vscroll)
-+    clutter_actor_allocate (priv->vscroll, &child_box, flags);
- 
-   /* Horizontal scrollbar */
-   if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
-@@ -653,7 +654,8 @@ st_scroll_view_allocate (ClutterActor          *actor,
-   child_box.y1 = content_box.y2 - sb_height;
-   child_box.y2 = content_box.y2;
- 
--  clutter_actor_allocate (priv->hscroll, &child_box, flags);
-+  if (priv->hscroll)
-+    clutter_actor_allocate (priv->hscroll, &child_box, flags);
- 
-   /* In case the scrollbar policy is NEVER or EXTERNAL or scrollbars
-    * should be overlayed, we don't trim the content box allocation by
-@@ -741,8 +743,11 @@ st_scroll_view_style_changed (StWidget *widget)
+@@ -741,8 +741,11 @@ st_scroll_view_style_changed (StWidget *widget)
    gdouble hfade_offset = st_theme_node_get_length (theme_node, "-st-hfade-offset");
    st_scroll_view_update_fade_effect (self, vfade_offset, hfade_offset);
  
diff --git a/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch b/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch
index fe8ec0b..f5f49be 100644
--- a/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch
+++ b/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch
@@ -14,7 +14,7 @@ Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/190
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
-index b9aaff2..6a0928a 100644
+index a8b6d2e..cb38aef 100644
 --- a/src/st/st-scroll-view.c
 +++ b/src/st/st-scroll-view.c
 @@ -244,11 +244,8 @@ st_scroll_view_dispose (GObject *object)
diff --git a/debian/patches/tools-fix-XDG-desktop-syntax-in-gnome-shell-overrides-mig.patch b/debian/patches/tools-fix-XDG-desktop-syntax-in-gnome-shell-overrides-mig.patch
deleted file mode 100644
index 30b0f83..0000000
--- a/debian/patches/tools-fix-XDG-desktop-syntax-in-gnome-shell-overrides-mig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Olivier Blin <[e-mail]>
-Date: Fri, 3 Aug 2018 00:35:24 +0200
-Subject: tools: fix XDG desktop syntax in gnome-shell-overrides-migration
-
-Reported by desktop-file-validate:
-error: value "True" for boolean key "NoDisplay" in group "Desktop
-Entry" contains invalid characters, boolean values must be "false" or
-"true"
-
-Origin: upstream, 3.29.91, commit:1fca09037416659e452bd722574e1d5a248f522d
----
- data/gnome-shell-overrides-migration.desktop.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/gnome-shell-overrides-migration.desktop.in b/data/gnome-shell-overrides-migration.desktop.in
-index 8ef86ac..99452e6 100644
---- a/data/gnome-shell-overrides-migration.desktop.in
-+++ b/data/gnome-shell-overrides-migration.desktop.in
-@@ -1,5 +1,5 @@
- [Desktop Entry]
- Type=Application
- Name=GNOME settings overrides migration
--NoDisplay=True
-+NoDisplay=true
- Exec=@libexecdir@/gnome-shell-overrides-migration.sh
diff --git a/debian/patches/ubuntu/desktop_detect.patch b/debian/patches/ubuntu/desktop_detect.patch
index fd5f6df..c245854 100644
--- a/debian/patches/ubuntu/desktop_detect.patch
+++ b/debian/patches/ubuntu/desktop_detect.patch
@@ -14,10 +14,10 @@ Origin: ubuntu
  create mode 100644 js/misc/desktop.js
 
 diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
-index 3c0feab..a4d0e4d 100644
+index 75a6c3b..c42e4a3 100644
 --- a/js/js-resources.gresource.xml
 +++ b/js/js-resources.gresource.xml
-@@ -13,6 +13,7 @@
+@@ -11,6 +11,7 @@
  
      <file>misc/config.js</file>
      <file>misc/extensionUtils.js</file>
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/workspace-Fix-infinite-loop-when-finding-parent-window-of.patch b/debian/patches/workspace-Fix-infinite-loop-when-finding-parent-window-of.patch
deleted file mode 100644
index a9dd41a..0000000
--- a/debian/patches/workspace-Fix-infinite-loop-when-finding-parent-window-of.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: verdre <[e-mail]>
-Date: Mon, 23 Jul 2018 14:22:34 +0200
-Subject: workspace: Fix infinite loop when finding parent window of dialogs
-
-When a dialog is added to a window while the overview is shown, we get
-its parent using get_transient_for() so we can add it to the right
-window clone.
-
-If we have multiple layers of dialogs we have to do this recursively
-until we find the root ancestor. This case currently results in an
-infinite loop: Since parent is always set to the same window, the
-while-condition will always be true.
-
-Bug: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/180
-Origin: upstream, 3.29.91, commit:52cbc299a795b4573a7558982115354cfa7a4e61
----
- js/ui/workspace.js          | 2 +-
- js/ui/workspaceThumbnail.js | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/js/ui/workspace.js b/js/ui/workspace.js
-index a183e07..6a8e924 100644
---- a/js/ui/workspace.js
-+++ b/js/ui/workspace.js
-@@ -1519,7 +1519,7 @@ var Workspace = new Lang.Class({
-             if (metaWin.is_attached_dialog()) {
-                 let parent = metaWin.get_transient_for();
-                 while (parent.is_attached_dialog())
--                    parent = metaWin.get_transient_for();
-+                    parent = parent.get_transient_for();
- 
-                 let idx = this._lookupIndex (parent);
-                 if (idx < 0) {
-diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
-index b1fa587..cf21e13 100644
---- a/js/ui/workspaceThumbnail.js
-+++ b/js/ui/workspaceThumbnail.js
-@@ -416,7 +416,7 @@ var WorkspaceThumbnail = new Lang.Class({
-         } else if (metaWin.is_attached_dialog()) {
-             let parent = metaWin.get_transient_for();
-             while (parent.is_attached_dialog())
--                parent = metaWin.get_transient_for();
-+                parent = parent.get_transient_for();
- 
-             let idx = this._lookupIndex (parent);
-             if (idx < 0) {
diff --git a/debian/patches/workspace-Simplify-detecting-added-dialogs-after-closing-.patch b/debian/patches/workspace-Simplify-detecting-added-dialogs-after-closing-.patch
deleted file mode 100644
index 2952a0e..0000000
--- a/debian/patches/workspace-Simplify-detecting-added-dialogs-after-closing-.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From: verdre <[e-mail]>
-Date: Tue, 19 Jun 2018 12:45:18 +0200
-Subject: workspace: Simplify detecting added dialogs after closing a window
-
-When trying to close a window in the overview by clicking the close
-button and the window doesn't get closed but a dialog is added to the
-window afterwards, we close the overview and show the dialog.
-
-Instead of adding a separate listener for the window-added signal to the
-WindowOverlay, let the WindowClones remember that the close button was
-pressed and activate themselves if a dialog is added after that.
-
-Bug: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/180
-Origin: upstream, 3.29.91, commit:da2fc2c9d3135d59bb355e739f24d540f844fb3d
----
- js/ui/workspace.js | 80 +++++++++++++++++++-----------------------------------
- 1 file changed, 28 insertions(+), 52 deletions(-)
-
-diff --git a/js/ui/workspace.js b/js/ui/workspace.js
-index 6a8e924..5aa9ba6 100644
---- a/js/ui/workspace.js
-+++ b/js/ui/workspace.js
-@@ -179,6 +179,7 @@ var WindowClone = new Lang.Class({
-         this.inDrag = false;
- 
-         this._selected = false;
-+        this._closeRequested = false;
-     },
- 
-     set slot(slot) {
-@@ -194,7 +195,6 @@ var WindowClone = new Lang.Class({
- 
-     deleteAll() {
-         // Delete all windows, starting from the bottom-most (most-modal) one
--
-         let windows = this.actor.get_children();
-         for (let i = windows.length - 1; i >= 1; i--) {
-             let realWindow = windows[i].source;
-@@ -204,11 +204,24 @@ var WindowClone = new Lang.Class({
-         }
- 
-         this.metaWindow.delete(global.get_current_time());
-+        this._closeRequested = true;
-     },
- 
--    addAttachedDialog(win) {
--        this._doAddAttachedDialog(win, win.get_compositor_private());
--        this._onMetaWindowSizeChanged();
-+    addDialog(win) {
-+        let parent = win.get_transient_for();
-+        while (parent.is_attached_dialog())
-+            parent = parent.get_transient_for();
-+
-+        // Display dialog if it is attached to our metaWindow
-+        if (win.is_attached_dialog() && parent == this.metaWindow) {
-+            this._doAddAttachedDialog(win, win.get_compositor_private());
-+            this._onMetaWindowSizeChanged();
-+        }
-+
-+        // The dialog popped up after the user tried to close the window,
-+        // assume it's a close confirmation and leave the overview
-+        if (this._closeRequested)
-+            this._activate();
-     },
- 
-     hasAttachedDialogs() {
-@@ -462,14 +475,12 @@ var WindowOverlay = new Lang.Class({
-         button._overlap = 0;
- 
-         this._idleToggleCloseId = 0;
--        button.connect('clicked', this._closeWindow.bind(this));
-+        button.connect('clicked', () => this._windowClone.deleteAll());
- 
-         windowClone.actor.connect('destroy', this._onDestroy.bind(this));
-         windowClone.connect('show-chrome', this._onShowChrome.bind(this));
-         windowClone.connect('hide-chrome', this._onHideChrome.bind(this));
- 
--        this._windowAddedId = 0;
--
-         button.hide();
-         title.hide();
- 
-@@ -590,43 +601,12 @@ var WindowOverlay = new Lang.Class({
-         Tweener.addTween(actor, params);
-     },
- 
--    _closeWindow(actor) {
--        let metaWindow = this._windowClone.metaWindow;
--        this._workspace = metaWindow.get_workspace();
--
--        this._windowAddedId = this._workspace.connect('window-added',
--                                                      this._onWindowAdded.bind(this));
--
--        this._windowClone.deleteAll();
--    },
--
-     _windowCanClose() {
-         return this._windowClone.metaWindow.can_close() &&
-                !this._windowClone.hasAttachedDialogs();
-     },
- 
--    _onWindowAdded(workspace, win) {
--        let metaWindow = this._windowClone.metaWindow;
--
--        if (win.get_transient_for() == metaWindow) {
--            workspace.disconnect(this._windowAddedId);
--            this._windowAddedId = 0;
--
--            // use an idle handler to avoid mapping problems -
--            // see comment in Workspace._windowAdded
--            let id = Mainloop.idle_add(() => {
--                this._windowClone.emit('selected');
--                return GLib.SOURCE_REMOVE;
--            });
--            GLib.Source.set_name_by_id(id, '[gnome-shell] this._windowClone.emit');
--        }
--    },
--
-     _onDestroy() {
--        if (this._windowAddedId > 0) {
--            this._workspace.disconnect(this._windowAddedId);
--            this._windowAddedId = 0;
--        }
-         if (this._idleToggleCloseId > 0) {
-             Mainloop.source_remove(this._idleToggleCloseId);
-             this._idleToggleCloseId = 0;
-@@ -1516,21 +1496,17 @@ var Workspace = new Lang.Class({
-             return;
- 
-         if (!this._isOverviewWindow(win)) {
--            if (metaWin.is_attached_dialog()) {
--                let parent = metaWin.get_transient_for();
--                while (parent.is_attached_dialog())
--                    parent = parent.get_transient_for();
--
--                let idx = this._lookupIndex (parent);
--                if (idx < 0) {
--                    // parent was not created yet, it will take care
--                    // of the dialog when created
--                    return;
--                }
-+            if (metaWin.get_transient_for() == null)
-+                return;
- 
--                let clone = this._windows[idx];
--                clone.addAttachedDialog(metaWin);
--            }
-+            // Let the top-most ancestor handle all transients
-+            let parent = metaWin.find_root_ancestor();
-+            let clone = this._windows.find(c => c.metaWindow == parent);
-+
-+            // If no clone was found, the parent hasn't been created yet
-+            // and will take care of the dialog when added
-+            if (clone)
-+                clone.addDialog(metaWin);
- 
-             return;
-         }
diff --git a/docs/reference/shell/meson.build b/docs/reference/shell/meson.build
index 1469ed4..a32d6a5 100644
--- a/docs/reference/shell/meson.build
+++ b/docs/reference/shell/meson.build
@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
     join_paths(meson.build_root(), 'src')
   ],
   scan_args: [
-    '--ignore-headers=' + ' '.join(private_headers + exclude_directories),
-    '--rebuild-types'
+    '--ignore-headers=' + ' '.join(private_headers + exclude_directories)
   ],
   install: true
 )
diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build
index fe89b53..3e9e9ab 100644
--- a/docs/reference/st/meson.build
+++ b/docs/reference/st/meson.build
@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
   ],
   scan_args: [
     '--ignore-headers=' + ' '.join(private_headers),
-    '--rebuild-sections',
-    '--rebuild-types'
+    '--rebuild-sections'
   ],
   install: true
 )
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/js-resources.gresource.xml b/js/js-resources.gresource.xml
index 3c0feab..75a6c3b 100644
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -9,8 +9,6 @@
     <file>gdm/realmd.js</file>
     <file>gdm/util.js</file>
 
-    <file>extensionPrefs/main.js</file>
-
     <file>misc/config.js</file>
     <file>misc/extensionUtils.js</file>
     <file>misc/fileUtils.js</file>
@@ -33,8 +31,6 @@
     <file>perf/core.js</file>
     <file>perf/hwtest.js</file>
 
-    <file>portalHelper/main.js</file>
-
     <file>ui/accessDialog.js</file>
     <file>ui/altTab.js</file>
     <file>ui/animation.js</file>
diff --git a/js/meson.build b/js/meson.build
index dd8ca3f..4a572c5 100644
--- a/js/meson.build
+++ b/js/meson.build
@@ -6,3 +6,17 @@ js_resources = gnome.compile_resources(
   c_name: 'shell_js_resources',
   dependencies: [config_js]
 )
+
+portal_resources = gnome.compile_resources(
+  'portal-resources', 'portal-resources.gresource.xml',
+  source_dir: ['.', meson.current_build_dir()],
+  c_name: 'portal_js_resources',
+  dependencies: [config_js]
+)
+
+prefs_resources = gnome.compile_resources(
+  'prefs-resources', 'prefs-resources.gresource.xml',
+  source_dir: ['.', meson.current_build_dir()],
+  c_name: 'prefs_js_resources',
+  dependencies: [config_js]
+)
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/portal-resources.gresource.xml b/js/portal-resources.gresource.xml
new file mode 100644
index 0000000..3a06747
--- /dev/null
+++ b/js/portal-resources.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/shell">
+    <file>misc/config.js</file>
+    <file>portalHelper/main.js</file>
+  </gresource>
+</gresources>
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/prefs-resources.gresource.xml b/js/prefs-resources.gresource.xml
new file mode 100644
index 0000000..653c4cb
--- /dev/null
+++ b/js/prefs-resources.gresource.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/shell">
+    <file>extensionPrefs/main.js</file>
+
+    <file>misc/config.js</file>
+    <file>misc/extensionUtils.js</file>
+    <file>misc/fileUtils.js</file>
+    <file>misc/params.js</file>
+  </gresource>
+</gresources>
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/components/networkAgent.js b/js/ui/components/networkAgent.js
index 5bd648a..998fcb7 100644
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -506,8 +506,12 @@ var VPNRequestHandler = new Lang.Class({
         try {
             data = this._dataStdout.peek_buffer();
 
-            keyfile.load_from_data(data.toString(), data.length,
-                                   GLib.KeyFileFlags.NONE);
+            if (data instanceof Uint8Array)
+                data = imports.byteArray.toGBytes(data);
+            else
+                data = data.toGBytes();
+
+            keyfile.load_from_bytes(data, GLib.KeyFileFlags.NONE);
 
             if (keyfile.get_integer(VPN_UI_GROUP, 'Version') != 2)
                 throw new Error('Invalid plugin keyfile version, is %d');
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/keyboard.js b/js/ui/keyboard.js
index 1666a50..5d5f0e2 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -492,13 +492,18 @@ var FocusTracker = new Lang.Class({
 
     _init() {
         this._currentWindow = null;
-        this._currentWindowPositionId = 0;
 
         global.display.connect('notify::focus-window', () => {
             this._setCurrentWindow(global.display.focus_window);
             this.emit('window-changed', this._currentWindow);
         });
 
+        global.display.connect('grab-op-begin', (display, window, op) => {
+            if (window == this._currentWindow &&
+                (op == Meta.GrabOp.MOVING || op == Meta.GrabOp.KEYBOARD_MOVING))
+                this.emit('reset');
+        });
+
         /* Valid for wayland clients */
         Main.inputMethod.connect('cursor-location-changed', (o, rect) => {
             let newRect = { x: rect.get_x(), y: rect.get_y(), width: rect.get_width(), height: rect.get_height() };
@@ -520,18 +525,7 @@ var FocusTracker = new Lang.Class({
     },
 
     _setCurrentWindow(window) {
-        if (this._currentWindow)
-            this._currentWindow.disconnect(this._currentWindowPositionId);
-
         this._currentWindow = window;
-        if (window) {
-            this._currentWindowPositionId = this._currentWindow.connect('position-changed', () => {
-                if (global.display.get_grab_op() == Meta.GrabOp.NONE)
-                    this.emit('position-changed');
-                else
-                    this.emit('reset');
-            });
-        }
     },
 
     _setCurrentRect(rect) {
diff --git a/js/ui/layout.js b/js/ui/layout.js
index 210fb66..7a3cb22 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -204,6 +204,7 @@ var LayoutManager = new Lang.Class({
 
         // Set up stage hierarchy to group all UI actors under one container.
         this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
+        this.uiGroup.set_flags(Clutter.ActorFlags.NO_LAYOUT);
         this.uiGroup.connect('allocate', (actor, box, flags) => {
             let children = actor.get_children();
             for (let i = 0; i < children.length; i++)
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>