Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ubuntu/+source/gnome-shell:ubuntu/bionic

[Marco Trevisan (Treviño)]

Unmerged commits

bf58e0e... by Marco Trevisan (Treviño) on 2019-05-08

Refresh patches

9129caa... by Marco Trevisan (Treviño) on 2019-05-08

debian/patches: Fix regression on missing spread animation

Fixes LP: #1827284

96192ec... by Iain Lane on 2019-05-07

Finalise changelog

2445e97... by Iain Lane on 2019-05-07

Merge commit 'd65babeab' into ubuntu/bionic

68d3d29... by Leonidas S. Barbosa on 2019-02-25

Import Debian changes 3.28.3+git20190124-0ubuntu18.04.2

gnome-shell (3.28.3+git20190124-0ubuntu18.04.2) bionic-security; urgency=medium

  * SECURITY UPDATE: Potential keyboard shortcuts and other actions
    - debian/patches/CVE-2019-3820-*.patch: fix in
      js/ui/panel.js, js/gdm/authPrompt.js, js/gdm/loginDialog.js,
      js/ui/shellEntry.js.
    - CVE-2019-3820

d65babe... by Marco Trevisan (Treviño) on 2019-05-03

debian/patches: Really set ellipsize mode in subtitle and body

Fixes LP: #1809788

78e6f42... by Marco Trevisan (Treviño) on 2019-05-02

debian/patches: listen actively to windows being destroyed during WS switch

Fixes LP: #1812527

42d662e... by Marco Trevisan (Treviño) on 2019-04-30

debian/patches: Protect from NULL obj in get_theme_node

Fixes LP: #1796606

57bb933... by Marco Trevisan (Treviño) on 2019-04-30

dnd: Only handle touch events in wayland

Fixes LP: #1817020

4848160... by Marco Trevisan (Treviño) on 2019-04-30

Ensure switch display mode is cyclic

Fixes LP: #1772811

diff --git a/NEWS b/NEWS
index 0c56e7e..6b0f9e1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,34 @@
+<<<<<<< NEWS
+=======
+3.28.3
+======
+* Fix lagging pointer when zoomed [Daniel; #682013]
+* Fix "Clear All" for calendar events [Florian; #325]
+* Misc. bug fixes [Florian, Mario, Marco; #136, #214, #788931, #791233]
+
+Contributors:
+  Carlos Garnacho, Florian Müllner, Mario Sanchez Prada, Joe Rabinoff,
+  Didier Roche, Marco Trevisan (Treviño), Daniel van Vugt
+
+Translators:
+  Pieter Schalk Schoeman [af], Gun Chleoc [gd]
+
+3.28.2
+======
+* Fix lock-up on cancelling polkit dialog [Florian; #221]
+* Guard against untimely keyboard map changes [Carlos; #240]
+* Fix blurriness of OSD under some resolutions [Silvère; #782011]
+* Fix icons in search provider results [Florian; #249]
+* Misc. bug fixes [Marco, Florian; #792687, #781471]
+
+Contributors:
+  Carlos Garnacho, Silvère Latchurié, Florian Müllner, Mario Sanchez Prada,
+  Ray Strode, Marco Trevisan (Treviño)
+
+Translators:
+  Stas Solovey [ru], Rafael Fontenelle [pt_BR]
+
+>>>>>>> NEWS
 3.28.1
 ======
 * Fix compose characters in shell entries [Carlos; #115]
diff --git a/debian/changelog b/debian/changelog
index 1ecd17a..f4df414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,150 @@
+<<<<<<< debian/changelog
+=======
+gnome-shell (3.28.3+git20190124-0ubuntu18.04.4) UNRELEASED; urgency=medium
+
+  * d/p/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch:
+    - Fix regression on missing spread animation (LP: #1827284)
+  * Refreshed patches
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 08 May 2019 14:49:43 -0500
+
+gnome-shell (3.28.3+git20190124-0ubuntu18.04.3) bionic; urgency=medium
+
+  * d/p/switchMonitor-switch-to-next-config-upon-initial-keypress.patch
+    - Ensure switch display mode is cyclic (LP: #1772811)
+  * debian/control:
+    - Depends on mutter 3.28.3+git20190124-0ubuntu18.04.3
+  * d/p/dnd-Only-handle-touch-events-in-wayland.patch:
+    - dnd: Only handle touch events in wayland (LP: #1817020)
+  * d/p/st-widget-Add-missing-g_return_val_if_fail.patch:
+    - st-widget: Protect from NULL obj in get_theme_node (LP: #1796606)
+  * d/p/windowManager-listen-actively-to-windows-being-destroyed-.patch:
+    - windowManager: listen actively to windows being destroyed during WS switch
+      (LP: #1812527)
+  * d/p/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch:
+    - Really set ellipsize mode in subtitle and body (LP: #1809788)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 07 May 2019 18:37:41 +0100
+
+gnome-shell (3.28.3+git20190124-0ubuntu18.04.2) bionic-security; urgency=medium
+
+  * SECURITY UPDATE: Potential keyboard shortcuts and other actions
+    - debian/patches/CVE-2019-3820-*.patch: fix in
+      js/ui/panel.js, js/gdm/authPrompt.js, js/gdm/loginDialog.js,
+      js/ui/shellEntry.js.
+    - CVE-2019-3820
+
+ -- Leonidas S. Barbosa <[e-mail]>  Mon, 25 Feb 2019 12:53:33 -0300
+
+gnome-shell (3.28.3+git20190124-0ubuntu18.04.1) bionic; urgency=medium
+
+  * New git snapshot release up to commit 24cdcc56d (LP: #1811900)
+    - Don't fill journal with osdWindow errors (LP: #1772677)
+    - Fix missing icon in keyboard indicator (LP: #1812266)
+  * d/p/authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch,
+    d/p/authPrompt-Unset-preemptiveAnswer-on-reset.patch,
+    d/p/gdm-util-Always-allow-to-retry-login-in-unlock-mode.patch,
+    d/p/ibus-set-content-type-no-holdKeyboard.patch,
+    d/p/popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch,
+    d/p/st-button-Ignore-pointer-emulated-touch-events.patch,
+    d/p/shell-ignore-invalid-window-monitor-index.patch,
+    d/p/workspace-fix-repositioned-windows-in-activities.patch:
+    - Removed patches applied upstream
+  * d/p/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch,
+    d/p/js-fix-invalid-access-errors.patch,
+    d/p/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch,
+    d/p/optional-hot-corner.patch,
+    d/p/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch,
+    d/p/workaround_crasher_fractional_scaling.patch:
+    - Refreshed as per upstream changes
+  * d/p/keyboard-Filter-redundant-FocusTracker-position-changed-s.patch,
+    d/p/keyboard-Listen-to-IbusPanelService-focus-in-out-to-track.patch:
+    - Fix OSK activation on X11 (LP: #1760399)
+  * d/p/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch:
+    - Label the PENDING_CHARGE state as "Not Charging" (LP: #1745032)
+  * d/p/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch:
+    - Add missing include (LP: #1811908)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 25 Jan 2019 18:29:40 +0000
+
+gnome-shell (3.28.3-0ubuntu0.18.04.4) bionic; urgency=medium
+
+  * debian/patches/ibus-set-content-type-no-holdKeyboard.patch:
+    - Cherry-pick upstream commit to prevent focus stealing on password fields
+      in firefox when ibus is used (LP: #1765304)
+
+ -- Olivier Tilloy <[e-mail]>  Wed, 05 Dec 2018 13:08:10 +0000
+
+gnome-shell (3.28.3-0ubuntu0.18.04.3) bionic; urgency=medium
+
+  * debian/ubuntu.css:
+    - use defined color for menu separators (LP: #1739931)
+    - set StEntry minimun height to work properly with Ubuntu font (LP: #1743058)
+  * debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch:
+    - Don't emit two click events on touch under X11 (LP: #1745888)
+  * d/p/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch,
+    d/p/st-scroll-view-Remove-scrollbars-references-on-dispose.patch:
+    - Handle NULL scroll bars in st-scroll-view (LP: #1725312)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 06 Nov 2018 17:49:17 +0000
+
+gnome-shell (3.28.3-0ubuntu0.18.04.2) bionic; urgency=medium
+
+  * New upstream release (LP: #1718931, LP: #1782614)
+  * debian/patches/30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch,
+    debian/patches/magnifier.js-Fix-zoom-juddering.patch,
+    debian/patches/st-label-Unset-clutter-text-instance-on-disposal.patch,
+    debian/patches/st-texture-cache-Don-t-add-NULL-textures-to-cache.patch,
+    debian/patches/st-texture-cache-Save-cairo-surfaces-to-a-different-map.patch,
+    debian/patches/ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch:
+    - Drop patches applied on the 3.28 branch
+  * debian/patches/js-fix-invalid-access-errors.patch:
+    - Refreshed to reflect upstream changes
+  * d/p/popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch
+    -  Don't handle key presses directly if there are modifiers (LP: #1784671)
+  * debian/patches/workspace-fix-repositioned-windows-in-activities.patch:
+    - Cherry-pick from upstream 3.28 branch
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 03 Aug 2018 07:18:24 +0100
+
+gnome-shell (3.28.2-0ubuntu0.18.04.1) bionic; urgency=medium
+
+  [ Olivier Tilloy ]
+  * New upstream release (LP: #1775145)
+    - fixes valid password rejection at login screen (LP: #1765261)
+  * Drop patches applied upstream:
+    - debian/patches/polkitAgent-Guard-against-repeated-close-calls.patch
+    - debian/patches/popupMenu-Fix-wrong-call-to-clutter_actor_add_child.patch
+    - debian/patches/workspaceThumbnail-initialize-porthole-based-on-workArea.patch
+    - debian/patches/workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
+    - debian/patches/workspaceThumbnail-rebuild-thumbnails-if-workareas-size-c.patch
+
+  [ Andrea Azzarone ]
+  * debian/patches/ubuntu_lock_on_suspend.patch: inhibit suspend until the
+    screen is locked also in the case where automatic screen lock is disabled
+    and screen lock on suspend is enabled (LP: #1768786)
+
+  [ Marco Trevisan (Treviño) ]
+  * Cherry pick upstream patches:
+    - debian/patches/st-label-Unset-clutter-text-instance-on-disposal.patch (LP: #1714989)
+  * debian/patches/st-texture-cache-Don-t-add-NULL-textures-to-cache.patch:
+    - Cherry pick updated version from upstream, splitted in:
+    + debian/patches/st-texture-cache-Don-t-add-NULL-textures-to-cache.patch
+    + debian/patches/st-texture-cache-Save-cairo-surfaces-to-a-different-map.patch
+  * debian/patches/authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch
+    debian/patches/authPrompt-Unset-preemptiveAnswer-on-reset.patch
+    debian/patches/gdm-util-Always-allow-to-retry-login-in-unlock-mode.patch:
+    - GDM gnome-shell greeter fix to fix unneeded login attempts (LP: #1777956)
+  * debian/patches/series:
+    - reorder to apply upstream cherry-picks before the others
+  
+  [ Daniel van Vugt ]
+  * debian/patches/magnifier.js-Fix-zoom-juddering.patch:
+    - magnifier.js: Fix zoom juddering (LP: #1691675)
+
+ -- Marco Trevisan <[e-mail]>  Tue, 21 Jun 2018 01:45:42 +0200
+
+>>>>>>> debian/changelog
 gnome-shell (3.28.1-0ubuntu2) bionic; urgency=medium
 
   [ Marco Trevisan (Treviño) ]
diff --git a/debian/control b/debian/control
index 739dae9..3990429 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,14 @@ Build-Depends: debhelper (>= 10.3~),
                sassc,
 Standards-Version: 4.0.0
 Homepage: https://wiki.gnome.org/Projects/GnomeShell
+<<<<<<< debian/control
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-shell/ubuntu
+=======
+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell
+Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell/+git/gnome-shell/+ref/ubuntu/bionic
+Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell -b ubuntu/bionic
+>>>>>>> debian/control
 
 Package: gnome-shell
 Architecture: linux-any
@@ -80,7 +87,11 @@ Depends: ${gir:Depends},
          gir1.2-gtk-3.0 (>= 3.16),
          gir1.2-gweather-3.0,
          gir1.2-ibus-1.0 (>= 1.5.2),
+<<<<<<< debian/control
          gir1.2-mutter-2 (>= 3.27.91),
+=======
+         gir1.2-mutter-2 (>= 3.28.3+git20190124-0ubuntu18.04.3),
+>>>>>>> debian/control
          gir1.2-nm-1.0 [linux-any],
          gir1.2-nma-1.0 [linux-any],
          gir1.2-pango-1.0,
@@ -93,7 +104,11 @@ Depends: ${gir:Depends},
          gnome-shell-common (= ${source:Version}),
          ubuntu-wallpapers,
          gsettings-desktop-schemas (>= 3.21.3),
+<<<<<<< debian/control
          mutter (>= 3.27.91),
+=======
+         mutter (>= 3.28.3+git20190124-0ubuntu18.04.3),
+>>>>>>> debian/control
          python3,
          libglib2.0-bin (>= 2.53.0),
 Recommends: xserver-xorg-legacy,
diff --git a/debian/control.in b/debian/control.in
index d01981b..06744c2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -55,7 +55,14 @@ Build-Depends: debhelper (>= 10.3~),
                sassc,
 Standards-Version: 4.0.0
 Homepage: https://wiki.gnome.org/Projects/GnomeShell
+<<<<<<< debian/control.in
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-shell/ubuntu
+=======
+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell
+Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell/+git/gnome-shell/+ref/ubuntu/bionic
+Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell -b ubuntu/bionic
+>>>>>>> debian/control.in
 
 Package: gnome-shell
 Architecture: linux-any
@@ -76,7 +83,11 @@ Depends: ${gir:Depends},
          gir1.2-gtk-3.0 (>= 3.16),
          gir1.2-gweather-3.0,
          gir1.2-ibus-1.0 (>= 1.5.2),
+<<<<<<< debian/control.in
          gir1.2-mutter-2 (>= 3.27.91),
+=======
+         gir1.2-mutter-2 (>= 3.28.3+git20190124-0ubuntu18.04.3),
+>>>>>>> debian/control.in
          gir1.2-nm-1.0 [linux-any],
          gir1.2-nma-1.0 [linux-any],
          gir1.2-pango-1.0,
@@ -89,7 +100,11 @@ Depends: ${gir:Depends},
          gnome-shell-common (= ${source:Version}),
          ubuntu-wallpapers,
          gsettings-desktop-schemas (>= 3.21.3),
+<<<<<<< debian/control.in
          mutter (>= 3.27.91),
+=======
+         mutter (>= 3.28.3+git20190124-0ubuntu18.04.3),
+>>>>>>> debian/control.in
          python3,
          libglib2.0-bin (>= 2.53.0),
 Recommends: xserver-xorg-legacy,
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..bb36f7c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+debian-branch=ubuntu/bionic
+upstream-branch=upstream/3.28.x
+debian-tag=ubuntu/%(version)s
+upstream-vcs-tag=%(version)s
+pristine-tar=True
diff --git a/debian/patches/41-handle-logind-fail.patch b/debian/patches/41-handle-logind-fail.patch
index bdf612e..2cba8d1 100644
--- a/debian/patches/41-handle-logind-fail.patch
+++ b/debian/patches/41-handle-logind-fail.patch
@@ -1,4 +1,10 @@
+<<<<<<< debian/patches/41-handle-logind-fail.patch
 Author: Emilio Pozuelo Monfort <[e-mail]>
+=======
+From: Emilio Pozuelo Monfort <[e-mail]>
+Date: Wed, 20 Jun 2018 19:22:06 +0200
+Subject: handle-logind-fail
+>>>>>>> debian/patches/41-handle-logind-fail.patch
 
 Even if logind is running (which is what haveSystemd() is checking), it may
 fail to create a session, e.g. if the kernel doesn't have cgroups support.
@@ -8,10 +14,22 @@ start. Thus talk to logind if XDG_SESSION_ID is set, which is a sign that
 logind actually created our session. Otherwise, fall back to ConsoleKit.
 
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729877
+<<<<<<< debian/patches/41-handle-logind-fail.patch
 
 --- a/js/misc/loginManager.js
 +++ b/js/misc/loginManager.js
 @@ -93,7 +93,7 @@
+=======
+---
+ js/misc/loginManager.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js
+index 4eb0686..3d3c4b4 100644
+--- a/js/misc/loginManager.js
++++ b/js/misc/loginManager.js
+@@ -93,7 +93,7 @@ let _loginManager = null;
+>>>>>>> debian/patches/41-handle-logind-fail.patch
   */
  function getLoginManager() {
      if (_loginManager == null) {
diff --git a/debian/patches/50_add_ubuntu_desktop_detect.patch b/debian/patches/50_add_ubuntu_desktop_detect.patch
index 08318cb..40b407a 100644
--- a/debian/patches/50_add_ubuntu_desktop_detect.patch
+++ b/debian/patches/50_add_ubuntu_desktop_detect.patch
@@ -1,3 +1,4 @@
+<<<<<<< debian/patches/50_add_ubuntu_desktop_detect.patch
 Description: Add an helper to detect current desktop
  We will differentiate some behavior depending on current desktop. Add an
  helper to centralize the current desktop detection.
@@ -8,6 +9,40 @@ Index: gnome-shell-3.24.3/js/misc/desktop.js
 ===================================================================
 --- /dev/null
 +++ gnome-shell-3.24.3/js/misc/desktop.js
+=======
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 20 Jun 2018 19:22:06 +0200
+Subject: Add an helper to detect current desktop
+
+We will differentiate some behavior depending on current desktop. Add an
+helper to centralize the current desktop detection.
+Forwarded: not-needed
+Origin: ubuntu
+===================================================================
+---
+ js/js-resources.gresource.xml |  1 +
+ js/misc/desktop.js            | 39 +++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 40 insertions(+)
+ create mode 100644 js/misc/desktop.js
+
+diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
+index 883b62d..3909dc8 100644
+--- a/js/js-resources.gresource.xml
++++ b/js/js-resources.gresource.xml
+@@ -13,6 +13,7 @@
+ 
+     <file>misc/config.js</file>
+     <file>misc/extensionUtils.js</file>
++    <file>misc/desktop.js</file>
+     <file>misc/fileUtils.js</file>
+     <file>misc/gnomeSession.js</file>
+     <file>misc/history.js</file>
+diff --git a/js/misc/desktop.js b/js/misc/desktop.js
+new file mode 100644
+index 0000000..3b0d128
+--- /dev/null
++++ b/js/misc/desktop.js
+>>>>>>> debian/patches/50_add_ubuntu_desktop_detect.patch
 @@ -0,0 +1,39 @@
 +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 +
@@ -48,6 +83,7 @@ Index: gnome-shell-3.24.3/js/misc/desktop.js
 +    _currentDesktopsMatches[name] = false;
 +    return false;
 +}
+<<<<<<< debian/patches/50_add_ubuntu_desktop_detect.patch
 Index: gnome-shell-3.24.3/js/js-resources.gresource.xml
 ===================================================================
 --- gnome-shell-3.24.3.orig/js/js-resources.gresource.xml
@@ -60,3 +96,5 @@ Index: gnome-shell-3.24.3/js/js-resources.gresource.xml
      <file>misc/fileUtils.js</file>
      <file>misc/gnomeSession.js</file>
      <file>misc/history.js</file>
+=======
+>>>>>>> debian/patches/50_add_ubuntu_desktop_detect.patch
diff --git a/debian/patches/70_allow_sound_above_100.patch b/debian/patches/70_allow_sound_above_100.patch
index b1eda45..7ea4f7a 100644
--- a/debian/patches/70_allow_sound_above_100.patch
+++ b/debian/patches/70_allow_sound_above_100.patch
@@ -1,3 +1,4 @@
+<<<<<<< debian/patches/70_allow_sound_above_100.patch
 Description: Allow volume to be set above 100%.
  Some systems have low maximum volume set (like x220), allow, from an option
  in gnome-control-center to set it above that 100% limit from g-s-d
@@ -14,6 +15,26 @@ Index: gnome-shell-3.27.91/js/ui/status/volume.js
 ===================================================================
 --- gnome-shell-3.27.91.orig/js/ui/status/volume.js
 +++ gnome-shell-3.27.91/js/ui/status/volume.js
+=======
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 20 Jun 2018 19:22:06 +0200
+Subject: Allow volume to be set above 100%.
+
+Some systems have low maximum volume set (like x220), allow, from an option
+in gnome-control-center to set it above that 100% limit from g-s-d
+(keyboard) and gnome-shell.
+Origin: ubuntu
+Bug-Ubuntu: https://launchpad.net/bugs/1706524
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=710424
+---
+ js/ui/status/volume.js | 32 +++++++++++++++++++++++++++++---
+ 1 file changed, 29 insertions(+), 3 deletions(-)
+
+diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
+index d814ef6..65c4c42 100644
+--- a/js/ui/status/volume.js
++++ b/js/ui/status/volume.js
+>>>>>>> debian/patches/70_allow_sound_above_100.patch
 @@ -7,6 +7,7 @@ const Gvc = imports.gi.Gvc;
  const St = imports.gi.St;
  const Signals = imports.signals;
diff --git a/debian/patches/71_smarter_alt_tab.patch b/debian/patches/71_smarter_alt_tab.patch
index f281909..06a3ce0 100644
--- a/debian/patches/71_smarter_alt_tab.patch
+++ b/debian/patches/71_smarter_alt_tab.patch
@@ -1,3 +1,4 @@
+<<<<<<< debian/patches/71_smarter_alt_tab.patch
 Description: Build a smarter alt-tab in the ubuntu session
  In case of a quick alt-tab (before the switcher UI shows up), we want to cover
  the power user use-case, which is to switch quickly between 2 windows.
@@ -21,6 +22,38 @@ Index: gnome-shell-3.27.91/js/ui/altTab.js
 ===================================================================
 --- gnome-shell-3.27.91.orig/js/ui/altTab.js
 +++ gnome-shell-3.27.91/js/ui/altTab.js
+=======
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 20 Jun 2018 19:22:06 +0200
+Subject: Build a smarter alt-tab in the ubuntu session
+
+In case of a quick alt-tab (before the switcher UI shows up), we want to cover
+the power user use-case, which is to switch quickly between 2 windows.
+The issue with current behavior is say:
+- you have an application with one instance, maximized
+- you have another application with multiple instances, like multiple
+  terminals, not maximized.
+If you press alt-tab, even quickly, the whole second application would be
+raised (as no window has been selected). The consequence is that you have
+all terminal in front of, for instance, your browser or documentation viewer
+you are using.
+The behavior we implement enables this. However, as soon as the switcher ui
+is displayed to the user, not selecting a particular window instance will
+raise the whole applications. Consequently only "quick alt-tab" flow is
+impacted.
+Origin: ubuntu
+Bug-Ubuntu: https://launchpad.net/bugs/1716921
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=787627
+---
+ js/ui/altTab.js        | 10 ++++++++++
+ js/ui/switcherPopup.js |  4 +++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/altTab.js b/js/ui/altTab.js
+index 97dddce..764d308 100644
+--- a/js/ui/altTab.js
++++ b/js/ui/altTab.js
+>>>>>>> debian/patches/71_smarter_alt_tab.patch
 @@ -13,6 +13,7 @@ const Atk = imports.gi.Atk;
  const Main = imports.ui.main;
  const SwitcherPopup = imports.ui.switcherPopup;
@@ -45,10 +78,17 @@ Index: gnome-shell-3.27.91/js/ui/altTab.js
          if (this._currentWindow < 0)
              appIcon.app.activate_window(appIcon.cachedWindows[0], timestamp);
          else if (appIcon.cachedWindows[this._currentWindow])
+<<<<<<< debian/patches/71_smarter_alt_tab.patch
 Index: gnome-shell-3.27.91/js/ui/switcherPopup.js
 ===================================================================
 --- gnome-shell-3.27.91.orig/js/ui/switcherPopup.js
 +++ gnome-shell-3.27.91/js/ui/switcherPopup.js
+=======
+diff --git a/js/ui/switcherPopup.js b/js/ui/switcherPopup.js
+index a53b1e6..71911c8 100644
+--- a/js/ui/switcherPopup.js
++++ b/js/ui/switcherPopup.js
+>>>>>>> debian/patches/71_smarter_alt_tab.patch
 @@ -12,8 +12,10 @@ const St = imports.gi.St;
  
  const Main = imports.ui.main;
diff --git a/debian/patches/CVE-2019-3820-1.patch b/debian/patches/CVE-2019-3820-1.patch
new file mode 100644
index 0000000..f704252
--- /dev/null
+++ b/debian/patches/CVE-2019-3820-1.patch
@@ -0,0 +1,29 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
+Date: Wed, 23 Jan 2019 23:55:12 +0100
+Subject: [PATCH] panel: Don't allow opening hidden menus via keybindings
+
+We shouldn't allow toggling menus that aren't supported by the
+current session mode, but as indicators are hidden rather than
+destroyed on mode switches, it is not enough to check for an
+indicator's existence.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/issues/851
+---
+ js/ui/panel.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/panel.js b/js/ui/panel.js
+index a76916b..85572e2 100644
+--- a/js/ui/panel.js
++++ b/js/ui/panel.js
+@@ -992,8 +992,8 @@ var Panel = new Lang.Class({
+     },
+ 
+     _toggleMenu(indicator) {
+-        if (!indicator) // menu not supported by current session mode
+-            return;
++        if (!indicator || !indicator.container.visible)
++            return; // menu not supported by current session mode
+ 
+         let menu = indicator.menu;
+         if (!indicator.actor.reactive)
diff --git a/debian/patches/CVE-2019-3820-2.patch b/debian/patches/CVE-2019-3820-2.patch
new file mode 100644
index 0000000..dc6e562
--- /dev/null
+++ b/debian/patches/CVE-2019-3820-2.patch
@@ -0,0 +1,93 @@
+From: Ray Strode <[e-mail]>
+Date: Wed, 23 Jan 2019 15:59:42 -0500
+Subject: [PATCH] shellActionModes: disable POPUP keybindings in unlock screen
+
+Certain keybindings should continue to work even when a popup
+menu is on screen. For instance, the keybinding for showing
+the app menu and the keyinding for showing the calendar are
+examples.
+
+This is achieved by putting in place a special "POPUP" action
+mode, whenever a popup menu is active.  This mode replaces
+the (e.g., "NORMAL" or "OVERVIEW") action mode that was in place
+for as long as the popup menu is active.
+
+But those keybindings should not work when the user is at the
+unlock dialog (which uses an action mode of "UNLOCK").
+
+Unfortunately, since commit c79d24b6 they do.
+
+This commit addresses the problem by forcing the action mode
+to NONE at the unlock screen when popups are visible.
+
+CVE-2019-3820
+
+Closes https://gitlab.gnome.org/GNOME/gnome-shell/issues/851
+---
+ js/gdm/authPrompt.js  | 3 ++-
+ js/gdm/loginDialog.js | 3 ++-
+ js/ui/shellEntry.js   | 6 ++++--
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
+index a0a4a21..78e0454 100644
+--- a/js/gdm/authPrompt.js
++++ b/js/gdm/authPrompt.js
+@@ -11,6 +11,7 @@ const Animation = imports.ui.animation;
+ const Batch = imports.gdm.batch;
+ const GdmUtil = imports.gdm.util;
+ const Params = imports.misc.params;
++const Shell = imports.gi.Shell;
+ const ShellEntry = imports.ui.shellEntry;
+ const Tweener = imports.ui.tweener;
+ const UserWidget = imports.ui.userWidget;
+@@ -99,7 +100,7 @@ var AuthPrompt = new Lang.Class({
+                          x_align: St.Align.START });
+         this._entry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
+                                      can_focus: true });
+-        ShellEntry.addContextMenu(this._entry, { isPassword: true });
++        ShellEntry.addContextMenu(this._entry, { isPassword: true, actionMode: Shell.ActionMode.NONE });
+ 
+         this.actor.add(this._entry,
+                        { expand: true,
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index 4a93545..5ab8525 100644
+--- a/js/gdm/loginDialog.js
++++ b/js/gdm/loginDialog.js
+@@ -338,7 +338,8 @@ var SessionMenuButton = new Lang.Class({
+                  this._button.remove_style_pseudo_class('active');
+         });
+ 
+-        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button });
++        this._manager = new PopupMenu.PopupMenuManager({ actor: this._button },
++                                                       { actionMode: Shell.ActionMode.NONE });
+         this._manager.addMenu(this._menu);
+ 
+         this._button.connect('clicked', () => { this._menu.toggle(); });
+diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
+index 9db5136..09bb9bb 100644
+--- a/js/ui/shellEntry.js
++++ b/js/ui/shellEntry.js
+@@ -9,6 +9,7 @@ const BoxPointer = imports.ui.boxpointer;
+ const Main = imports.ui.main;
+ const Params = imports.misc.params;
+ const PopupMenu = imports.ui.popupMenu;
++const Shell = imports.gi.Shell;
+ 
+ var EntryMenu = new Lang.Class({
+     Name: 'ShellEntryMenu',
+@@ -150,11 +151,12 @@ function addContextMenu(entry, params) {
+     if (entry.menu)
+         return;
+ 
+-    params = Params.parse (params, { isPassword: false });
++    params = Params.parse (params, { isPassword: false, actionMode: Shell.ActionMode.POPUP });
+ 
+     entry.menu = new EntryMenu(entry);
+     entry.menu.isPassword = params.isPassword;
+-    entry._menuManager = new PopupMenu.PopupMenuManager({ actor: entry });
++    entry._menuManager = new PopupMenu.PopupMenuManager({ actor: entry },
++                                                        { actionMode: params.actionMode });
+     entry._menuManager.addMenu(entry.menu);
+ 
+     // Add an event handler to both the entry and its clutter_text; the former
diff --git a/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch b/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch
index 96b2cf0..6645cf9 100644
--- a/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch
+++ b/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch
@@ -1,5 +1,9 @@
 From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+<<<<<<< debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch
 Date: Wed, 18 Oct 2017 05:32:22 -0500
+=======
+Date: Wed, 18 Oct 2017 12:32:22 +0200
+>>>>>>> debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch
 Subject: StIcon: only compute shadow pipeline when the texture is properly
  allocated
 
diff --git a/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
new file mode 100644
index 0000000..9f1787e
--- /dev/null
+++ b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
@@ -0,0 +1,40 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Fri, 3 May 2019 15:27:13 -0500
+Subject: dialog: Really set ellipsize mode in subtitle and body
+
+Dialog's subtitle or body could not be properly wrapped, while it's ellipsized
+when the text's width doesn't exceed the container size.
+
+Clutter text has an `ellipsize` property, however in dialog's subtitle and body
+we have been setting the `ellipsize-mode` property to Pango.EllipsizeMode.NONE
+that is not present in the underlying GObject.
+
+Not being an error in javascript, gjs didn't warn us about this, while at the
+same time the St.Label's default Pango.EllipsizeMode.END was used.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/922
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/531
+
+(cherry picked from commit 3121c9aa29406ad85e949b697e90092f1fa6fc2e)
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/5703a25e
+Bug-Ubuntu: https://bugs.launchpad.net/oem-priority/+bug/1809788
+Applied: 3.28.4
+---
+ js/ui/dialog.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/dialog.js b/js/ui/dialog.js
+index 89db963..3377957 100644
+--- a/js/ui/dialog.js
++++ b/js/ui/dialog.js
+@@ -185,7 +185,7 @@ var MessageDialogContent = new Lang.Class({
+             this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
+         });
+ 
+-        let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
++        let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
+                           line_wrap: true };
+         Object.assign(this._subtitle.clutter_text, textProps);
+         Object.assign(this._body.clutter_text, textProps);
diff --git a/debian/patches/dnd-Only-handle-touch-events-in-wayland.patch b/debian/patches/dnd-Only-handle-touch-events-in-wayland.patch
new file mode 100644
index 0000000..adb0ad8
--- /dev/null
+++ b/debian/patches/dnd-Only-handle-touch-events-in-wayland.patch
@@ -0,0 +1,40 @@
+From: Andrea Azzarone <[e-mail]>
+Date: Mon, 4 Mar 2019 16:14:22 +0000
+Subject: dnd: Only handle touch events in wayland
+
+There are serveral issues around touch passive grab and touch/pointer doubly
+handling to use these on X11, so we stick to single-touch/pointer there.
+
+Cherry picked from commit 60ccdc2deb746c0d96b0268ee5034b65478ce779
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1015
+
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1817020
+GNOME-Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1015
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/457
+Applied-Upstream: 3.28.4
+---
+ js/ui/dnd.js | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/js/ui/dnd.js b/js/ui/dnd.js
+index 9e961a1..af7a27a 100644
+--- a/js/ui/dnd.js
++++ b/js/ui/dnd.js
+@@ -132,6 +132,16 @@ var _Draggable = new Lang.Class({
+     },
+ 
+     _onTouchEvent(actor, event) {
++        // Here we only handle touch events on wayland. On X11
++        // we do get emulated pointer events, which already works
++        // for single-touch cases. Besides, the X11 passive touch grab
++        // set up by Mutter will make us see first the touch events
++        // and later the pointer events, so it will look like two
++        // unrelated series of events, we want to avoid double handling
++        // in these cases.
++        if (!Meta.is_wayland_compositor())
++            return Clutter.EVENT_PROPAGATE;
++
+         if (event.type() != Clutter.EventType.TOUCH_BEGIN ||
+             !global.display.is_pointer_emulating_sequence(event.get_event_sequence()))
+             return Clutter.EVENT_PROPAGATE;
diff --git a/debian/patches/js-fix-invalid-access-errors.patch b/debian/patches/js-fix-invalid-access-errors.patch
index dec3a60..5f3dbff 100644
--- a/debian/patches/js-fix-invalid-access-errors.patch
+++ b/debian/patches/js-fix-invalid-access-errors.patch
@@ -1,5 +1,9 @@
 From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 Date: Mon, 4 Dec 2017 19:41:50 -0600
+=======
+Date: Tue, 5 Dec 2017 02:41:50 +0100
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
 Subject: js: fix invalid-access errors
 
 tweener: Save handlers on target and remove them on destroy
@@ -24,6 +28,7 @@ Remove duplicated handler on 'destroy' and just use a generic one.
 
 https://bugzilla.gnome.org/show_bug.cgi?id=791233
 
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 workspaceThumbnail: Disconnect from window signals on destruction
 
 Avoid to try to destroy the window clone content more than once
@@ -68,10 +73,13 @@ good practice).
 
 https://bugzilla.gnome.org/show_bug.cgi?id=791233
 
+=======
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
 Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=791233
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1747566
 Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/4
 ---
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
  js/ui/dnd.js                | 65 +++++++++++++++++++++++++++------------------
  js/ui/tweener.js            | 64 +++++++++++++++++++++++++++++++++++---------
  js/ui/workspace.js          | 35 +++++++++++++++++-------
@@ -80,6 +88,14 @@ Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/4
 
 diff --git a/js/ui/dnd.js b/js/ui/dnd.js
 index a38607c..431c60d 100644
+=======
+ js/ui/dnd.js     | 65 +++++++++++++++++++++++++++++++++-----------------------
+ js/ui/tweener.js | 63 ++++++++++++++++++++++++++++++++++++++++++------------
+ 2 files changed, 89 insertions(+), 39 deletions(-)
+
+diff --git a/js/ui/dnd.js b/js/ui/dnd.js
+index ec1ba1d..9e961a1 100644
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
 --- a/js/ui/dnd.js
 +++ b/js/ui/dnd.js
 @@ -27,6 +27,12 @@ var DragMotionResult = {
@@ -175,7 +191,11 @@ index a38607c..431c60d 100644
          this._dragOrigOpacity = this._dragActor.opacity;
          if (this._dragActorOpacity != undefined)
              this._dragActor.opacity = this._dragActorOpacity;
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 @@ -500,7 +515,7 @@ var _Draggable = new Lang.Class({
+=======
+@@ -518,7 +533,7 @@ var _Draggable = new Lang.Class({
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
                                                  event.get_time())) {
                      // If it accepted the drop without taking the actor,
                      // handle it ourselves.
@@ -184,7 +204,11 @@ index a38607c..431c60d 100644
                          if (this._restoreOnSuccess) {
                              this._restoreDragActor(event.get_time());
                              return true;
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 @@ -508,7 +523,7 @@ var _Draggable = new Lang.Class({
+=======
+@@ -526,7 +541,7 @@ var _Draggable = new Lang.Class({
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
                              this._dragActor.destroy();
                      }
  
@@ -193,7 +217,11 @@ index a38607c..431c60d 100644
                      global.screen.set_cursor(Meta.Cursor.DEFAULT);
                      this.emit('drag-end', event.get_time(), true);
                      this._dragComplete();
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 @@ -557,20 +572,22 @@ var _Draggable = new Lang.Class({
+=======
+@@ -575,20 +590,22 @@ var _Draggable = new Lang.Class({
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
  
      _cancelDrag(eventTime) {
          this.emit('drag-cancelled', eventTime);
@@ -220,7 +248,11 @@ index a38607c..431c60d 100644
          this._animateDragEnd(eventTime,
                               { x: snapBackX,
                                 y: snapBackY,
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 @@ -581,7 +598,7 @@ var _Draggable = new Lang.Class({
+=======
+@@ -599,7 +616,7 @@ var _Draggable = new Lang.Class({
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
      },
  
      _restoreDragActor(eventTime) {
@@ -229,7 +261,11 @@ index a38607c..431c60d 100644
          let [restoreX, restoreY, restoreScale] = this._getRestoreLocation();
  
          // fade the actor back in at its original location
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 @@ -596,12 +613,6 @@ var _Draggable = new Lang.Class({
+=======
+@@ -614,12 +631,6 @@ var _Draggable = new Lang.Class({
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
      _animateDragEnd(eventTime, params) {
          this._animationInProgress = true;
  
@@ -242,7 +278,11 @@ index a38607c..431c60d 100644
          params['opacity']          = this._dragOrigOpacity;
          params['transition']       = 'easeOutQuad';
          params['onComplete']       = this._onAnimationComplete;
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 @@ -624,9 +635,6 @@ var _Draggable = new Lang.Class({
+=======
+@@ -642,9 +653,6 @@ var _Draggable = new Lang.Class({
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
      },
  
      _onAnimationComplete(dragActor, eventTime) {
@@ -252,7 +292,11 @@ index a38607c..431c60d 100644
          if (this._dragOrigParent) {
              Main.uiGroup.remove_child(this._dragActor);
              this._dragOrigParent.add_actor(this._dragActor);
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 @@ -641,7 +649,7 @@ var _Draggable = new Lang.Class({
+=======
+@@ -659,7 +667,7 @@ var _Draggable = new Lang.Class({
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
      },
  
      _dragComplete() {
@@ -261,7 +305,11 @@ index a38607c..431c60d 100644
              Shell.util_set_hidden_from_pick(this._dragActor, false);
  
          this._ungrabEvents();
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 @@ -652,7 +660,12 @@ var _Draggable = new Lang.Class({
+=======
+@@ -670,7 +678,12 @@ var _Draggable = new Lang.Class({
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
              this._updateHoverId = 0;
          }
  
@@ -276,10 +324,17 @@ index a38607c..431c60d 100644
      }
  });
 diff --git a/js/ui/tweener.js b/js/ui/tweener.js
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 index 1a85e2f..663b97b 100644
 --- a/js/ui/tweener.js
 +++ b/js/ui/tweener.js
 @@ -69,30 +69,68 @@ function _getTweenState(target) {
+=======
+index 1a85e2f..22818ba 100644
+--- a/js/ui/tweener.js
++++ b/js/ui/tweener.js
+@@ -69,30 +69,67 @@ function _getTweenState(target) {
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
      return target.__ShellTweenerState;
  }
  
@@ -320,8 +375,12 @@ index 1a85e2f..663b97b 100644
 +    let wrapperNeeded = false;
 +    let tweenerHandlers = _ensureHandlers(target);
 +
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 +    if (!(name in tweenerHandlers))
 +    {
+=======
++    if (!(name in tweenerHandlers)) {
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
 +        tweenerHandlers[name] = [];
 +        wrapperNeeded = true;
 +    }
@@ -361,6 +420,7 @@ index 1a85e2f..663b97b 100644
  }
  
  function _actorDestroyed(target) {
+<<<<<<< debian/patches/js-fix-invalid-access-errors.patch
 diff --git a/js/ui/workspace.js b/js/ui/workspace.js
 index 1e121b7..8836537 100644
 --- a/js/ui/workspace.js
@@ -562,3 +622,5 @@ index c1b4bdd..0c72e74 100644
  
          return clone;
      },
+=======
+>>>>>>> debian/patches/js-fix-invalid-access-errors.patch
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
index 1402949..79767a4 100644
--- 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
@@ -1,5 +1,9 @@
 From: Daniel van Vugt <[e-mail]>
+<<<<<<< debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
 Date: Fri, 6 Apr 2018 05:26:58 -0500
+=======
+Date: Fri, 6 Apr 2018 12:26:58 +0200
+>>>>>>> debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
 Subject: js/ui: Choose some actors to cache on the GPU
 
 Adds a wrapper function to flag actors that are good candidates for
@@ -64,10 +68,17 @@ index 47f718a..602646a 100644
          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
+<<<<<<< debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
 index 5ee2476..14864f1 100644
 --- a/js/ui/dash.js
 +++ b/js/ui/dash.js
 @@ -402,6 +402,7 @@ var Dash = new Lang.Class({
+=======
+index d75af65..4d3fe73 100644
+--- a/js/ui/dash.js
++++ b/js/ui/dash.js
+@@ -404,6 +404,7 @@ var Dash = new Lang.Class({
+>>>>>>> debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
                                         clip_to_allocation: true });
          this._box._delegate = this;
          this._container.add_actor(this._box);
@@ -96,10 +107,17 @@ index cfa192d..89db963 100644
          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
+<<<<<<< debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
 index d86cf9e..5277cf7 100644
 --- a/js/ui/main.js
 +++ b/js/ui/main.js
 @@ -716,3 +716,19 @@ function showRestartMessage(message) {
+=======
+index 2c54bb6..baca1c2 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -719,3 +719,19 @@ function showRestartMessage(message) {
+>>>>>>> debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
      let restartMessage = new RestartMessage(message);
      restartMessage.open();
  }
@@ -120,7 +138,11 @@ index d86cf9e..5277cf7 100644
 +    actor.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 +}
 diff --git a/js/ui/panel.js b/js/ui/panel.js
+<<<<<<< debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
 index 2f59324..2237ead 100644
+=======
+index ef14ddf..a76916b 100644
+>>>>>>> debian/patches/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
 --- a/js/ui/panel.js
 +++ b/js/ui/panel.js
 @@ -772,6 +772,7 @@ var Panel = new Lang.Class({
diff --git a/debian/patches/keyboard-Filter-redundant-FocusTracker-position-changed-s.patch b/debian/patches/keyboard-Filter-redundant-FocusTracker-position-changed-s.patch
new file mode 100644
index 0000000..a694dce
--- /dev/null
+++ b/debian/patches/keyboard-Filter-redundant-FocusTracker-position-changed-s.patch
@@ -0,0 +1,38 @@
+From: Carlos Garnacho <[e-mail]>
+Date: Mon, 17 Sep 2018 21:04:48 +0200
+Subject: keyboard: Filter redundant FocusTracker::position-changed signals
+
+Just emit the signal if it did actually change.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1812735
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/239
+---
+ js/ui/keyboard.js | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
+index 4413846..4a923ad 100644
+--- a/js/ui/keyboard.js
++++ b/js/ui/keyboard.js
+@@ -491,6 +491,7 @@ var FocusTracker = new Lang.Class({
+     _init() {
+         this._currentWindow = null;
+         this._currentWindowPositionId = 0;
++        this._rect = null;
+ 
+         global.screen.get_display().connect('notify::focus-window', () => {
+             this._setCurrentWindow(global.screen.get_display().focus_window);
+@@ -539,6 +540,13 @@ var FocusTracker = new Lang.Class({
+             rect.y -= frameRect.y;
+         }
+ 
++        if (this._rect &&
++            this._rect.x == rect.x &&
++            this._rect.y == rect.y &&
++            this._rect.width == rect.width &&
++            this._rect.height == rect.height)
++            return;
++
+         this._rect = rect;
+         this.emit('position-changed');
+     },
diff --git a/debian/patches/keyboard-Listen-to-IbusPanelService-focus-in-out-to-track.patch b/debian/patches/keyboard-Listen-to-IbusPanelService-focus-in-out-to-track.patch
new file mode 100644
index 0000000..0f4122f
--- /dev/null
+++ b/debian/patches/keyboard-Listen-to-IbusPanelService-focus-in-out-to-track.patch
@@ -0,0 +1,65 @@
+From: Carlos Garnacho <[e-mail]>
+Date: Tue, 18 Sep 2018 12:54:29 +0200
+Subject: keyboard: Listen to IbusPanelService::focus-in/out to track focus
+ changes
+
+In X11 there's no input panel state requests, so restore the previous behavior
+that focused entries would always toggle the OSK on there.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1760399
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/239
+---
+ js/misc/ibusManager.js |  5 +++++
+ js/ui/keyboard.js      | 16 ++++++++++++++++
+ 2 files changed, 21 insertions(+)
+
+diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
+index ad2e0fc..33ad877 100644
+--- a/js/misc/ibusManager.js
++++ b/js/misc/ibusManager.js
+@@ -119,6 +119,11 @@ var IBusManager = new Lang.Class({
+                 let cursorLocation = { x, y, width: w, height: h };
+                 this.emit('set-cursor-location', cursorLocation);
+             });
++            this._panelService.connect('focus-in', (panel, path) => {
++                if (!GLib.str_has_suffix(path, '/InputContext_1'))
++                    this.emit ('focus-in');
++            });
++            this._panelService.connect('focus-out', () => { this.emit('focus-out'); });
+ 
+             try {
+                 // IBus versions older than 1.5.10 have a bug which
+diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
+index 4a923ad..7dba1a8 100644
+--- a/js/ui/keyboard.js
++++ b/js/ui/keyboard.js
+@@ -512,6 +512,12 @@ var FocusTracker = new Lang.Class({
+ 
+             this._setCurrentRect(rect);
+         });
++        this._ibusManager.connect('focus-in', () => {
++            this.emit('focus-changed', true);
++        });
++        this._ibusManager.connect('focus-out', () => {
++            this.emit('focus-changed', false);
++        });
+     },
+ 
+     get currentWindow() {
+@@ -594,6 +600,16 @@ var Keyboard = new Lang.Class({
+             this._animFocusedWindow = null;
+             this._oskFocusWindow = null;
+         });
++        this._focusTracker.connect('focus-changed', (tracker, focused) => {
++            // Valid only for X11
++            if (Meta.is_wayland_compositor())
++                return;
++
++            if (focused)
++                this.show(Main.layoutManager.focusIndex);
++            else
++                this.hide();
++        });
+ 
+         Meta.get_backend().connect('last-device-changed', 
+             (backend, deviceId) => {
diff --git a/debian/patches/optional-hot-corner.patch b/debian/patches/optional-hot-corner.patch
index 0ae5f0f..484a5da 100644
--- a/debian/patches/optional-hot-corner.patch
+++ b/debian/patches/optional-hot-corner.patch
@@ -1,5 +1,9 @@
+<<<<<<< debian/patches/optional-hot-corner.patch
 From 9d7ad6b631470b28efcdb49d24ca4a835d3df17d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Florian=20M=C3=BCllner?= <[e-mail]>
+=======
+From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
+>>>>>>> debian/patches/optional-hot-corner.patch
 Date: Thu, 8 Jun 2017 17:07:56 +0200
 Subject: [PATCH] layout: Make the hot corner optional
 
@@ -14,10 +18,17 @@ https://bugzilla.gnome.org/show_bug.cgi?id=688320
  js/ui/layout.js                     | 8 ++++++++
  2 files changed, 16 insertions(+)
 
+<<<<<<< debian/patches/optional-hot-corner.patch
 Index: gnome-shell-3.27.91/data/org.gnome.shell.gschema.xml.in
 ===================================================================
 --- gnome-shell-3.27.91.orig/data/org.gnome.shell.gschema.xml.in
 +++ gnome-shell-3.27.91/data/org.gnome.shell.gschema.xml.in
+=======
+diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
+index 63a1903..8ec1d26 100644
+--- a/data/org.gnome.shell.gschema.xml.in
++++ b/data/org.gnome.shell.gschema.xml.in
+>>>>>>> debian/patches/optional-hot-corner.patch
 @@ -38,6 +38,14 @@
          load all extensions regardless of the versions they claim to support.
        </description>
@@ -33,11 +44,19 @@ Index: gnome-shell-3.27.91/data/org.gnome.shell.gschema.xml.in
      <key name="favorite-apps" type="as">
        <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>
+<<<<<<< debian/patches/optional-hot-corner.patch
 Index: gnome-shell-3.27.91/js/ui/layout.js
 ===================================================================
 --- gnome-shell-3.27.91.orig/js/ui/layout.js
 +++ gnome-shell-3.27.91/js/ui/layout.js
 @@ -268,6 +268,9 @@ var LayoutManager = new Lang.Class({
+=======
+diff --git a/js/ui/layout.js b/js/ui/layout.js
+index e615e56..fa21ef8 100644
+--- a/js/ui/layout.js
++++ b/js/ui/layout.js
+@@ -269,6 +269,9 @@ var LayoutManager = new Lang.Class({
+>>>>>>> debian/patches/optional-hot-corner.patch
          this._backgroundGroup.lower_bottom();
          this._bgManagers = [];
  
@@ -47,7 +66,11 @@ Index: gnome-shell-3.27.91/js/ui/layout.js
          // Need to update struts on new workspaces when they are added
          global.screen.connect('notify::n-workspaces',
                                this._queueUpdateRegions.bind(this));
+<<<<<<< debian/patches/optional-hot-corner.patch
 @@ -364,6 +367,11 @@ var LayoutManager = new Lang.Class({
+=======
+@@ -365,6 +368,11 @@ var LayoutManager = new Lang.Class({
+>>>>>>> debian/patches/optional-hot-corner.patch
          });
          this.hotCorners = [];
  
diff --git a/debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch b/debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
new file mode 100644
index 0000000..d74b23c
--- /dev/null
+++ b/debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
@@ -0,0 +1,212 @@
+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?= <[e-mail]>
+Date: Fri, 2 Nov 2018 21:51:33 +0100
+Subject: power: Label the PENDING_CHARGE state as "Not Charging"
+
+The pending-charge state means AC power is on but the battery is not
+being charged. This can happen because its charge is above a certain
+threshold, to avoid short charging cycles and prolong the battery's
+life, or because the PSU is not powerful enough to charge the batteries.
+
+Instead of lying to the user about something being estimated, we should
+simply tell the truth and set the label to "Not Charging".
+
+Closes: #701.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/701
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/52c59ac0dd7ddbe064
+---
+ js/ui/status/power.js | 4 +++-
+ po/ca.po              | 4 ++++
+ po/de.po              | 4 ++++
+ po/el.po              | 4 ++++
+ po/eo.po              | 4 ++++
+ po/es.po              | 4 ++++
+ po/fur.po             | 4 ++++
+ po/it.po              | 4 ++++
+ po/ja.po              | 4 ++++
+ po/sl.po              | 4 ++++
+ po/sv.po              | 4 ++++
+ po/tr.po              | 4 ++++
+ 12 files changed, 47 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/status/power.js b/js/ui/status/power.js
+index a2bfd75..bfd0de5 100644
+--- a/js/ui/status/power.js
++++ b/js/ui/status/power.js
+@@ -79,7 +79,9 @@ var Indicator = new Lang.Class({
+             seconds = this._proxy.TimeToFull;
+         else if (this._proxy.State == UPower.DeviceState.DISCHARGING)
+             seconds = this._proxy.TimeToEmpty;
+-        // state is one of PENDING_CHARGING, PENDING_DISCHARGING
++        else if (this._proxy.State == UPower.DeviceState.PENDING_CHARGE)
++            return _("Not Charging");
++        // state is PENDING_DISCHARGE
+         else
+             return _("Estimating…");
+ 
+diff --git a/po/ca.po b/po/ca.po
+index 5858f87..0bd69fd 100644
+--- a/po/ca.po
++++ b/po/ca.po
+@@ -1922,6 +1922,10 @@ msgstr "Paràmetres d'energia"
+ msgid "Fully Charged"
+ msgstr "Totalment carregada"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr ""
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
+diff --git a/po/de.po b/po/de.po
+index bb83a6e..5565f9e 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -1935,6 +1935,10 @@ msgstr "Energieeinstellungen"
+ msgid "Fully Charged"
+ msgstr "Vollständig geladen"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr "Lädt nicht"
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
+diff --git a/po/el.po b/po/el.po
+index c822608..2061c24 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -1795,6 +1795,10 @@ msgstr "Ρυθμίσεις τροφοδοσίας"
+ msgid "Fully Charged"
+ msgstr "Πλήρως φορτισμένη"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr "Δεν φορτίζεται"
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
+diff --git a/po/eo.po b/po/eo.po
+index 4ee0b5e..1d7278b 100644
+--- a/po/eo.po
++++ b/po/eo.po
+@@ -1527,6 +1527,10 @@ msgstr "Energiagordoj"
+ msgid "Fully Charged"
+ msgstr "Plene ŝargita"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr "Ne ŝargante"
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: ../js/ui/status/power.js:84 ../js/ui/status/power.js:90
+diff --git a/po/es.po b/po/es.po
+index e2c935c..28dd56c 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -1914,6 +1914,10 @@ msgstr "Configuración de energía"
+ msgid "Fully Charged"
+ msgstr "Cargada completamente"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr "No está cargando"
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
+diff --git a/po/fur.po b/po/fur.po
+index f416ed0..6e485a8 100644
+--- a/po/fur.po
++++ b/po/fur.po
+@@ -1910,6 +1910,10 @@ msgstr "Impostazions di alimentazion"
+ msgid "Fully Charged"
+ msgstr "Cjarie"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr "Nol sta cjariant"
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
+diff --git a/po/it.po b/po/it.po
+index ab18794..bcc2438 100644
+--- a/po/it.po
++++ b/po/it.po
+@@ -1931,6 +1931,10 @@ msgstr "Impostazioni alimentazione"
+ msgid "Fully Charged"
+ msgstr "Carica"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr "Non in carica"
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
+diff --git a/po/ja.po b/po/ja.po
+index 0264e97..e6ef9a6 100644
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -1800,6 +1800,10 @@ msgstr "電源設定"
+ msgid "Fully Charged"
+ msgstr "充電完了"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr "放電中"
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
+diff --git a/po/sl.po b/po/sl.po
+index b7e9798..75b7b62 100644
+--- a/po/sl.po
++++ b/po/sl.po
+@@ -1937,6 +1937,10 @@ msgstr "Upravljanje napajanja"
+ msgid "Fully Charged"
+ msgstr "Polno napolnjeno"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr "Naprava se ne polni"
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
+diff --git a/po/sv.po b/po/sv.po
+index 5345657..edd66ff 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -1899,6 +1899,10 @@ msgstr "Ströminställningar"
+ msgid "Fully Charged"
+ msgstr "Fulladdad"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr "Laddar inte"
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
+diff --git a/po/tr.po b/po/tr.po
+index 0304eb8..409362e 100644
+--- a/po/tr.po
++++ b/po/tr.po
+@@ -1889,6 +1889,10 @@ msgstr "Güç Ayarları"
+ msgid "Fully Charged"
+ msgstr "Tümüyle Dolu"
+ 
++#: js/ui/status/power.js:74
++msgid "Not Charging"
++msgstr "Şarj Olmuyor"
++
+ #. 0 is reported when UPower does not have enough data
+ #. to estimate battery life
+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
diff --git a/debian/patches/series b/debian/patches/series
index aaf1b09..deee978 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,7 @@
+<<<<<<< debian/patches/series
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
+=======
+>>>>>>> debian/patches/series
 41-handle-logind-fail.patch
 50_add_ubuntu_desktop_detect.patch
 70_allow_sound_above_100.patch
@@ -11,6 +14,7 @@ ubuntu_gdm.patch
 ubuntu_background_login.patch
 ubuntu_gdm_alternatives.patch
 ubuntu_block_mode_extension_update.patch
+<<<<<<< debian/patches/series
 # Cherry picks from upstream
 ui-Theme-lookup-should-respect-XDG_DATA_DIRS.patch
 workspaceThumbnail-only-update-_porthole-if-the-overview-.patch
@@ -28,3 +32,24 @@ workspace-fix-repositioned-windows-in-activities.patch
 st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 st-texture-cache-Don-t-add-NULL-textures-to-cache.patch
 js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
+=======
+volume-Add-back-sound-feedback-on-scroll.patch
+workaround_crasher_fractional_scaling.patch
+StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch
+js-fix-invalid-access-errors.patch
+st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
+js-ui-Choose-some-actors-to-cache-on-the-GPU.patch
+st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
+st-scroll-view-Remove-scrollbars-references-on-dispose.patch
+keyboard-Filter-redundant-FocusTracker-position-changed-s.patch
+keyboard-Listen-to-IbusPanelService-focus-in-out-to-track.patch
+power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
+CVE-2019-3820-1.patch
+CVE-2019-3820-2.patch
+switchMonitor-switch-to-next-config-upon-initial-keypress.patch
+dnd-Only-handle-touch-events-in-wayland.patch
+st-widget-Add-missing-g_return_val_if_fail.patch
+windowManager-listen-actively-to-windows-being-destroyed-.patch
+dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
+st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch
+>>>>>>> debian/patches/series
diff --git a/debian/patches/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch b/debian/patches/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch
new file mode 100644
index 0000000..65a15de
--- /dev/null
+++ b/debian/patches/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch
@@ -0,0 +1,85 @@
+From: Carlos Garnacho <[e-mail]>
+Date: Thu, 28 Jun 2018 20:22:40 +0200
+Subject: st-adjustment: Mark all properties as EXPLICIT_NOTIFY
+
+All adjustment setter functions take good care of avoiding emission of
+notify:: when it's not needed. The set_property() implementation already
+calls into the setter functions, so mark the properties as EXPLICITY_NOTIFY
+in order to optimize notify:: emission away through g_object_set (rather
+common from JS code).
+
+(cherry picked from commit b1b455ff1a0e856149142747e77fb1c98df34c03)
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1270
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/8702d66
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1827284
+Applied-Upstream: 3.28.4
+---
+ src/st/st-adjustment.c | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/st/st-adjustment.c b/src/st/st-adjustment.c
+index 005c6eb..598df4e 100644
+--- a/src/st/st-adjustment.c
++++ b/src/st/st-adjustment.c
+@@ -205,7 +205,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   g_object_class_install_property (object_class,
+                                    PROP_UPPER,
+                                    g_param_spec_double ("upper",
+@@ -215,7 +216,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   g_object_class_install_property (object_class,
+                                    PROP_VALUE,
+                                    g_param_spec_double ("value",
+@@ -225,7 +227,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   g_object_class_install_property (object_class,
+                                    PROP_STEP_INC,
+                                    g_param_spec_double ("step-increment",
+@@ -235,7 +238,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   g_object_class_install_property (object_class,
+                                    PROP_PAGE_INC,
+                                    g_param_spec_double ("page-increment",
+@@ -245,7 +249,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   g_object_class_install_property (object_class,
+                                    PROP_PAGE_SIZE,
+                                    g_param_spec_double ("page-size",
+@@ -255,7 +260,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
+                                                         G_MAXDOUBLE,
+                                                         0.0,
+                                                         ST_PARAM_READWRITE |
+-                                                        G_PARAM_CONSTRUCT));
++                                                        G_PARAM_CONSTRUCT |
++                                                        G_PARAM_EXPLICIT_NOTIFY));
+   /**
+    * StAdjustment::changed:
+    * @self: the #StAdjustment
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
new file mode 100644
index 0000000..0c5e93d
--- /dev/null
+++ b/debian/patches/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
@@ -0,0 +1,38 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Fri, 3 Aug 2018 18:51:24 +0200
+Subject: st/scroll-view: Handle the case where scrollbars are NULL
+
+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, not to crash
+in `st_widget_style_changed`.
+
+Fixes #467
+
+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 | 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..a8b6d2e 100644
+--- a/src/st/st-scroll-view.c
++++ b/src/st/st-scroll-view.c
+@@ -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);
+ 
+-  st_widget_style_changed (ST_WIDGET (priv->hscroll));
+-  st_widget_style_changed (ST_WIDGET (priv->vscroll));
++  if (priv->hscroll)
++    st_widget_style_changed (ST_WIDGET (priv->hscroll));
++
++  if (priv->vscroll)
++    st_widget_style_changed (ST_WIDGET (priv->vscroll));
+ 
+   ST_WIDGET_CLASS (st_scroll_view_parent_class)->style_changed (widget);
+ }
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
new file mode 100644
index 0000000..f5f49be
--- /dev/null
+++ b/debian/patches/st-scroll-view-Remove-scrollbars-references-on-dispose.patch
@@ -0,0 +1,33 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Fri, 3 Aug 2018 19:06:47 +0200
+Subject: st/scroll-view: Remove scrollbars references on dispose
+
+As we're destroying the scrollbars on destruction, we should remove any
+reference of it, not to cause multiple-calls to disposal to unreference them
+again.
+
+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 | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
+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)
+       priv->fade_effect = NULL;
+     }
+ 
+-  if (priv->vscroll)
+-    clutter_actor_destroy (priv->vscroll);
+-
+-  if (priv->hscroll)
+-    clutter_actor_destroy (priv->hscroll);
++  g_clear_pointer (&priv->vscroll, clutter_actor_destroy);
++  g_clear_pointer (&priv->hscroll, clutter_actor_destroy);
+ 
+   /* For most reliable freeing of memory, an object with signals
+    * like StAdjustment should be explicitly disposed. Since we own
diff --git a/debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch b/debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
index 0ff18f9..4c361e7 100644
--- a/debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
+++ b/debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
@@ -1,5 +1,9 @@
 From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+<<<<<<< debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 Date: Wed, 29 Nov 2017 19:48:02 -0600
+=======
+Date: Thu, 30 Nov 2017 02:48:02 +0100
+>>>>>>> debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 Subject: st-texture-cache: Cancel sliced image loading on target actor
  destroy
 
@@ -19,10 +23,17 @@ Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/5
  1 file changed, 26 insertions(+), 4 deletions(-)
 
 diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c
+<<<<<<< debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 index e8a832d..13b019e 100644
 --- a/src/st/st-texture-cache.c
 +++ b/src/st/st-texture-cache.c
 @@ -1019,6 +1019,7 @@ typedef struct {
+=======
+index 6219071..fc81189 100644
+--- a/src/st/st-texture-cache.c
++++ b/src/st/st-texture-cache.c
+@@ -1027,6 +1027,7 @@ typedef struct {
+>>>>>>> debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
    gint   grid_width, grid_height;
    gint   scale_factor;
    ClutterActor *actor;
@@ -30,7 +41,11 @@ index e8a832d..13b019e 100644
    GFunc load_callback;
    gpointer load_callback_data;
  } AsyncImageData;
+<<<<<<< debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 @@ -1029,10 +1030,21 @@ on_data_destroy (gpointer data)
+=======
+@@ -1037,9 +1038,20 @@ on_data_destroy (gpointer data)
+>>>>>>> debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
    AsyncImageData *d = (AsyncImageData *)data;
    g_object_unref (d->gfile);
    g_object_unref (d->actor);
@@ -38,7 +53,11 @@ index e8a832d..13b019e 100644
    g_free (d);
  }
  
+<<<<<<< debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
  static void
+=======
++static void
+>>>>>>> debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 +on_sliced_image_actor_destroyed (ClutterActor *actor,
 +                                 gpointer data)
 +{
@@ -48,11 +67,18 @@ index e8a832d..13b019e 100644
 +  g_cancellable_cancel (cancellable);
 +}
 +
+<<<<<<< debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 +static void
  on_sliced_image_loaded (GObject *source_object,
                          GAsyncResult *res,
                          gpointer user_data)
 @@ -1042,7 +1054,7 @@ on_sliced_image_loaded (GObject *source_object,
+=======
+ static void
+ on_sliced_image_loaded (GObject *source_object,
+                         GAsyncResult *res,
+@@ -1050,7 +1062,7 @@ on_sliced_image_loaded (GObject *source_object,
+>>>>>>> debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
    GTask *task = G_TASK (res);
    GList *list, *pixbufs;
  
@@ -61,7 +87,11 @@ index e8a832d..13b019e 100644
      return;
  
    pixbufs = g_task_propagate_pointer (task, NULL);
+<<<<<<< debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 @@ -1056,6 +1068,10 @@ on_sliced_image_loaded (GObject *source_object,
+=======
+@@ -1064,6 +1076,10 @@ on_sliced_image_loaded (GObject *source_object,
+>>>>>>> debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
  
    g_list_free_full (pixbufs, g_object_unref);
  
@@ -72,7 +102,11 @@ index e8a832d..13b019e 100644
    if (data->load_callback != NULL)
      data->load_callback (cache, data->load_callback_data);
  }
+<<<<<<< debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 @@ -1093,7 +1109,7 @@ load_sliced_image (GTask        *result,
+=======
+@@ -1101,7 +1117,7 @@ load_sliced_image (GTask        *result,
+>>>>>>> debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
    gchar *buffer = NULL;
    gsize length;
  
@@ -81,7 +115,11 @@ index e8a832d..13b019e 100644
  
    data = task_data;
    g_assert (data);
+<<<<<<< debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 @@ -1101,7 +1117,7 @@ load_sliced_image (GTask        *result,
+=======
+@@ -1109,7 +1125,7 @@ load_sliced_image (GTask        *result,
+>>>>>>> debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
    loader = gdk_pixbuf_loader_new ();
    g_signal_connect (loader, "size-prepared", G_CALLBACK (on_loader_size_prepared), data);
  
@@ -90,7 +128,11 @@ index e8a832d..13b019e 100644
      {
        g_warning ("Failed to open sliced image: %s", error->message);
        goto out;
+<<<<<<< debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 @@ -1169,6 +1185,7 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
+=======
+@@ -1177,6 +1193,7 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
+>>>>>>> debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
    AsyncImageData *data;
    GTask *result;
    ClutterActor *actor = clutter_actor_new ();
@@ -98,7 +140,11 @@ index e8a832d..13b019e 100644
  
    data = g_new0 (AsyncImageData, 1);
    data->grid_width = grid_width;
+<<<<<<< debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
 @@ -1176,11 +1193,16 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
+=======
+@@ -1184,11 +1201,16 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
+>>>>>>> debian/patches/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch
    data->scale_factor = scale;
    data->gfile = g_object_ref (file);
    data->actor = actor;
diff --git a/debian/patches/st-widget-Add-missing-g_return_val_if_fail.patch b/debian/patches/st-widget-Add-missing-g_return_val_if_fail.patch
new file mode 100644
index 0000000..4af9547
--- /dev/null
+++ b/debian/patches/st-widget-Add-missing-g_return_val_if_fail.patch
@@ -0,0 +1,32 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
+Date: Tue, 5 Mar 2019 19:42:01 +0100
+Subject: st-widget: Add missing g_return_val_if_fail()
+
+It's a public function, so it's good practice to sanity-check its
+input (unless disabled at compile time of course).
+
+https://gitlab.gnome.org/GNOME/gnome-shell/issues/1018
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/438
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1796606
+---
+ src/st/st-widget.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/st/st-widget.c b/src/st/st-widget.c
+index 7c39b35..09a06e7 100644
+--- a/src/st/st-widget.c
++++ b/src/st/st-widget.c
+@@ -571,7 +571,11 @@ get_root_theme_node (ClutterStage *stage)
+ StThemeNode *
+ st_widget_get_theme_node (StWidget *widget)
+ {
+-  StWidgetPrivate *priv = st_widget_get_instance_private (widget);
++  StWidgetPrivate *priv;
++
++  g_return_val_if_fail (ST_IS_WIDGET (widget), NULL);
++
++  priv = st_widget_get_instance_private (widget);
+ 
+   if (priv->theme_node == NULL)
+     {
diff --git a/debian/patches/switchMonitor-switch-to-next-config-upon-initial-keypress.patch b/debian/patches/switchMonitor-switch-to-next-config-upon-initial-keypress.patch
new file mode 100644
index 0000000..4f9a217
--- /dev/null
+++ b/debian/patches/switchMonitor-switch-to-next-config-upon-initial-keypress.patch
@@ -0,0 +1,58 @@
+From: Daniel Drake <[e-mail]>
+Date: Mon, 30 Jul 2018 21:17:44 -0300
+Subject: switchMonitor: switch to next config upon initial keypress
+
+In GNOME-3.24, pressing Super+P or a similar function key would cause
+a switch to the next available monitor configuration.
+
+However, in GNOME-3.26, this was reimplemented in mutter and gnome-shell
+and the behaviour is now different: pressing Super+P and releasing will
+cause no change in montor configuration[1]. In this new design you have
+to press Super+P and keep holding Super in order to keep the switcher
+open, then press P again (or use the arrow keys or mouse) to
+select the next one in the list.
+
+This is incompatible with many Asus products such as Asus X530UN, where
+pressing the presentation mode media key (Fn+F8) actually generates
+the following keypress events from the keyboard controller:
+
+Fn pressed: nothing
+F8 pressed: nothing
+F8 released: Super press, p press, p release, Super release (quick burst)
+Fn released: nothing
+
+With this firmware behaviour it's not possible to hold the keys and have
+the dialog come up so that you can select another new mode.
+
+To solve this, when the switcher is opened, select the next available
+display config by default, which is more similar to the pre-GNOME-3.26
+behaviour. Now pressing Fn+F8 on this laptop will result in the display
+mode switch taking place.
+
+[1]: The mentioned desired behaviour will at least happen after
+https://gitlab.gnome.org/GNOME/mutter/issues/281 has been fixed
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/208
+
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1772811
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/208
+Applied-Upstream: yes, 3.30.1
+---
+ js/ui/switchMonitor.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/switchMonitor.js b/js/ui/switchMonitor.js
+index 96fb854..31b4f33 100644
+--- a/js/ui/switchMonitor.js
++++ b/js/ui/switchMonitor.js
+@@ -49,8 +49,8 @@ var SwitchMonitorPopup = new Lang.Class({
+ 
+     _initialSelection() {
+         let currentConfig = Meta.MonitorManager.get().get_switch_config();
+-        currentConfig %= Meta.MonitorSwitchConfigType.UNKNOWN;
+-        this._select(currentConfig);
++        let selectConfig = (currentConfig + 1) % Meta.MonitorSwitchConfigType.UNKNOWN;
++        this._select(selectConfig);
+     },
+ 
+     _keyPressHandler(keysym, action) {
diff --git a/debian/patches/ubuntu-lightdm-user-switching.patch b/debian/patches/ubuntu-lightdm-user-switching.patch
index b8a7d09..9186134 100644
--- a/debian/patches/ubuntu-lightdm-user-switching.patch
+++ b/debian/patches/ubuntu-lightdm-user-switching.patch
@@ -1,4 +1,7 @@
+<<<<<<< debian/patches/ubuntu-lightdm-user-switching.patch
 From b043396a553e047178fd2bc5e3b69870963580fc Mon Sep 17 00:00:00 2001
+=======
+>>>>>>> debian/patches/ubuntu-lightdm-user-switching.patch
 From: Tim Lunn <[e-mail]>
 Date: Tue, 9 Oct 2012 20:18:28 +1100
 Subject: [PATCH] userMenu: allow user switching when using lightdm
@@ -9,6 +12,7 @@ switch to the lightdm greeter.
 
 https://bugzilla.gnome.org/show_bug.cgi?id=685794
 ---
+<<<<<<< debian/patches/ubuntu-lightdm-user-switching.patch
  js/misc/systemActions.js |   38 ++++++++++++++++++++++++++++++--------
  1 file changed, 30 insertions(+), 8 deletions(-)
 
@@ -16,6 +20,15 @@ Index: gnome-shell-3.27.91/js/misc/systemActions.js
 ===================================================================
 --- gnome-shell-3.27.91.orig/js/misc/systemActions.js
 +++ gnome-shell-3.27.91/js/misc/systemActions.js
+=======
+ js/misc/systemActions.js | 34 +++++++++++++++++++++++++++-------
+ 1 file changed, 27 insertions(+), 7 deletions(-)
+
+diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js
+index bf8b460..fffa567 100644
+--- a/js/misc/systemActions.js
++++ b/js/misc/systemActions.js
+>>>>>>> debian/patches/ubuntu-lightdm-user-switching.patch
 @@ -218,6 +218,21 @@ const SystemActions = new Lang.Class({
          return this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName;
      },
diff --git a/debian/patches/ubuntu_background_login.patch b/debian/patches/ubuntu_background_login.patch
index e35797e..285c101 100644
--- a/debian/patches/ubuntu_background_login.patch
+++ b/debian/patches/ubuntu_background_login.patch
@@ -1,3 +1,4 @@
+<<<<<<< debian/patches/ubuntu_background_login.patch
 Description: Change default background color based on session.
  We changed default GDM color for our ubuntu session. Change it as well here,
  still applying the background noise loading.
@@ -8,6 +9,25 @@ Index: gnome-shell-3.25.91/js/ui/background.js
 ===================================================================
 --- gnome-shell-3.25.91.orig/js/ui/background.js
 +++ gnome-shell-3.25.91/js/ui/background.js
+=======
+From: Didier Roche <[e-mail]>
+Date: Wed, 20 Jun 2018 19:22:06 +0200
+Subject: Change default background color based on session.
+
+We changed default GDM color for our ubuntu session. Change it as well here,
+still applying the background noise loading.
+This screen is appearing for a slip second when the Shell is loading.
+Forwarded: not-needed
+===================================================================
+---
+ js/ui/background.js | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/background.js b/js/ui/background.js
+index b24f825..9b0a4c1 100644
+--- a/js/ui/background.js
++++ b/js/ui/background.js
+>>>>>>> debian/patches/ubuntu_background_login.patch
 @@ -102,12 +102,13 @@ const Lang = imports.lang;
  const Meta = imports.gi.Meta;
  const Signals = imports.signals;
diff --git a/debian/patches/ubuntu_block_mode_extension_update.patch b/debian/patches/ubuntu_block_mode_extension_update.patch
index e42705c..3abc62a 100644
--- a/debian/patches/ubuntu_block_mode_extension_update.patch
+++ b/debian/patches/ubuntu_block_mode_extension_update.patch
@@ -1,4 +1,11 @@
+<<<<<<< debian/patches/ubuntu_block_mode_extension_update.patch
 Description: Don't allow ubuntu mode extension to update
+=======
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 20 Jun 2018 19:22:06 +0200
+Subject: Don't allow ubuntu mode extension to update
+
+>>>>>>> debian/patches/ubuntu_block_mode_extension_update.patch
 Ensure that no update is proposed or loaded if sideloaded (always
 prefer system version) on the ubuntu session.
 We want to ensure that the default code running is going through
@@ -13,11 +20,24 @@ The patch set is too large otherwise to keep it maintainable as a distro
 patch.
 Origin: ubuntu
 Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=789852
+<<<<<<< debian/patches/ubuntu_block_mode_extension_update.patch
 
 Index: gnome-shell-3.27.91/js/misc/desktop.js
 ===================================================================
 --- gnome-shell-3.27.91.orig/js/misc/desktop.js
 +++ gnome-shell-3.27.91/js/misc/desktop.js
+=======
+---
+ js/misc/desktop.js           | 13 +++++++++++++
+ js/misc/extensionUtils.js    |  7 +++++++
+ js/ui/extensionDownloader.js | 13 +++++++++++++
+ 3 files changed, 33 insertions(+)
+
+diff --git a/js/misc/desktop.js b/js/misc/desktop.js
+index 3b0d128..82da582 100644
+--- a/js/misc/desktop.js
++++ b/js/misc/desktop.js
+>>>>>>> debian/patches/ubuntu_block_mode_extension_update.patch
 @@ -6,6 +6,8 @@ const GLib = imports.gi.GLib;
  // the env variable. It's safe to cache matching result
  let _currentDesktopsMatches = {};
@@ -42,10 +62,17 @@ Index: gnome-shell-3.27.91/js/misc/desktop.js
 +
 +    return ubuntuModeExtensions.indexOf(uuid) !== -1;
 +}
+<<<<<<< debian/patches/ubuntu_block_mode_extension_update.patch
 Index: gnome-shell-3.27.91/js/misc/extensionUtils.js
 ===================================================================
 --- gnome-shell-3.27.91.orig/js/misc/extensionUtils.js
 +++ gnome-shell-3.27.91/js/misc/extensionUtils.js
+=======
+diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
+index 9f77b4c..685b98b 100644
+--- a/js/misc/extensionUtils.js
++++ b/js/misc/extensionUtils.js
+>>>>>>> debian/patches/ubuntu_block_mode_extension_update.patch
 @@ -9,6 +9,7 @@ const Signals = imports.signals;
  const Gio = imports.gi.Gio;
  
@@ -67,10 +94,17 @@ Index: gnome-shell-3.27.91/js/misc/extensionUtils.js
          try {
              extension = createExtensionObject(uuid, extensionDir, type);
          } catch(e) {
+<<<<<<< debian/patches/ubuntu_block_mode_extension_update.patch
 Index: gnome-shell-3.27.91/js/ui/extensionDownloader.js
 ===================================================================
 --- gnome-shell-3.27.91.orig/js/ui/extensionDownloader.js
 +++ gnome-shell-3.27.91/js/ui/extensionDownloader.js
+=======
+diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
+index 9b6f7a3..034f964 100644
+--- a/js/ui/extensionDownloader.js
++++ b/js/ui/extensionDownloader.js
+>>>>>>> debian/patches/ubuntu_block_mode_extension_update.patch
 @@ -10,9 +10,11 @@ const St = imports.gi.St;
  const Shell = imports.gi.Shell;
  
@@ -83,7 +117,11 @@ Index: gnome-shell-3.27.91/js/ui/extensionDownloader.js
  const ModalDialog = imports.ui.modalDialog;
  
  const _signals = ExtensionSystem._signals;
+<<<<<<< debian/patches/ubuntu_block_mode_extension_update.patch
 @@ -28,6 +30,14 @@ function installExtension(uuid, invocati
+=======
+@@ -28,6 +30,14 @@ function installExtension(uuid, invocation) {
+>>>>>>> debian/patches/ubuntu_block_mode_extension_update.patch
      let params = { uuid: uuid,
                     shell_version: Config.PACKAGE_VERSION };
  
diff --git a/debian/patches/ubuntu_gdm.patch b/debian/patches/ubuntu_gdm.patch
index 77af4a4..22d85a9 100644
--- a/debian/patches/ubuntu_gdm.patch
+++ b/debian/patches/ubuntu_gdm.patch
@@ -1,3 +1,4 @@
+<<<<<<< debian/patches/ubuntu_gdm.patch
 Description: Ensure gdm has an ubuntu styling by default.
  As it's system-wide and not user-wide, use the ubuntu.css stylesheet
  for the gdm mode of GNOME Shell. This doesn't impact the aNOME
@@ -8,6 +9,25 @@ Index: gnome-shell-3.27.91/js/ui/sessionMode.js
 ===================================================================
 --- gnome-shell-3.27.91.orig/js/ui/sessionMode.js
 +++ gnome-shell-3.27.91/js/ui/sessionMode.js
+=======
+From: Didier Roche <[e-mail]>
+Date: Wed, 20 Jun 2018 19:22:06 +0200
+Subject: Ensure gdm has an ubuntu styling by default.
+
+As it's system-wide and not user-wide, use the ubuntu.css stylesheet
+for the gdm mode of GNOME Shell. This doesn't impact the aNOME
+user session though.
+Forwarded: not-needed
+===================================================================
+---
+ js/ui/sessionMode.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
+index aac29ae..97118dc 100644
+--- a/js/ui/sessionMode.js
++++ b/js/ui/sessionMode.js
+>>>>>>> debian/patches/ubuntu_gdm.patch
 @@ -42,6 +42,7 @@ const _modes = {
  
      'gdm': {
diff --git a/debian/patches/ubuntu_gdm_alternatives.patch b/debian/patches/ubuntu_gdm_alternatives.patch
index 4a6026f..b7052ca 100644
--- a/debian/patches/ubuntu_gdm_alternatives.patch
+++ b/debian/patches/ubuntu_gdm_alternatives.patch
@@ -1,15 +1,33 @@
+<<<<<<< debian/patches/ubuntu_gdm_alternatives.patch
 Description: Add support for GDM3 theme alternatives
   GNOME vanilla and systemd76 derivative ships their own GDM theme.
 Author: Jeremy Soller <[e-mail]>
+=======
+From: Jeremy Soller <[e-mail]>
+Date: Wed, 20 Jun 2018 19:22:06 +0200
+Subject: Add support for GDM3 theme alternatives
+
+ GNOME vanilla and systemd76 derivative ships their own GDM theme.
+>>>>>>> debian/patches/ubuntu_gdm_alternatives.patch
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=787454
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1715722
 Last-Update: 2017-09-08
 ---
+<<<<<<< debian/patches/ubuntu_gdm_alternatives.patch
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: gnome-shell-3.25.91/js/ui/sessionMode.js
 ===================================================================
 --- gnome-shell-3.25.91.orig/js/ui/sessionMode.js
 +++ gnome-shell-3.25.91/js/ui/sessionMode.js
+=======
+ js/ui/sessionMode.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
+index 97118dc..9ac12d6 100644
+--- a/js/ui/sessionMode.js
++++ b/js/ui/sessionMode.js
+>>>>>>> debian/patches/ubuntu_gdm_alternatives.patch
 @@ -42,7 +42,7 @@ const _modes = {
  
      'gdm': {
diff --git a/debian/patches/ubuntu_lock_on_suspend.patch b/debian/patches/ubuntu_lock_on_suspend.patch
index 1ce5584..6d51766 100644
--- a/debian/patches/ubuntu_lock_on_suspend.patch
+++ b/debian/patches/ubuntu_lock_on_suspend.patch
@@ -1,3 +1,4 @@
+<<<<<<< debian/patches/ubuntu_lock_on_suspend.patch
 Description: add support for the ubuntu lock on suspend option 
 Author: Tim Lunn <[e-mail]>
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1063110
@@ -11,6 +12,21 @@ Index: gnome-shell-3.27.91/js/ui/screenShield.js
 ===================================================================
 --- gnome-shell-3.27.91.orig/js/ui/screenShield.js
 +++ gnome-shell-3.27.91/js/ui/screenShield.js
+=======
+From: Tim Lunn <[e-mail]>
+Date: Wed, 20 Jun 2018 19:22:06 +0200
+Subject: add support for the ubuntu lock on suspend option
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1063110
+---
+ js/ui/screenShield.js | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
+index 2d8d9b3..5ceb993 100644
+--- a/js/ui/screenShield.js
++++ b/js/ui/screenShield.js
+>>>>>>> debian/patches/ubuntu_lock_on_suspend.patch
 @@ -32,6 +32,7 @@ const Util = imports.misc.util;
  const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
  const LOCK_ENABLED_KEY = 'lock-enabled';
@@ -19,7 +35,29 @@ Index: gnome-shell-3.27.91/js/ui/screenShield.js
  
  const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
  const DISABLE_LOCK_KEY = 'disable-lock-screen';
+<<<<<<< debian/patches/ubuntu_lock_on_suspend.patch
 @@ -727,7 +728,7 @@ var ScreenShield = new Lang.Class({
+=======
+@@ -543,6 +544,7 @@ var ScreenShield = new Lang.Class({
+ 
+         this._settings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
+         this._settings.connect('changed::' + LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));
++        this._settings.connect('changed::' + SUSPEND_LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));
+ 
+         this._lockSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
+         this._lockSettings.connect('changed::' + DISABLE_LOCK_KEY, this._syncInhibitor.bind(this));
+@@ -707,7 +709,8 @@ var ScreenShield = new Lang.Class({
+     },
+ 
+     _syncInhibitor() {
+-        let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
++        let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY) ||
++                          this._settings.get_boolean(SUSPEND_LOCK_ENABLED_KEY);
+         let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);
+         let inhibit = (this._loginSession && this._loginSession.Active &&
+                        !this._isActive && lockEnabled && !lockLocked);
+@@ -727,7 +730,7 @@ var ScreenShield = new Lang.Class({
+>>>>>>> debian/patches/ubuntu_lock_on_suspend.patch
  
      _prepareForSleep(loginManager, aboutToSuspend) {
          if (aboutToSuspend) {
diff --git a/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch b/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
index f6ea268..633e9f1 100644
--- a/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
+++ b/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
@@ -1,5 +1,9 @@
 From: =?utf-8?q?Florian_M=C3=BCllner?= <[e-mail]>
+<<<<<<< debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
 Date: Fri, 23 Feb 2018 16:58:22 -0600
+=======
+Date: Fri, 23 Feb 2018 23:58:22 +0100
+>>>>>>> debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
 Subject: volume: Add back sound feedback on scroll
 
 Commit 8d4855f1008 accidentally removed the volume change feedback
@@ -34,8 +38,13 @@ Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/53
 Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/51
 ---
  js/ui/slider.js        |  2 --
+<<<<<<< debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
  js/ui/status/volume.js | 19 ++++++++++++++++++-
  2 files changed, 18 insertions(+), 3 deletions(-)
+=======
+ js/ui/status/volume.js | 20 +++++++++++++++++++-
+ 2 files changed, 19 insertions(+), 3 deletions(-)
+>>>>>>> debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
 
 diff --git a/js/ui/slider.js b/js/ui/slider.js
 index 9853929..30295b4 100644
@@ -52,18 +61,33 @@ index 9853929..30295b4 100644
          }
          return Clutter.EVENT_PROPAGATE;
 diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
+<<<<<<< debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
 index 65c4c42..c0f9cf3 100644
 --- a/js/ui/status/volume.js
 +++ b/js/ui/status/volume.js
 @@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
  const Lang = imports.lang;
  const Gio = imports.gi.Gio;
+=======
+index 65c4c42..de5f188 100644
+--- a/js/ui/status/volume.js
++++ b/js/ui/status/volume.js
+@@ -3,7 +3,9 @@
+ const Clutter = imports.gi.Clutter;
+ const Lang = imports.lang;
+ const Gio = imports.gi.Gio;
++const GLib = imports.gi.GLib;
+>>>>>>> debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
  const Gvc = imports.gi.Gvc;
 +const Mainloop = imports.mainloop;
  const St = imports.gi.St;
  const Signals = imports.signals;
  
+<<<<<<< debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
 @@ -36,9 +37,16 @@ var StreamSlider = new Lang.Class({
+=======
+@@ -36,9 +38,16 @@ var StreamSlider = new Lang.Class({
+>>>>>>> debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
  
          this.item = new PopupMenu.PopupBaseMenuItem({ activate: false });
  
@@ -81,7 +105,11 @@ index 65c4c42..c0f9cf3 100644
  
          this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
          this.item.actor.add(this._icon);
+<<<<<<< debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
 @@ -135,6 +143,7 @@ var StreamSlider = new Lang.Class({
+=======
+@@ -135,6 +144,7 @@ var StreamSlider = new Lang.Class({
+>>>>>>> debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
  
          let volume = value * this._get_control_max_volume();
          let prevMuted = this._stream.is_muted;
@@ -89,7 +117,11 @@ index 65c4c42..c0f9cf3 100644
          if (volume < 1) {
              this._stream.volume = 0;
              if (!prevMuted)
+<<<<<<< debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
 @@ -145,6 +154,14 @@ var StreamSlider = new Lang.Class({
+=======
+@@ -145,6 +155,14 @@ var StreamSlider = new Lang.Class({
+>>>>>>> debian/patches/volume-Add-back-sound-feedback-on-scroll.patch
                  this._stream.change_is_muted(false);
          }
          this._stream.push_volume();
diff --git a/debian/patches/windowManager-listen-actively-to-windows-being-destroyed-.patch b/debian/patches/windowManager-listen-actively-to-windows-being-destroyed-.patch
new file mode 100644
index 0000000..76cbcf0
--- /dev/null
+++ b/debian/patches/windowManager-listen-actively-to-windows-being-destroyed-.patch
@@ -0,0 +1,47 @@
+From: Carlos Garnacho <[e-mail]>
+Date: Thu, 6 Sep 2018 21:50:21 +0200
+Subject: windowManager: listen actively to windows being destroyed during WS
+ switch
+
+Prevents gjs from dealing with already dispose()d objects.
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/539
+
+(cherry-picked from b087752b5539a8cbb1d61979cb069aef8a3475be)
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/b087752b
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1812527
+---
+ js/ui/windowManager.js | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
+index 8e7e7a6..49d7035 100644
+--- a/js/ui/windowManager.js
++++ b/js/ui/windowManager.js
+@@ -1763,6 +1763,14 @@ var WindowManager = new Lang.Class({
+             }
+         }
+ 
++        for (let i = 0; i < switchData.windows.length; i++) {
++            let w = switchData.windows[i];
++
++            w.windowDestroyId = w.window.connect('destroy', () => {
++                switchData.windows.splice(switchData.windows.indexOf(w), 1);
++            });
++        }
++
+         switchData.inGroup.set_position(-xDest, -yDest);
+         switchData.inGroup.raise_top();
+ 
+@@ -1793,8 +1801,8 @@ var WindowManager = new Lang.Class({
+ 
+         for (let i = 0; i < switchData.windows.length; i++) {
+                 let w = switchData.windows[i];
+-                if (w.window.is_destroyed()) // Window gone
+-                    continue;
++                w.window.disconnect(w.windowDestroyId);
++
+                 if (w.window.get_parent() == switchData.outGroup) {
+                     w.window.reparent(w.parent);
+                     w.window.hide();
diff --git a/debian/patches/workaround_crasher_fractional_scaling.patch b/debian/patches/workaround_crasher_fractional_scaling.patch
index 1421031..68cc306 100644
--- a/debian/patches/workaround_crasher_fractional_scaling.patch
+++ b/debian/patches/workaround_crasher_fractional_scaling.patch
@@ -1,3 +1,4 @@
+<<<<<<< debian/patches/workaround_crasher_fractional_scaling.patch
 Description: Avoid crashing if width or height are NaNs.
  This is a temporary workaround that avoid a crash if width or height are NaNs.
  The true fix would be to avoid width and height to get NaN values.
@@ -8,6 +9,26 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788316
 --- a/src/st/st-theme-node-drawing.c
 +++ b/src/st/st-theme-node-drawing.c
 @@ -2505,7 +2505,7 @@
+=======
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 20 Jun 2018 19:22:06 +0200
+Subject: Avoid crashing if width or height are NaNs.
+
+This is a temporary workaround that avoid a crash if width or height are NaNs.
+The true fix would be to avoid width and height to get NaN values.
+Origin: ubuntu
+Bug-Ubuntu: https://launchpad.net/bugs/1714542
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788316
+---
+ src/st/st-theme-node-drawing.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
+index 0637d97..7342c6c 100644
+--- a/src/st/st-theme-node-drawing.c
++++ b/src/st/st-theme-node-drawing.c
+@@ -2531,7 +2531,7 @@ st_theme_node_paint (StThemeNode           *node,
+>>>>>>> debian/patches/workaround_crasher_fractional_scaling.patch
    allocation.x2 = width;
    allocation.y2 = height;
  
@@ -16,4 +37,7 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=788316
      return;
  
    /* Check whether we need to recreate the textures of the paint
+<<<<<<< debian/patches/workaround_crasher_fractional_scaling.patch
 
+=======
+>>>>>>> debian/patches/workaround_crasher_fractional_scaling.patch
diff --git a/debian/ubuntu-session-mods/ubuntu.css b/debian/ubuntu-session-mods/ubuntu.css
index da34f04..1a17b4f 100644
--- a/debian/ubuntu-session-mods/ubuntu.css
+++ b/debian/ubuntu-session-mods/ubuntu.css
@@ -519,7 +519,11 @@ StScrollBar {
   height: 1px;
   margin: 6px 64px;
   background-color: transparent;
+<<<<<<< debian/ubuntu-session-mods/ubuntu.css
   border-color: #3a3a34;
+=======
+  border-color: #2c2c28;
+>>>>>>> debian/ubuntu-session-mods/ubuntu.css
   border-bottom-width: 1px;
   border-bottom-style: solid; }
 
@@ -1911,6 +1915,14 @@ stage {
   font-family: Ubuntu, Cantarell, Sans-Serif;
 }
 
+<<<<<<< debian/ubuntu-session-mods/ubuntu.css
+=======
+/* Set minimum height as per Ubuntu font usage, fixes password entries (LP: #1743058) */
+StEntry {
+  min-height: 19px;
+}
+
+>>>>>>> debian/ubuntu-session-mods/ubuntu.css
 /* switch colors */
 .toggle-switch-us:checked {
   background-image: url("ubuntu-toggle-on-us.svg");
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 481cd3a..1bd9b02 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -242,11 +242,19 @@ var AuthPrompt = new Lang.Class({
         this.emit('prompted');
     },
 
+<<<<<<< js/gdm/authPrompt.js
     _onVerificationFailed() {
         this._queryingService = null;
         this.clear();
 
         this.updateSensitivity(true);
+=======
+    _onVerificationFailed(userVerifier, canRetry) {
+        this._queryingService = null;
+        this.clear();
+
+        this.updateSensitivity(canRetry);
+>>>>>>> js/gdm/authPrompt.js
         this.setActorInDefaultButtonWell(null);
         this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
     },
@@ -439,6 +447,10 @@ var AuthPrompt = new Lang.Class({
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
         this.cancelButton.reactive = true;
         this.nextButton.label = _("Next");
+<<<<<<< js/gdm/authPrompt.js
+=======
+        this._preemptiveAnswer = null;
+>>>>>>> js/gdm/authPrompt.js
 
         if (this._userVerifier)
             this._userVerifier.cancel();
diff --git a/js/gdm/util.js b/js/gdm/util.js
index 261e1e4..082b680 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -534,12 +534,22 @@ var ShellUserVerifier = new Lang.Class({
     _verificationFailed(retry) {
         // For Not Listed / enterprise logins, immediately reset
         // the dialog
+<<<<<<< js/gdm/util.js
         // Otherwise, we allow ALLOWED_FAILURES attempts. After that, we
         // go back to the welcome screen.
 
         this._failCounter++;
         let canRetry = retry && this._userName &&
             this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);
+=======
+        // Otherwise, when in login mode we allow ALLOWED_FAILURES attempts.
+        // After that, we go back to the welcome screen.
+
+        this._failCounter++;
+        let canRetry = retry && this._userName &&
+            (this._reauthOnly ||
+             this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY));
+>>>>>>> js/gdm/util.js
 
         if (canRetry) {
             if (!this.hasPendingMessages) {
@@ -562,7 +572,11 @@ var ShellUserVerifier = new Lang.Class({
             }
         }
 
+<<<<<<< js/gdm/util.js
         this.emit('verification-failed');
+=======
+        this.emit('verification-failed', canRetry);
+>>>>>>> js/gdm/util.js
     },
 
     _onConversationStopped(client, serviceName) {
diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
index 782b9ad..f943db2 100644
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -115,6 +115,14 @@ var IBusManager = new Lang.Class({
                                                          object_path: IBus.PATH_PANEL });
             this._candidatePopup.setPanelService(this._panelService);
             this._panelService.connect('update-property', this._updateProperty.bind(this));
+<<<<<<< js/misc/ibusManager.js
+=======
+            this._panelService.connect('set-cursor-location', (ps, x, y, w, h) => {
+                let cursorLocation = { x, y, width: w, height: h };
+                this.emit('set-cursor-location', cursorLocation);
+            });
+
+>>>>>>> js/misc/ibusManager.js
             try {
                 // IBus versions older than 1.5.10 have a bug which
                 // causes spurious set-content-type emissions when
@@ -200,7 +208,11 @@ var IBusManager = new Lang.Class({
         }
 
         this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
+<<<<<<< js/misc/ibusManager.js
                                            null, callback);
+=======
+                                           null, callback || null);
+>>>>>>> js/misc/ibusManager.js
     },
 
     preloadEngines(ids) {
diff --git a/js/misc/keyboardManager.js b/js/misc/keyboardManager.js
index b8984fe..c0c6560 100644
--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@@ -89,6 +89,11 @@ var KeyboardManager = new Lang.Class({
     },
 
     setUserLayouts(ids) {
+<<<<<<< js/misc/keyboardManager.js
+=======
+        let currentId = this._current ? this._current.id : null;
+        let currentGroupIndex = this._current ? this._current.groupIndex : null;
+>>>>>>> js/misc/keyboardManager.js
         this._current = null;
         this._layoutInfos = {};
 
@@ -115,6 +120,12 @@ var KeyboardManager = new Lang.Class({
             info.group = group;
             info.groupIndex = groupIndex;
 
+<<<<<<< js/misc/keyboardManager.js
+=======
+            if (currentId == id && currentGroupIndex == groupIndex)
+                this._current = info;
+
+>>>>>>> js/misc/keyboardManager.js
             i += 1;
         }
     },
diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index 1ce4f83..7bffc23 100644
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -236,11 +236,20 @@ var ObjectManager = new Lang.Class({
     _onNameVanished() {
         let objectPaths = Object.keys(this._objects);
         for (let i = 0; i < objectPaths.length; i++) {
+<<<<<<< js/misc/objectManager.js
             let object = this._objects[objectPaths];
 
             let interfaceNames = Object.keys(object);
             for (let j = 0; i < interfaceNames.length; i++) {
                 let interfaceName = interfaceNames[i];
+=======
+            let objectPath = objectPaths[i];
+            let object = this._objects[objectPath];
+
+            let interfaceNames = Object.keys(object);
+            for (let j = 0; j < interfaceNames.length; j++) {
+                let interfaceName = interfaceNames[j];
+>>>>>>> js/misc/objectManager.js
 
                 if (object[interfaceName])
                     this._removeInterface(objectPath, interfaceName);
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index a46017a..486f5f8 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -802,6 +802,11 @@ var NotificationMessage = new Lang.Class({
     },
 
     _onDestroy() {
+<<<<<<< js/ui/calendar.js
+=======
+        this.parent();
+
+>>>>>>> js/ui/calendar.js
         if (this._updatedId)
             this.notification.disconnect(this._updatedId);
         this._updatedId = 0;
@@ -821,6 +826,11 @@ var EventsSection = new Lang.Class({
         this._desktopSettings.connect('changed', this._reloadEvents.bind(this));
         this._eventSource = new EmptyEventSource();
 
+<<<<<<< js/ui/calendar.js
+=======
+        this._messageById = new Map();
+
+>>>>>>> js/ui/calendar.js
         this.parent();
 
         this._title = new St.Button({ style_class: 'events-section-title',
@@ -875,12 +885,16 @@ var EventsSection = new Lang.Class({
 
         this._reloading = true;
 
+<<<<<<< js/ui/calendar.js
         this._list.destroy_all_children();
 
+=======
+>>>>>>> js/ui/calendar.js
         let periodBegin = _getBeginningOfDay(this._date);
         let periodEnd = _getEndOfDay(this._date);
         let events = this._eventSource.getEvents(periodBegin, periodEnd);
 
+<<<<<<< js/ui/calendar.js
         for (let i = 0; i < events.length; i++) {
             let event = events[i];
 
@@ -889,6 +903,30 @@ var EventsSection = new Lang.Class({
                 this._ignoreEvent(event);
             });
             this.addMessage(message, false);
+=======
+        let ids = events.map(e => e.id);
+        this._messageById.forEach((message, id) => {
+            if (ids.includes(id))
+                return;
+            this._messageById.delete(id);
+            this.removeMessage(message);
+        });
+
+        for (let i = 0; i < events.length; i++) {
+            let event = events[i];
+
+            let message = this._messageById.get(event.id);
+            if (!message) {
+                message = new EventMessage(event, this._date);
+                message.connect('close', () => {
+                    this._ignoreEvent(event);
+                });
+                this._messageById.set(event.id, message);
+                this.addMessage(message, false);
+            } else {
+                this.moveMessage(message, i, false);
+            }
+>>>>>>> js/ui/calendar.js
         }
 
         this._reloading = false;
diff --git a/js/ui/components/automountManager.js b/js/ui/components/automountManager.js
index 2d8f3f8..cfd19db 100644
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -210,6 +210,13 @@ var AutomountManager = new Lang.Class({
     },
 
     _onVolumeRemoved(monitor, volume) {
+<<<<<<< js/ui/components/automountManager.js
+=======
+        if (volume._allowAutorunExpireId && volume._allowAutorunExpireId > 0) {
+            Mainloop.source_remove(volume._allowAutorunExpireId);
+            delete volume._allowAutorunExpireId;
+        }
+>>>>>>> js/ui/components/automountManager.js
         this._volumeQueue = 
             this._volumeQueue.filter(element => (element != volume));
     },
@@ -234,8 +241,15 @@ var AutomountManager = new Lang.Class({
     _allowAutorunExpire(volume) {
         let id = Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, () => {
             volume.allowAutorun = false;
+<<<<<<< js/ui/components/automountManager.js
+            return GLib.SOURCE_REMOVE;
+        });
+=======
+            delete volume._allowAutorunExpireId;
             return GLib.SOURCE_REMOVE;
         });
+        volume._allowAutorunExpireId = id;
+>>>>>>> js/ui/components/automountManager.js
         GLib.Source.set_name_by_id(id, '[gnome-shell] volume.allowAutorun');
     }
 });
diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index 75f4203..447fb55 100644
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -655,7 +655,11 @@ var NetworkAgent = new Lang.Class({
         switch (connectionType) {
         case '802-11-wireless':
             let wirelessSetting = connection.get_setting_wireless();
+<<<<<<< js/ui/components/networkAgent.js
             let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid());
+=======
+            let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
+>>>>>>> js/ui/components/networkAgent.js
             title = _("Authentication required by wireless network");
             body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
             break;
diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index 316bc2a..9180266 100644
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -201,7 +201,13 @@ var AuthenticationDialog = new Lang.Class({
     close(timestamp) {
         this.parent(timestamp);
 
+<<<<<<< js/ui/components/polkitAgent.js
         Main.sessionMode.disconnect(this._sessionUpdatedId);
+=======
+        if (this._sessionUpdatedId)
+            Main.sessionMode.disconnect(this._sessionUpdatedId);
+        this._sessionUpdatedId = 0;
+>>>>>>> js/ui/components/polkitAgent.js
     },
 
     _ensureOpen() {
diff --git a/js/ui/dash.js b/js/ui/dash.js
index 5ee2476..83e73ce 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -52,6 +52,11 @@ var DashItemContainer = new Lang.Class({
         this.animatingOut = false;
 
         this.connect('destroy', () => {
+<<<<<<< js/ui/dash.js
+=======
+            if (this.child != null)
+                this.child.destroy();
+>>>>>>> js/ui/dash.js
             this.label.destroy();
         });
     },
diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index a38607c..25ae400 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -396,10 +396,22 @@ var _Draggable = new Lang.Class({
         return true;
     },
 
+<<<<<<< js/ui/dnd.js
     _updateDragHover() {
         this._updateHoverId = 0;
         let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
                                                                   this._dragX, this._dragY);
+=======
+    _pickTargetActor() {
+        return this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
+                                                            this._dragX, this._dragY);
+    },
+
+    _updateDragHover() {
+        this._updateHoverId = 0;
+        let target = this._pickTargetActor();
+
+>>>>>>> js/ui/dnd.js
         let dragEvent = {
             x: this._dragX,
             y: this._dragY,
@@ -407,6 +419,21 @@ var _Draggable = new Lang.Class({
             source: this.actor._delegate,
             targetActor: target
         };
+<<<<<<< js/ui/dnd.js
+=======
+
+        let targetActorDestroyHandlerId;
+        let handleTargetActorDestroyClosure;
+        handleTargetActorDestroyClosure = () => {
+            target = this._pickTargetActor();
+            dragEvent.targetActor = target;
+            targetActorDestroyHandlerId =
+                target.connect('destroy', handleTargetActorDestroyClosure);
+        };
+        targetActorDestroyHandlerId =
+            target.connect('destroy', handleTargetActorDestroyClosure);
+
+>>>>>>> js/ui/dnd.js
         for (let i = 0; i < dragMonitors.length; i++) {
             let motionFunc = dragMonitors[i].dragMotion;
             if (motionFunc) {
@@ -417,6 +444,10 @@ var _Draggable = new Lang.Class({
                 }
             }
         }
+<<<<<<< js/ui/dnd.js
+=======
+        dragEvent.targetActor.disconnect(targetActorDestroyHandlerId);
+>>>>>>> js/ui/dnd.js
 
         while (target) {
             if (target._delegate && target._delegate.handleDragOver) {
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 7d18d0b..e0fe505 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -760,7 +760,11 @@ var EndSessionDialog = new Lang.Class({
         let updatePrepared = this._pkOfflineProxy.UpdatePrepared;
         let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
 
+<<<<<<< js/ui/endSessionDialog.js
         _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText);
+=======
+        _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText || '');
+>>>>>>> js/ui/endSessionDialog.js
         this._checkBox.actor.visible = (dialogContent.checkBoxText && updatePrepared && updatesAllowed);
         this._checkBox.actor.checked = (updatePrepared && updateTriggered);
 
diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index e35c01a..36fbf92 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -76,6 +76,10 @@ function disableExtension(uuid) {
     if (extension.stylesheet) {
         let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
         theme.unload_stylesheet(extension.stylesheet);
+<<<<<<< js/ui/extensionSystem.js
+=======
+        delete extension.stylesheet;
+>>>>>>> js/ui/extensionSystem.js
     }
 
     try {
@@ -115,6 +119,7 @@ function enableExtension(uuid) {
     extensionOrder.push(uuid);
 
     let stylesheetNames = [global.session_mode + '.css', 'stylesheet.css'];
+<<<<<<< js/ui/extensionSystem.js
     for (let i = 0; i < stylesheetNames.length; i++) {
         let stylesheetFile = extension.dir.get_child(stylesheetNames[i]);
         if (stylesheetFile.query_exists(null)) {
@@ -122,6 +127,20 @@ function enableExtension(uuid) {
             theme.load_stylesheet(stylesheetFile);
             extension.stylesheet = stylesheetFile;
             break;
+=======
+    let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
+    for (let i = 0; i < stylesheetNames.length; i++) {
+        try {
+            let stylesheetFile = extension.dir.get_child(stylesheetNames[i]);
+            theme.load_stylesheet(stylesheetFile);
+            extension.stylesheet = stylesheetFile;
+            break;
+        } catch (e) {
+            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+                continue; // not an error
+            log(`Failed to load stylesheet for extension ${uuid}: ${e.message}`);
+            return;
+>>>>>>> js/ui/extensionSystem.js
         }
     }
 
@@ -131,6 +150,13 @@ function enableExtension(uuid) {
         _signals.emit('extension-state-changed', extension);
         return;
     } catch(e) {
+<<<<<<< js/ui/extensionSystem.js
+=======
+        if (extension.stylesheet) {
+            theme.unload_stylesheet(extension.stylesheet);
+            delete extension.stylesheet;
+        }
+>>>>>>> js/ui/extensionSystem.js
         logExtensionError(uuid, e);
         return;
     }
diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 60f2653..2b2afae 100644
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -418,6 +418,14 @@ var IconGrid = new Lang.Class({
     },
 
     _animationDone() {
+<<<<<<< js/ui/iconGrid.js
+=======
+        this._clonesAnimating.forEach(clone => {
+            clone.source.reactive = true;
+            clone.source.opacity = 255;
+            clone.destroy();
+        });
+>>>>>>> js/ui/iconGrid.js
         this._clonesAnimating = [];
         this.emit('animation-done');
     },
@@ -538,10 +546,13 @@ var IconGrid = new Lang.Class({
                                    onComplete: () => {
                                        if (isLastItem)
                                            this._animationDone();
+<<<<<<< js/ui/iconGrid.js
 
                                        actor.opacity = 255;
                                        actor.reactive = true;
                                        actorClone.destroy();
+=======
+>>>>>>> js/ui/iconGrid.js
                                    }};
                 fadeParams = { time: ANIMATION_FADE_IN_TIME_FOR_ITEM,
                                transition: 'easeInOutQuad',
@@ -562,12 +573,17 @@ var IconGrid = new Lang.Class({
                                    scale_x: scaleX,
                                    scale_y: scaleY,
                                    onComplete: () => {
+<<<<<<< js/ui/iconGrid.js
                                        if (isLastItem) {
                                            this._animationDone();
                                            this._restoreItemsOpacity();
                                        }
                                        actor.reactive = true;
                                        actorClone.destroy();
+=======
+                                       if (isLastItem)
+                                           this._animationDone();
+>>>>>>> js/ui/iconGrid.js
                                    }};
                 fadeParams = { time: ANIMATION_FADE_IN_TIME_FOR_ITEM,
                                transition: 'easeInOutQuad',
@@ -581,12 +597,15 @@ var IconGrid = new Lang.Class({
         }
     },
 
+<<<<<<< js/ui/iconGrid.js
     _restoreItemsOpacity() {
         for (let index = 0; index < this._items.length; index++) {
             this._items[index].actor.opacity = 255;
         }
     },
 
+=======
+>>>>>>> js/ui/iconGrid.js
     _getAllocatedChildSizeAndSpacing(child) {
         let [,, natWidth, natHeight] = child.get_preferred_size();
         let width = Math.min(this._getHItemSize(), natWidth);
diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index e13c7b7..543c5a9 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1,6 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+<<<<<<< js/ui/keyboard.js
 const FocusCaretTracker = imports.ui.focusCaretTracker;
+=======
+>>>>>>> js/ui/keyboard.js
 const Atspi = imports.gi.Atspi;
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
@@ -13,6 +16,10 @@ const Signals = imports.signals;
 const St = imports.gi.St;
 const InputSourceManager = imports.ui.status.keyboard;
 
+<<<<<<< js/ui/keyboard.js
+=======
+const IBusManager = imports.misc.ibusManager;
+>>>>>>> js/ui/keyboard.js
 const BoxPointer = imports.ui.boxpointer;
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
@@ -261,6 +268,10 @@ var Key = new Lang.Class({
         this._extended_keyboard = null;
         this._pressTimeoutId = 0;
         this._capturedPress = false;
+<<<<<<< js/ui/keyboard.js
+=======
+
+>>>>>>> js/ui/keyboard.js
         this._capturedEventId = 0;
         this._unmapId = 0;
         this._longPress = false;
@@ -484,6 +495,82 @@ var KeyboardModel = new Lang.Class({
     }
 });
 
+<<<<<<< js/ui/keyboard.js
+=======
+var FocusTracker = new Lang.Class({
+    Name: 'FocusTracker',
+
+    _init() {
+        this._currentWindow = null;
+        this._currentWindowPositionId = 0;
+
+        global.screen.get_display().connect('notify::focus-window', () => {
+            this._setCurrentWindow(global.screen.get_display().focus_window);
+            this.emit('window-changed', this._currentWindow);
+        });
+
+        /* 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() };
+            this._setCurrentRect(newRect);
+        });
+
+        this._ibusManager = IBusManager.getIBusManager();
+        this._ibusManager.connect('set-cursor-location', (manager, rect) => {
+            /* Valid for X11 clients only */
+            if (Main.inputMethod.currentFocus)
+                return;
+
+            this._setCurrentRect(rect);
+        });
+    },
+
+    get currentWindow() {
+        return this._currentWindow;
+    },
+
+    _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) {
+        if (this._currentWindow) {
+            let frameRect = this._currentWindow.get_frame_rect();
+            rect.x -= frameRect.x;
+            rect.y -= frameRect.y;
+        }
+
+        this._rect = rect;
+        this.emit('position-changed');
+    },
+
+    getCurrentRect() {
+        let rect = { x: this._rect.x, y: this._rect.y,
+                     width: this._rect.width, height: this._rect.height };
+
+        if (this._currentWindow) {
+            let frameRect = this._currentWindow.get_frame_rect();
+            rect.x += frameRect.x;
+            rect.y += frameRect.y;
+        }
+
+        return rect;
+    }
+});
+Signals.addSignalMethods(FocusTracker.prototype);
+
+>>>>>>> js/ui/keyboard.js
 var Keyboard = new Lang.Class({
     Name: 'Keyboard',
 
@@ -491,6 +578,7 @@ var Keyboard = new Lang.Class({
         this.actor = null;
         this._focusInExtendedKeys = false;
 
+<<<<<<< js/ui/keyboard.js
         this._focusCaretTracker = new FocusCaretTracker.FocusCaretTracker();
         this._focusCaretTracker.connect('focus-changed', this._onFocusChanged.bind(this));
         this._focusCaretTracker.connect('caret-moved', this._onCaretMoved.bind(this));
@@ -500,6 +588,12 @@ var Keyboard = new Lang.Class({
         this._updateCaretPositionId = 0;
         this._currentFocusWindow = null;
         this._originalWindowY = null;
+=======
+        this._languagePopup = null;
+        this._currentFocusWindow = null;
+        this._animFocusedWindow = null;
+        this._delayedAnimFocusWindow = null;
+>>>>>>> js/ui/keyboard.js
 
         this._enableKeyboard = false; // a11y settings value
         this._enabled = false; // enabled state (by setting or device type)
@@ -510,6 +604,17 @@ var Keyboard = new Lang.Class({
         this._lastDeviceId = null;
         this._suggestions = null;
 
+<<<<<<< js/ui/keyboard.js
+=======
+        this._focusTracker = new FocusTracker();
+        this._focusTracker.connect('position-changed', this._onFocusPositionChanged.bind(this));
+        this._focusTracker.connect('reset', () => {
+            this._delayedAnimFocusWindow = null;
+            this._animFocusedWindow = null;
+            this._oskFocusWindow = null;
+        });
+
+>>>>>>> js/ui/keyboard.js
         Meta.get_backend().connect('last-device-changed', 
             (backend, deviceId) => {
                 let manager = Clutter.DeviceManager.get_default();
@@ -532,6 +637,7 @@ var Keyboard = new Lang.Class({
         this._keyboardRestingId = 0;
 
         Main.layoutManager.connect('monitors-changed', this._relayout.bind(this));
+<<<<<<< js/ui/keyboard.js
         //Main.inputMethod.connect('cursor-location-changed', (o, rect) => {
         //    if (this._keyboardVisible) {
         //        let currentWindow = global.screen.get_display().focus_window;
@@ -539,12 +645,15 @@ var Keyboard = new Lang.Class({
         //                               rect.get_width(), rect.get_height());
         //    }
         //});
+=======
+>>>>>>> js/ui/keyboard.js
     },
 
     get visible() {
         return this._keyboardVisible;
     },
 
+<<<<<<< js/ui/keyboard.js
     _setCaretTrackerEnabled(enabled) {
         if (this._caretTrackingEnabled == enabled)
             return;
@@ -628,6 +737,11 @@ var Keyboard = new Lang.Class({
         let accessible = event.source;
         if (this._currentAccessible == accessible)
             this._updateCaretPosition(accessible);
+=======
+    _onFocusPositionChanged(focusTracker) {
+        let rect = focusTracker.getCurrentRect();
+        this.setCursorLocation(focusTracker.currentWindow, rect.x, rect.y, rect.width, rect.height);
+>>>>>>> js/ui/keyboard.js
     },
 
     _lastDeviceIsTouchscreen() {
@@ -650,8 +764,11 @@ var Keyboard = new Lang.Class({
         if (!this._enabled && !this._keyboardController)
             return;
 
+<<<<<<< js/ui/keyboard.js
         this._setCaretTrackerEnabled(this._enabled);
 
+=======
+>>>>>>> js/ui/keyboard.js
         if (this._enabled && !this._keyboardController)
             this._setupKeyboard();
         else if (!this._enabled)
@@ -936,9 +1053,17 @@ var Keyboard = new Lang.Class({
     },
 
     _relayout() {
+<<<<<<< js/ui/keyboard.js
         if (this.actor == null)
             return;
         let monitor = Main.layoutManager.keyboardMonitor;
+=======
+        let monitor = Main.layoutManager.keyboardMonitor;
+
+        if (this.actor == null || monitor == null)
+            return;
+
+>>>>>>> js/ui/keyboard.js
         let maxHeight = monitor.height / 3;
         this.actor.width = monitor.width;
         this.actor.height = maxHeight;
@@ -1027,11 +1152,22 @@ var Keyboard = new Lang.Class({
         if (!this._keyboardRequested)
             return;
 
+<<<<<<< js/ui/keyboard.js
         if (this._currentAccessible)
             this._updateCaretPosition(this._currentAccessible);
         Main.layoutManager.keyboardIndex = monitor;
         this._relayout();
         Main.layoutManager.showKeyboard();
+=======
+        Main.layoutManager.keyboardIndex = monitor;
+        this._relayout();
+        Main.layoutManager.showKeyboard();
+
+        if (this._delayedAnimFocusWindow) {
+            this._setAnimationWindow(this._delayedAnimFocusWindow);
+            this._delayedAnimFocusWindow = null;
+        }
+>>>>>>> js/ui/keyboard.js
     },
 
     hide() {
@@ -1102,8 +1238,14 @@ var Keyboard = new Lang.Class({
         window.move_frame(true, frameRect.x, frameRect.y);
     },
 
+<<<<<<< js/ui/keyboard.js
     _animateWindow(window, show, deltaY) {
         let windowActor = window.get_compositor_private();
+=======
+    _animateWindow(window, show) {
+        let windowActor = window.get_compositor_private();
+        let deltaY = Main.layoutManager.keyboardBox.height;
+>>>>>>> js/ui/keyboard.js
         if (!windowActor)
             return;
 
@@ -1124,6 +1266,7 @@ var Keyboard = new Lang.Class({
         }
     },
 
+<<<<<<< js/ui/keyboard.js
     setCursorLocation(window, x, y , w, h) {
         if (window == this._oskFocusWindow)
             return;
@@ -1153,6 +1296,41 @@ var Keyboard = new Lang.Class({
             this._oskFocusWindow = window;
             this._oskFocusWindowDelta = delta;
         }
+=======
+    _setAnimationWindow(window) {
+        if (this._animFocusedWindow == window)
+            return;
+
+        if (this._animFocusedWindow)
+            this._animateWindow(this._animFocusedWindow, false);
+        if (window)
+            this._animateWindow(window, true);
+
+        this._animFocusedWindow = window;
+    },
+
+    setCursorLocation(window, x, y , w, h) {
+        let monitor = Main.layoutManager.keyboardMonitor;
+
+        if (window && monitor) {
+            let keyboardHeight = Main.layoutManager.keyboardBox.height;
+            let focusObscured = false;
+
+            if (y + h >= monitor.y + monitor.height - keyboardHeight) {
+                if (this._keyboardVisible)
+                    this._setAnimationWindow(window);
+                else
+                    this._delayedAnimFocusWindow = window;
+            } else if (y < keyboardHeight) {
+                this._delayedAnimFocusWindow = null;
+                this._setAnimationWindow(null);
+            }
+        } else {
+            this._setAnimationWindow(null);
+        }
+
+        this._oskFocusWindow = window;
+>>>>>>> js/ui/keyboard.js
     },
 });
 
diff --git a/js/ui/layout.js b/js/ui/layout.js
index 6f81039..e4e5e9e 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -203,6 +203,10 @@ var LayoutManager = new Lang.Class({
 
         // Set up stage hierarchy to group all UI actors under one container.
         this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
+<<<<<<< js/ui/layout.js
+=======
+        this.uiGroup.set_flags(Clutter.ActorFlags.NO_LAYOUT);
+>>>>>>> js/ui/layout.js
         this.uiGroup.connect('allocate', (actor, box, flags) => {
             let children = actor.get_children();
             for (let i = 0; i < children.length; i++)
@@ -557,6 +561,11 @@ var LayoutManager = new Lang.Class({
     },
 
     get focusMonitor() {
+<<<<<<< js/ui/layout.js
+=======
+        if (this.focusIndex < 0)
+            return null;
+>>>>>>> js/ui/layout.js
         return this.monitors[this.focusIndex];
     },
 
diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index b752b12..68511e7 100644
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -19,7 +19,10 @@ const MagnifierDBus = imports.ui.magnifierDBus;
 const Params = imports.misc.params;
 const PointerWatcher = imports.ui.pointerWatcher;
 
+<<<<<<< js/ui/magnifier.js
 var MOUSE_POLL_FREQUENCY = 50;
+=======
+>>>>>>> js/ui/magnifier.js
 var CROSSHAIRS_CLIP_SIZE = [100, 100];
 var NO_CHANGE = 0.0;
 
@@ -152,8 +155,15 @@ var Magnifier = new Lang.Class({
      * Turn on mouse tracking, if not already doing so.
      */
     startTrackingMouse() {
+<<<<<<< js/ui/magnifier.js
         if (!this._pointerWatch)
             this._pointerWatch = PointerWatcher.getPointerWatcher().addWatch(MOUSE_POLL_FREQUENCY, this.scrollToMousePos.bind(this));
+=======
+        if (!this._pointerWatch) {
+            let interval = 1000 / Clutter.get_default_frame_rate();
+            this._pointerWatch = PointerWatcher.getPointerWatcher().addWatch(interval, this.scrollToMousePos.bind(this));
+        }
+>>>>>>> js/ui/magnifier.js
     },
 
     /**
diff --git a/js/ui/main.js b/js/ui/main.js
index 2cfe941..d7742ee 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -256,6 +256,17 @@ function _getStylesheet(name) {
     if (stylesheet.query_exists(null))
         return stylesheet;
 
+<<<<<<< js/ui/main.js
+=======
+    let dataDirs = GLib.get_system_data_dirs();
+    for (let i = 0; i < dataDirs.length; i++) {
+        let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'theme', name]);
+        let stylesheet = Gio.file_new_for_path(path);
+        if (stylesheet.query_exists(null))
+            return stylesheet;
+    }
+
+>>>>>>> js/ui/main.js
     stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + name);
     if (stylesheet.query_exists(null))
         return stylesheet;
@@ -335,6 +346,12 @@ function loadTheme() {
     let theme = new St.Theme ({ application_stylesheet: _cssStylesheet,
                                 default_stylesheet: _defaultCssStylesheet });
 
+<<<<<<< js/ui/main.js
+=======
+    if (theme.default_stylesheet == null)
+        throw new Error("No valid stylesheet found for '%s'".format(sessionMode.stylesheetName));
+
+>>>>>>> js/ui/main.js
     if (previousTheme) {
         let customStylesheets = previousTheme.get_custom_stylesheets();
 
diff --git a/js/ui/messageList.js b/js/ui/messageList.js
index aff201e..285d14a 100644
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@@ -362,7 +362,12 @@ var Message = new Lang.Class({
         this.setBody(body);
 
         this._closeButton.connect('clicked', this.close.bind(this));
+<<<<<<< js/ui/messageList.js
         this.actor.connect('notify::hover', this._sync.bind(this));
+=======
+        let actorHoverId = this.actor.connect('notify::hover', this._sync.bind(this));
+        this._closeButton.connect('destroy', this.actor.disconnect.bind(this.actor, actorHoverId));
+>>>>>>> js/ui/messageList.js
         this.actor.connect('clicked', this._onClicked.bind(this));
         this.actor.connect('destroy', this._onDestroy.bind(this));
         this._sync();
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 9ce5b44..20b635a 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1320,6 +1320,10 @@ var MessageTray = new Lang.Class({
         this._bannerBin.y = -this._banner.actor.height;
         this.actor.show();
 
+<<<<<<< js/ui/messageTray.js
+=======
+        Meta.disable_unredirect_for_screen(global.screen);
+>>>>>>> js/ui/messageTray.js
         this._updateShowingNotification();
 
         let [x, y, mods] = global.get_pointer();
@@ -1457,6 +1461,10 @@ var MessageTray = new Lang.Class({
 
         this._pointerInNotification = false;
         this._notificationRemoved = false;
+<<<<<<< js/ui/messageTray.js
+=======
+        Meta.enable_unredirect_for_screen(global.screen);
+>>>>>>> js/ui/messageTray.js
 
         this._banner.actor.destroy();
         this._banner = null;
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 9f08562..61dc4b3 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -117,10 +117,15 @@ var FdoNotificationDaemon = new Lang.Class({
                  bitsPerSample, nChannels, data] = hints['image-data'];
             return Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
                                                       bitsPerSample, width, height, rowStride);
+<<<<<<< js/ui/notificationDaemon.js
         } else if (hints['image-path']) {
             return new Gio.FileIcon({ file: Gio.File.new_for_path(hints['image-path']) });
         }
         return null;
+=======
+        }
+        return this._iconForNotificationData(hints['image-path']);
+>>>>>>> js/ui/notificationDaemon.js
     },
 
     _fallbackIconForNotificationData(hints) {
diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js
index f27f489..83d77f1 100644
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -108,15 +108,41 @@ var OsdWindow = new Lang.Class({
         this._hideTimeoutId = 0;
         this._reset();
 
+<<<<<<< js/ui/osdWindow.js
         Main.layoutManager.connect('monitors-changed',
                                    this._relayout.bind(this));
         let themeContext = St.ThemeContext.get_for_stage(global.stage);
         themeContext.connect('notify::scale-factor',
                              this._relayout.bind(this));
+=======
+        this.actor.connect('destroy', this._onDestroy.bind(this));
+
+        this._monitorsChangedId =
+            Main.layoutManager.connect('monitors-changed',
+                                       this._relayout.bind(this));
+        let themeContext = St.ThemeContext.get_for_stage(global.stage);
+        this._scaleChangedId =
+            themeContext.connect('notify::scale-factor',
+                                 this._relayout.bind(this));
+>>>>>>> js/ui/osdWindow.js
         this._relayout();
         Main.uiGroup.add_child(this.actor);
     },
 
+<<<<<<< js/ui/osdWindow.js
+=======
+    _onDestroy() {
+        if (this._monitorsChangedId)
+            Main.layoutManager.disconnect(this._monitorsChangedId);
+        this._monitorsChangedId = 0;
+
+        let themeContext = St.ThemeContext.get_for_stage(global.stage);
+        if (this._scaleChangedId)
+            themeContext.disconnect(this._scaleChangedId);
+        this._scaleChangedId = 0;
+    },
+
+>>>>>>> js/ui/osdWindow.js
     setIcon(icon) {
         this._icon.gicon = icon;
     },
@@ -204,7 +230,11 @@ var OsdWindow = new Lang.Class({
 
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
         this._icon.icon_size = popupSize / (2 * scaleFactor);
+<<<<<<< js/ui/osdWindow.js
         this._box.translation_y = monitor.height / 4;
+=======
+        this._box.translation_y = Math.round(monitor.height / 4);
+>>>>>>> js/ui/osdWindow.js
         this._boxConstraint.minSize = popupSize;
     }
 });
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 2240576..8ee8de3 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -393,10 +393,15 @@ var Overview = new Lang.Class({
         if (!Main.layoutManager.primaryMonitor)
             return;
 
+<<<<<<< js/ui/overview.js
         let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
 
         this._coverPane.set_position(0, workArea.y);
         this._coverPane.set_size(workArea.width, workArea.height);
+=======
+        this._coverPane.set_position(0, 0);
+        this._coverPane.set_size(global.screen_width, global.screen_height);
+>>>>>>> js/ui/overview.js
 
         this._updateBackgrounds();
     },
diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index a2905ab..6ff9a0b 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -284,6 +284,14 @@ var ThumbnailsSlider = new Lang.Class({
         return child.get_theme_node().get_length('visible-width');
     },
 
+<<<<<<< js/ui/overviewControls.js
+=======
+    _onDragEnd() {
+        this.actor.sync_hover();
+        this.parent();
+    },
+
+>>>>>>> js/ui/overviewControls.js
     _getSlide() {
         if (!this._visible)
             return 0;
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 2f59324..e02cf35 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -796,6 +796,10 @@ var Panel = new Lang.Class({
         this.actor.connect('get-preferred-height', this._getPreferredHeight.bind(this));
         this.actor.connect('allocate', this._allocate.bind(this));
         this.actor.connect('button-press-event', this._onButtonPress.bind(this));
+<<<<<<< js/ui/panel.js
+=======
+        this.actor.connect('touch-event', this._onButtonPress.bind(this));
+>>>>>>> js/ui/panel.js
         this.actor.connect('key-press-event', this._onKeyPress.bind(this));
 
         Main.overview.connect('showing', () => {
@@ -939,8 +943,18 @@ var Panel = new Lang.Class({
         if (event.get_source() != actor)
             return Clutter.EVENT_PROPAGATE;
 
+<<<<<<< js/ui/panel.js
         let button = event.get_button();
         if (button != 1)
+=======
+        let type = event.type();
+        let isPress = type == Clutter.EventType.BUTTON_PRESS;
+        if (!isPress && type != Clutter.EventType.TOUCH_BEGIN)
+            return Clutter.EVENT_PROPAGATE;
+
+        let button = isPress ? event.get_button() : -1;
+        if (isPress && button != 1)
+>>>>>>> js/ui/panel.js
             return Clutter.EVENT_PROPAGATE;
 
         let focusWindow = global.display.focus_window;
@@ -1079,6 +1093,10 @@ var Panel = new Lang.Class({
         let windows = activeWorkspace.list_windows().filter(metaWindow => {
             return metaWindow.is_on_primary_monitor() &&
                    metaWindow.showing_on_its_workspace() &&
+<<<<<<< js/ui/panel.js
+=======
+                   !metaWindow.is_hidden() &&
+>>>>>>> js/ui/panel.js
                    metaWindow.get_window_type() != Meta.WindowType.DESKTOP;
         });
 
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 67b928c..b161441 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -141,8 +141,22 @@ var PopupBaseMenuItem = new Lang.Class({
     },
 
     _onKeyPressEvent(actor, event) {
+<<<<<<< js/ui/popupMenu.js
         let symbol = event.get_key_symbol();
 
+=======
+        let state = event.get_state();
+
+        // if user has a modifier down (except capslock)
+        // then don't handle the key press here
+        state &= ~Clutter.ModifierType.LOCK_MASK;
+        state &= Clutter.ModifierType.MODIFIER_MASK;
+
+        if (state)
+            return Clutter.EVENT_PROPAGATE;
+
+        let symbol = event.get_key_symbol();
+>>>>>>> js/ui/popupMenu.js
         if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
             this.activate(event);
             return Clutter.EVENT_STOP;
@@ -394,8 +408,14 @@ var PopupImageMenuItem = new Lang.Class({
     _init(text, icon, params) {
         this.parent(params);
 
+<<<<<<< js/ui/popupMenu.js
         this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
         this.actor.add_child(this._icon, { align: St.Align.END });
+=======
+        this._icon = new St.Icon({ style_class: 'popup-menu-icon',
+                                   x_align: Clutter.ActorAlign.END });
+        this.actor.add_child(this._icon);
+>>>>>>> js/ui/popupMenu.js
         this.label = new St.Label({ text: text });
         this.actor.add_child(this.label);
         this.actor.label_actor = this.label;
diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
index 1e8e6c9..89c5e4c 100644
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -295,7 +295,11 @@ var RemoteSearchProvider = new Lang.Class({
                                name: metas[i]['name'],
                                description: metas[i]['description'],
                                createIcon: size => {
+<<<<<<< js/ui/remoteSearch.js
                                    this.createIcon(size, metas[i]);
+=======
+                                   return this.createIcon(size, metas[i]);
+>>>>>>> js/ui/remoteSearch.js
                                },
                                clipboardText: metas[i]['clipboardText'] });
         }
diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index 82deab5..0a0218d 100644
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -114,6 +114,7 @@ var RunDialog = new Lang.Class({
 
         this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY,
                                                      entry: this._entryText });
+<<<<<<< js/ui/runDialog.js
         this._entryText.connect('key-press-event', (o, e) => {
             let symbol = e.get_key_symbol();
             if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
@@ -126,6 +127,18 @@ var RunDialog = new Lang.Class({
 
                 return Clutter.EVENT_STOP;
             }
+=======
+        this._entryText.connect('activate', (o) => {
+            this.popModal();
+            this._run(o.get_text(),
+                      Clutter.get_current_event().get_state() & Clutter.ModifierType.CONTROL_MASK);
+            if (!this._commandError ||
+                !this.pushModal())
+                this.close();
+        });
+        this._entryText.connect('key-press-event', (o, e) => {
+            let symbol = e.get_key_symbol();
+>>>>>>> js/ui/runDialog.js
             if (symbol == Clutter.Tab) {
                 let text = o.get_text();
                 let prefix;
diff --git a/js/ui/search.js b/js/ui/search.js
index 1fb54b4..59a4a11 100644
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -192,6 +192,10 @@ var SearchResultsBase = new Lang.Class({
     },
 
     clear() {
+<<<<<<< js/ui/search.js
+=======
+        this._cancellable.cancel();
+>>>>>>> js/ui/search.js
         for (let resultId in this._resultDisplays)
             this._resultDisplays[resultId].actor.destroy();
         this._resultDisplays = {};
@@ -225,6 +229,15 @@ var SearchResultsBase = new Lang.Class({
             this._cancellable.reset();
 
             this.provider.getResultMetas(metasNeeded, metas => {
+<<<<<<< js/ui/search.js
+=======
+                if (this._cancellable.is_cancelled()) {
+                    if (metas.length > 0)
+                        log(`Search provider ${this.provider.id} returned results after the request was canceled`);
+                    callback(false);
+                    return;
+                }
+>>>>>>> js/ui/search.js
                 if (metas.length != metasNeeded.length) {
                     log('Wrong number of result metas returned by search provider ' + this.provider.id +
                         ': expected ' + metasNeeded.length + ' but got ' + metas.length);
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 3dce2c9..184a5cf 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -360,11 +360,22 @@ var InputSourceManager = new Lang.Class({
         this._settings.connect('per-window-changed', this._sourcesPerWindowChanged.bind(this));
         this._sourcesPerWindowChanged();
         this._disableIBus = false;
+<<<<<<< js/ui/status/keyboard.js
     },
 
     reload() {
         this._keyboardManager.setKeyboardOptions(this._settings.keyboardOptions);
         this._inputSourcesChanged();
+=======
+        this._reloading = false;
+    },
+
+    reload() {
+        this._reloading = true;
+        this._keyboardManager.setKeyboardOptions(this._settings.keyboardOptions);
+        this._inputSourcesChanged();
+        this._reloading = false;
+>>>>>>> js/ui/status/keyboard.js
     },
 
     _ibusReadyCallback(im, ready) {
@@ -458,7 +469,19 @@ var InputSourceManager = new Lang.Class({
     },
 
     activateInputSource(is, interactive) {
+<<<<<<< js/ui/status/keyboard.js
         KeyboardManager.holdKeyboard();
+=======
+        // The focus changes during holdKeyboard/releaseKeyboard may trick
+        // the client into hiding UI containing the currently focused entry.
+        // So holdKeyboard/releaseKeyboard are not called when
+        // 'set-content-type' signal is received.
+        // E.g. Focusing on a password entry in a popup in Xorg Firefox
+        // will emit 'set-content-type' signal.
+        // https://gitlab.gnome.org/GNOME/gnome-shell/issues/391
+        if (!this._reloading)
+            KeyboardManager.holdKeyboard();
+>>>>>>> js/ui/status/keyboard.js
         this._keyboardManager.apply(is.xkbId);
 
         // All the "xkb:..." IBus engines simply "echo" back symbols,
@@ -473,7 +496,14 @@ var InputSourceManager = new Lang.Class({
         else
             engine = 'xkb:us::eng';
 
+<<<<<<< js/ui/status/keyboard.js
         this._ibusManager.setEngine(engine, KeyboardManager.releaseKeyboard);
+=======
+        if (!this._reloading)
+            this._ibusManager.setEngine(engine, KeyboardManager.releaseKeyboard);
+        else
+            this._ibusManager.setEngine(engine);
+>>>>>>> js/ui/status/keyboard.js
         this._currentInputSourceChanged(is);
 
         if (interactive)
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 54ed5ca..53a5c2e 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -419,12 +419,23 @@ var NMConnectionDevice = new Lang.Class({
         this._deactivateItem.actor.visible = this._device.state > NM.DeviceState.DISCONNECTED;
 
         if (this._activeConnection == null) {
+<<<<<<< js/ui/status/network.js
             this._activeConnection = this._device.active_connection;
 
             if (this._activeConnection) {
                 ensureActiveConnectionProps(this._activeConnection, this._client);
                 let item = this._connectionItems.get(this._activeConnection.connection.get_uuid());
                 item.setActiveConnection(this._activeConnection);
+=======
+            let activeConnection = this._device.active_connection;
+            if (activeConnection && activeConnection.connection) {
+                let item = this._connectionItems.get(activeConnection.connection.get_uuid());
+                if (item) {
+                    this._activeConnection = activeConnection;
+                    ensureActiveConnectionProps(this._activeConnection, this._client);
+                    item.setActiveConnection(this._activeConnection);
+                }
+>>>>>>> js/ui/status/network.js
             }
         }
 
@@ -1944,6 +1955,10 @@ var NMApplet = new Lang.Class({
         this.indicators.visible = this._client.nm_running;
         this.menu.actor.visible = this._client.networking_enabled;
 
+<<<<<<< js/ui/status/network.js
+=======
+        this._updateIcon();
+>>>>>>> js/ui/status/network.js
         this._syncConnectivity();
     },
 
diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index 68a0b4b..c1c92e8 100644
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -58,6 +58,12 @@ var AltSwitcher = new Lang.Class({
             childToShow = this._standard;
         } else if (this._alternate.visible) {
             childToShow = this._alternate;
+<<<<<<< js/ui/status/system.js
+=======
+        } else {
+            this.actor.hide();
+            return;
+>>>>>>> js/ui/status/system.js
         }
 
         let childShown = this.actor.get_child();
@@ -79,7 +85,11 @@ var AltSwitcher = new Lang.Class({
             global.sync_pointer();
         }
 
+<<<<<<< js/ui/status/system.js
         this.actor.visible = (childToShow != null);
+=======
+        this.actor.show();
+>>>>>>> js/ui/status/system.js
     },
 
     _onDestroy() {
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 91bc222..832538a 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -311,6 +311,10 @@ var ViewSelector = new Lang.Class({
     },
 
     hide() {
+<<<<<<< js/ui/viewSelector.js
+=======
+        this.reset();
+>>>>>>> js/ui/viewSelector.js
         this._workspacesDisplay.hide();
     },
 
@@ -459,7 +463,15 @@ var ViewSelector = new Lang.Class({
     },
 
     reset() {
+<<<<<<< js/ui/viewSelector.js
         global.stage.set_key_focus(null);
+=======
+        // Don't drop the key focus on Clutter's side if anything but the
+        // overview has pushed a modal (e.g. system modals when activated using
+        // the overview).
+        if (Main.modalCount <= 1)
+            global.stage.set_key_focus(null);
+>>>>>>> js/ui/viewSelector.js
 
         this._entry.text = '';
 
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index d450f35..c9b66a5 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -24,7 +24,11 @@ const EdgeDragAction = imports.ui.edgeDragAction;
 const CloseDialog = imports.ui.closeDialog;
 const SwitchMonitor = imports.ui.switchMonitor;
 
+<<<<<<< js/ui/windowManager.js
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
+=======
+var SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
+>>>>>>> js/ui/windowManager.js
 var MINIMIZE_WINDOW_ANIMATION_TIME = 0.2;
 var SHOW_WINDOW_ANIMATION_TIME = 0.15;
 var DIALOG_SHOW_WINDOW_ANIMATION_TIME = 0.1;
@@ -627,8 +631,13 @@ var AppSwitchAction = new Lang.Class({
 
         if (this.get_n_current_points() == 3) {
             for (let i = 0; i < this.get_n_current_points(); i++) {
+<<<<<<< js/ui/windowManager.js
                 [startX, startY] = this.get_press_coords(i);
                 [x, y] = this.get_motion_coords(i);
+=======
+                let [startX, startY] = this.get_press_coords(i);
+                let [x, y] = this.get_motion_coords(i);
+>>>>>>> js/ui/windowManager.js
 
                 if (Math.abs(x - startX) > MOTION_THRESHOLD ||
                     Math.abs(y - startY) > MOTION_THRESHOLD)
@@ -1173,6 +1182,13 @@ var WindowManager = new Lang.Class({
                 yScale = geom.height / actor.height;
             } else {
                 let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
+<<<<<<< js/ui/windowManager.js
+=======
+                if (!monitor) {
+                    this._minimizeWindowDone();
+                    return;
+                }
+>>>>>>> js/ui/windowManager.js
                 xDest = monitor.x;
                 yDest = monitor.y;
                 if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
@@ -1248,6 +1264,14 @@ var WindowManager = new Lang.Class({
                                 geom.height / actor.height);
             } else {
                 let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
+<<<<<<< js/ui/windowManager.js
+=======
+                if (!monitor) {
+                    actor.show();
+                    this._unminimizeWindowDone();
+                    return;
+                }
+>>>>>>> js/ui/windowManager.js
                 actor.set_position(monitor.x, monitor.y);
                 if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
                     actor.x += monitor.width;
diff --git a/js/ui/windowMenu.js b/js/ui/windowMenu.js
index f0e564b..cb6e795 100644
--- a/js/ui/windowMenu.js
+++ b/js/ui/windowMenu.js
@@ -128,11 +128,18 @@ var WindowMenu = new Lang.Class({
 
         let screen = global.screen;
         let nMonitors = screen.get_n_monitors();
+<<<<<<< js/ui/windowMenu.js
         if (nMonitors > 1) {
             this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
 
             let monitorIndex = window.get_monitor();
 
+=======
+        let monitorIndex = window.get_monitor();
+        if (nMonitors > 1 && monitorIndex >= 0) {
+            this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+>>>>>>> js/ui/windowMenu.js
             let dir = Meta.ScreenDirection.UP;
             let upMonitorIndex =
                 screen.get_monitor_neighbor_index(monitorIndex, dir);
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 1e121b7..bc2bb2f 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -137,8 +137,15 @@ var WindowClone = new Lang.Class({
         this._dragSlot = [0, 0, 0, 0];
         this._stackAbove = null;
 
+<<<<<<< js/ui/workspace.js
         this._windowClone._updateId = this.metaWindow.connect('size-changed',
             this._onRealWindowSizeChanged.bind(this));
+=======
+        this._windowClone._sizeChangedId = this.metaWindow.connect('size-changed',
+            this._onMetaWindowSizeChanged.bind(this));
+        this._windowClone._posChangedId = this.metaWindow.connect('position-changed',
+            this._computeBoundingBox.bind(this));
+>>>>>>> js/ui/workspace.js
         this._windowClone._destroyId =
             this.realWindow.connect('destroy', () => {
                 // First destroy the clone and then destroy everything
@@ -206,8 +213,12 @@ var WindowClone = new Lang.Class({
 
     addAttachedDialog(win) {
         this._doAddAttachedDialog(win, win.get_compositor_private());
+<<<<<<< js/ui/workspace.js
         this._computeBoundingBox();
         this.emit('size-changed');
+=======
+        this._onMetaWindowSizeChanged();
+>>>>>>> js/ui/workspace.js
     },
 
     hasAttachedDialogs() {
@@ -216,6 +227,7 @@ var WindowClone = new Lang.Class({
 
     _doAddAttachedDialog(metaWin, realWin) {
         let clone = new Clutter.Clone({ source: realWin });
+<<<<<<< js/ui/workspace.js
         clone._updateId = metaWin.connect('size-changed', () => {
             this._computeBoundingBox();
             this.emit('size-changed');
@@ -225,6 +237,16 @@ var WindowClone = new Lang.Class({
 
             this._computeBoundingBox();
             this.emit('size-changed');
+=======
+        clone._sizeChangedId = metaWin.connect('size-changed',
+            this._onMetaWindowSizeChanged.bind(this));
+        clone._posChangedId = metaWin.connect('position-changed',
+            this._onMetaWindowSizeChanged.bind(this));
+        clone._destroyId = realWin.connect('destroy', () => {
+            clone.destroy();
+
+            this._onMetaWindowSizeChanged();
+>>>>>>> js/ui/workspace.js
         });
         this.actor.add_child(clone);
     },
@@ -321,12 +343,21 @@ var WindowClone = new Lang.Class({
             else
                 realWindow = child.source;
 
+<<<<<<< js/ui/workspace.js
             realWindow.meta_window.disconnect(child._updateId);
+=======
+            realWindow.meta_window.disconnect(child._sizeChangedId);
+            realWindow.meta_window.disconnect(child._posChangedId);
+>>>>>>> js/ui/workspace.js
             realWindow.disconnect(child._destroyId);
         });
     },
 
+<<<<<<< js/ui/workspace.js
     _onRealWindowSizeChanged() {
+=======
+    _onMetaWindowSizeChanged() {
+>>>>>>> js/ui/workspace.js
         this._computeBoundingBox();
         this.emit('size-changed');
     },
@@ -469,7 +500,10 @@ var WindowOverlay = new Lang.Class({
         this._windowAddedId = 0;
 
         button.hide();
+<<<<<<< js/ui/workspace.js
         title.hide();
+=======
+>>>>>>> js/ui/workspace.js
 
         this.title = title;
         this.closeButton = button;
@@ -544,12 +578,19 @@ var WindowOverlay = new Lang.Class({
         let titleX = cloneX + (cloneWidth - title.width) / 2;
         let titleY = cloneY + cloneHeight - (title.height - this.borderSize) / 2;
 
+<<<<<<< js/ui/workspace.js
         if (animate) {
             this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY), title.width);
         } else {
             title.width = title.width;
             title.set_position(Math.floor(titleX), Math.floor(titleY));
         }
+=======
+        if (animate)
+            this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY));
+        else
+            title.set_position(Math.floor(titleX), Math.floor(titleY));
+>>>>>>> js/ui/workspace.js
 
         let borderX = cloneX - this.borderSize;
         let borderY = cloneY - this.borderSize;
@@ -568,10 +609,19 @@ var WindowOverlay = new Lang.Class({
     _animateOverlayActor(actor, x, y, width, height) {
         let params = { x: x,
                        y: y,
+<<<<<<< js/ui/workspace.js
                        width: width,
                        time: Overview.ANIMATION_TIME,
                        transition: 'easeOutQuad' };
 
+=======
+                       time: Overview.ANIMATION_TIME,
+                       transition: 'easeOutQuad' };
+
+        if (width !== undefined)
+            params.width = width;
+
+>>>>>>> js/ui/workspace.js
         if (height !== undefined)
             params.height = height;
 
@@ -1431,6 +1481,7 @@ var Workspace = new Lang.Class({
     _doRemoveWindow(metaWin) {
         let win = metaWin.get_compositor_private();
 
+<<<<<<< js/ui/workspace.js
         // find the position of the window in our list
         let index = this._lookupIndex (metaWin);
 
@@ -1459,6 +1510,28 @@ var Workspace = new Lang.Class({
         }
         clone.destroy();
 
+=======
+        let clone = this._removeWindowClone(metaWin);
+
+        if (clone) {
+            // If metaWin.get_compositor_private() returned non-NULL, that
+            // means the window still exists (and is just being moved to
+            // another workspace or something), so set its overviewHint
+            // accordingly. (If it returned NULL, then the window is being
+            // destroyed; we'd like to animate this, but it's too late at
+            // this point.)
+            if (win) {
+                let [stageX, stageY] = clone.actor.get_transformed_position();
+                let [stageWidth, stageHeight] = clone.actor.get_transformed_size();
+                win._overviewHint = {
+                    x: stageX,
+                    y: stageY,
+                    scale: stageWidth / clone.actor.width
+                };
+            }
+            clone.destroy();
+        }
+>>>>>>> js/ui/workspace.js
 
         // We need to reposition the windows; to avoid shuffling windows
         // around while the user is interacting with the workspace, we delay
@@ -1514,7 +1587,11 @@ var Workspace = new Lang.Class({
             if (metaWin.is_attached_dialog()) {
                 let parent = metaWin.get_transient_for();
                 while (parent.is_attached_dialog())
+<<<<<<< js/ui/workspace.js
                     parent = metaWin.get_transient_for();
+=======
+                    parent = parent.get_transient_for();
+>>>>>>> js/ui/workspace.js
 
                 let idx = this._lookupIndex (parent);
                 if (idx < 0) {
@@ -1848,6 +1925,12 @@ var Workspace = new Lang.Class({
         clone.connect('size-changed', () => {
             this._recalculateWindowPositions(WindowPositionFlags.NONE);
         });
+<<<<<<< js/ui/workspace.js
+=======
+        clone.actor.connect('destroy', () => {
+            this._removeWindowClone(clone.metaWindow);
+        });
+>>>>>>> js/ui/workspace.js
 
         this.actor.add_actor(clone.actor);
 
@@ -1869,6 +1952,20 @@ var Workspace = new Lang.Class({
         return [clone, overlay];
     },
 
+<<<<<<< js/ui/workspace.js
+=======
+    _removeWindowClone(metaWin) {
+        // find the position of the window in our list
+        let index = this._lookupIndex (metaWin);
+
+        if (index == -1)
+            return null;
+
+        this._windowOverlays.splice(index, 1);
+        return this._windows.splice(index, 1).pop();
+    },
+
+>>>>>>> js/ui/workspace.js
     _onShowOverlayClose(windowOverlay) {
         for (let i = 0; i < this._windowOverlays.length; i++) {
             let overlay = this._windowOverlays[i];
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 7d5d2c0..0b55bea 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -31,7 +31,11 @@ var WORKSPACE_CUT_SIZE = 10;
 
 var WORKSPACE_KEEP_ALIVE_TIME = 100;
 
+<<<<<<< js/ui/workspaceThumbnail.js
 const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
+=======
+var OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
+>>>>>>> js/ui/workspaceThumbnail.js
 
 /* A layout manager that requests size only for primary_actor, but then allocates
    all using a fixed layout */
@@ -68,7 +72,11 @@ var WindowClone = new Lang.Class({
         this.realWindow = realWindow;
         this.metaWindow = realWindow.meta_window;
 
+<<<<<<< js/ui/workspaceThumbnail.js
         this.clone._updateId = this.metaWindow.connect('position-changed',
+=======
+        this.clone._updateId = this.realWindow.connect('notify::position',
+>>>>>>> js/ui/workspaceThumbnail.js
                                                        this._onPositionChanged.bind(this));
         this.clone._destroyId = this.realWindow.connect('destroy', () => {
             // First destroy the clone and then destroy everything
@@ -153,7 +161,11 @@ var WindowClone = new Lang.Class({
         let clone = new Clutter.Clone({ source: realDialog });
         this._updateDialogPosition(realDialog, clone);
 
+<<<<<<< js/ui/workspaceThumbnail.js
         clone._updateId = metaDialog.connect('position-changed', dialog => {
+=======
+        clone._updateId = realDialog.connect('notify::position', dialog => {
+>>>>>>> js/ui/workspaceThumbnail.js
             this._updateDialogPosition(dialog, clone);
         });
         clone._destroyId = realDialog.connect('destroy', () => {
@@ -171,7 +183,10 @@ var WindowClone = new Lang.Class({
     },
 
     _onPositionChanged() {
+<<<<<<< js/ui/workspaceThumbnail.js
         let rect = this.metaWindow.get_frame_rect();
+=======
+>>>>>>> js/ui/workspaceThumbnail.js
         this.actor.set_position(this.realWindow.x, this.realWindow.y);
     },
 
@@ -179,7 +194,11 @@ var WindowClone = new Lang.Class({
         this.actor.get_children().forEach(child => {
             let realWindow = child.source;
 
+<<<<<<< js/ui/workspaceThumbnail.js
             realWindow.meta_window.disconnect(child._updateId);
+=======
+            realWindow.disconnect(child._updateId);
+>>>>>>> js/ui/workspaceThumbnail.js
             realWindow.disconnect(child._destroyId);
         });
     },
@@ -241,7 +260,11 @@ var WindowClone = new Lang.Class({
 Signals.addSignalMethods(WindowClone.prototype);
 
 
+<<<<<<< js/ui/workspaceThumbnail.js
 const ThumbnailState = {
+=======
+var ThumbnailState = {
+>>>>>>> js/ui/workspaceThumbnail.js
     NEW   :         0,
     ANIMATING_IN :  1,
     NORMAL:         2,
@@ -275,8 +298,13 @@ var WorkspaceThumbnail = new Lang.Class({
 
         this._createBackground();
 
+<<<<<<< js/ui/workspaceThumbnail.js
         let monitor = Main.layoutManager.primaryMonitor;
         this.setPorthole(monitor.x, monitor.y, monitor.width, monitor.height);
+=======
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(this.monitorIndex);
+        this.setPorthole(workArea.x, workArea.y, workArea.width, workArea.height);
+>>>>>>> js/ui/workspaceThumbnail.js
 
         let windows = global.get_window_actors().filter(actor => {
             let win = actor.meta_window;
@@ -321,8 +349,11 @@ var WorkspaceThumbnail = new Lang.Class({
     },
 
     setPorthole(x, y, width, height) {
+<<<<<<< js/ui/workspaceThumbnail.js
         this._portholeX = x;
         this._portholeY = y;
+=======
+>>>>>>> js/ui/workspaceThumbnail.js
         this.actor.set_size(width, height);
         this._contents.set_position(-x, -y);
     },
@@ -374,6 +405,7 @@ var WorkspaceThumbnail = new Lang.Class({
     },
 
     _doRemoveWindow(metaWin) {
+<<<<<<< js/ui/workspaceThumbnail.js
         let win = metaWin.get_compositor_private();
 
         // find the position of the window in our list
@@ -386,6 +418,11 @@ var WorkspaceThumbnail = new Lang.Class({
         this._windows.splice(index, 1);
 
         clone.destroy();
+=======
+        let clone = this._removeWindowClone(metaWin);
+        if (clone)
+            clone.destroy();
+>>>>>>> js/ui/workspaceThumbnail.js
     },
 
     _doAddWindow(metaWin) {
@@ -428,7 +465,11 @@ var WorkspaceThumbnail = new Lang.Class({
         } else if (metaWin.is_attached_dialog()) {
             let parent = metaWin.get_transient_for();
             while (parent.is_attached_dialog())
+<<<<<<< js/ui/workspaceThumbnail.js
                 parent = metaWin.get_transient_for();
+=======
+                parent = parent.get_transient_for();
+>>>>>>> js/ui/workspaceThumbnail.js
 
             let idx = this._lookupIndex (parent);
             if (idx < 0) {
@@ -537,6 +578,12 @@ var WorkspaceThumbnail = new Lang.Class({
         clone.connect('drag-end', () => {
             Main.overview.endWindowDrag(clone.metaWindow);
         });
+<<<<<<< js/ui/workspaceThumbnail.js
+=======
+        clone.actor.connect('destroy', () => {
+            this._removeWindowClone(clone.metaWindow);
+        });
+>>>>>>> js/ui/workspaceThumbnail.js
         this._contents.add_actor(clone.actor);
 
         if (this._windows.length == 0)
@@ -549,6 +596,19 @@ var WorkspaceThumbnail = new Lang.Class({
         return clone;
     },
 
+<<<<<<< js/ui/workspaceThumbnail.js
+=======
+    _removeWindowClone(metaWin) {
+        // find the position of the window in our list
+        let index = this._lookupIndex (metaWin);
+
+        if (index == -1)
+            return null;
+
+        return this._windows.splice(index, 1).pop();
+    },
+
+>>>>>>> js/ui/workspaceThumbnail.js
     activate(time) {
         if (this.state > ThumbnailState.NORMAL)
             return;
@@ -1159,7 +1219,11 @@ var ThumbnailsBox = new Lang.Class({
     // The "porthole" is the portion of the screen that we show in the
     // workspaces
     _ensurePorthole() {
+<<<<<<< js/ui/workspaceThumbnail.js
         if (!Main.layoutManager.primaryMonitor)
+=======
+        if (!Main.layoutManager.primaryMonitor || !Main.overview.visible)
+>>>>>>> js/ui/workspaceThumbnail.js
             return false;
 
         if (!this._porthole)
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 563e43d..28b6d2e 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -470,6 +470,10 @@ var WorkspacesDisplay = new Lang.Class({
         this._switchWorkspaceNotifyId = 0;
 
         this._notifyOpacityId = 0;
+<<<<<<< js/ui/workspacesView.js
+=======
+        this._restackedNotifyId = 0;
+>>>>>>> js/ui/workspacesView.js
         this._scrollEventId = 0;
         this._keyPressEventId = 0;
 
diff --git a/meson.build b/meson.build
index bfc2ff7..298dbc3 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,9 @@
 project('gnome-shell', 'c',
+<<<<<<< meson.build
   version: '3.28.1',
+=======
+  version: '3.28.3',
+>>>>>>> meson.build
   meson_version: '>= 0.42.0',
   license: 'GPLv2+'
 )
diff --git a/po/af.po b/po/af.po
index 72ecaa6..5b848c2 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the gnome-shell package.
 # F Wolff <[e-mail]>, 2011, 2013, 2014, 2015, 2016.
 # Dawid Loubser <[e-mail]>, 2013.
+<<<<<<< po/af.po
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
@@ -12,11 +13,24 @@ msgstr ""
 "PO-Revision-Date: 2016-02-29 19:51+0200\n"
 "Last-Translator: F Wolff <[e-mail]>\n"
 "Language-Team: [e-mail]\n"
+=======
+# Pieter Schoeman <[e-mail]>, 2017.
+#
+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-01-30 15:45+0000\n"
+"PO-Revision-Date: 2018-02-10 11:12+0200\n"
+"Last-Translator: Pieter Schalk Schoeman <[e-mail]>\n"
+"Language-Team: Afrikaans <[e-mail]>\n"
+>>>>>>> po/af.po
 "Language: af\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"
+<<<<<<< po/af.po
 "X-Generator: Virtaal 1.0.0-beta1\n"
 "X-DamnedLies-Scope: partial\n"
 "X-Project-Style: gnome\n"
@@ -62,12 +76,64 @@ msgid "Window management and application launching"
 msgstr "Vensterbestuur en toepassinglansering"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
+=======
+"X-Generator: Poedit 2.0.3\n"
+"X-DamnedLies-Scope: partial\n"
+"X-Project-Style: gnome\n"
+
+#: data/50-gnome-shell-system.xml:6
+msgid "System"
+msgstr "Stelsel"
+
+#: data/50-gnome-shell-system.xml:9
+msgid "Show the notification list"
+msgstr "Wys die lys van kennisgewings"
+
+#: data/50-gnome-shell-system.xml:12
+msgid "Focus the active notification"
+msgstr "Fokus op die aktiewe kennisgewing"
+
+#: data/50-gnome-shell-system.xml:15
+msgid "Show the overview"
+msgstr "Wys die oorsig"
+
+#: data/50-gnome-shell-system.xml:18
+msgid "Show all applications"
+msgstr "Wys alle toepassings"
+
+#: data/50-gnome-shell-system.xml:21
+msgid "Open the application menu"
+msgstr "Open die toepassingkieslys"
+
+#: data/gnome-shell-extension-prefs.desktop.in.in:4
+#: js/extensionPrefs/main.js:152
+msgid "Shell Extensions"
+msgstr "Shell uitbreidings"
+
+#: data/gnome-shell-extension-prefs.desktop.in.in:5
+msgid "Configure GNOME Shell Extensions"
+msgstr "Stel GNOME Shell-uitbreidings op"
+
+#: data/org.gnome.Shell.desktop.in.in:4
+msgid "GNOME Shell"
+msgstr "GNOME Shell"
+
+#: data/org.gnome.Shell.desktop.in.in:5
+msgid "Window management and application launching"
+msgstr "Vensterbestuur en toepassinglansering"
+
+#: data/org.gnome.shell.gschema.xml.in:6
+>>>>>>> po/af.po
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr ""
 "Aktiveer interne gereedskap wat nuttig is vir ontwikkelaars en toetsers "
 "vanaf Alt-F2"
 
+<<<<<<< po/af.po
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
+=======
+#: data/org.gnome.shell.gschema.xml.in:9
+>>>>>>> po/af.po
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
@@ -75,11 +141,19 @@ msgstr ""
 "Laat toegang na interne ontfout- en moniteringsgereedskap toe deur die Alt-"
 "F2-dialoog te gebruik."
 
+<<<<<<< po/af.po
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "UUIDs of extensions to enable"
 msgstr "UUID's van uitbreidings om te aktiveer"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
+=======
+#: data/org.gnome.shell.gschema.xml.in:16
+msgid "UUIDs of extensions to enable"
+msgstr "UUID's van uitbreidings om te aktiveer"
+
+#: data/org.gnome.shell.gschema.xml.in:17
+>>>>>>> po/af.po
 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 "
@@ -91,11 +165,46 @@ msgstr ""
 "moet in hierdie lys verskyn. U kan ook hierdie lys manipuleer met die "
 "EnableExtension- en DisableExtension-DBus-metodes op org.gnome.Shell."
 
+<<<<<<< po/af.po
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
 msgstr "Lys van werkarealêer-ID's vir gunstelingtoepassings"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:8
+=======
+#: data/org.gnome.shell.gschema.xml.in:26
+msgid "Disable user extensions"
+msgstr "Skakel gebruikers uitbreidings af"
+
+#: data/org.gnome.shell.gschema.xml.in:27
+msgid ""
+"Disable all extensions the user has enabled without affecting the “enabled-"
+"extension” setting."
+msgstr ""
+"Skakel alle uitbreidings wat die gebruiker aangeskakel het af sonder om die "
+"\"aangeskakelde-uitbreiding\" instelling te verander."
+
+#: data/org.gnome.shell.gschema.xml.in:34
+msgid "Disables the validation of extension version compatibility"
+msgstr "Skakel die validasie van uitbreidings weergawe versoenbaarheid af"
+
+#: 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 ""
+"GNOME Shell sal slegs uitbreidings laai wat die huidig geïnstalleerde "
+"weergawe ondersteun. Deur die opsie te aktiveer sal die toets afgeskakel "
+"word en alle uitbreidings sal gelaai kan word ongeag of hulle die weergawe "
+"ondersteun of nie."
+
+#: data/org.gnome.shell.gschema.xml.in:43
+msgid "List of desktop file IDs for favorite applications"
+msgstr "Lys van werkarealêer-ID's vir gunstelingtoepassings"
+
+#: data/org.gnome.shell.gschema.xml.in:44
+>>>>>>> po/af.po
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
@@ -103,6 +212,7 @@ msgstr ""
 "Die toepassings wat ooreenstem met dié identifiseerders sal in die "
 "gunstelinge-area vertoon word."
 
+<<<<<<< po/af.po
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
 msgstr "Geskiedenis vir die opdrag-dialoogvenster (Alt-F2)"
@@ -119,28 +229,67 @@ msgstr "Wys altyd die 'Meld af'-kieslysitem in die gebruikerkieslys."
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
+=======
+#: data/org.gnome.shell.gschema.xml.in:51
+msgid "App Picker View"
+msgstr "Toepassingkieser oorsig"
+
+#: data/org.gnome.shell.gschema.xml.in:52
+msgid "Index of the currently selected view in the application picker."
+msgstr "Indeks van die huidige aansig in die toepassing kieser."
+
+#: data/org.gnome.shell.gschema.xml.in:58
+msgid "History for command (Alt-F2) dialog"
+msgstr "Geskiedenis vir die opdrag-dialoogvenster (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 "Geskiedenis vir die \"looking glass\"-dialoogvenster"
+
+#: data/org.gnome.shell.gschema.xml.in:67
+msgid "Always show the “Log out” menu item in the user menu."
+msgstr "Wys altyd die 'Meld af' opsie in die gebruikerkieslys."
+
+#: data/org.gnome.shell.gschema.xml.in:68
+msgid ""
+"This key overrides the automatic hiding of the “Log out” menu item in single-"
+>>>>>>> po/af.po
 "user, single-session situations."
 msgstr ""
 "Hierdie sleutel oorheers die outomatiese wegsteek van die 'Meld af'-"
 "kieslysitem in enkelgebruiker-, enkelsessie-situasies."
 
+<<<<<<< po/af.po
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+=======
+#: data/org.gnome.shell.gschema.xml.in:75
+>>>>>>> po/af.po
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
 "Of wagwoord onthou moet word vir die heg van geënkripteerde of afgeleë "
 "lêerstelsels"
 
+<<<<<<< po/af.po
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 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 "
+=======
+#: 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 "
+>>>>>>> po/af.po
 "state of the checkbox."
 msgstr ""
 "'n Wagwoord sal versoek word wanneer 'n geënkripteerde toestel of afgeleë "
 "lêerstelsel geheg word. As die wagwoord vir toekomstige gebruik gestoor kan "
 "word sal 'n 'Onthou wagwoord'-keuseblokkie teenwoordig wees. Hierdie sleutel "
+<<<<<<< po/af.po
 "stel die verstektoestand van die keuseblokkie."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:20
@@ -221,12 +370,138 @@ msgid "Attach modal dialog to the parent window"
 msgstr "Heg modale dialoogvenster vas aan die ouervenster"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+=======
+"stel die verstektoestand van die keuseblokkie stel."
+
+#: data/org.gnome.shell.gschema.xml.in:85
+msgid ""
+"Whether the default Bluetooth adapter had set up devices associated to it"
+msgstr ""
+"Of die verstek Bluetooth verwerker opgestelde toestelle het wat daarmee "
+"verband hou"
+
+#: 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 ""
+"Die shell sal slegs 'n Bluetooth-kieslysitem wys as 'n Bluetooth-verwerker "
+"aangeskakel is, of as daar toestelle ingestel is wat verband hou met die "
+"verstekverwerker. Dit sal herstel word as die verstekverwerker ooit gesien "
+"word om nie toestelle wat daarmee verband hou, te hê nie."
+
+#: data/org.gnome.shell.gschema.xml.in:101
+msgid "Keybinding to open the application menu"
+msgstr "Sleutelbinding om die toepassingskieslys oop te maak"
+
+#: data/org.gnome.shell.gschema.xml.in:102
+msgid "Keybinding to open the application menu."
+msgstr "Sleutelbinding om die toepassingskieslys oop te maak."
+
+#: data/org.gnome.shell.gschema.xml.in:108
+msgid "Keybinding to open the “Show Applications” view"
+msgstr "Sleutelkortpad om die \"Vertoon toepassings\"-aansig oop te maak"
+
+#: data/org.gnome.shell.gschema.xml.in:109
+msgid ""
+"Keybinding to open the “Show Applications” view of the Activities Overview."
+msgstr ""
+"Sleutelkortpad om die \"Vertoon toepassings\"-aansig van die Aktiwiteite-"
+"oorsig oop te maak."
+
+#: data/org.gnome.shell.gschema.xml.in:116
+msgid "Keybinding to open the overview"
+msgstr "Sleutelbinding om die oorsig oop te maak"
+
+#: data/org.gnome.shell.gschema.xml.in:117
+msgid "Keybinding to open the Activities Overview."
+msgstr "Sleutelbinding om die Aktiwiteite-oorsig oop te maak."
+
+#: data/org.gnome.shell.gschema.xml.in:123
+msgid "Keybinding to toggle the visibility of the notification list"
+msgstr "Sleutelbinding om die sigbaarheid van die kennisgewinglys te swik"
+
+#: data/org.gnome.shell.gschema.xml.in:124
+msgid "Keybinding to toggle the visibility of the notification list."
+msgstr "Sleutelbinding om die sigbaarheid van die kennisgewinglys te swik."
+
+#: data/org.gnome.shell.gschema.xml.in:130
+msgid "Keybinding to focus the active notification"
+msgstr "Sleutelbinding om die aktiewe kennisgewing te fokus"
+
+#: data/org.gnome.shell.gschema.xml.in:131
+msgid "Keybinding to focus the active notification."
+msgstr "Sleutelbinding om die aktiewe kennisgewing te fokus."
+
+#: data/org.gnome.shell.gschema.xml.in:137
+msgid ""
+"Keybinding that pauses and resumes all running tweens, for debugging purposes"
+msgstr ""
+"Sleutelkortpaaie wat alle uitvoerende tweens stop en weer begin vir "
+"ontvoutings doeleindes"
+
+#: data/org.gnome.shell.gschema.xml.in:146
+msgid "Which keyboard to use"
+msgstr "Watter sleutelbord om te gebruik"
+
+#: data/org.gnome.shell.gschema.xml.in:147
+msgid "The type of keyboard to use."
+msgstr "Die tipe sleutelbord om te gebruik."
+
+#: data/org.gnome.shell.gschema.xml.in:158
+#: data/org.gnome.shell.gschema.xml.in:185
+msgid "Limit switcher to current workspace."
+msgstr "Beperk wisselaar tot huidige werkspasie."
+
+#: 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 ""
+"As waar sal slegs toepassings wat vensters in die huidige werkspasie het in "
+"die wisselaar vertoon word. Anders sal alle toepassings ingesluit word."
+
+#: data/org.gnome.shell.gschema.xml.in:176
+msgid "The application icon mode."
+msgstr "Die toepassingsikoon-modus."
+
+#: 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 ""
+"Stel op hoe die vensters vertoon word in die wisselaar. Geldige moontlikhede "
+"is 'slegs-duimnaelskets' (wys 'n duimnaelskets van die venster), 'slegs-toep-"
+"ikoon' (wys slegs die toepassing se ikoon), of 'altwee'."
+
+#: 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 ""
+"As waar sal slegs vensters van die huidige werkspasie in die wisselaar "
+"vertoon word. Anders sal alle vensters ingesluit word."
+
+#: data/org.gnome.shell.gschema.xml.in:197
+msgid "Attach modal dialog to the parent window"
+msgstr "Heg modale dialoogvenster vas aan die ouervenster"
+
+#: 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
+>>>>>>> po/af.po
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Hierdie sleutel oorskryf die sleutel in org.gnome.mutter wanneer GNOME Shell "
 "uitgevoer word."
 
+<<<<<<< po/af.po
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 #, fuzzy
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -249,11 +524,40 @@ msgid "Network Login"
 msgstr "Netwerkaanmelding"
 
 #: ../js/extensionPrefs/main.js:121
+=======
+#: data/org.gnome.shell.gschema.xml.in:206
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "Aktiveer rand-tilering wanneer vensters op skermrand laat val word"
+
+#: data/org.gnome.shell.gschema.xml.in:214
+msgid "Workspaces are managed dynamically"
+msgstr "Werkspasies word dinamies bestuur"
+
+#: data/org.gnome.shell.gschema.xml.in:222
+msgid "Workspaces only on primary monitor"
+msgstr "Werkspasies slegs op primêre monitor"
+
+#: data/org.gnome.shell.gschema.xml.in:230
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr "Vertraag fokusverandering in muismodus totdat die wyser ophou beweeg"
+
+#: data/org.gnome.Shell.PortalHelper.desktop.in.in:3
+msgid "Network Login"
+msgstr "Netwerkaanmelding"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/org.gnome.Shell.PortalHelper.desktop.in.in:9
+msgid "network-workgroup"
+msgstr "netwerk-werkgroep"
+
+#: js/extensionPrefs/main.js:120
+>>>>>>> po/af.po
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
 "'n Fout het voorgekom tydens die lansering van die voorkeuredialoog vir %s:"
 
+<<<<<<< po/af.po
 #: ../js/extensionPrefs/main.js:153
 msgid "GNOME Shell Extensions"
 msgstr "GNOME Shell-uitbreidings"
@@ -277,24 +581,55 @@ msgid "Unlock"
 msgstr "Sluit oop"
 
 #: ../js/gdm/authPrompt.js:214
+=======
+#: js/gdm/authPrompt.js:149 js/ui/audioDeviceSelection.js:71
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
+#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
+#: js/ui/shellMountOperation.js:344 js/ui/status/network.js:936
+msgid "Cancel"
+msgstr "Kanselleer"
+
+#: js/gdm/authPrompt.js:171 js/gdm/authPrompt.js:218 js/gdm/authPrompt.js:450
+msgid "Next"
+msgstr "Volgende"
+
+#: js/gdm/authPrompt.js:214 js/ui/shellMountOperation.js:348
+#: js/ui/unlockDialog.js:59
+msgid "Unlock"
+msgstr "Sluit oop"
+
+#: js/gdm/authPrompt.js:216
+>>>>>>> po/af.po
 msgctxt "button"
 msgid "Sign In"
 msgstr "Meld aan"
 
+<<<<<<< po/af.po
 #: ../js/gdm/loginDialog.js:285
+=======
+#: js/gdm/loginDialog.js:308
+>>>>>>> po/af.po
 msgid "Choose Session"
 msgstr "Kies sessie"
 
 #. 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.
+<<<<<<< po/af.po
 #: ../js/gdm/loginDialog.js:435
+=======
+#: js/gdm/loginDialog.js:458
+>>>>>>> po/af.po
 msgid "Not listed?"
 msgstr "Nie op die lys nie?"
 
 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
+<<<<<<< po/af.po
 #: ../js/gdm/loginDialog.js:854
+=======
+#: js/gdm/loginDialog.js:888
+>>>>>>> po/af.po
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(bv. gebruiker of %s)"
@@ -302,6 +637,7 @@ msgstr "(bv. gebruiker of %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)
+<<<<<<< po/af.po
 #: ../js/gdm/loginDialog.js:859 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
@@ -314,6 +650,18 @@ msgstr "Aanmeldvenster"
 #: ../js/gdm/util.js:341
 #, fuzzy
 #| msgid "Connection error"
+=======
+#: js/gdm/loginDialog.js:893 js/ui/components/networkAgent.js:243
+#: js/ui/components/networkAgent.js:261
+msgid "Username: "
+msgstr "Gebruikernaam: "
+
+#: js/gdm/loginDialog.js:1236
+msgid "Login Window"
+msgstr "Aanmeldvenster"
+
+#: js/gdm/util.js:346
+>>>>>>> po/af.po
 msgid "Authentication error"
 msgstr "Verifiëringsfout"
 
@@ -322,40 +670,185 @@ msgstr "Verifiëringsfout"
 #. 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
+<<<<<<< po/af.po
 #: ../js/gdm/util.js:473
 msgid "(or swipe finger)"
 msgstr "(of veeg vinger)"
 
 #: ../js/misc/util.js:119
+=======
+#: js/gdm/util.js:478
+msgid "(or swipe finger)"
+msgstr "(of veeg vinger)"
+
+#. Translators: The name of the power-off action in search
+#: js/misc/systemActions.js:99
+msgctxt "search-result"
+msgid "Power off"
+msgstr "Skakel af"
+
+#. Translators: A list of keywords that match the power-off action, separated by semicolons
+#: js/misc/systemActions.js:102
+msgid "power off;shutdown"
+msgstr "skakel af;afskakel"
+
+#. Translators: The name of the lock screen action in search
+#: js/misc/systemActions.js:106
+msgctxt "search-result"
+msgid "Lock screen"
+msgstr "Sluit skerm"
+
+#. Translators: A list of keywords that match the lock screen action, separated by semicolons
+#: js/misc/systemActions.js:109
+msgid "lock screen"
+msgstr "sluit skerm"
+
+#. Translators: The name of the logout action in search
+#: js/misc/systemActions.js:113
+msgctxt "search-result"
+msgid "Log out"
+msgstr "Meld af"
+
+#. Translators: A list of keywords that match the logout action, separated by semicolons
+#: js/misc/systemActions.js:116
+msgid "logout;sign off"
+msgstr "meld af;teken af"
+
+#. Translators: The name of the suspend action in search
+#: js/misc/systemActions.js:120
+msgctxt "search-result"
+msgid "Suspend"
+msgstr "Sluimer"
+
+#. Translators: A list of keywords that match the suspend action, separated by semicolons
+#: js/misc/systemActions.js:123
+msgid "suspend;sleep"
+msgstr "suspend;sleep;sluimer;slaap"
+
+#. Translators: The name of the switch user action in search
+#: js/misc/systemActions.js:127
+msgctxt "search-result"
+msgid "Switch user"
+msgstr "Wissel gebruiker"
+
+#. Translators: A list of keywords that match the switch user action, separated by semicolons
+#: js/misc/systemActions.js:130
+msgid "switch user"
+msgstr "wissel gebruiker"
+
+#. Translators: The name of the lock orientation action in search
+#: js/misc/systemActions.js:134
+msgctxt "search-result"
+msgid "Lock orientation"
+msgstr "Sluit oriëntasie"
+
+#. Translators: A list of keywords that match the lock orientation action, separated by semicolons
+#: js/misc/systemActions.js:137
+msgid "lock orientation"
+msgstr "sluit oriëntasie"
+
+#: js/misc/util.js:122
+>>>>>>> po/af.po
 msgid "Command not found"
 msgstr "Opdrag nie gevind nie"
 
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
+<<<<<<< po/af.po
 #: ../js/misc/util.js:152
 msgid "Could not parse command:"
 msgstr "Kon nie opdrag ontleed nie:"
 
 #: ../js/misc/util.js:160
+=======
+#: js/misc/util.js:155
+msgid "Could not parse command:"
+msgstr "Kon nie opdrag ontleed nie:"
+
+#: js/misc/util.js:163
+>>>>>>> po/af.po
 #, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "Uitvoer van “%s” het misluk:"
 
+<<<<<<< po/af.po
 #. Translators: Time in 24h format
 #: ../js/misc/util.js:191
+=======
+#: js/misc/util.js:180
+msgid "Just now"
+msgstr "Nounet"
+
+#: js/misc/util.js:182
+#, javascript-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minuut gelede"
+msgstr[1] "%d minute gelede"
+
+#: js/misc/util.js:185
+#, javascript-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d uur gelede"
+msgstr[1] "%d ure gelede"
+
+#: js/misc/util.js:188
+msgid "Yesterday"
+msgstr "Gister"
+
+#: js/misc/util.js:190
+#, javascript-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d dag gelede"
+msgstr[1] "%d dae gelede"
+
+#: js/misc/util.js:193
+#, javascript-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d week gelede"
+msgstr[1] "%d weke gelede"
+
+#: js/misc/util.js:196
+#, javascript-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d maand gelede"
+msgstr[1] "%d maande gelede"
+
+#: js/misc/util.js:198
+#, javascript-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d jaar gelede"
+msgstr[1] "%d jaar gelede"
+
+#. Translators: Time in 24h format
+#: js/misc/util.js:228
+>>>>>>> po/af.po
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30"
+<<<<<<< po/af.po
 #: ../js/misc/util.js:197
+=======
+#: js/misc/util.js:234
+>>>>>>> po/af.po
 #, no-c-format
 msgid "Yesterday, %H∶%M"
 msgstr "Gister, %H:%M"
 
 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30"
+<<<<<<< po/af.po
 #: ../js/misc/util.js:203
+=======
+#: js/misc/util.js:240
+>>>>>>> po/af.po
 #, no-c-format
 msgid "%A, %H∶%M"
 msgstr "%A %H:%M"
@@ -363,7 +856,11 @@ msgstr "%A %H:%M"
 #. Translators: this is the month name and day number
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30"
+<<<<<<< po/af.po
 #: ../js/misc/util.js:209
+=======
+#: js/misc/util.js:246
+>>>>>>> po/af.po
 #, no-c-format
 msgid "%B %d, %H∶%M"
 msgstr "%e %B %H∶%M"
@@ -371,26 +868,42 @@ msgstr "%e %B %H∶%M"
 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 24h format.
 #. i.e. "May 25 2012, 14:30"
+<<<<<<< po/af.po
 #: ../js/misc/util.js:215
+=======
+#: js/misc/util.js:252
+>>>>>>> po/af.po
 #, no-c-format
 msgid "%B %d %Y, %H∶%M"
 msgstr "%e %B %Y, %H∶%M"
 
 #. Translators: Time in 12h format
+<<<<<<< po/af.po
 #: ../js/misc/util.js:220
+=======
+#: js/misc/util.js:257
+>>>>>>> po/af.po
 msgid "%l∶%M %p"
 msgstr "%l:%M %p"
 
 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 12h format. i.e. "Yesterday, 2:30 pm"
+<<<<<<< po/af.po
 #: ../js/misc/util.js:226
+=======
+#: js/misc/util.js:263
+>>>>>>> po/af.po