Merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master-3-29+yaru into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master

[Marco Trevisan (Treviño)]

Merge with debian experimental and include didier's change for yaru as default.

pristine-tar and upstream/latest can be pulled from salsa.

[Iain Lane (laney)]

Merged, please consider fixing the topic for the rest of the ubuntu patches next time

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

Well, there are indeed others ubuntu-only, but didn't know weather the limit was in some, so I just did this for the obvious one :)

diff --git a/NEWS b/NEWS
index 9730c0b..e12a262 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,8 @@
 ==============
-Version 3.28.1
+Version 3.29.90
 ==============
-
-	* Tell libICE to stop opening a TCP socket
-	* Shore up permissions of .config
+	* Drop deprecated environment variable again
+	* harden permissions on config dir
 	* Translation updates
 
 ==============
diff --git a/debian/changelog b/debian/changelog
index 983de4a..432151e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,75 @@
+gnome-session (3.29.90-1ubuntu1) cosmic; urgency=medium
+
+  * Merge with debian, remaining changes:
+    - debian/control.in:
+      + Recommend session-migration
+      + Move xwayland dependency to gnome-session and make gnome-session
+        Arch: any
+      + Split gnome-startup-applications to a separate binary package so
+        that it can be uninstalled without breaking the system
+      + Add unity-session
+    - Split ubuntu-session out of gnome-session.
+    - Add upstart user session and systemd user session:
+      debian/data, debian/gnome-session-bin.user-session.upstart
+    - debian/gnome-session-bin.postinst, debian/gnome-session-bin.prerm:
+       Moved registering gnome-session binary as a session manager to
+       gnome-session-bin package
+    - Add gnome-session-wayland transitional package
+    - don't install gnome-mimeapps.list (installed by desktop-file-utils in
+      Ubuntu):
+      debian/gnome-session-common.dirs, gnome-session-common.install,
+      gnome-session-common.maintscript, gnome-session-common.postinst
+    - debian/patches/103_kill_the_fail_whale.patch:
+      + Kill the Fail Whale as it tends to be more annoying than helpful
+    - debian/patches/22_support_autostart_delay.patch:
+      + Bugzilla patch to support adding a delay to autostart apps, using
+        a "X-GNOME-Autostart-Delay" key in the desktop file
+    - debian/patches/50_ubuntu_sessions.patch:
+      + Add ubuntu session tweaks
+    - debian/patches/51_remove_session_saving_from_gui.patch:
+      + Add GNOME_SESSION_SAVE environment variable for people wanting to
+        use the save session still, knowing that it can break your system
+        if used unwisely
+    - debian/patches/53_add_sessionmigration.patch:
+      + launch session-migration if present at the start of the session.
+        This sync tool runns different session migration scripts that can be
+        provided in various desktop packages.
+    - debian/patches/95_dbus_request_shutdown.patch:
+      + Add "RequestShutdown" and "RequestReboot" DBus methods to allow
+        other applications to shutdown or reboot the machine via the session
+        manager.
+    - debian/patches/ignore_gsettings_region.patch:
+      + Ignore the "region" gsettings value - users' setting of LC_*
+        variables saved in ~/.pam_environment.
+    - debian/patches/revert_remove_gnome_session_properties.patch:
+      + Don't merge translations into gnome-session-properties.desktop
+  * debian/patches/50_ubuntu_sessions.patch:
+    - moved to debian/patches/ubuntu/ubuntu-sessions.patch (using gbp topic)
+
+  [ Didier Roche ]
+  * Remove gnome-themes-extra and gtk2-engines-pixbuf Recommends.
+    Those are pulled by the themes as needed.
+  * ubuntu-session now depends on yaru-theme-gnome-shell, as the mod
+    refers to it. (LP: #1783571)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 17 Aug 2018 03:12:08 +0200
+
+gnome-session (3.29.90-1) experimental; urgency=medium
+
+  * New upstream revision
+  * debian/*: Update for experimental (3.29/3.30 series)
+  * debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch:
+    - revert removal of GNOME_DESKTOP_SESSION_ID not to break apps using it
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Thu, 16 Aug 2018 10:45:17 +0200
+
+gnome-session (3.28.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Drop patch included in new release
+
+ -- Tim Lunn <[e-mail]>  Sat, 14 Apr 2018 12:57:24 +1000
+
 gnome-session (3.28.1-0ubuntu3) bionic; urgency=medium
 
   * Prevent debian/unity-gnome-shell-migration.17.10.py script migration
@@ -47,6 +119,24 @@ gnome-session (3.28.0-0ubuntu3) bionic; urgency=medium
 
  -- Tim Lunn <[e-mail]>  Sun, 01 Apr 2018 11:53:22 +1000
 
+gnome-session (3.28.0-2) unstable; urgency=medium
+
+  * Team upload
+  * d/p/xsmp-don-t-check-for-HAVE_XTRANS.patch:
+    Add patch from upstream making xtrans support work again, so that
+    gnome-session doesn't fall back to TCP sockets for session management
+    (Closes: #894351)
+
+ -- Simon McVittie <[e-mail]>  Thu, 29 Mar 2018 14:55:15 +0100
+
+gnome-session (3.28.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/rules: Switch to dh_missing --fail-missing
+    instead of dh_install --list-missing
+
+ -- Tim Lunn <[e-mail]>  Sun, 18 Mar 2018 18:06:26 +1100
+
 gnome-session (3.28.0-0ubuntu2) bionic; urgency=medium
 
   * Add new communitheme session to the ubuntu session package. This
@@ -68,6 +158,13 @@ gnome-session (3.28.0-0ubuntu1) bionic; urgency=medium
 
  -- Tim Lunn <[e-mail]>  Sun, 18 Mar 2018 19:00:24 +1100
 
+gnome-session (3.27.92-1) unstable; urgency=medium
+
+  * New upstream release candidate
+  * Release to unstable
+
+ -- Jeremy Bicha <[e-mail]>  Sat, 10 Mar 2018 21:11:30 -0500
+
 gnome-session (3.27.91-0ubuntu4) bionic; urgency=medium
 
   * debian/rules: Simplify code for adding X-Ubuntu-Gettext-Domain
@@ -121,6 +218,30 @@ gnome-session (3.27.91-0ubuntu1) bionic; urgency=medium
 
  -- Tim Lunn <[e-mail]>  Mon, 05 Mar 2018 17:55:42 +1100
 
+gnome-session (3.27.90.1-1) experimental; urgency=medium
+
+  * New upstream development release
+  * Build with meson
+  * Update Vcs fields for migration to https://salsa.debian.org/
+
+ -- Jeremy Bicha <[e-mail]>  Sat, 17 Feb 2018 15:50:51 -0500
+
+gnome-session (3.26.1-2) unstable; urgency=medium
+
+  * Drop unnecessary Suggests: gnome-user-guide (LP: #1691867)
+  * Update Vcs fields for conversion to git
+  * Add debian/gbp.conf
+  * Bump Standards-Version to 4.1.2
+
+ -- Jeremy Bicha <[e-mail]>  Fri, 15 Dec 2017 14:34:08 -0500
+
+gnome-session (3.26.1-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+
+ -- Simon McVittie <[e-mail]>  Fri, 06 Oct 2017 10:52:04 +0100
+
 gnome-session (3.26.1-0ubuntu10) bionic; urgency=medium
 
   * No-change rebuild against latest gnome-desktop3
@@ -209,13 +330,19 @@ gnome-session (3.26.1-0ubuntu1) artful; urgency=medium
 
  -- Didier Roche <[e-mail]>  Mon, 09 Oct 2017 12:23:49 +0200
 
+gnome-session (3.26.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <[e-mail]>  Thu, 14 Sep 2017 19:11:33 -0400
+
 gnome-session (3.26.0-0ubuntu2) artful; urgency=medium
 
   [ Jeremy Bicha ]
   * Have gnome-session recommend gnome-themes-standard (Adwaita for GTK+ 2)
 
   [ ventrical ]
-  * unity-session: Recommend zeitgeist-datahub 
+  * unity-session: Recommend zeitgeist-datahub
 
  -- ventrical <[e-mail]>  Mon, 02 Oct 2017 19:56:50 -0400
 
@@ -235,6 +362,14 @@ gnome-session (3.26.0-0ubuntu1) artful; urgency=medium
 
  -- Iain Lane <[e-mail]>  Thu, 14 Sep 2017 17:32:12 +0100
 
+gnome-session (3.25.90-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.1.0
+  * Drop all patches: Applied (or improved) in new release
+
+ -- Jeremy Bicha <[e-mail]>  Wed, 06 Sep 2017 22:21:26 -0400
+
 gnome-session (3.25.90-0ubuntu4) artful; urgency=medium
 
   * Add a || true until GNOME Shell migrates to release pocket. We will
@@ -267,6 +402,29 @@ gnome-session (3.25.90-0ubuntu1) artful; urgency=medium
 
  -- Jeremy Bicha <[e-mail]>  Mon, 21 Aug 2017 18:23:52 -0400
 
+gnome-session (3.24.1-2) unstable; urgency=medium
+
+  * Upload to unstable (Closes: #869947)
+
+ -- Jeremy Bicha <[e-mail]>  Sun, 06 Aug 2017 17:37:05 -0400
+
+gnome-session (3.24.1-1) experimental; urgency=medium
+
+  * New upstream release.
+    - Drop debian/patches/git_wayland_login_shell.patch, applied upstream
+    - Bump gnome-settings-daemon dependency to 3.24
+    - debian/gnome-session.install: Also install gnome-dummy session file
+  * debian/control.in: Bump Standards-Version to 4.0.0 (no further changes)
+  * debian/rules: Switch default "gnome" session to wayland
+  * d/p/0001-manager-add-bus-daemon-dbus-api-xml-file.patch,
+    d/p/0002-system-add-api-for-detecting-if-this-is-the-last-ses.patch,
+    d/p/0003-manager-kill-off-bus-clients-at-log-out.patch: kill off bus
+    clients at log out, backported from upstream 3.25
+  * d/p/0004-fail-whale-handle-X-server-dying-before-startup.patch: handle X
+    server dying before startup, cherry-picked from 3.24 branch
+
+ -- Laurent Bigonville <[e-mail]>  Thu, 06 Jul 2017 00:25:20 +0200
+
 gnome-session (3.24.1-0ubuntu22) artful; urgency=medium
 
   * Switch to wayland by default for both ubuntu and GNOME session:
@@ -365,10 +523,10 @@ gnome-session (3.24.1-0ubuntu12) artful; urgency=medium
 gnome-session (3.24.1-0ubuntu11) artful; urgency=medium
 
   * debian/ubuntu-session.postinst
-    - Check for user's sessions that are set to "ubuntu" and set gdm3 
+    - Check for user's sessions that are set to "ubuntu" and set gdm3
       as the default display manager as recommended.  This just changes
-      the default in /etc/X11/default-display-manager, it still requires 
-      configure from gdm3 to run after configure from ubuntu-session to 
+      the default in /etc/X11/default-display-manager, it still requires
+      configure from gdm3 to run after configure from ubuntu-session to
       complete setting the proper default without prompting the user.
 
  -- Ken VanDine <[e-mail]>  Mon, 03 Jul 2017 14:20:28 -0400
@@ -377,7 +535,7 @@ gnome-session (3.24.1-0ubuntu10) artful; urgency=medium
 
   * debian/unity-gnome-shell-migration.py:
     u-c-c was actually unity-control-center, not ubuntu-control-center.
-    Changing the key for migration. 
+    Changing the key for migration.
 
  -- Didier Roche <[e-mail]>  Thu, 06 Jul 2017 15:15:14 +0200
 
@@ -425,7 +583,7 @@ gnome-session (3.24.1-0ubuntu5) artful; urgency=medium
     after logging out (LP: #1610944)
     - 0001-manager-add-bus-daemon-dbus-api-xml-file.patch
     - 0002-system-add-api-for-detecting-if-this-is-the-last-ses.patch
-    - 0003-manager-kill-off-bus-clients-at-log-out.patch    
+    - 0003-manager-kill-off-bus-clients-at-log-out.patch
 
  -- Jeremy Bicha <[e-mail]>  Wed, 21 Jun 2017 18:57:12 -0400
 
@@ -510,6 +668,12 @@ gnome-session (3.23.4.1-0ubuntu1) zesty; urgency=medium
 
  -- Jeremy Bicha <[e-mail]>  Tue, 07 Feb 2017 18:24:14 -0500
 
+gnome-session (3.22.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <[e-mail]>  Thu, 09 Mar 2017 06:47:00 +0100
+
 gnome-session (3.22.2-2ubuntu1) zesty; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
@@ -753,7 +917,7 @@ gnome-session (3.20.2-1ubuntu1) yakkety; urgency=medium
       session-properties applet for ubuntu sessions
     - debian/patches/Revert-switch-to-Xorg-by-default.patch: Disabled for now,
       we will keep Xorg as default for the time being
-  * Refresh Patches as Required 
+  * Refresh Patches as Required
 
   [ Iain Lane ]
   * Update the merge on top of 3.20.2-1 and 3.18.1.2-1ubuntu5
@@ -1144,7 +1308,7 @@ gnome-session (3.4.2.1-3) unstable; urgency=low
     + epiphany.desktop → epiphany-browser.desktop.
     + Anyway replace epiphany with iceweasel.
     + Update default handlers for LibreOffice.
-  * 04_fallback_warning_notify.patch: use libnotify to show the fallback 
+  * 04_fallback_warning_notify.patch: use libnotify to show the fallback
     warning instead of a dialog.
   * Build-depend on libnotify.
 
@@ -1257,9 +1421,9 @@ gnome-session (3.0.2-2) experimental; urgency=low
   [ Josselin Mouette ]
   * defaults.list:
     + Make epiphany-newtab the default http handler.
-    + Add a few more text MIME types to gedit, otherwise they can be 
+    + Add a few more text MIME types to gedit, otherwise they can be
       handled by emacs.
-    + Point directories to nautilus.desktop. Closes: #618376. Thanks 
+    + Point directories to nautilus.desktop. Closes: #618376. Thanks
       Jérémy Bicha.
 
   [ Michael Biebl ]
@@ -1292,28 +1456,28 @@ gnome-session (3.0.0-2) experimental; urgency=low
 
 gnome-session (3.0.0-1) experimental; urgency=low
 
-  * debian/rules: remove the libexecdir setting, let the cdbs default be 
+  * debian/rules: remove the libexecdir setting, let the cdbs default be
     used instead.
   * New usptream release.
   * Remove disabled patches.
   * 10_session_save.patch:
     + Updated for the new version.
-    + Disabled for now, the saved session is either discarded or 
+    + Disabled for now, the saved session is either discarded or
       overwritten at logout time depending on the save-session setting.
-  * 11_saved_session_name.patch: dropped, we won’t be needing it with 
+  * 11_saved_session_name.patch: dropped, we won’t be needing it with
     the way session saving is handled in 3.0.
-  * Pull back gnome-wm and gnome-wm.desktop, it’s the easiest way to 
+  * Pull back gnome-wm and gnome-wm.desktop, it’s the easiest way to
     configure the window manager for the fallback session.
-  * 01_gnome-wm.patch: new patch. Make gnome-wm the default instead of 
+  * 01_gnome-wm.patch: new patch. Make gnome-wm the default instead of
     metacity.
-  * 02_fallback_desktop.patch: new patch. Build a gnome-fallback.desktop 
+  * 02_fallback_desktop.patch: new patch. Build a gnome-fallback.desktop
     for /usr/share/xsessions.
   * 13_no_fallback_notification.patch: refreshed accordingly.
   * Move gsettings-desktop-schemas dependency to gnome-session-bin.
-  * gnome-session.postinst: drop removal of obsolete alternative, it’s 
+  * gnome-session.postinst: drop removal of obsolete alternative, it’s
     in stable now.
-  * Split gnome-session again. Put common files in gnome-session-common, 
-    the standard session in gnome-session and the fallback session in 
+  * Split gnome-session again. Put common files in gnome-session-common,
+    the standard session in gnome-session and the fallback session in
     gnome-session-fallback.
   * Sort out the resulting Conflicts/Replaces/Provides nightmare.
   * Move back the defaults.list to gnome-session-common.
@@ -1390,7 +1554,7 @@ gnome-session (2.30.2-3) unstable; urgency=low
 
 gnome-session (2.30.2-2) unstable; urgency=low
 
-  * Temporarily disable gnome3-session in preparation of the squeeze 
+  * Temporarily disable gnome3-session in preparation of the squeeze
     release. This way gnome-shell can be removed from squeeze too.
   * 03_devicekit_optional.patch: dropped, upower builds everywhere.
   * 03_upower.patch: stolen upstream. Closes: #595088.
@@ -1423,21 +1587,21 @@ gnome-session (2.30.0-1) unstable; urgency=low
 
   * New upstream release.
   * Refresh patches.
-  * 13_capplet_always_save.patch, 14_crash_on_exit.patch: dropped, 
+  * 13_capplet_always_save.patch, 14_crash_on_exit.patch: dropped,
     merged upstream.
-  * Pass --libexecdir=/usr/lib, since it will add /gnome-session 
+  * Pass --libexecdir=/usr/lib, since it will add /gnome-session
     already.
 
  -- Josselin Mouette <[e-mail]>  Tue, 13 Apr 2010 22:53:59 +0200
 
 gnome-session (2.28.0-7) unstable; urgency=low
 
-  * 12_no_gdm_fallback.patch: new patch. Don’t fall back on GDM if 
-    ConsoleKit failed to reboot. CK will not even be attempted if it is 
+  * 12_no_gdm_fallback.patch: new patch. Don’t fall back on GDM if
+    ConsoleKit failed to reboot. CK will not even be attempted if it is
     not available, anyway. Closes: #572085.
-  * Require upower/libdevkit-power unconditionnally, now that it works 
-    on kfreebsd. 
-  * 13_capplet_always_save.patch: stolen upstream. Ensure that the 
+  * Require upower/libdevkit-power unconditionnally, now that it works
+    on kfreebsd.
+  * 13_capplet_always_save.patch: stolen upstream. Ensure that the
     capplet saves all changes when it exits. Closes: #574862.
   * 14_crash_on_exit.patch: stolen upstream. Fix crash upon exit.
     Closes: #548120.
@@ -1454,18 +1618,18 @@ gnome-session (2.28.0-6) unstable; urgency=low
 
 gnome-session (2.28.0-5) unstable; urgency=low
 
-  * defaults.list: add text/x-patch. Some packages set brain-dead MIME 
+  * defaults.list: add text/x-patch. Some packages set brain-dead MIME
     handlers for this.
   * Remove obsolete gnome-session.dirs.
   * 55gnome-session_gnomerc: add gnome3-session.
-  * README.Debian: fix documentation of window manager startup according 
+  * README.Debian: fix documentation of window manager startup according
     to the previous upload.
-  * Add a gnome3-session binary and a corresponding package, that starts 
+  * Add a gnome3-session binary and a corresponding package, that starts
     gnome-shell instead of gnome-panel + metacity.
-  * 11_saved_session_name.patch: new patch. Allow to change the 
+  * 11_saved_session_name.patch: new patch. Allow to change the
     directory where the session is saved with the command line. The
     corresponding option is used by gnome3-session.
-  * Split translations, icons and startup scripts in a new 
+  * Split translations, icons and startup scripts in a new
     gnome-session-common package.
   * Straighten dependencies accordingly.
 
@@ -1473,7 +1637,7 @@ gnome-session (2.28.0-5) unstable; urgency=low
 
 gnome-session (2.28.0-4) unstable; urgency=low
 
-  * 01_gnome-wm.patch: OK, you win. Kill all the 3D crap, always use 
+  * 01_gnome-wm.patch: OK, you win. Kill all the 3D crap, always use
     metacity by default. Closes: #553417.
   * Drop mesa-utils dependency accordingly.
 
@@ -1481,9 +1645,9 @@ gnome-session (2.28.0-4) unstable; urgency=low
 
 gnome-session (2.28.0-3) unstable; urgency=low
 
-  * 03_devicekit_optional.patch: new patch. Make DeviceKit-Power support 
+  * 03_devicekit_optional.patch: new patch. Make DeviceKit-Power support
     optional, so that gnome-session builds on non-Linux architectures.
-  * 90_relibtoolize.patch: regenerated accordingly, add an autoheader 
+  * 90_relibtoolize.patch: regenerated accordingly, add an autoheader
     invocation.
 
  -- Josselin Mouette <[e-mail]>  Fri, 06 Nov 2009 13:51:37 +0100
@@ -1491,7 +1655,7 @@ gnome-session (2.28.0-3) unstable; urgency=low
 gnome-session (2.28.0-2) unstable; urgency=low
 
   * Don’t require devicekit-power on non-linux architectures.
-  * Only recommend gnome-power-manager, so that gnome-session remains 
+  * Only recommend gnome-power-manager, so that gnome-session remains
     installable on kfreebsd. Instead, break versions < 2.28.
   * Fix README.Debian to stop mentioning compiz. Closes: #552400.
   * Remove policykit-gnome dependency.
@@ -1532,12 +1696,12 @@ gnome-session (2.28.0-1) unstable; urgency=low
 gnome-session (2.26.2-1) unstable; urgency=low
 
   * defaults.list: use brasero-nautilus instead of nautilus-cd-burner.
-  * 55gnome-session_gnomerc: make it clear that /usr/share/gnome is not 
-    a symlink to /etc, since users are stupid enough to think this 
+  * 55gnome-session_gnomerc: make it clear that /usr/share/gnome is not
+    a symlink to /etc, since users are stupid enough to think this
     should be the case.
   * New upstream release.
   * 01_gnome-wm.patch, 10_session_save.patch: updated accordingly.
-  * 11_dbus_exit.patch: replaced by the much improved version provided 
+  * 11_dbus_exit.patch: replaced by the much improved version provided
     by upstream.
   * 12_desktop_crash.patch: dropped, merged upstream.
 
@@ -1545,7 +1709,7 @@ gnome-session (2.26.2-1) unstable; urgency=low
 
 gnome-session (2.26.1-7) unstable; urgency=low
 
-  * 12_desktop_crash.patch: new patch from Petr Gajdůšek. Use 
+  * 12_desktop_crash.patch: new patch from Petr Gajdůšek. Use
     g_ptr_array_free to free a GPtrArray, not g_strfreev.
     Closes: #532702.
 
@@ -1554,9 +1718,9 @@ gnome-session (2.26.1-7) unstable; urgency=low
 gnome-session (2.26.1-6) unstable; urgency=low
 
   * 01_gnome-wm.patch:
-    + Don’t set LIBGL_ALWAYS_INDIRECT, compiz does it by itself if 
+    + Don’t set LIBGL_ALWAYS_INDIRECT, compiz does it by itself if
       needed and it slows things down if it’s not needed.
-    + Don’t enable the glib compiz plugin, only the gconf one; the glib 
+    + Don’t enable the glib compiz plugin, only the gconf one; the glib
       plugin makes it lock up on startup. Closes: #531388.
 
  -- Josselin Mouette <[e-mail]>  Tue, 02 Jun 2009 14:41:45 +0200
@@ -1565,19 +1729,19 @@ gnome-session (2.26.1-5) unstable; urgency=low
 
   * 01_gnome-wm.patch:
     + Actually install gnome-wm.desktop, it’s pretty useless otherwise.
-    + Don’t read the GConf key, it’s obviously set to gnome-wm if we’re 
+    + Don’t read the GConf key, it’s obviously set to gnome-wm if we’re
       starting gnome-wm.
     + Make compiz the default if compiz-gtk is installed.
-    + Remove a few unneeded things from the script to make it start 
+    + Remove a few unneeded things from the script to make it start
       faster.
   * gconf-defaults: make gnome-wm the default window manager.
-  * README.Debian: document how programs are started and how to 
+  * README.Debian: document how programs are started and how to
     configure the different kinds of startups.
   * 90_relibtoolize.patch: updated.
-  * Split the package between gnome-session-bin, which contains the 
-    minimal runtime needed to actually run the gnome-session binary, and 
-    gnome-session, which contains all the startup scripts and has much 
-    larger dependencies, including the components which are required by 
+  * Split the package between gnome-session-bin, which contains the
+    minimal runtime needed to actually run the gnome-session binary, and
+    gnome-session, which contains all the startup scripts and has much
+    larger dependencies, including the components which are required by
     default. This prepares us for GDM 2.26.
   * Update the list of copyright holders.
 
@@ -1585,9 +1749,9 @@ gnome-session (2.26.1-5) unstable; urgency=low
 
 gnome-session (2.26.1-4) unstable; urgency=low
 
-  * gconf-defaults: remove the file manager from the required components 
-    list. Now that nautilus has an autostart file, this is no longer 
-    necessary. It avoids restarting it endlessly when this is not 
+  * gconf-defaults: remove the file manager from the required components
+    list. Now that nautilus has an autostart file, this is no longer
+    necessary. It avoids restarting it endlessly when this is not
     required. Closes: #525718.
   * Break nautilus << 2.26.2-4 to ensure the autostart file is here.
 
@@ -1603,7 +1767,7 @@ gnome-session (2.26.1-3) unstable; urgency=low
 
 gnome-session (2.26.1-2) experimental; urgency=low
 
-  * prerm: only unregister the alternative when deinstalling the 
+  * prerm: only unregister the alternative when deinstalling the
     package. Closes: #524900.
   * Break xserver-xorg << 1:7.4. See GNOME#568989 for why.
   * Drop build-dependencies on gnome-keyring and libgnomeui.
@@ -1611,14 +1775,14 @@ gnome-session (2.26.1-2) experimental; urgency=low
   * copyright:
     + Update list of main authors. Closes: #526963.
     + Point to versioned GPL.
-  * 11_dbus_exit.patch: new patch. Don’t exit when the system bus is 
+  * 11_dbus_exit.patch: new patch. Don’t exit when the system bus is
     disconnected. Thanks Sjoerd Simmons for the hint.
 
  -- Josselin Mouette <[e-mail]>  Thu, 21 May 2009 10:55:25 +0200
 
 gnome-session (2.26.1-1) experimental; urgency=low
 
-  * 10_session_save.patch: fix bug that leads to saving the session 
+  * 10_session_save.patch: fix bug that leads to saving the session
     every time a SaveYourselfComplete request is received.
   * New upstream release.
     + Refresh or regenerate patches.
@@ -1629,38 +1793,38 @@ gnome-session (2.26.0.90-1) experimental; urgency=low
 
   * New upstream release.
   * Require gnome-settings-daemon 2.26 for the startup mechanism change.
-  * Don’t require gnome-control-center, everything needed should be in 
+  * Don’t require gnome-control-center, everything needed should be in
     g-s-d now.
   * 01_ignore-gdm-lang.patch: dropped, merged upstream.
   * 02_gsd-spawn.patch: removed; fixed upstream in a different way.
-  * 03_powermanagement.patch: dropped, upstream finally standardized the 
+  * 03_powermanagement.patch: dropped, upstream finally standardized the
     logout dialog.
-  * 04_at-spi_startup.patch, 09_splash_hide.patch, 
+  * 04_at-spi_startup.patch, 09_splash_hide.patch,
     10_update_notifier.patch: dropped, obsolete.
-  * Rename 90_autoconf-autoheader.patch to 90_relibtoolize.patch and 
+  * Rename 90_autoconf-autoheader.patch to 90_relibtoolize.patch and
     regenerate it for the new version.
   * Remove files corresponding to obsolete components.
   * Remove gnome-wm from the default session, it has a startup file now.
-  * Remove debian/gnome-wm and patch the upstream version with 
+  * Remove debian/gnome-wm and patch the upstream version with
     01_gnome-wm.patch instead.
   * Document how to change the Window Manager in README.Debian.
   * Massive update to build-dependencies.
   * Make dbus-x11 and policykit-gnome dependencies.
   * Remove manpage hack, not necessary anymore.
   * Install all autostart stuff in /usr/share, not in /etc.
-  * 10_session_save.patch: new patch, based on the patch by Ghee Teo. 
-    Enable session saving from the capplet again, and make it work on 
+  * 10_session_save.patch: new patch, based on the patch by Ghee Teo.
+    Enable session saving from the capplet again, and make it work on
     the manager side.
   * Use patch-translations.mk, require gnome-pkg-tools 0.13.
   * Add translations based on the strings in gnome-session 2.22.
-  * Break gnome-panel < 2.26, since previous versions (2.22 and our 
+  * Break gnome-panel < 2.26, since previous versions (2.22 and our
     patched 2.24) are not able to talk to this version.
 
  -- Josselin Mouette <[e-mail]>  Sat, 11 Apr 2009 15:30:31 +0200
 
 gnome-session (2.22.3-3) unstable; urgency=low
 
-  * 55gnome-session_gnomerc: change XDG_DATA_DIRS to include 
+  * 55gnome-session_gnomerc: change XDG_DATA_DIRS to include
     /usr/share/gnome when gnome-session is being launched.
   * defaults.list: move the defaults from gnome-vfs.
     + Add some subtypes of text/plain to gedit defaults.
@@ -1673,9 +1837,9 @@ gnome-session (2.22.3-3) unstable; urgency=low
 
 gnome-session (2.22.3-2) unstable; urgency=low
 
-  * Recommend dbus-x11 instead of dbus for the availability of 
+  * Recommend dbus-x11 instead of dbus for the availability of
     dbus-launch.
-  * 04_at-spi_startup.patch: new patch. Do not try to start at-spi if it 
+  * 04_at-spi_startup.patch: new patch. Do not try to start at-spi if it
     is not installed. Closes: #501407.
   * Remove build-dependency on esound.
 
@@ -1701,7 +1865,7 @@ gnome-session (2.22.2-1) unstable; urgency=low
     and 90_autoconf-autoheader.patch.
 
   [ Josselin Mouette ]
-  * New upstream release, includes migration of the trash to the new 
+  * New upstream release, includes migration of the trash to the new
     location.
 
  -- Josselin Mouette <[e-mail]>  Wed, 28 May 2008 02:10:26 +0200
@@ -1893,7 +2057,7 @@ gnome-session (2.18.0-2) unstable; urgency=low
   * Add the only missing manpage (Closes: #252006)
 
   [ Josselin Mouette ]
-  * 01_clever_save.diff: stolen from upstream's SVN. Be more clever when 
+  * 01_clever_save.diff: stolen from upstream's SVN. Be more clever when
     saving the session, so that e.g. multiple xterms are not forgotten.
     Closes: #364463.
 
@@ -1975,9 +2139,9 @@ gnome-session (2.14.3-6) unstable; urgency=low
 
 gnome-session (2.14.3-5) unstable; urgency=medium
 
-  * Quote the readlink call to handle the case where the 
+  * Quote the readlink call to handle the case where the
     x-session-manager alternative is broken (closes: #403931).
-  * Medium urgency because it has the potential to cause all X sessions 
+  * Medium urgency because it has the potential to cause all X sessions
     to fail starting.
 
  -- Josselin Mouette <[e-mail]>  Wed, 20 Dec 2006 21:37:44 +0100
@@ -2029,7 +2193,7 @@ gnome-session (2.14.2-1) unstable; urgency=low
 
 gnome-session (2.14.1-2) unstable; urgency=low
 
-  * 03_implicit_conversion.diff: Fix for implicit conversion 
+  * 03_implicit_conversion.diff: Fix for implicit conversion
     (closes: #368062).
 
  -- Josselin Mouette <[e-mail]>  Thu, 25 May 2006 00:49:18 +0200
@@ -2046,7 +2210,7 @@ gnome-session (2.14.1-1) unstable; urgency=low
 gnome-session (2.14.0-2) unstable; urgency=low
 
   * Update watch file.
-  * 01_create_autostart.diff: create the autostart directory when it 
+  * 01_create_autostart.diff: create the autostart directory when it
     doesn't exist (closes: #360590, #360431).
 
  -- Josselin Mouette <[e-mail]>  Fri,  7 Apr 2006 09:59:27 +0200
@@ -2116,11 +2280,11 @@ gnome-session (2.10.0-8) unstable; urgency=low
 
 gnome-session (2.10.0-7) unstable; urgency=medium
 
-  * The "now all dependencies in GNOME are back to the old times 
+  * The "now all dependencies in GNOME are back to the old times
     madness, why not do the same here?" release.
   * rules: remove --as-needed (closes: #325639).
   * default.session:
-    + Remove gnome-smproxy. It slows down the startup process and 
+    + Remove gnome-smproxy. It slows down the startup process and
       sometimes hangs.
     + Remove magicdev, which is deprecated.
 
@@ -2203,7 +2367,7 @@ gnome-session (2.8.1-4) unstable; urgency=medium
 
 gnome-session (2.8.1-3) unstable; urgency=low
 
-  * 09_splash_hide.diff: stop displaying splash when all applications are 
+  * 09_splash_hide.diff: stop displaying splash when all applications are
     launched, it avoids waiting when some of them are broken. Thanks seb128.
   * 07_kill_esd.diff: kill esd upon logout (closes: #187730).
 
@@ -2226,7 +2390,7 @@ gnome-session (2.8.1-2) unstable; urgency=low
       upgrade script
     + gnome-volume-daemon: removed, obsolete.
   * Upload to unstable.
-  * control.in: 
+  * control.in:
     + Bump build-dependencies to 2.8 versions.
     + Build-depend on libgconf2-dev, not gconf2.
 
@@ -2242,7 +2406,7 @@ gnome-session (2.8.1-1) experimental; urgency=low
     Depends
   * debian/patches/00_acinclude.m4.diff:
   - removed, not needed anymore
-  * debian/patches/01_autoreconf.patch: 
+  * debian/patches/01_autoreconf.patch:
   - updated, result of "libtoolize --force --copy;
     aclocal-1.7; autoheader; automake-1.7 -acf; autoconf; rm -rf
     autom4te.cache" with the 00_ patch applied.
@@ -2585,10 +2749,10 @@ gnome-session (2.0.8-2) experimental; urgency=low
  -- Christian Marillat <[e-mail]>  Tue, 22 Oct 2002 18:00:11 +0200
 
 gnome-session (2.0.8-1.1upgradetest) experimental; urgency=low
- 
+
   * EXPERIMENTAL TESTING RELEASE
   * Add upgrade scripts.
- 
+
  -- Colin Walters <[e-mail]>  Sat, 19 Oct 2002 22:54:05 -0400
 
 gnome-session (2.0.8-1) experimental; urgency=low
@@ -3347,7 +3511,7 @@ gnome-core (1.0.53-2) unstable; urgency=low
 
 gnome-core (1.0.53-1) unstable; urgency=low
 
-  * New upstream version. 
+  * New upstream version.
   * gnome-session does now depend on gnome-panel and recommends
     gmc (both are needed for a full Gnome desktop).
   * gnome-terminal does not have a border. Closes: #38972
@@ -3359,7 +3523,7 @@ gnome-core (1.0.52-1) unstable; urgency=low
   * New maintainer. Steve said that he wanted to give away some of
     his packages. I've asked to take gnome-core, he never replied, so
     I'm taking it but I will give it back to him if he wanted to
-    keep it. In the meantime I can better manage bugs with my name 
+    keep it. In the meantime I can better manage bugs with my name
     in the Maintainer field.
   * New upstream version.
 
@@ -3400,11 +3564,11 @@ gnome-core (1.0.9-0.1) unstable; urgency=low
   * cdplayer_applet works again. Closes: #42192
   * gnome pager works well: Closes: #42499, #42610
   * modem_lights draws itself correctly. Closes: #43861, #45055
-  * The dialer applets doesn't exit when stopping while 
+  * The dialer applets doesn't exit when stopping while
     not yet connected. Closes: #45287
   * No more Debian menu in the panel. Closes: #41040
   * GnomeICU works with this panel. Closes: #39626, #39515
-  * gnome-panel-data conflicts with asclock. 
+  * gnome-panel-data conflicts with asclock.
     Closes: #40712, #40715, #40808, #41430
     A better solution will be needed. Maybe put asclock in his own
     package or create a asclock-data package that will be shared.
@@ -3425,7 +3589,7 @@ gnome-core (1.0.9-0.1) unstable; urgency=low
   * The terminal keeps its size when dragging the manu bar in and out.
     Closes: #44762
   * The menu section of gnome-terminal corrected. Closes: #37635
-    
+
  -- Raphael Hertzog <[e-mail]>  Wed, 22 Sep 1999 13:24:34 +0200
 
 gnome-core (1.0.7-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index dd8ac13..9f1f0a0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,8 @@ Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Jeremy Bicha <[e-mail]>, Michael Biebl <[e-mail]>, Tim Lunn <[e-mail]>
-Standards-Version: 4.0.0
-Build-Depends: debhelper (>= 10),
+Uploaders: Jeremy Bicha <[e-mail]>, Tim Lunn <[e-mail]>
+Build-Depends: debhelper (>= 11.1.3),
                dh-migrations,
                gnome-pkg-tools (>= 0.13),
                gnome-common,
@@ -35,6 +34,7 @@ Build-Depends: debhelper (>= 10),
                xsltproc,
                xtrans-dev,
                libsystemd-dev (>= 209) [linux-any]
+Standards-Version: 4.1.2
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-session
 XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-session.git
 Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-session
@@ -43,14 +43,14 @@ Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-session
 Package: gnome-session
 Architecture: any
 Depends: ${misc:Depends},
-         gnome-settings-daemon (>= 3.23.3),
+         gnome-settings-daemon (>= 3.24),
          gnome-shell (>= 3.25.91-0ubuntu4~),
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion}),
-         gnome-session-common (= ${source:Version}),
+         gnome-session-common (= ${binary:Version}),
          xwayland [linux-any]
 Recommends: fonts-cantarell,
-            adwaita-icon-theme-full,   
+            adwaita-icon-theme-full,
             gnome-themes-extra
 Suggests: gnome-user-docs,
 #          desktop-base,
@@ -95,16 +95,15 @@ Description: Startup Applications manager for GNOME
 Package: ubuntu-session
 Architecture: any
 Depends: ${misc:Depends},
-         gnome-settings-daemon (>= 3.23.3),
+         gnome-settings-daemon (>= 3.24),
          gnome-shell (>= 3.24.3-0ubuntu2),
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion}),
-         gnome-session-common (= ${source:Version}),
-         xwayland [linux-any]
+         gnome-session-common (= ${binary:Version}),
+         xwayland [linux-any],
+         yaru-theme-gnome-shell,
 Recommends: session-migration,
             python3,
-            gnome-themes-extra,
-            gtk2-engines-pixbuf,
 Provides: x-session-manager,
 Breaks: unity (<< 7.5.0+17.10.20170619),
         unity-settings-daemon (<< 15.04.1+17.04.20170619),
diff --git a/debian/control.in b/debian/control.in
index 0e07abe..3b65c1d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 4.0.0
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11.1.3),
                dh-migrations,
                gnome-pkg-tools (>= 0.13),
                gnome-common,
@@ -31,6 +30,7 @@ Build-Depends: debhelper (>= 10),
                xsltproc,
                xtrans-dev,
                libsystemd-dev (>= 209) [linux-any]
+Standards-Version: 4.1.2
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-session
 XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-session.git
 Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-session
@@ -39,14 +39,14 @@ Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-session
 Package: gnome-session
 Architecture: any
 Depends: ${misc:Depends},
-         gnome-settings-daemon (>= 3.23.3),
+         gnome-settings-daemon (>= 3.24),
          gnome-shell (>= 3.25.91-0ubuntu4~),
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion}),
-         gnome-session-common (= ${source:Version}),
+         gnome-session-common (= ${binary:Version}),
          xwayland [linux-any]
 Recommends: fonts-cantarell,
-            adwaita-icon-theme-full,   
+            adwaita-icon-theme-full,
             gnome-themes-extra
 Suggests: gnome-user-docs,
 #          desktop-base,
@@ -91,16 +91,15 @@ Description: Startup Applications manager for GNOME
 Package: ubuntu-session
 Architecture: any
 Depends: ${misc:Depends},
-         gnome-settings-daemon (>= 3.23.3),
+         gnome-settings-daemon (>= 3.24),
          gnome-shell (>= 3.24.3-0ubuntu2),
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion}),
-         gnome-session-common (= ${source:Version}),
-         xwayland [linux-any]
+         gnome-session-common (= ${binary:Version}),
+         xwayland [linux-any],
+         yaru-theme-gnome-shell,
 Recommends: session-migration,
             python3,
-            gnome-themes-extra,
-            gtk2-engines-pixbuf,
 Provides: x-session-manager,
 Breaks: unity (<< 7.5.0+17.10.20170619),
         unity-settings-daemon (<< 15.04.1+17.04.20170619),
diff --git a/debian/gnome-session.install b/debian/gnome-session.install
index 6a898d2..0f6143c 100644
--- a/debian/gnome-session.install
+++ b/debian/gnome-session.install
@@ -1,4 +1,4 @@
 usr/share/doc
-usr/share/xsessions/gnome-xorg.desktop
-usr/share/gnome-session/sessions/gnome.session
-usr/share/wayland-sessions/gnome.desktop
+usr/share/xsessions/*.desktop
+usr/share/gnome-session/sessions/*.session
+usr/share/wayland-sessions/*.desktop
diff --git a/debian/patches/103_kill_the_fail_whale.patch b/debian/patches/103_kill_the_fail_whale.patch
index b7c2e86..5843d73 100644
--- a/debian/patches/103_kill_the_fail_whale.patch
+++ b/debian/patches/103_kill_the_fail_whale.patch
@@ -1,7 +1,16 @@
-Index: gnome-session/gnome-session/gsm-fail-whale.c
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 15 Aug 2018 17:13:26 +0200
+Subject: _kill_the_fail_whale
+
 ===================================================================
---- gnome-session.orig/gnome-session/gsm-fail-whale.c
-+++ gnome-session/gnome-session/gsm-fail-whale.c
+---
+ gnome-session/gsm-fail-whale.c | 25 ++++---------------------
+ 1 file changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/gnome-session/gsm-fail-whale.c b/gnome-session/gsm-fail-whale.c
+index 7b9a0a5..a62ceb0 100644
+--- a/gnome-session/gsm-fail-whale.c
++++ b/gnome-session/gsm-fail-whale.c
 @@ -21,6 +21,8 @@
  #include <signal.h>
  #include <stdlib.h>
@@ -11,7 +20,7 @@ Index: gnome-session/gnome-session/gsm-fail-whale.c
  #include <glib/gi18n.h>
  #include <glib/gstdio.h>
  
-@@ -38,25 +40,6 @@ gsm_fail_whale_dialog_we_failed  (gboole
+@@ -38,25 +40,6 @@ gsm_fail_whale_dialog_we_failed  (gboolean            debug_mode,
                                    gboolean            allow_logout,
                                    GsmShellExtensions *extensions)
  {
diff --git a/debian/patches/22_support_autostart_delay.patch b/debian/patches/22_support_autostart_delay.patch
index 17814c9..310df37 100644
--- a/debian/patches/22_support_autostart_delay.patch
+++ b/debian/patches/22_support_autostart_delay.patch
@@ -1,18 +1,21 @@
-Description: Add support for autostarting applications after a delay
- Make it possible to delay autostarting an application for a time
- period defined by the "X-GNOME-Autostart-Delay" key in the applications
- desktop file
-Author: Chris Coulson <[e-mail]>
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
+From: Chris Coulson <[e-mail]>
+Date: Wed, 15 Aug 2018 17:13:26 +0200
+Subject: Add support for autostarting applications after a delay
 
+Make it possible to delay autostarting an application for a time
+period defined by the "X-GNOME-Autostart-Delay" key in the applications
+desktop file
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
 ---
- gnome-session/gsm-app.c           |   18 ++++++++++++++
- gnome-session/gsm-app.h           |    2 +
- gnome-session/gsm-autostart-app.c |   26 +++++++++++++++++++++
- gnome-session/gsm-autostart-app.h |    1 
- gnome-session/gsm-manager.c       |   46 +++++++++++++++++++++++++++++++++++---
+ gnome-session/gsm-app.c           | 18 ++++++++++++++-
+ gnome-session/gsm-app.h           |  2 ++
+ gnome-session/gsm-autostart-app.c | 26 ++++++++++++++++++++++
+ gnome-session/gsm-autostart-app.h |  1 +
+ gnome-session/gsm-manager.c       | 46 ++++++++++++++++++++++++++++++++++++---
  5 files changed, 89 insertions(+), 4 deletions(-)
 
+diff --git a/gnome-session/gsm-app.c b/gnome-session/gsm-app.c
+index d1ef89a..3f6a8ec 100644
 --- a/gnome-session/gsm-app.c
 +++ b/gnome-session/gsm-app.c
 @@ -316,6 +316,7 @@ gsm_app_class_init (GsmAppClass *klass)
@@ -47,6 +50,8 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
  }
  
  void
+diff --git a/gnome-session/gsm-app.h b/gnome-session/gsm-app.h
+index f38b3be..85cb97e 100644
 --- a/gnome-session/gsm-app.h
 +++ b/gnome-session/gsm-app.h
 @@ -63,6 +63,7 @@ struct _GsmAppClass
@@ -57,7 +62,7 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
          gboolean    (*impl_provides)                  (GsmApp     *app,
                                                         const char *service);
          char **     (*impl_get_provides)              (GsmApp     *app);
-@@ -124,6 +125,7 @@ gboolean         gsm_app_has_autostart_c
+@@ -124,6 +125,7 @@ gboolean         gsm_app_has_autostart_condition        (GsmApp     *app,
  gboolean         gsm_app_get_registered                 (GsmApp     *app);
  void             gsm_app_set_registered                 (GsmApp     *app,
                                                           gboolean  registered);
@@ -65,6 +70,8 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
  
  gboolean         gsm_app_save_to_keyfile                (GsmApp    *app,
                                                           GKeyFile  *keyfile,
+diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
+index 2332b03..a7046cb 100644
 --- a/gnome-session/gsm-autostart-app.c
 +++ b/gnome-session/gsm-autostart-app.c
 @@ -20,6 +20,7 @@
@@ -83,7 +90,7 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
  
          GFileMonitor         *condition_monitor;
          guint                 condition_notify_id;
-@@ -105,6 +107,7 @@ gsm_autostart_app_init (GsmAutostartApp
+@@ -105,6 +107,7 @@ gsm_autostart_app_init (GsmAutostartApp *app)
          app->priv->pid = -1;
          app->priv->condition_monitor = NULL;
          app->priv->condition = FALSE;
@@ -91,7 +98,7 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
  }
  
  static gboolean
-@@ -615,6 +618,20 @@ load_desktop_file (GsmAutostartApp  *app
+@@ -615,6 +618,20 @@ load_desktop_file (GsmAutostartApp  *app)
                                                                     "AutostartCondition");
          setup_condition_monitor (app);
  
@@ -112,7 +119,7 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
          g_object_set (app,
                        "phase", phase,
                        "startup-id", startup_id,
-@@ -1323,6 +1340,14 @@ gsm_autostart_app_get_app_id (GsmApp *ap
+@@ -1323,6 +1340,14 @@ gsm_autostart_app_get_app_id (GsmApp *app)
          return g_app_info_get_id (G_APP_INFO (GSM_AUTOSTART_APP (app)->priv->app_info));
  }
  
@@ -127,7 +134,7 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
  static gboolean
  gsm_autostart_app_initable_init (GInitable *initable,
                                   GCancellable *cancellable,
-@@ -1439,6 +1464,7 @@ gsm_autostart_app_class_init (GsmAutosta
+@@ -1439,6 +1464,7 @@ gsm_autostart_app_class_init (GsmAutostartAppClass *klass)
          app_class->impl_has_autostart_condition = gsm_autostart_app_has_autostart_condition;
          app_class->impl_get_app_id = gsm_autostart_app_get_app_id;
          app_class->impl_get_autorestart = gsm_autostart_app_get_autorestart;
@@ -135,9 +142,11 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
          app_class->impl_save_to_keyfile = gsm_autostart_app_save_to_keyfile;
  
          g_object_class_install_property (object_class,
+diff --git a/gnome-session/gsm-autostart-app.h b/gnome-session/gsm-autostart-app.h
+index a4cd9af..75ae659 100644
 --- a/gnome-session/gsm-autostart-app.h
 +++ b/gnome-session/gsm-autostart-app.h
-@@ -70,6 +70,7 @@ void    gsm_autostart_app_add_provides
+@@ -70,6 +70,7 @@ void    gsm_autostart_app_add_provides       (GsmAutostartApp *aapp,
  #define GSM_AUTOSTART_APP_DBUS_PATH_KEY   "X-GNOME-DBus-Path"
  #define GSM_AUTOSTART_APP_DBUS_ARGS_KEY   "X-GNOME-DBus-Start-Arguments"
  #define GSM_AUTOSTART_APP_DISCARD_KEY     "X-GNOME-Autostart-discard-exec"
@@ -145,6 +154,8 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
  
  G_END_DECLS
  
+diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
+index 3cf421c..835099c 100644
 --- a/gnome-session/gsm-manager.c
 +++ b/gnome-session/gsm-manager.c
 @@ -399,7 +399,8 @@ app_condition_changed (GsmApp     *app,
@@ -157,10 +168,11 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
                          error = NULL;
                          res = gsm_app_stop (app, &error);
                          if (! res) {
-@@ -724,10 +725,36 @@ on_phase_timeout (GsmManager *manager)
+@@ -723,11 +724,37 @@ on_phase_timeout (GsmManager *manager)
+         return FALSE;
  }
  
- static gboolean
++static gboolean
 +_autostart_delay_timeout (GsmApp *app)
 +{
 +        GError *error = NULL;
@@ -184,7 +196,7 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
 +        return FALSE;
 +}
 +
-+static gboolean
+ static gboolean
  _start_app (const char *id,
              GsmApp     *app,
              GsmManager *manager)
diff --git a/debian/patches/51_remove_session_saving_from_gui.patch b/debian/patches/51_remove_session_saving_from_gui.patch
index 50ab9d1..8d63a07 100644
--- a/debian/patches/51_remove_session_saving_from_gui.patch
+++ b/debian/patches/51_remove_session_saving_from_gui.patch
@@ -1,8 +1,17 @@
-Index: gnome-session-3.6.0/gnome-session/gsm-session-fill.c
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 15 Aug 2018 17:13:26 +0200
+Subject: _remove_session_saving_from_gui
+
 ===================================================================
---- gnome-session-3.6.0.orig/gnome-session/gsm-session-fill.c	2012-09-25 06:07:50.000000000 +1200
-+++ gnome-session-3.6.0/gnome-session/gsm-session-fill.c	2012-09-26 11:00:17.264033717 +1200
-@@ -238,7 +238,8 @@
+---
+ gnome-session/gsm-session-fill.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gnome-session/gsm-session-fill.c b/gnome-session/gsm-session-fill.c
+index af203bb..9f18f14 100644
+--- a/gnome-session/gsm-session-fill.c
++++ b/gnome-session/gsm-session-fill.c
+@@ -143,7 +143,8 @@ load_standard_apps (GsmManager *manager,
  
                  autostart_dirs = gsm_util_get_autostart_dirs ();
  
diff --git a/debian/patches/53_add_sessionmigration.patch b/debian/patches/53_add_sessionmigration.patch
index 70cea89..9ef4735 100644
--- a/debian/patches/53_add_sessionmigration.patch
+++ b/debian/patches/53_add_sessionmigration.patch
@@ -1,8 +1,17 @@
-Index: b/gnome-session/gsm-session-fill.c
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 15 Aug 2018 17:13:26 +0200
+Subject: _add_sessionmigration
+
 ===================================================================
+---
+ gnome-session/gsm-session-fill.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/gnome-session/gsm-session-fill.c b/gnome-session/gsm-session-fill.c
+index 9f18f14..725c459 100644
 --- a/gnome-session/gsm-session-fill.c
 +++ b/gnome-session/gsm-session-fill.c
-@@ -135,6 +135,21 @@
+@@ -132,6 +132,21 @@ static void
  load_standard_apps (GsmManager *manager,
                      GKeyFile   *keyfile)
  {
diff --git a/debian/patches/95_dbus_request_shutdown.patch b/debian/patches/95_dbus_request_shutdown.patch
index b3f312f..9b26df8 100644
--- a/debian/patches/95_dbus_request_shutdown.patch
+++ b/debian/patches/95_dbus_request_shutdown.patch
@@ -1,12 +1,20 @@
-Description: Add "RequestShutdown" and "RequestReboot" DBus methods to allow
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 15 Aug 2018 17:13:26 +0200
+Subject: Add "RequestShutdown" and "RequestReboot" DBus methods to allow
+
 other applications to shutdown or reboot the machine via the session manager
 Author: Chris Coulson <[e-mail]>
+---
+ gnome-session/gsm-manager.c                | 41 ++++++++++++++++++++++++++++++
+ gnome-session/gsm-manager.h                |  4 +++
+ gnome-session/org.gnome.SessionManager.xml | 17 +++++++++++++
+ 3 files changed, 62 insertions(+)
 
-Index: gnome-session-3.15.3/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-3.15.3.orig/gnome-session/gsm-manager.c
-+++ gnome-session-3.15.3/gnome-session/gsm-manager.c
-@@ -2433,6 +2433,47 @@ request_logout (GsmManager           *ma
+diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
+index 835099c..60d1e8c 100644
+--- a/gnome-session/gsm-manager.c
++++ b/gnome-session/gsm-manager.c
+@@ -2487,6 +2487,47 @@ request_logout (GsmManager           *manager,
          end_phase (manager);
  }
  
@@ -54,11 +62,11 @@ Index: gnome-session-3.15.3/gnome-session/gsm-manager.c
  static gboolean
  gsm_manager_shutdown (GsmExportedManager    *skeleton,
                        GDBusMethodInvocation *invocation,
-Index: gnome-session-3.15.3/gnome-session/gsm-manager.h
-===================================================================
---- gnome-session-3.15.3.orig/gnome-session/gsm-manager.h
-+++ gnome-session-3.15.3/gnome-session/gsm-manager.h
-@@ -122,6 +122,10 @@ void                _gsm_manager_set_act
+diff --git a/gnome-session/gsm-manager.h b/gnome-session/gsm-manager.h
+index bc440cb..7da25a6 100644
+--- a/gnome-session/gsm-manager.h
++++ b/gnome-session/gsm-manager.h
+@@ -126,6 +126,10 @@ void                _gsm_manager_set_renderer                  (GsmManager     *
  gboolean            gsm_manager_logout                         (GsmManager     *manager,
                                                                  guint           logout_mode,
                                                                  GError        **error);
@@ -69,10 +77,10 @@ Index: gnome-session-3.15.3/gnome-session/gsm-manager.h
  
  gboolean            gsm_manager_set_phase                      (GsmManager     *manager,
                                                                  GsmManagerPhase phase);
-Index: gnome-session-3.15.3/gnome-session/org.gnome.SessionManager.xml
-===================================================================
---- gnome-session-3.15.3.orig/gnome-session/org.gnome.SessionManager.xml
-+++ gnome-session-3.15.3/gnome-session/org.gnome.SessionManager.xml
+diff --git a/gnome-session/org.gnome.SessionManager.xml b/gnome-session/org.gnome.SessionManager.xml
+index 580ec35..a2d9278 100644
+--- a/gnome-session/org.gnome.SessionManager.xml
++++ b/gnome-session/org.gnome.SessionManager.xml
 @@ -342,6 +342,23 @@
        </doc:doc>
      </method>
diff --git a/debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch b/debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch
new file mode 100644
index 0000000..0f4cf1a
--- /dev/null
+++ b/debian/patches/debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch
@@ -0,0 +1,27 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Wed, 15 Aug 2018 17:13:57 +0200
+Subject: Revert "main: Remove GNOME_DESKTOP_SESSION_ID envvar"
+
+This reverts commit 00e0e6226371d53f651cc881e74c0543192c94a8.
+
+Keep this for compatibility reasons, many apps still depends on this
+---
+ gnome-session/main.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/gnome-session/main.c b/gnome-session/main.c
+index 9a7f554..b1ac385 100644
+--- a/gnome-session/main.c
++++ b/gnome-session/main.c
+@@ -408,6 +408,11 @@ main (int argc, char **argv)
+                 g_free (ibus_path);
+         }
+ 
++        /* Some third-party programs rely on GNOME_DESKTOP_SESSION_ID to
++         * detect if GNOME is running. We keep this for compatibility reasons.
++         */
++        gsm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
++
+         /* We want to use the GNOME menus which has the designed categories.
+          */
+         gsm_util_setenv ("XDG_MENU_PREFIX", "gnome-");
diff --git a/debian/patches/ignore_gsettings_region.patch b/debian/patches/ignore_gsettings_region.patch
index 96e8d10..8c037c1 100644
--- a/debian/patches/ignore_gsettings_region.patch
+++ b/debian/patches/ignore_gsettings_region.patch
@@ -1,12 +1,19 @@
-Description: Ignore the "region" gsettings value
- We rely on ~/.pam_environment for the users' setting of LC_* variables.
+From: Gunnar Hjalmarsson <[e-mail]>
+Date: Wed, 15 Aug 2018 17:13:26 +0200
+Subject: Ignore the "region" gsettings value
+
+We rely on ~/.pam_environment for the users' setting of LC_* variables.
 Bug-Ubuntu: https://launchpad.net/bugs/1722002
-Author: Gunnar Hjalmarsson <[e-mail]>
 Forwarded: not-needed
+---
+ gnome-session/gnome-session.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
+diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
+index ce63df5..df9a8f6 100755
 --- a/gnome-session/gnome-session.in
 +++ b/gnome-session/gnome-session.in
-@@ -13,9 +13,9 @@
+@@ -13,9 +13,9 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
    fi
  fi
  
diff --git a/debian/patches/revert_remove_gnome_session_properties.patch b/debian/patches/revert_remove_gnome_session_properties.patch
index 424a587..8212cff 100644
--- a/debian/patches/revert_remove_gnome_session_properties.patch
+++ b/debian/patches/revert_remove_gnome_session_properties.patch
@@ -1,6 +1,5 @@
-From 195ab8780148446950c17d736dbb05492be4a9a5 Mon Sep 17 00:00:00 2001
 From: Tim Lunn <[e-mail]>
-Date: Sat, 3 Mar 2018 10:15:04 +1100
+Date: Sat, 3 Mar 2018 00:15:04 +0100
 Subject: [PATCH] Revert "Remove gnome-session-properties"
 
 This reverts commits ea285af9 and 0c6fe6ca and ports the build to meson.
@@ -37,7 +36,7 @@ as svg icons. .png icons don't fit in a quilt patch.
  meson.build                                        |    1 +
  po/POTFILES.in                                     |    6 +
  po/POTFILES.skip                                   |    1 +
- 26 files changed, 6015 insertions(+), 1 deletion(-)
+ 26 files changed, 6007 insertions(+), 1 deletion(-)
  create mode 100644 capplet/gsm-app-dialog.c
  create mode 100644 capplet/gsm-app-dialog.h
  create mode 100644 capplet/gsm-properties-dialog.c
@@ -59,10 +58,11 @@ as svg icons. .png icons don't fit in a quilt patch.
  create mode 100644 data/session-properties.ui
  create mode 100644 doc/man/gnome-session-properties.1
 
-Index: gnome-session-3.28.0/capplet/gsm-app-dialog.c
-===================================================================
+diff --git a/capplet/gsm-app-dialog.c b/capplet/gsm-app-dialog.c
+new file mode 100644
+index 0000000..e7369dd
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/gsm-app-dialog.c
++++ b/capplet/gsm-app-dialog.c
 @@ -0,0 +1,540 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -604,10 +604,11 @@ Index: gnome-session-3.28.0/capplet/gsm-app-dialog.c
 +
 +        return retval;
 +}
-Index: gnome-session-3.28.0/capplet/gsm-app-dialog.h
-===================================================================
+diff --git a/capplet/gsm-app-dialog.h b/capplet/gsm-app-dialog.h
+new file mode 100644
+index 0000000..ced0628
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/gsm-app-dialog.h
++++ b/capplet/gsm-app-dialog.h
 @@ -0,0 +1,66 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -675,10 +676,11 @@ Index: gnome-session-3.28.0/capplet/gsm-app-dialog.h
 +G_END_DECLS
 +
 +#endif /* __GSM_APP_DIALOG_H */
-Index: gnome-session-3.28.0/capplet/gsm-properties-dialog.c
-===================================================================
+diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
+new file mode 100644
+index 0000000..33812b8
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/gsm-properties-dialog.c
++++ b/capplet/gsm-properties-dialog.c
 @@ -0,0 +1,774 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -1454,10 +1456,11 @@ Index: gnome-session-3.28.0/capplet/gsm-properties-dialog.c
 +
 +        return GTK_WIDGET (object);
 +}
-Index: gnome-session-3.28.0/capplet/gsm-properties-dialog.h
-===================================================================
+diff --git a/capplet/gsm-properties-dialog.h b/capplet/gsm-properties-dialog.h
+new file mode 100644
+index 0000000..df4915e
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/gsm-properties-dialog.h
++++ b/capplet/gsm-properties-dialog.h
 @@ -0,0 +1,57 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -1516,10 +1519,11 @@ Index: gnome-session-3.28.0/capplet/gsm-properties-dialog.h
 +G_END_DECLS
 +
 +#endif /* __GSM_PROPERTIES_DIALOG_H */
-Index: gnome-session-3.28.0/capplet/gsp-app-manager.c
-===================================================================
+diff --git a/capplet/gsp-app-manager.c b/capplet/gsp-app-manager.c
+new file mode 100644
+index 0000000..bcd6d40
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/gsp-app-manager.c
++++ b/capplet/gsp-app-manager.c
 @@ -0,0 +1,593 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -2114,10 +2118,11 @@ Index: gnome-session-3.28.0/capplet/gsp-app-manager.c
 +
 +        return g_slist_copy (manager->priv->apps);
 +}
-Index: gnome-session-3.28.0/capplet/gsp-app-manager.h
-===================================================================
+diff --git a/capplet/gsp-app-manager.h b/capplet/gsp-app-manager.h
+new file mode 100644
+index 0000000..777f8d6
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/gsp-app-manager.h
++++ b/capplet/gsp-app-manager.h
 @@ -0,0 +1,81 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -2200,10 +2205,11 @@ Index: gnome-session-3.28.0/capplet/gsp-app-manager.h
 +G_END_DECLS
 +
 +#endif /* __GSP_APP_MANAGER_H */
-Index: gnome-session-3.28.0/capplet/gsp-app.c
-===================================================================
+diff --git a/capplet/gsp-app.c b/capplet/gsp-app.c
+new file mode 100644
+index 0000000..1fa5496
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/gsp-app.c
++++ b/capplet/gsp-app.c
 @@ -0,0 +1,1129 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -3334,10 +3340,11 @@ Index: gnome-session-3.28.0/capplet/gsp-app.c
 +
 +        return TRUE;
 +}
-Index: gnome-session-3.28.0/capplet/gsp-app.h
-===================================================================
+diff --git a/capplet/gsp-app.h b/capplet/gsp-app.h
+new file mode 100644
+index 0000000..a199795
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/gsp-app.h
++++ b/capplet/gsp-app.h
 @@ -0,0 +1,108 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@@ -3447,10 +3454,11 @@ Index: gnome-session-3.28.0/capplet/gsp-app.h
 +G_END_DECLS
 +
 +#endif /* __GSP_APP_H */
-Index: gnome-session-3.28.0/capplet/gsp-keyfile.c
-===================================================================
+diff --git a/capplet/gsp-keyfile.c b/capplet/gsp-keyfile.c
+new file mode 100644
+index 0000000..48c8e31
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/gsp-keyfile.c
++++ b/capplet/gsp-keyfile.c
 @@ -0,0 +1,207 @@
 +/*
 + * gsp-keyfile.c: GKeyFile extensions
@@ -3659,10 +3667,11 @@ Index: gnome-session-3.28.0/capplet/gsp-keyfile.c
 +        }
 +        g_free (C_value);
 +}
-Index: gnome-session-3.28.0/capplet/gsp-keyfile.h
-===================================================================
+diff --git a/capplet/gsp-keyfile.h b/capplet/gsp-keyfile.h
+new file mode 100644
+index 0000000..d94f667
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/gsp-keyfile.h
++++ b/capplet/gsp-keyfile.h
 @@ -0,0 +1,65 @@
 +/*
 + * gsp-keyfile.h: GKeyFile extensions
@@ -3729,10 +3738,11 @@ Index: gnome-session-3.28.0/capplet/gsp-keyfile.h
 +G_END_DECLS
 +
 +#endif /* GSP_KEYFILE_H */
-Index: gnome-session-3.28.0/capplet/main.c
-===================================================================
+diff --git a/capplet/main.c b/capplet/main.c
+new file mode 100644
+index 0000000..3c7177b
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/main.c
++++ b/capplet/main.c
 @@ -0,0 +1,108 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + * main.c
@@ -3842,10 +3852,11 @@ Index: gnome-session-3.28.0/capplet/main.c
 +
 +        return 0;
 +}
-Index: gnome-session-3.28.0/capplet/meson.build
-===================================================================
+diff --git a/capplet/meson.build b/capplet/meson.build
+new file mode 100644
+index 0000000..8bc9f58
 --- /dev/null
-+++ gnome-session-3.28.0/capplet/meson.build
++++ b/capplet/meson.build
 @@ -0,0 +1,36 @@
 +
 +cflags = [
@@ -3883,10 +3894,11 @@ Index: gnome-session-3.28.0/capplet/meson.build
 +	install: true,
 +	install_dir: session_bindir
 +)
-Index: gnome-session-3.28.0/data/gnome-session-properties.desktop.in
-===================================================================
+diff --git a/data/gnome-session-properties.desktop.in b/data/gnome-session-properties.desktop.in
+new file mode 100644
+index 0000000..a0b2c6b
 --- /dev/null
-+++ gnome-session-3.28.0/data/gnome-session-properties.desktop.in
++++ b/data/gnome-session-properties.desktop.in
 @@ -0,0 +1,14 @@
 +[Desktop Entry]
 +Name=Startup Applications
@@ -3902,10 +3914,11 @@ Index: gnome-session-3.28.0/data/gnome-session-properties.desktop.in
 +X-GNOME-Bugzilla-Product=gnome-session
 +X-GNOME-Bugzilla-Component=gnome-session-properties
 +X-GNOME-Bugzilla-Version=@VERSION@
-Index: gnome-session-3.28.0/data/icons/16x16/session-properties.svg
-===================================================================
+diff --git a/data/icons/16x16/session-properties.svg b/data/icons/16x16/session-properties.svg
+new file mode 100644
+index 0000000..4f7c37f
 --- /dev/null
-+++ gnome-session-3.28.0/data/icons/16x16/session-properties.svg
++++ b/data/icons/16x16/session-properties.svg
 @@ -0,0 +1,394 @@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -4301,10 +4314,11 @@ Index: gnome-session-3.28.0/data/icons/16x16/session-properties.svg
 +       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5604);stroke-width:0.99999982;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 +  </g>
 +</svg>
-Index: gnome-session-3.28.0/data/icons/22x22/session-properties.svg
-===================================================================
+diff --git a/data/icons/22x22/session-properties.svg b/data/icons/22x22/session-properties.svg
+new file mode 100644
+index 0000000..1d0afda
 --- /dev/null
-+++ gnome-session-3.28.0/data/icons/22x22/session-properties.svg
++++ b/data/icons/22x22/session-properties.svg
 @@ -0,0 +1,440 @@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -4746,10 +4760,11 @@ Index: gnome-session-3.28.0/data/icons/22x22/session-properties.svg
 +       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5604);stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 +  </g>
 +</svg>
-Index: gnome-session-3.28.0/data/icons/32x32/session-properties.svg
-===================================================================
+diff --git a/data/icons/32x32/session-properties.svg b/data/icons/32x32/session-properties.svg
+new file mode 100644
+index 0000000..5bb1455
 --- /dev/null
-+++ gnome-session-3.28.0/data/icons/32x32/session-properties.svg
++++ b/data/icons/32x32/session-properties.svg
 @@ -0,0 +1,490 @@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -5241,10 +5256,11 @@ Index: gnome-session-3.28.0/data/icons/32x32/session-properties.svg
 +       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5604);stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 +  </g>
 +</svg>
-Index: gnome-session-3.28.0/data/icons/scalable/session-properties.svg
-===================================================================
+diff --git a/data/icons/scalable/session-properties.svg b/data/icons/scalable/session-properties.svg
+new file mode 100644
+index 0000000..cec2c39
 --- /dev/null
-+++ gnome-session-3.28.0/data/icons/scalable/session-properties.svg
++++ b/data/icons/scalable/session-properties.svg
 @@ -0,0 +1,515 @@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -5761,10 +5777,11 @@ Index: gnome-session-3.28.0/data/icons/scalable/session-properties.svg
 +       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5604);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 +  </g>
 +</svg>
-Index: gnome-session-3.28.0/data/icons/symbolic/session-properties-symbolic.svg
-===================================================================
+diff --git a/data/icons/symbolic/session-properties-symbolic.svg b/data/icons/symbolic/session-properties-symbolic.svg
+new file mode 100644
+index 0000000..497fb9d
 --- /dev/null
-+++ gnome-session-3.28.0/data/icons/symbolic/session-properties-symbolic.svg
++++ b/data/icons/symbolic/session-properties-symbolic.svg
 @@ -0,0 +1,28 @@
 +<?xml version='1.0' encoding='UTF-8' standalone='no'?>
 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -5794,10 +5811,10 @@ Index: gnome-session-3.28.0/data/icons/symbolic/session-properties-symbolic.svg
 +
 +  </g>
 +</svg>
-Index: gnome-session-3.28.0/data/meson.build
-===================================================================
---- gnome-session-3.28.0.orig/data/meson.build
-+++ gnome-session-3.28.0/data/meson.build
+diff --git a/data/meson.build b/data/meson.build
+index 62cbb75..7f9f2ed 100644
+--- a/data/meson.build
++++ b/data/meson.build
 @@ -162,7 +162,30 @@ if enable_session_selector
    )
  endif
@@ -5829,10 +5846,11 @@ Index: gnome-session-3.28.0/data/meson.build
 +  'icons/scalable/session-properties.svg',
 +  install_dir: icondir + '/scalable/apps'
 +)
-Index: gnome-session-3.28.0/data/session-properties.ui
-===================================================================
+diff --git a/data/session-properties.ui b/data/session-properties.ui
+new file mode 100644
+index 0000000..6526154
 --- /dev/null
-+++ gnome-session-3.28.0/data/session-properties.ui
++++ b/data/session-properties.ui
 @@ -0,0 +1,303 @@
 +<?xml version="1.0"?>
 +<interface>
@@ -6137,10 +6155,11 @@ Index: gnome-session-3.28.0/data/session-properties.ui
 +    </child>
 +  </object>
 +</interface>
-Index: gnome-session-3.28.0/doc/man/gnome-session-properties.1
-===================================================================
+diff --git a/doc/man/gnome-session-properties.1 b/doc/man/gnome-session-properties.1
+new file mode 100644
+index 0000000..c7ef1af
 --- /dev/null
-+++ gnome-session-3.28.0/doc/man/gnome-session-properties.1
++++ b/doc/man/gnome-session-properties.1
 @@ -0,0 +1,24 @@
 +.\"
 +.\" gnome-session-properties manual page.
@@ -6166,10 +6185,10 @@ Index: gnome-session-3.28.0/doc/man/gnome-session-properties.1
 +.SH SEE ALSO
 +.BR gnome-session(1)
 +.BR gnome-session-quit(1)
-Index: gnome-session-3.28.0/doc/man/gnome-session.1
-===================================================================
---- gnome-session-3.28.0.orig/doc/man/gnome-session.1
-+++ gnome-session-3.28.0/doc/man/gnome-session.1
+diff --git a/doc/man/gnome-session.1 b/doc/man/gnome-session.1
+index bf9cf80..35c062c 100644
+--- a/doc/man/gnome-session.1
++++ b/doc/man/gnome-session.1
 @@ -94,6 +94,7 @@ when gnome-session is invoked.
  .B /usr/share/gnome/autostart
  .IP
@@ -6178,16 +6197,16 @@ Index: gnome-session-3.28.0/doc/man/gnome-session.1
  .PP
  .B $XDG_CONFIG_HOME/gnome-session/sessions
  .B $XDG_CONFIG_DIRS/gnome-session/sessions
-@@ -109,4 +110,5 @@ This directory contains the list of appl
+@@ -109,4 +110,5 @@ This directory contains the list of applications of the saved session.
  If you find bugs in the \fIgnome-session\fP program, please report
  these on https://bugzilla.gnome.org.
  .SH SEE ALSO
 +.BR gnome-session-properties(1)
  .BR gnome-session-quit(1)
-Index: gnome-session-3.28.0/doc/man/meson.build
-===================================================================
---- gnome-session-3.28.0.orig/doc/man/meson.build
-+++ gnome-session-3.28.0/doc/man/meson.build
+diff --git a/doc/man/meson.build b/doc/man/meson.build
+index 4a389bc..9d9cc2d 100644
+--- a/doc/man/meson.build
++++ b/doc/man/meson.build
 @@ -34,7 +34,8 @@ endforeach
  
  man_data = files(
@@ -6198,11 +6217,11 @@ Index: gnome-session-3.28.0/doc/man/meson.build
  )
  
  install_data(
-Index: gnome-session-3.28.0/meson.build
-===================================================================
---- gnome-session-3.28.0.orig/meson.build
-+++ gnome-session-3.28.0/meson.build
-@@ -179,6 +179,7 @@ top_inc = include_directories('.')
+diff --git a/meson.build b/meson.build
+index d1b1d32..526a791 100644
+--- a/meson.build
++++ b/meson.build
+@@ -181,6 +181,7 @@ top_inc = include_directories('.')
  subdir('gnome-session')
  subdir('tools')
  subdir('data')
@@ -6210,10 +6229,10 @@ Index: gnome-session-3.28.0/meson.build
  
  enable_docbook = get_option('docbook')
  enable_man = get_option('man')
-Index: gnome-session-3.28.0/po/POTFILES.in
-===================================================================
---- gnome-session-3.28.0.orig/po/POTFILES.in
-+++ gnome-session-3.28.0/po/POTFILES.in
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index c20c662..b91b63c 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
 @@ -1,11 +1,17 @@
  # List of source files containing translatable strings.
  # Please keep this file sorted alphabetically.
@@ -6232,10 +6251,10 @@ Index: gnome-session-3.28.0/po/POTFILES.in
  data/ubuntu.desktop.in
  data/ubuntu-wayland.desktop.in
  data/ubuntu-communitheme-snap.desktop.in
-Index: gnome-session-3.28.0/po/POTFILES.skip
-===================================================================
---- gnome-session-3.28.0.orig/po/POTFILES.skip
-+++ gnome-session-3.28.0/po/POTFILES.skip
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index 91b4156..a563ec3 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
 @@ -3,3 +3,4 @@
  # Please keep this file sorted alphabetically.
  data/gnome-dummy.session.desktop.in
diff --git a/debian/patches/series b/debian/patches/series
index 629abde..f391d3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
+debian/Revert-main-Remove-GNOME_DESKTOP_SESSION_ID-envvar.patch
 22_support_autostart_delay.patch
-50_ubuntu_sessions.patch
+ubuntu/ubuntu-sessions.patch
 51_remove_session_saving_from_gui.patch
 53_add_sessionmigration.patch
 95_dbus_request_shutdown.patch
diff --git a/debian/patches/50_ubuntu_sessions.patch b/debian/patches/ubuntu/ubuntu-sessions.patch
index 97540c3..f3ed3e2 100644
--- a/debian/patches/50_ubuntu_sessions.patch
+++ b/debian/patches/ubuntu/ubuntu-sessions.patch
@@ -1,26 +1,45 @@
-Description: tweak the session system to make it for ubuntu.
+From: Ubuntu Developers <[e-mail]>
+Date: Wed, 15 Aug 2018 17:13:26 +0200
+Subject: tweak the session system to make it for ubuntu.
+
+The session contains:
+ - ubuntu (gnome-shell with ubuntu tweaks) in ubuntu-session package
+ - unity in unity-session package
+ - gnome-shell in the main gnome-session package.
+ (TryExec enables to show them or not depends on the package installed)
+Forwarded: Not needed
 The session contains:
  - ubuntu (gnome-shell with ubuntu tweaks) in ubuntu-session package
  - unity in unity-session package
  - gnome-shell in the main gnome-session package.
  (TryExec enables to show them or not depends on the package installed)
+
 Forwarded: Not needed
 ---
- data/gnome.desktop.in             |    4 +--
- data/meson.build                  |   47 +++++++++++++++++++++++++++++++++++++-
- data/ubuntu-wayland.desktop.in    |    7 +++++
- data/ubuntu.desktop.in            |    7 +++++
- data/ubuntu.session.desktop.in.in |    3 ++
- data/unity.desktop.in             |    7 +++++
- data/unity.session.desktop.in.in  |    4 +++
- meson_post_install.py             |    4 +++
- po/POTFILES.in                    |    5 ++++
- 9 files changed, 85 insertions(+), 3 deletions(-)
+ data/gnome.desktop.in                            |  4 +-
+ data/meson.build                                 | 72 +++++++++++++++++++++++-
+ data/ubuntu-communitheme-snap-wayland.desktop.in |  7 +++
+ data/ubuntu-communitheme-snap.desktop.in         |  7 +++
+ data/ubuntu-wayland.desktop.in                   |  7 +++
+ data/ubuntu.desktop.in                           |  7 +++
+ data/ubuntu.session.desktop.in.in                |  3 +
+ data/unity.desktop.in                            |  7 +++
+ data/unity.session.desktop.in.in                 |  4 ++
+ meson_post_install.py                            |  7 +++
+ po/POTFILES.in                                   |  7 +++
+ 11 files changed, 129 insertions(+), 3 deletions(-)
+ create mode 100644 data/ubuntu-communitheme-snap-wayland.desktop.in
+ create mode 100644 data/ubuntu-communitheme-snap.desktop.in
+ create mode 100644 data/ubuntu-wayland.desktop.in
+ create mode 100644 data/ubuntu.desktop.in
+ create mode 100644 data/ubuntu.session.desktop.in.in
+ create mode 100644 data/unity.desktop.in
+ create mode 100644 data/unity.session.desktop.in.in
 
-Index: gnome-session-3.28.0/data/gnome.desktop.in
-===================================================================
---- gnome-session-3.28.0.orig/data/gnome.desktop.in
-+++ gnome-session-3.28.0/data/gnome.desktop.in
+diff --git a/data/gnome.desktop.in b/data/gnome.desktop.in
+index 7b78e94..bfdc424 100644
+--- a/data/gnome.desktop.in
++++ b/data/gnome.desktop.in
 @@ -1,7 +1,7 @@
  [Desktop Entry]
  Name=GNOME
@@ -31,10 +50,10 @@ Index: gnome-session-3.28.0/data/gnome.desktop.in
 +TryExec=gnome-shell
  Type=Application
  DesktopNames=GNOME
-Index: gnome-session-3.28.0/data/meson.build
-===================================================================
---- gnome-session-3.28.0.orig/data/meson.build
-+++ gnome-session-3.28.0/data/meson.build
+diff --git a/data/meson.build b/data/meson.build
+index 89af98f..62cbb75 100644
+--- a/data/meson.build
++++ b/data/meson.build
 @@ -17,6 +17,25 @@ i18n.merge_file(
    install_dir: join_paths(session_datadir, 'xsessions')
  )
@@ -123,66 +142,72 @@ Index: gnome-session-3.28.0/data/meson.build
  ]
  
  foreach session: sessions
-Index: gnome-session-3.28.0/data/ubuntu-wayland.desktop.in
-===================================================================
+diff --git a/data/ubuntu-communitheme-snap-wayland.desktop.in b/data/ubuntu-communitheme-snap-wayland.desktop.in
+new file mode 100644
+index 0000000..e28ec7d
 --- /dev/null
-+++ gnome-session-3.28.0/data/ubuntu-wayland.desktop.in
++++ b/data/ubuntu-communitheme-snap-wayland.desktop.in
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
-+Name=Ubuntu on Wayland
++Name=Ubuntu with communitheme snap on Wayland
 +Comment=This session logs you into Ubuntu
-+Exec=env GNOME_SHELL_SESSION_MODE=ubuntu  gnome-session --session=ubuntu
-+TryExec=gnome-shell
++Exec=env GNOME_SHELL_SESSION_MODE=ubuntu-communitheme /snap/communitheme/current/session
++TryExec=/snap/communitheme/current/session
 +Type=Application
-+DesktopNames=ubuntu:GNOME
-Index: gnome-session-3.28.0/data/ubuntu.desktop.in
-===================================================================
++DesktopNames=communitheme:ubuntu:GNOME
+diff --git a/data/ubuntu-communitheme-snap.desktop.in b/data/ubuntu-communitheme-snap.desktop.in
+new file mode 100644
+index 0000000..2860c66
 --- /dev/null
-+++ gnome-session-3.28.0/data/ubuntu.desktop.in
++++ b/data/ubuntu-communitheme-snap.desktop.in
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
-+Name=Ubuntu
++Name=Ubuntu with communitheme snap
 +Comment=This session logs you into Ubuntu
-+Exec=env GNOME_SHELL_SESSION_MODE=ubuntu gnome-session --session=ubuntu
-+TryExec=gnome-shell
++Exec=env GNOME_SHELL_SESSION_MODE=ubuntu-communitheme /snap/communitheme/current/session
++TryExec=/snap/communitheme/current/session
 +Type=Application
-+DesktopNames=ubuntu:GNOME
-Index: gnome-session-3.28.0/data/ubuntu-communitheme-snap-wayland.desktop.in
-===================================================================
++DesktopNames=communitheme:ubuntu:GNOME
+diff --git a/data/ubuntu-wayland.desktop.in b/data/ubuntu-wayland.desktop.in
+new file mode 100644
+index 0000000..7880baf
 --- /dev/null
-+++ gnome-session-3.28.0/data/ubuntu-communitheme-snap-wayland.desktop.in
++++ b/data/ubuntu-wayland.desktop.in
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
-+Name=Ubuntu with communitheme snap on Wayland
++Name=Ubuntu on Wayland
 +Comment=This session logs you into Ubuntu
-+Exec=env GNOME_SHELL_SESSION_MODE=ubuntu-communitheme /snap/communitheme/current/session
-+TryExec=/snap/communitheme/current/session
++Exec=env GNOME_SHELL_SESSION_MODE=ubuntu  gnome-session --session=ubuntu
++TryExec=gnome-shell
 +Type=Application
-+DesktopNames=communitheme:ubuntu:GNOME
-Index: gnome-session-3.28.0/data/ubuntu-communitheme-snap.desktop.in
-===================================================================
++DesktopNames=ubuntu:GNOME
+diff --git a/data/ubuntu.desktop.in b/data/ubuntu.desktop.in
+new file mode 100644
+index 0000000..0b7e0ab
 --- /dev/null
-+++ gnome-session-3.28.0/data/ubuntu-communitheme-snap.desktop.in
++++ b/data/ubuntu.desktop.in
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
-+Name=Ubuntu with communitheme snap
++Name=Ubuntu
 +Comment=This session logs you into Ubuntu
-+Exec=env GNOME_SHELL_SESSION_MODE=ubuntu-communitheme /snap/communitheme/current/session
-+TryExec=/snap/communitheme/current/session
++Exec=env GNOME_SHELL_SESSION_MODE=ubuntu gnome-session --session=ubuntu
++TryExec=gnome-shell
 +Type=Application
-+DesktopNames=communitheme:ubuntu:GNOME
-Index: gnome-session-3.28.0/data/ubuntu.session.desktop.in.in
-===================================================================
++DesktopNames=ubuntu:GNOME
+diff --git a/data/ubuntu.session.desktop.in.in b/data/ubuntu.session.desktop.in.in
+new file mode 100644
+index 0000000..d8df078
 --- /dev/null
-+++ gnome-session-3.28.0/data/ubuntu.session.desktop.in.in
++++ b/data/ubuntu.session.desktop.in.in
 @@ -0,0 +1,3 @@
 +[GNOME Session]
 +Name=Ubuntu
 +RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
-Index: gnome-session-3.28.0/data/unity.desktop.in
-===================================================================
+diff --git a/data/unity.desktop.in b/data/unity.desktop.in
+new file mode 100644
+index 0000000..991a087
 --- /dev/null
-+++ gnome-session-3.28.0/data/unity.desktop.in
++++ b/data/unity.desktop.in
 @@ -0,0 +1,7 @@
 +[Desktop Entry]
 +Name=Unity
@@ -191,19 +216,20 @@ Index: gnome-session-3.28.0/data/unity.desktop.in
 +TryExec=unity
 +Type=Application
 +DesktopNames=Unity:Unity7:ubuntu
-Index: gnome-session-3.28.0/data/unity.session.desktop.in.in
-===================================================================
+diff --git a/data/unity.session.desktop.in.in b/data/unity.session.desktop.in.in
+new file mode 100644
+index 0000000..615b492
 --- /dev/null
-+++ gnome-session-3.28.0/data/unity.session.desktop.in.in
++++ b/data/unity.session.desktop.in.in
 @@ -0,0 +1,4 @@
 +[GNOME Session]
 +Name=Unity
 +RequiredComponents=unity-settings-daemon;
 +DesktopName=Unity:Unity7:ubuntu
-Index: gnome-session-3.28.0/meson_post_install.py
-===================================================================
---- gnome-session-3.28.0.orig/meson_post_install.py
-+++ gnome-session-3.28.0/meson_post_install.py
+diff --git a/meson_post_install.py b/meson_post_install.py
+index e2e352c..b8a8b4f 100644
+--- a/meson_post_install.py
++++ b/meson_post_install.py
 @@ -24,3 +24,10 @@ if not os.path.exists(dst_dir):
  src = os.path.join(install_root, 'xsessions', 'gnome.desktop')
  dst = os.path.join(dst_dir, 'gnome.desktop')
@@ -215,10 +241,10 @@ Index: gnome-session-3.28.0/meson_post_install.py
 +src = os.path.join(install_root, 'xsessions', 'ubuntu-communitheme-snap-wayland.desktop')
 +dst = os.path.join(dst_dir, 'ubuntu-communitheme-snap-wayland.desktop')
 +shutil.copyfile(src, dst)
-Index: gnome-session-3.28.0/po/POTFILES.in
-===================================================================
---- gnome-session-3.28.0.orig/po/POTFILES.in
-+++ gnome-session-3.28.0/po/POTFILES.in
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 63faf7d..c20c662 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
 @@ -6,6 +6,13 @@ data/gnome-xorg.desktop.in
  data/gnome-dummy.session.desktop.in.in
  data/gnome.session.desktop.in.in
diff --git a/debian/rules b/debian/rules
index fec338a..bcf2331 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
-
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
 
 %:
 	dh $@ --with gnome
@@ -35,9 +35,6 @@ override_dh_install:
 	mkdir -p debian/ubuntu-session/usr/share/icons
 	ln -s /snap/communitheme/current/share/icons/communitheme debian/ubuntu-session/usr/share/icons/communitheme
 
-override_dh_missing:
-	dh_missing --list-missing
-
 override_dh_auto_build:
 	dh_auto_build
 	ninja -C obj-$(DEB_HOST_GNU_TYPE) gnome-session-3.0-pot
@@ -45,3 +42,6 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f po/gnome-session-3.0.pot
+
+override_dh_missing:
+	dh_missing --fail-missing
diff --git a/debian/watch b/debian/watch
index ac38817..35b7b17 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \
 	@PACKAGE@@ANY_VERSION@\.tar\.xz
diff --git a/gnome-session/main.c b/gnome-session/main.c
index b1ac385..9a7f554 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -408,11 +408,6 @@ main (int argc, char **argv)
                 g_free (ibus_path);
         }
 
-        /* Some third-party programs rely on GNOME_DESKTOP_SESSION_ID to
-         * detect if GNOME is running. We keep this for compatibility reasons.
-         */
-        gsm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
-
         /* We want to use the GNOME menus which has the designed categories.
          */
         gsm_util_setenv ("XDG_MENU_PREFIX", "gnome-");
diff --git a/meson.build b/meson.build
index 0231360..d1b1d32 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
   'gnome-session', 'c',
-  version: '3.28.1',
+  version: '3.29.90',
   license: 'GPL2+',
   default_options: 'buildtype=debugoptimized',
   meson_version: '>= 0.43.0'
diff --git a/po/ca.po b/po/ca.po
index 62bbb7b..e831b52 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -14,77 +14,78 @@ msgstr ""
 "Project-Id-Version: gnome-session 2.3.7\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "session&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-06-21 22:12+0000\n"
-"PO-Revision-Date: 2015-03-07 00:41+0200\n"
-"Last-Translator: Jordi Mas <[e-mail]>\n"
+"POT-Creation-Date: 2018-01-08 21:39+0000\n"
+"PO-Revision-Date: 2018-02-22 18:29+0100\n"
+"Last-Translator: Robert Antoni Buj Gelonch <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 2.0.6\n"
 
-#: ../data/gnome-custom-session.desktop.in.h:1
+#: data/gnome-custom-session.desktop.in:3
 msgid "Custom"
 msgstr "Personalitzada"
 
-#: ../data/gnome-custom-session.desktop.in.h:2
+#: data/gnome-custom-session.desktop.in:4
 msgid "This entry lets you select a saved session"
 msgstr "Aquesta entrada us permet seleccionar una sessió desada"
 
-#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1
+#: data/gnome.desktop.in:3 data/gnome.session.desktop.in.in:3
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../data/gnome.desktop.in.h:2 ../data/gnome-xorg.desktop.in.h:2
+#: data/gnome.desktop.in:4 data/gnome-xorg.desktop.in:4
 msgid "This session logs you into GNOME"
 msgstr "Aquesta sessió us entra al GNOME"
 
-#: ../data/gnome-xorg.desktop.in.h:1
+#: data/gnome-xorg.desktop.in:3
 msgid "GNOME on Xorg"
-msgstr "GNOME en Xorg"
+msgstr "GNOME damunt Xorg"
 
-#: ../data/gnome-dummy.session.desktop.in.in.h:1
+#: data/gnome-dummy.session.desktop.in.in:3
 msgid "GNOME dummy"
 msgstr "GNOME de prova"
 
-#: ../data/session-selector.ui.h:1
+#: data/session-selector.ui:15
 msgid "Custom Session"
 msgstr "Sessió personalitzada"
 
-#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102
+#: data/session-selector.ui:50 tools/gnome-session-selector.c:102
 msgid "Please select a custom session to run"
 msgstr "Seleccioneu quina sessió personalitzada voleu"
 
-#: ../data/session-selector.ui.h:3
+#: data/session-selector.ui:105
 msgid "_New Session"
 msgstr "Sessió _nova"
 
-#: ../data/session-selector.ui.h:4
+#: data/session-selector.ui:119
 msgid "_Remove Session"
 msgstr "_Suprimeix la sessió"
 
-#: ../data/session-selector.ui.h:5
+#: data/session-selector.ui:133
 msgid "Rena_me Session"
 msgstr "_Canvia el nom de la sessió"
 
-#: ../data/session-selector.ui.h:6
+#: data/session-selector.ui:168
 msgid "_Continue"
 msgstr "_Continua"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:313
+#: gnome-session/gsm-fail-whale-dialog.c:313
 msgid "Oh no!  Something has gone wrong."
 msgstr "Alguna cosa ha fallat."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:320
+#: gnome-session/gsm-fail-whale-dialog.c:320
 msgid ""
 "A problem has occurred and the system can’t recover. Please contact a system "
 "administrator"
 msgstr ""
-"S'ha produït un problema i el sistema no es pot recuperar. Contacteu amb "
-"un administrador del sistema"
+"S'ha produït un problema i el sistema no es pot recuperar. Contacteu amb un "
+"administrador del sistema"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:322
+#: gnome-session/gsm-fail-whale-dialog.c:322
 msgid ""
 "A problem has occurred and the system can’t recover. All extensions have "
 "been disabled as a precaution."
@@ -92,7 +93,7 @@ msgstr ""
 "S'ha produït un problema i el sistema no es pot recuperar. Com a mètode de "
 "precaució s'han inhabilitat totes les extensions."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:324
+#: gnome-session/gsm-fail-whale-dialog.c:324
 msgid ""
 "A problem has occurred and the system can’t recover.\n"
 "Please log out and try again."
@@ -100,27 +101,27 @@ msgstr ""
 "S'ha produït un problema i el sistema no es pot recuperar.\n"
 "Sortiu i torneu-ho a provar."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:339
+#: gnome-session/gsm-fail-whale-dialog.c:339
 msgid "_Log Out"
 msgstr "_Surt"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:281
+#: gnome-session/gsm-fail-whale-dialog.c:361 gnome-session/main.c:279
 msgid "Enable debugging code"
 msgstr "Habilita el codi de depuració"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:362
+#: gnome-session/gsm-fail-whale-dialog.c:362
 msgid "Allow logout"
 msgstr "Permet sortir"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:363
+#: gnome-session/gsm-fail-whale-dialog.c:363
 msgid "Show extension warning"
 msgstr "Mostra l'avís de l'extensió"
 
-#: ../gnome-session/gsm-manager.c:1318 ../gnome-session/gsm-manager.c:1971
+#: gnome-session/gsm-manager.c:1266 gnome-session/gsm-manager.c:1919
 msgid "Not responding"
 msgstr "No està responent"
 
-#: ../gnome-session/gsm-util.c:382
+#: gnome-session/gsm-util.c:382
 msgid "_Log out"
 msgstr "_Surt"
 
@@ -128,15 +129,15 @@ msgstr "_Surt"
 #. * then the XSMP client already has set several XSMP
 #. * properties. But it could still be that SmProgram is not set.
 #.
-#: ../gnome-session/gsm-xsmp-client.c:557
+#: gnome-session/gsm-xsmp-client.c:557
 msgid "Remembered Application"
 msgstr "Aplicació recordada"
 
-#: ../gnome-session/gsm-xsmp-client.c:1207
+#: gnome-session/gsm-xsmp-client.c:1216
 msgid "This program is blocking logout."
 msgstr "Aquest programa està blocant la sortida."
 
-#: ../gnome-session/gsm-xsmp-server.c:340
+#: gnome-session/gsm-xsmp-server.c:340
 msgid ""
 "Refusing new client connection because the session is currently being shut "
 "down\n"
@@ -144,65 +145,50 @@ msgstr ""
 "Es refusarà la connexió de client nova perquè la sessió s'està aturant\n"
 
 # Nota: ICE -> Inter-Client Exchange (http://en.wikipedia.org/wiki/X_Window_System_protocols_and_architecture#Inter-client_communication)
-#: ../gnome-session/gsm-xsmp-server.c:609
+#: gnome-session/gsm-xsmp-server.c:609
 #, c-format
 msgid "Could not create ICE listening socket: %s"
 msgstr "No s'ha pogut crear el sòcol ICE d'escolta: %s"
 
-#: ../gnome-session/main.c:279
+#: gnome-session/main.c:277
 msgid "Override standard autostart directories"
 msgstr "Ignora els directoris estàndard d'inici automàtic"
 
-#: ../gnome-session/main.c:279
+#: gnome-session/main.c:277
 msgid "AUTOSTART_DIR"
 msgstr "DIRECTORI_INICI_AUTOMÀTIC"
 
-#: ../gnome-session/main.c:280
+#: gnome-session/main.c:278
 msgid "Session to use"
 msgstr "Sessió que s'utilitzarà"
 
-#: ../gnome-session/main.c:280
+#: gnome-session/main.c:278
 msgid "SESSION_NAME"
 msgstr "NOM_DE_SESSIÓ"
 
-#: ../gnome-session/main.c:282
+#: gnome-session/main.c:280
 msgid "Do not load user-specified applications"
 msgstr "No carreguis les aplicacions especificades per l'usuari"
 
-#: ../gnome-session/main.c:283
+#: gnome-session/main.c:281
 msgid "Version of this application"
 msgstr "Versió d'aquesta aplicació"
 
 #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong
-#: ../gnome-session/main.c:285
+#: gnome-session/main.c:283
 msgid "Show the fail whale dialog for testing"
 msgstr "Mostra el diàleg de la balena per fer proves"
 
-#: ../gnome-session/main.c:286
+#: gnome-session/main.c:284
 msgid "Disable hardware acceleration check"
 msgstr "Inhabilita la comprovació d'acceleració del maquinari"
 
-#: ../gnome-session/main.c:318
+#: gnome-session/main.c:316
 msgid " — the GNOME session manager"
 msgstr " — el gestor de sessions del GNOME"
 
-#: ../tools/gnome-session-inhibit.c:108
+#: tools/gnome-session-inhibit.c:108
 #, c-format
-#| msgid ""
-#| "%s [OPTION...] COMMAND\n"
-#| "\n"
-#| "Execute COMMAND while inhibiting some session functionality.\n"
-#| "\n"
-#| "  -h, --help        Show this help\n"
-#| "  --version         Show program version\n"
-#| "  --app-id ID       The application id to use\n"
-#| "                    when inhibiting (optional)\n"
-#| "  --reason REASON   The reason for inhibiting (optional)\n"
-#| "  --inhibit ARG     Things to inhibit, colon-separated list of:\n"
-#| "                    logout, switch-user, suspend, idle, automount\n"
-#| "  --inhibit-only    Do not launch COMMAND and wait forever instead\n"
-#| "\n"
-#| "If no --inhibit option is specified, idle is assumed.\n"
 msgid ""
 "%s [OPTION…] COMMAND\n"
 "\n"
@@ -236,67 +222,66 @@ msgstr ""
 "\n"
 "Si no s'especifica cap opció a --inhibit, s'utilitzarà «idle» (inactiu).\n"
 
-#: ../tools/gnome-session-inhibit.c:146
+#: tools/gnome-session-inhibit.c:146
 #, c-format
 msgid "Failed to execute %s\n"
 msgstr "No s'ha pogut executar %s\n"
 
-#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216
-#: ../tools/gnome-session-inhibit.c:226
+#: tools/gnome-session-inhibit.c:206 tools/gnome-session-inhibit.c:216
+#: tools/gnome-session-inhibit.c:226
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s requereix un argument\n"
 
-#: ../tools/gnome-session-selector.c:61
+#: tools/gnome-session-selector.c:61
 #, c-format
 msgid "Session %d"
 msgstr "Sessió %d"
 
-#: ../tools/gnome-session-selector.c:107
+#: tools/gnome-session-selector.c:107
 msgid ""
 "Session names are not allowed to start with “.” or contain “/” characters"
 msgstr ""
 "Els noms de sessió no poden començar amb els caràcters «.» ni contenir «/»"
 
-#: ../tools/gnome-session-selector.c:111
+#: tools/gnome-session-selector.c:111
 msgid "Session names are not allowed to start with “.”"
 msgstr "Els noms de sessió no poden començar amb el caràcter «.»"
 
-#: ../tools/gnome-session-selector.c:115
+#: tools/gnome-session-selector.c:115
 msgid "Session names are not allowed to contain “/” characters"
 msgstr "Els noms de sessió no poden contenir el caràcter «/»"
 
-#: ../tools/gnome-session-selector.c:123
+#: tools/gnome-session-selector.c:123
 #, c-format
-#| msgid "A session named ‘%s’ already exists"
 msgid "A session named “%s” already exists"
 msgstr "Ja existeix una sessió amb el nom «%s»"
 
-#: ../tools/gnome-session-quit.c:50
+#: tools/gnome-session-quit.c:50
 msgid "Log out"
 msgstr "Surt"
 
-#: ../tools/gnome-session-quit.c:51
+#: tools/gnome-session-quit.c:51
 msgid "Power off"
 msgstr "Atura"
 
-#: ../tools/gnome-session-quit.c:52
+#: tools/gnome-session-quit.c:52
 msgid "Reboot"
 msgstr "Reinicia"
 
-#: ../tools/gnome-session-quit.c:53
+#: tools/gnome-session-quit.c:53
 msgid "Ignoring any existing inhibitors"
 msgstr "S'està ignorant qualsevol inhibidor existent"
 
-#: ../tools/gnome-session-quit.c:54
+#: tools/gnome-session-quit.c:54
 msgid "Don’t prompt for user confirmation"
 msgstr "No demanis la confirmació de l'usuari"
 
-#: ../tools/gnome-session-quit.c:88 ../tools/gnome-session-quit.c:102
+#: tools/gnome-session-quit.c:88 tools/gnome-session-quit.c:102
 msgid "Could not connect to the session manager"
 msgstr "No s'ha pogut connectar al gestor de sessions"
 
-#: ../tools/gnome-session-quit.c:198
+#: tools/gnome-session-quit.c:198
 msgid "Program called with conflicting options"
 msgstr ""
 "El programa s'ha invocat amb opcions que entren en conflicte entre elles"
@@ -751,7 +736,7 @@ msgstr ""
 #~ "el paquet AT-SPI estigui instal·lat. S'ha iniciat la sessió sense la "
 #~ "tecnologia assistiva."
 
-# Ho he escurçat una mica -> Accessibility Technologies Service Provider 
+# Ho he escurçat una mica -> Accessibility Technologies Service Provider
 # Interface (dpm)
 #~ msgid "AT SPI Registry Wrapper"
 #~ msgstr "Embolcall del servei de registre de l'accessibilitat (AT SPI)"
diff --git a/po/gd.po b/po/gd.po
index af14814..fcdf9b4 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-session\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product"
-"=gnome-session&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-09-18 14:31+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"session&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2018-03-13 14:46+0000\n"
 "PO-Revision-Date: 2018-02-26 12:22+0100\n"
 "Last-Translator: GunChleoc <[e-mail]>\n"
 "Language-Team: Fòram na Gàidhlig\n"
@@ -22,113 +22,97 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-09-15 06:24+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-custom-session.desktop.in.h:1
+#: data/gnome-custom-session.desktop.in:3
 msgid "Custom"
 msgstr "Gnàthaichte"
 
-#: ../data/gnome-custom-session.desktop.in.h:2
+#: data/gnome-custom-session.desktop.in:4
 msgid "This entry lets you select a saved session"
-msgstr ""
-"’S urrainn dhut seisean air a shàbhaladh a thaghadh leis an innteart seo"
+msgstr "’S urrainn dhut seisean air a shàbhaladh a thaghadh leis an innteart seo"
 
-#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1
+#: data/gnome.desktop.in:3 data/gnome.session.desktop.in.in:3
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../data/gnome.desktop.in.h:2 ../data/gnome-xorg.desktop.in.h:2
+#: data/gnome.desktop.in:4 data/gnome-xorg.desktop.in:4
 msgid "This session logs you into GNOME"
 msgstr "Clàraidh an seisean seo a-steach gu GNOME thu"
 
-#: ../data/gnome-xorg.desktop.in.h:1
+#: data/gnome-xorg.desktop.in:3
 msgid "GNOME on Xorg"
 msgstr "GNOME air Xorg"
 
-#: ../data/gnome-dummy.session.desktop.in.in.h:1
+#: data/gnome-dummy.session.desktop.in.in:3
 msgid "GNOME dummy"
 msgstr "Caochag GNOME"
 
-#: ../data/session-selector.ui.h:1
+#: data/session-selector.ui:15
 msgid "Custom Session"
 msgstr "Seisean gnàthaichte"
 
-#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102
+#: data/session-selector.ui:50 tools/gnome-session-selector.c:102
 msgid "Please select a custom session to run"
 msgstr "Tagh seisean gnàthaichte gus a ruith"
 
-#: ../data/session-selector.ui.h:3
+#: data/session-selector.ui:105
 msgid "_New Session"
 msgstr "_Seisean ùr"
 
-#: ../data/session-selector.ui.h:4
+#: data/session-selector.ui:119
 msgid "_Remove Session"
 msgstr "Thoi_r an seisean air falbh"
 
-#: ../data/session-selector.ui.h:5
+#: data/session-selector.ui:133
 msgid "Rena_me Session"
 msgstr "Thoir ain_m ùr air an t-seisean"
 
-#: ../data/session-selector.ui.h:6
+#: data/session-selector.ui:168
 msgid "_Continue"
 msgstr "_Lean air adhart"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:313
+#: gnome-session/gsm-fail-whale-dialog.c:313
 msgid "Oh no!  Something has gone wrong."
 msgstr "Obh Obh! Chaidh rudeigin cearr."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:320
-#| msgid ""
-#| "A problem has occurred and the system can't recover. Please contact a "
-#| "system administrator"
+#: gnome-session/gsm-fail-whale-dialog.c:320
 msgid ""
 "A problem has occurred and the system can’t recover. Please contact a system "
 "administrator"
-msgstr ""
-"Thachair duilgheadas ach nach urrainn dhan t-siostam aiseag. Feuch an cuir "
-"thu fiosrachadh gu rianaire an t-siostaim agad."
+msgstr "Thachair duilgheadas ach nach urrainn dhan t-siostam aiseag. Feuch an cuir thu fiosrachadh gu rianaire an t-siostaim agad."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:322
-#| msgid ""
-#| "A problem has occurred and the system can't recover. All extensions have "
-#| "been disabled as a precaution."
+#: gnome-session/gsm-fail-whale-dialog.c:322
 msgid ""
 "A problem has occurred and the system can’t recover. All extensions have "
 "been disabled as a precaution."
-msgstr ""
-"Thachair duilgheadas ach nach urrainn dhan t-siostam aiseag. Chaidh na "
-"h-uile leudachan a chur à comas mar earalas."
+msgstr "Thachair duilgheadas ach nach urrainn dhan t-siostam aiseag. Chaidh na h-uile leudachan a chur à comas mar earalas."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:324
-#| msgid ""
-#| "A problem has occurred and the system can't recover.\n"
-#| "Please log out and try again."
+#: gnome-session/gsm-fail-whale-dialog.c:324
 msgid ""
 "A problem has occurred and the system can’t recover.\n"
 "Please log out and try again."
-msgstr ""
-"Thachair duilgheadas ach nach urrainn dhan t-siostam aiseag.\n"
-"An clàraich thu a-mach is a-steach airson feuchainn ris a-rithist?"
+msgstr "Thachair duilgheadas ach nach urrainn dhan t-siostam aiseag.\nAn clàraich thu a-mach is a-steach airson feuchainn ris a-rithist?"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:339
+#: gnome-session/gsm-fail-whale-dialog.c:339
 msgid "_Log Out"
 msgstr "C_làraich a-mach"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:281
+#: gnome-session/gsm-fail-whale-dialog.c:361 gnome-session/main.c:279
 msgid "Enable debugging code"
 msgstr "Cuir an comas còd dì-bhugachaidh"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:362
+#: gnome-session/gsm-fail-whale-dialog.c:362
 msgid "Allow logout"
 msgstr "Ceadaich clàradh a-mach"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:363
+#: gnome-session/gsm-fail-whale-dialog.c:363
 msgid "Show extension warning"
 msgstr "Seall rabhadh leudachain"
 
-#: ../gnome-session/gsm-manager.c:1266 ../gnome-session/gsm-manager.c:1919
+#: gnome-session/gsm-manager.c:1266 gnome-session/gsm-manager.c:1919
 msgid "Not responding"
 msgstr "Chan eil e a’ freagairt"
 
-#: ../gnome-session/gsm-util.c:382
+#: gnome-session/gsm-util.c:382
 msgid "_Log out"
 msgstr "C_làraich a-mach"
 
@@ -136,81 +120,64 @@ msgstr "C_làraich a-mach"
 #. * then the XSMP client already has set several XSMP
 #. * properties. But it could still be that SmProgram is not set.
 #.
-#: ../gnome-session/gsm-xsmp-client.c:557
+#: gnome-session/gsm-xsmp-client.c:557
 msgid "Remembered Application"
 msgstr "Prògram air a chuimhneachadh"
 
-#: ../gnome-session/gsm-xsmp-client.c:1207
+#: gnome-session/gsm-xsmp-client.c:1216
 msgid "This program is blocking logout."
 msgstr "Tha am prògram seo a’ bacadh a’ chlàraidh a-mach."
 
-#: ../gnome-session/gsm-xsmp-server.c:340
+#: gnome-session/gsm-xsmp-server.c:340
 msgid ""
 "Refusing new client connection because the session is currently being shut "
 "down\n"
-msgstr "A’ diùltadh ceangal ùr ri cliant on a tha an seisean ’ga dhùnadh sìos an-"
-"dràsta.\n"
+msgstr "A’ diùltadh ceangal ùr ri cliant on a tha an seisean ’ga dhùnadh sìos an-dràsta.\n"
 
-#: ../gnome-session/gsm-xsmp-server.c:609
+#: gnome-session/gsm-xsmp-server.c:609
 #, c-format
 msgid "Could not create ICE listening socket: %s"
 msgstr "Cha b’ urrainn dhuinn socaid èisteachd ICE a chruthachadh: %s"
 
-#: ../gnome-session/main.c:279
+#: gnome-session/main.c:277
 msgid "Override standard autostart directories"
 msgstr "Tar-àithn na pasganan fèin-tòiseachaidh bunaiteach"
 
-#: ../gnome-session/main.c:279
+#: gnome-session/main.c:277
 msgid "AUTOSTART_DIR"
 msgstr "PASGAN_FÈIN_TOISEACHAIDH"
 
-#: ../gnome-session/main.c:280
+#: gnome-session/main.c:278
 msgid "Session to use"
 msgstr "An seisean ri chleachdadh"
 
-#: ../gnome-session/main.c:280
+#: gnome-session/main.c:278
 msgid "SESSION_NAME"
 msgstr "AINM_SEISEIN"
 
-#: ../gnome-session/main.c:282
+#: gnome-session/main.c:280
 msgid "Do not load user-specified applications"
 msgstr "Cha b’ urrainn dhuinn prògraman gnàthaichte a’ chleachdaiche a luchdadh"
 
-#: ../gnome-session/main.c:283
+#: gnome-session/main.c:281
 msgid "Version of this application"
 msgstr "Tionndadh a’ phrògraim seo"
 
 #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong
-#: ../gnome-session/main.c:285
+#: gnome-session/main.c:283
 msgid "Show the fail whale dialog for testing"
 msgstr "Seall an còmhradh “fail whale” a chum deuchainn"
 
-#: ../gnome-session/main.c:286
+#: gnome-session/main.c:284
 msgid "Disable hardware acceleration check"
 msgstr "Cuir an dearbhadh air luathachadh a’ bhathair-chruaidh à comas"
 
-#: ../gnome-session/main.c:318
-#| msgid " - the GNOME session manager"
+#: gnome-session/main.c:316
 msgid " — the GNOME session manager"
 msgstr " – manaidsear nan seisean GNOME"
 
-#: ../tools/gnome-session-inhibit.c:108
+#: tools/gnome-session-inhibit.c:108
 #, c-format
-#| msgid ""
-#| "%s [OPTION...] COMMAND\n"
-#| "\n"
-#| "Execute COMMAND while inhibiting some session functionality.\n"
-#| "\n"
-#| "  -h, --help        Show this help\n"
-#| "  --version         Show program version\n"
-#| "  --app-id ID       The application id to use\n"
-#| "                    when inhibiting (optional)\n"
-#| "  --reason REASON   The reason for inhibiting (optional)\n"
-#| "  --inhibit ARG     Things to inhibit, colon-separated list of:\n"
-#| "                    logout, switch-user, suspend, idle, automount\n"
-#| "  --inhibit-only    Do not launch COMMAND and wait forever instead\n"
-#| "\n"
-#| "If no --inhibit option is specified, idle is assumed.\n"
 msgid ""
 "%s [OPTION…] COMMAND\n"
 "\n"
@@ -226,93 +193,67 @@ msgid ""
 "  --inhibit-only    Do not launch COMMAND and wait forever instead\n"
 "\n"
 "If no --inhibit option is specified, idle is assumed.\n"
-msgstr ""
-"%s [ROGHAINN…] ÀITHNE\n"
-"\n"
-"Cuir ÀITHNE an gnìomh fhad ’s a thèid cuid a dh’fhoincseanan seisean a "
-"bhacadh.\n"
-"\n"
-"  -h, --help        Seall a’ chobhair seo\n"
-"  --version         Seall an tionndadh dhen phrògram\n"
-"  --app-id ID       ID a’ phrògraim a thèid a chleachdadh\n"
-"                    leis a’ bhacadh (roghainneil)\n"
-"  --reason ADHBHAR  Adhbhar a’ bhacaidh (rogainneil)\n"
-"  --inhibit ARG     Nithean ri am bacadh, liosta air a sgaradh le\n"
-"                    còileanan de:\n"
-"                    logout, switch-user, suspend, idle, automount\n"
-"  --inhibit-only    Na tòisich air ÀITHNE is feitheamh gun chrìch\n"
-"                    ’na àite\n"
-"\n"
-"Mura deach an roghainn --inhibit a shònrachadh, thathar an dùil\n"
-"air idle.\n"
+msgstr "%s [ROGHAINN…] ÀITHNE\n\nCuir ÀITHNE an gnìomh fhad ’s a thèid cuid a dh’fhoincseanan seisean a bhacadh.\n\n  -h, --help        Seall a’ chobhair seo\n  --version         Seall an tionndadh dhen phrògram\n  --app-id ID       ID a’ phrògraim a thèid a chleachdadh\n                    leis a’ bhacadh (roghainneil)\n  --reason ADHBHAR  Adhbhar a’ bhacaidh (rogainneil)\n  --inhibit ARG     Nithean ri am bacadh, liosta air a sgaradh le\n                    còileanan de:\n                    logout, switch-user, suspend, idle, automount\n  --inhibit-only    Na tòisich air ÀITHNE is feitheamh gun chrìch\n                    ’na àite\n\nMura deach an roghainn --inhibit a shònrachadh, thathar an dùil\nair idle.\n"
 
-#: ../tools/gnome-session-inhibit.c:146
+#: tools/gnome-session-inhibit.c:146
 #, c-format
 msgid "Failed to execute %s\n"
 msgstr "Cha deach leinn %s a chur an gnìomh\n"
 
-#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216
-#: ../tools/gnome-session-inhibit.c:226
+#: tools/gnome-session-inhibit.c:206 tools/gnome-session-inhibit.c:216
+#: tools/gnome-session-inhibit.c:226
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "Tha argamaid a dhìth air %s\n"
 
-#: ../tools/gnome-session-selector.c:61
+#: tools/gnome-session-selector.c:61
 #, c-format
 msgid "Session %d"
 msgstr "Seisean %d"
 
-#: ../tools/gnome-session-selector.c:107
-#| msgid ""
-#| "Session names are not allowed to start with ‘.’ or contain ‘/’ characters"
+#: tools/gnome-session-selector.c:107
 msgid ""
 "Session names are not allowed to start with “.” or contain “/” characters"
-msgstr ""
-"Chan eil ainm seisein a thòisicheas le “.” no sa bheil an caractar “/” "
-"ceadaichte"
+msgstr "Chan eil ainm seisein a thòisicheas le “.” no sa bheil an caractar “/” ceadaichte"
 
-#: ../tools/gnome-session-selector.c:111
-#| msgid "Session names are not allowed to start with ‘.’"
+#: tools/gnome-session-selector.c:111
 msgid "Session names are not allowed to start with “.”"
 msgstr "Chan eil ainm seisein a thòisicheas le “.” ceadaichte"
 
-#: ../tools/gnome-session-selector.c:115
-#| msgid "Session names are not allowed to contain ‘/’ characters"
+#: tools/gnome-session-selector.c:115
 msgid "Session names are not allowed to contain “/” characters"
 msgstr "Chan eil ainm seisein sa bheil an caractar “/” ceadaichte"
 
-#: ../tools/gnome-session-selector.c:123
+#: tools/gnome-session-selector.c:123
 #, c-format
-#| msgid "A session named ‘%s’ already exists"
 msgid "A session named “%s” already exists"
 msgstr "Tha seisean air a bheil “%s” ann mar-thà"
 
-#: ../tools/gnome-session-quit.c:50
+#: tools/gnome-session-quit.c:50
 msgid "Log out"
 msgstr "Clàraich a-mach"
 
-#: ../tools/gnome-session-quit.c:51
+#: tools/gnome-session-quit.c:51
 msgid "Power off"
-msgstr "Cuir a’ chumhachd dheth"
+msgstr "Dùin sìos"
 
-#: ../tools/gnome-session-quit.c:52
+#: tools/gnome-session-quit.c:52
 msgid "Reboot"
 msgstr "Ath-thòisich an siostam"
 
-#: ../tools/gnome-session-quit.c:53
+#: tools/gnome-session-quit.c:53
 msgid "Ignoring any existing inhibitors"
 msgstr "A’ leigeil seachad gach bacadair a tha ann"
 
-#: ../tools/gnome-session-quit.c:54
-#| msgid "Don't prompt for user confirmation"
+#: tools/gnome-session-quit.c:54
 msgid "Don’t prompt for user confirmation"
 msgstr "Na faighnich airson dearbhadh a’ chleachdaiche"
 
-#: ../tools/gnome-session-quit.c:88 ../tools/gnome-session-quit.c:102
+#: tools/gnome-session-quit.c:88 tools/gnome-session-quit.c:102
 msgid "Could not connect to the session manager"
 msgstr "Cha b’ urrainn dhuinn ceangal ri manaidsear nan seisean"
 
-#: ../tools/gnome-session-quit.c:198
+#: tools/gnome-session-quit.c:198
 msgid "Program called with conflicting options"
 msgstr "Chaidh prògram a ghairm le roghainnean ann an còmhstri"
 
diff --git a/po/oc.po b/po/oc.po
index bb02994..bbbc5dd 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -2,14 +2,13 @@
 # Copyright (C) 1998-2012 Free Software Foundation, Inc.
 # Yannig Marchegay (Kokoyaya) <[e-mail]>, 2007.
 # Cédric Valmary (Tot en òc) <[e-mail]>, 2015.
-# Cédric Valmary (totenoc.eu) <[e-mail]>, 2016.
+# Cédric Valmary (totenoc.eu) <[e-mail]>, 2016, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-session.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"session&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-05-25 09:04+0000\n"
-"PO-Revision-Date: 2016-02-27 18:21+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-session/issues\n"
+"POT-Creation-Date: 2018-06-01 11:05+0000\n"
+"PO-Revision-Date: 2018-06-27 12:29+0200\n"
 "Last-Translator: Cédric Valmary (totenoc.eu) <[e-mail]>\n"
 "Language-Team: Tot En Òc\n"
 "Language: oc\n"
@@ -20,141 +19,112 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/gnome-custom-session.desktop.in.h:1
+#: data/gnome-custom-session.desktop.in:3
 msgid "Custom"
 msgstr "Personalizat"
 
-#: ../data/gnome-custom-session.desktop.in.h:2
+#: data/gnome-custom-session.desktop.in:4
 msgid "This entry lets you select a saved session"
 msgstr "Aquesta causida permet d'accedir a una session enregistrada"
 
-#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1
+#: data/gnome.desktop.in:3 data/gnome.session.desktop.in.in:3
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../data/gnome.desktop.in.h:2 ../data/gnome-xorg.desktop.in.h:2
+#: data/gnome.desktop.in:4 data/gnome-xorg.desktop.in:4
 msgid "This session logs you into GNOME"
 msgstr "Aquesta session vos connècta dins GNOME"
 
-#: ../data/gnome-xorg.desktop.in.h:1
+#: data/gnome-xorg.desktop.in:3
 msgid "GNOME on Xorg"
 msgstr "GNOME sus Xorg"
 
-#: ../data/gnome-dummy.session.desktop.in.in.h:1
+#: data/gnome-dummy.session.desktop.in.in:3
 msgid "GNOME dummy"
 msgstr "GNOME factici"
 
-#: ../data/session-selector.ui.h:1
+#: data/session-selector.ui:15
 msgid "Custom Session"
 msgstr "Session personalizada"
 
-#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102
+#: data/session-selector.ui:50 tools/gnome-session-selector.c:102
 msgid "Please select a custom session to run"
 msgstr "Causissètz una session personalizada d'aviar"
 
-#: ../data/session-selector.ui.h:3
+#: data/session-selector.ui:105
 msgid "_New Session"
 msgstr "Session _novèla"
 
-#: ../data/session-selector.ui.h:4
+#: data/session-selector.ui:119
 msgid "_Remove Session"
 msgstr "Sup_rimir la session"
 
-#: ../data/session-selector.ui.h:5
+#: data/session-selector.ui:133
 msgid "Rena_me Session"
 msgstr "Reno_menar la session"
 
-#: ../data/session-selector.ui.h:6
+#: data/session-selector.ui:168
 msgid "_Continue"
 msgstr "_Contunhar"
 
-#: ../data/session-properties.ui.h:1
-msgid "Additional startup _programs:"
-msgstr "_Programas suplementaris a l'aviada :"
-
-#: ../data/session-properties.ui.h:2
-msgid "Startup Programs"
-msgstr "Programas a l'aviada"
-
-#: ../data/session-properties.ui.h:3
-msgid "_Automatically remember running applications when logging out"
-msgstr ""
-"Se remembrar _automaticament de las aplicacions en cors d'execucion al "
-"moment de la desconnexion"
-
-#: ../data/session-properties.ui.h:4
-msgid "_Remember Currently Running Applications"
-msgstr "_Se remembrar de las aplicacions en cors d'execucion"
-
-#: ../data/session-properties.ui.h:5
-msgid "Options"
-msgstr "Opcions"
-
-#: ../data/session-properties.ui.h:6
-msgid "Browse…"
-msgstr "Percórrer…"
-
-#: ../data/session-properties.ui.h:7
-msgid "Comm_ent:"
-msgstr "Co_mentari :"
-
-#: ../data/session-properties.ui.h:8
-msgid "Co_mmand:"
-msgstr "_Comanda :"
-
-#: ../data/session-properties.ui.h:9
-msgid "_Name:"
-msgstr "_Nom :"
-
-#: ../gnome-session/gsm-fail-whale-dialog.c:313
+#: gnome-session/gsm-fail-whale-dialog.c:313
 msgid "Oh no!  Something has gone wrong."
 msgstr "Ò damne ! Quicòm a trucat."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:320
+#: gnome-session/gsm-fail-whale-dialog.c:320
+#| msgid ""
+#| "A problem has occurred and the system can't recover. Please contact a "
+#| "system administrator"
 msgid ""
-"A problem has occurred and the system can't recover. Please contact a system "
+"A problem has occurred and the system can’t recover. Please contact a system "
 "administrator"
 msgstr ""
 "Un problèma s'es produit e lo sistèma se pòt pas recuperar. Contactatz un "
 "administrator del sistèma"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:322
+#: gnome-session/gsm-fail-whale-dialog.c:322
+#| msgid ""
+#| "A problem has occurred and the system can't recover. All extensions have "
+#| "been disabled as a precaution."
 msgid ""
-"A problem has occurred and the system can't recover. All extensions have "
+"A problem has occurred and the system can’t recover. All extensions have "
 "been disabled as a precaution."
 msgstr ""
 "Un problèma s'es produit e lo sistèma se pòt pas recuperar. Totas las "
 "extensions son estadas desactivadas per mesura de precaucion."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:324
+#: gnome-session/gsm-fail-whale-dialog.c:324
+#| msgid ""
+#| "A problem has occurred and the system can't recover.\n"
+#| "Please log out and try again."
 msgid ""
-"A problem has occurred and the system can't recover.\n"
+"A problem has occurred and the system can’t recover.\n"
 "Please log out and try again."
 msgstr ""
 "Un problèma s'es produit e lo sistèma se pòt pas recuperar.\n"
 "Desconnectatz-vos e ensajatz tornamai."
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:339
+#: gnome-session/gsm-fail-whale-dialog.c:339
 msgid "_Log Out"
 msgstr "_Tampar la session"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:283
+#: gnome-session/gsm-fail-whale-dialog.c:361 gnome-session/main.c:279
 msgid "Enable debugging code"
 msgstr "Activa lo còdi de desbugatge"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:362
+#: gnome-session/gsm-fail-whale-dialog.c:362
 msgid "Allow logout"
 msgstr "Autorizar la desconnexion"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:363
+#: gnome-session/gsm-fail-whale-dialog.c:363
 msgid "Show extension warning"
 msgstr "Afichar l'avertiment per las extensions"
 
-#: ../gnome-session/gsm-manager.c:1228 ../gnome-session/gsm-manager.c:1881
+#: gnome-session/gsm-manager.c:1266 gnome-session/gsm-manager.c:1919
 msgid "Not responding"
 msgstr "Abséncia de responsa"
 
-#: ../gnome-session/gsm-util.c:382
+#: gnome-session/gsm-util.c:382
 msgid "_Log out"
 msgstr "_Se desconnectar"
 
@@ -162,15 +132,15 @@ msgstr "_Se desconnectar"
 #. * then the XSMP client already has set several XSMP
 #. * properties. But it could still be that SmProgram is not set.
 #.
-#: ../gnome-session/gsm-xsmp-client.c:557
+#: gnome-session/gsm-xsmp-client.c:557
 msgid "Remembered Application"
 msgstr "Aplicacions memorizadas"
 
-#: ../gnome-session/gsm-xsmp-client.c:1207
+#: gnome-session/gsm-xsmp-client.c:1216
 msgid "This program is blocking logout."
 msgstr "Aqueste programa blòca la desconnexion."
 
-#: ../gnome-session/gsm-xsmp-server.c:340
+#: gnome-session/gsm-xsmp-server.c:338
 msgid ""
 "Refusing new client connection because the session is currently being shut "
 "down\n"
@@ -178,52 +148,68 @@ msgstr ""
 "Refús de la connexion d'un novèl client perque la session es actualament en "
 "cors de tampadura\n"
 
-#: ../gnome-session/gsm-xsmp-server.c:609
+#: gnome-session/gsm-xsmp-server.c:605
 #, c-format
 msgid "Could not create ICE listening socket: %s"
 msgstr "Impossible de crear lo connectador d'escota ICE : %s"
 
-#: ../gnome-session/main.c:281
+#: gnome-session/main.c:277
 msgid "Override standard autostart directories"
 msgstr "Remplaça los repertòris autostart estandards"
 
-#: ../gnome-session/main.c:281
+#: gnome-session/main.c:277
 msgid "AUTOSTART_DIR"
 msgstr "REP_AUTOSTART"
 
-#: ../gnome-session/main.c:282
+#: gnome-session/main.c:278
 msgid "Session to use"
 msgstr "Session d'utilizar"
 
-#: ../gnome-session/main.c:282
+#: gnome-session/main.c:278
 msgid "SESSION_NAME"
 msgstr "NOM_SESSION"
 
-#: ../gnome-session/main.c:284
+#: gnome-session/main.c:280
 msgid "Do not load user-specified applications"
 msgstr "Carga pas las aplicacions demandadas per l'utilizaire"
 
-#: ../gnome-session/main.c:285
+#: gnome-session/main.c:281
 msgid "Version of this application"
 msgstr "Version d'aquesta aplicacion"
 
 #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong
-#: ../gnome-session/main.c:287
+#: gnome-session/main.c:283
 msgid "Show the fail whale dialog for testing"
 msgstr "Afichar lo dialòg d'error per lo testar"
 
-#: ../gnome-session/main.c:288
+#: gnome-session/main.c:284
 msgid "Disable hardware acceleration check"
 msgstr "Desactivar la verificacion de l'acceleracion materiala"
 
-#: ../gnome-session/main.c:320
-msgid " - the GNOME session manager"
-msgstr "- lo gestionari de sessions de GNOME"
-
-#: ../tools/gnome-session-inhibit.c:108
-#, c-format
+#: gnome-session/main.c:316
+#| msgid " - the GNOME session manager"
+msgid " — the GNOME session manager"
+msgstr " — lo gestionari de sessions de GNOME"
+
+#: tools/gnome-session-inhibit.c:108
+#, c-format, c-format
+#| msgid ""
+#| "%s [OPCION...] COMMAND\n"
+#| "\n"
+#| "Execute COMMAND while inhibiting some session functionality.\n"
+#| "\n"
+#| "  -h, --help        Show this help\n"
+#| "  --version         Show program version\n"
+#| "  --app-id ID       The application id to use\n"
+#| "                    when inhibiting (optional)\n"
+#| "  --reason REASON   The reason for inhibiting (optional)\n"
+#| "  --inhibit ARG     Things to inhibit, colon-separated list of:\n"
+#| "                    logout, switch-user, suspend, idle, automount\n"
+#| "  --inhibit-only    Do not launch COMMAND and wait forever instead\n"
+#| "\n"
+#| "If no --inhibit option is specified, idle is assumed.\n"
 msgid ""
-"%s [OPTION...] COMMAND\n"
+"%s [OPTION…] COMMAND\n"
 "\n"
 "Execute COMMAND while inhibiting some session functionality.\n"
 "\n"
@@ -238,86 +224,122 @@ msgid ""
 "\n"
 "If no --inhibit option is specified, idle is assumed.\n"
 msgstr ""
-"%s [OPCION...] COMANDA\n"
+"%s [OPTION…] COMANDA\n"
 "\n"
-"Executa COMANDA tot en inibant de foncionalitats de la session.\n"
+"Executa COMANDA tot en inibent de foncionalitats de la session.\n"
 "\n"
 "  -h, --help        Afichar aquesta ajuda\n"
 "  --version         Afichar la version del programa\n"
 "  --app-id ID       L'identificant d'aplicacion d'utilizar\n"
 "                    al moment de l'inibicion (opcional)\n"
 "  --reason REASON   La rason de l'inibicion (opcional)\n"
-"  --inhibit ARG     Las causes d'inibir, lista separada per de punts dobles "
-"demest :\n"
+"  --inhibit ARG     Las causas d'inibir, lista separada per de dobles "
+"punts demest :\n"
 "                    logout, switch-user, suspend, idle, automount\n"
-"  --inhibit-only    Aviar pas COMANDA e esperar indefinidament a la plaça\n"
+"  --inhibit-only    Avietz pas COMANDA e esperatz indefinidament a la "
+"plaça\n"
 "\n"
-"Se cap d'opcion --inhibit es pas precisada, « idle » es supausat.\n"
+"Se pas cap d'opcion --inhibit es pas precisat, « idle » es supausat.\n"
 
-#: ../tools/gnome-session-inhibit.c:146
+#: tools/gnome-session-inhibit.c:146
 #, c-format
 msgid "Failed to execute %s\n"
 msgstr "Impossible d'executar %s\n"
 
-#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216
-#: ../tools/gnome-session-inhibit.c:226
+#: tools/gnome-session-inhibit.c:206 tools/gnome-session-inhibit.c:216
+#: tools/gnome-session-inhibit.c:226
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s necessita un paramètre\n"
 
-#: ../tools/gnome-session-selector.c:61
+#: tools/gnome-session-selector.c:61
 #, c-format
 msgid "Session %d"
 msgstr "Session %d"
 
-#: ../tools/gnome-session-selector.c:107
+#: tools/gnome-session-selector.c:107
+#| msgid ""
+#| "Session names are not allowed to start with ‘.’ or contain ‘/’ characters"
 msgid ""
-"Session names are not allowed to start with ‘.’ or contain ‘/’ characters"
+"Session names are not allowed to start with “.” or contain “/” characters"
 msgstr ""
-"Los noms de sessions pòdon pas començar per « . » o conténer lo caractèr « / "
-"»"
+"Los noms de sessions pòdon pas començar per « . » o conténer lo "
+"caractèr « / »"
 
-#: ../tools/gnome-session-selector.c:111
-msgid "Session names are not allowed to start with ‘.’"
+#: tools/gnome-session-selector.c:111
+#| msgid "Session names are not allowed to start with ‘.’"
+msgid "Session names are not allowed to start with “.”"
 msgstr "Los noms de sessions pòdon pas començar per « . »"
 
-#: ../tools/gnome-session-selector.c:115
-msgid "Session names are not allowed to contain ‘/’ characters"
+#: tools/gnome-session-selector.c:115
+#| msgid "Session names are not allowed to contain ‘/’ characters"
+msgid "Session names are not allowed to contain “/” characters"
 msgstr "Los noms de sessions pòdon pas conténer lo caractèr « / »"
 
-#: ../tools/gnome-session-selector.c:123
-#, c-format
-msgid "A session named ‘%s’ already exists"
+#: tools/gnome-session-selector.c:123
+#, c-format, c-format
+#| msgid "A session named ‘%s’ already exists"
+msgid "A session named “%s” already exists"
 msgstr "Una session nomenada « %s » existís ja"
 
-#: ../tools/gnome-session-quit.c:50
+#: tools/gnome-session-quit.c:50
 msgid "Log out"
 msgstr "Se desconnècta"
 
-#: ../tools/gnome-session-quit.c:51
+#: tools/gnome-session-quit.c:51
 msgid "Power off"
 msgstr "S'atuda"
 
-#: ../tools/gnome-session-quit.c:52
+#: tools/gnome-session-quit.c:52
 msgid "Reboot"
 msgstr "Reaviar"
 
-#: ../tools/gnome-session-quit.c:53
+#: tools/gnome-session-quit.c:53
 msgid "Ignoring any existing inhibitors"
 msgstr "Ignorar tot inibitor existent"
 
-#: ../tools/gnome-session-quit.c:54
-msgid "Don't prompt for user confirmation"
+#: tools/gnome-session-quit.c:54
+#| msgid "Don't prompt for user confirmation"
+msgid "Don’t prompt for user confirmation"
 msgstr "Demanda pas de confirmacion"
 
-#: ../tools/gnome-session-quit.c:88 ../tools/gnome-session-quit.c:102
+#: tools/gnome-session-quit.c:88 tools/gnome-session-quit.c:102
 msgid "Could not connect to the session manager"
 msgstr "Impossible de se connectar al gestionari de sessions"
 
-#: ../tools/gnome-session-quit.c:198
+#: tools/gnome-session-quit.c:198
 msgid "Program called with conflicting options"
 msgstr "Programa apelat amb d'opcions conflictualas"
 
+#~ msgid "Additional startup _programs:"
+#~ msgstr "_Programas suplementaris a l'aviada :"
+
+#~ msgid "Startup Programs"
+#~ msgstr "Programas a l'aviada"
+
+#~ msgid "_Automatically remember running applications when logging out"
+#~ msgstr ""
+#~ "Se remembrar _automaticament de las aplicacions en cors d'execucion al "
+#~ "moment de la desconnexion"
+
+#~ msgid "_Remember Currently Running Applications"
+#~ msgstr "_Se remembrar de las aplicacions en cors d'execucion"
+
+#~ msgid "Options"
+#~ msgstr "Opcions"
+
+#~ msgid "Browse…"
+#~ msgstr "Percórrer…"
+
+#~ msgid "Comm_ent:"
+#~ msgstr "Co_mentari :"
+
+#~ msgid "Co_mmand:"
+#~ msgstr "_Comanda :"
+
+#~ msgid "_Name:"
+#~ msgstr "_Nom :"
+
 #~ msgid "This session logs you into GNOME, using Wayland"
 #~ msgstr "Aquesta session vos connècta dins GNOME, en utilizant Wayland"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6f07716..97ad96b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -18,10 +18,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-session master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "session&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-11 09:19+0000\n"
-"PO-Revision-Date: 2016-10-18 17:25+0800\n"
+"POT-Creation-Date: 2018-01-08 21:39+0000\n"
+"PO-Revision-Date: 2018-02-03 23:08+0800\n"
 "Last-Translator: Tong Hui <[e-mail]>\n"
 "Language-Team: Chinese (simplified) <[e-mail]>\n"
 "Language: zh_CN\n"
@@ -31,99 +31,99 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.8.9\n"
 
-#: ../data/gnome-custom-session.desktop.in.h:1
+#: data/gnome-custom-session.desktop.in:3
 msgid "Custom"
 msgstr "自定义"
 
-#: ../data/gnome-custom-session.desktop.in.h:2
+#: data/gnome-custom-session.desktop.in:4
 msgid "This entry lets you select a saved session"
 msgstr "此项允许您选择一个已保存的会话"
 
-#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1
+#: data/gnome.desktop.in:3 data/gnome.session.desktop.in.in:3
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../data/gnome.desktop.in.h:2 ../data/gnome-xorg.desktop.in.h:2
+#: data/gnome.desktop.in:4 data/gnome-xorg.desktop.in:4
 msgid "This session logs you into GNOME"
 msgstr "此会话将您登录到 GNOME"
 
-#: ../data/gnome-xorg.desktop.in.h:1
+#: data/gnome-xorg.desktop.in:3
 msgid "GNOME on Xorg"
 msgstr "运行于 Xorg 的 GNOME"
 
-#: ../data/gnome-dummy.session.desktop.in.in.h:1
+#: data/gnome-dummy.session.desktop.in.in:3
 msgid "GNOME dummy"
 msgstr "GNOME dummy"
 
-#: ../data/session-selector.ui.h:1
+#: data/session-selector.ui:15
 msgid "Custom Session"
 msgstr "自定义会话"
 
-#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102
+#: data/session-selector.ui:50 tools/gnome-session-selector.c:102
 msgid "Please select a custom session to run"
 msgstr "请选择一个要运行的自定义会话"
 
-#: ../data/session-selector.ui.h:3
+#: data/session-selector.ui:105
 msgid "_New Session"
 msgstr "新建会话(_N)"
 
-#: ../data/session-selector.ui.h:4
+#: data/session-selector.ui:119
 msgid "_Remove Session"
 msgstr "移除会话(_R)"
 
-#: ../data/session-selector.ui.h:5
+#: data/session-selector.ui:133
 msgid "Rena_me Session"
 msgstr "重命名会话(_M)"
 
-#: ../data/session-selector.ui.h:6
+#: data/session-selector.ui:168
 msgid "_Continue"
 msgstr "继续(_C)"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:313
+#: gnome-session/gsm-fail-whale-dialog.c:313
 msgid "Oh no!  Something has gone wrong."
 msgstr "糟糕！出错啦！"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:320
+#: gnome-session/gsm-fail-whale-dialog.c:320
 msgid ""
-"A problem has occurred and the system can't recover. Please contact a system "
+"A problem has occurred and the system can’t recover. Please contact a system "
 "administrator"
 msgstr "系统出错且无法恢复。请联系系统管理员。"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:322
+#: gnome-session/gsm-fail-whale-dialog.c:322
 msgid ""
-"A problem has occurred and the system can't recover. All extensions have "
+"A problem has occurred and the system can’t recover. All extensions have "
 "been disabled as a precaution."
 msgstr "系统出错且无法恢复。为预防起见，已禁用了所有扩展。"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:324
+#: gnome-session/gsm-fail-whale-dialog.c:324
 msgid ""
-"A problem has occurred and the system can't recover.\n"
+"A problem has occurred and the system can’t recover.\n"
 "Please log out and try again."
 msgstr "系统出错并无法恢复，请尝试注销并重新登录。"
 
 # gsm/logout.c:248
-#: ../gnome-session/gsm-fail-whale-dialog.c:339
+#: gnome-session/gsm-fail-whale-dialog.c:339
 msgid "_Log Out"
 msgstr "注销(_L)"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:274
+#: gnome-session/gsm-fail-whale-dialog.c:361 gnome-session/main.c:279
 msgid "Enable debugging code"
 msgstr "启用调试代码"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:362
+#: gnome-session/gsm-fail-whale-dialog.c:362
 msgid "Allow logout"
 msgstr "允许注销"
 
-#: ../gnome-session/gsm-fail-whale-dialog.c:363
+#: gnome-session/gsm-fail-whale-dialog.c:363
 msgid "Show extension warning"
 msgstr "显示扩展警告"
 
-#: ../gnome-session/gsm-manager.c:1228 ../gnome-session/gsm-manager.c:1881
+#: gnome-session/gsm-manager.c:1266 gnome-session/gsm-manager.c:1919
 msgid "Not responding"
 msgstr "无响应"
 
 # gsm/logout.c:248
-#: ../gnome-session/gsm-util.c:382
+#: gnome-session/gsm-util.c:382
 msgid "_Log out"
 msgstr "注销(_L)"
 
@@ -131,66 +131,66 @@ msgstr "注销(_L)"
 #. * then the XSMP client already has set several XSMP
 #. * properties. But it could still be that SmProgram is not set.
 #.
-#: ../gnome-session/gsm-xsmp-client.c:557
+#: gnome-session/gsm-xsmp-client.c:557
 msgid "Remembered Application"
 msgstr "记住的应用程序"
 
-#: ../gnome-session/gsm-xsmp-client.c:1207
+#: gnome-session/gsm-xsmp-client.c:1216
 msgid "This program is blocking logout."
 msgstr "此程序正在阻止注销。"
 
-#: ../gnome-session/gsm-xsmp-server.c:340
+#: gnome-session/gsm-xsmp-server.c:340
 msgid ""
 "Refusing new client connection because the session is currently being shut "
 "down\n"
 msgstr "拒绝新客户连接，原因是会话正在关闭\n"
 
-#: ../gnome-session/gsm-xsmp-server.c:609
+#: gnome-session/gsm-xsmp-server.c:609
 #, c-format
 msgid "Could not create ICE listening socket: %s"
 msgstr "无法创建 ICE 监听套接字：%s"
 
-#: ../gnome-session/main.c:272
+#: gnome-session/main.c:277
 msgid "Override standard autostart directories"
 msgstr "取代默认的自动启动目录"
 
-#: ../gnome-session/main.c:272
+#: gnome-session/main.c:277
 msgid "AUTOSTART_DIR"
 msgstr "自动启动目录"
 
-#: ../gnome-session/main.c:273
+#: gnome-session/main.c:278
 msgid "Session to use"
 msgstr "要使用的会话"
 
-#: ../gnome-session/main.c:273
+#: gnome-session/main.c:278
 msgid "SESSION_NAME"
 msgstr "会话名称"
 
-#: ../gnome-session/main.c:275
+#: gnome-session/main.c:280
 msgid "Do not load user-specified applications"
 msgstr "不装入用户指定的应用程序"
 
-#: ../gnome-session/main.c:276
+#: gnome-session/main.c:281
 msgid "Version of this application"
 msgstr "此应用程序的版本"
 
 #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong
-#: ../gnome-session/main.c:278
+#: gnome-session/main.c:283
 msgid "Show the fail whale dialog for testing"
 msgstr "显示用于测试的鲸鱼失败对话框"
 
-#: ../gnome-session/main.c:279
+#: gnome-session/main.c:284
 msgid "Disable hardware acceleration check"
 msgstr "禁用硬件加速检测"
 
-#: ../gnome-session/main.c:311
-msgid " - the GNOME session manager"
+#: gnome-session/main.c:316
+msgid " — the GNOME session manager"
 msgstr "- GNOME 会话管理器"
 
-#: ../tools/gnome-session-inhibit.c:108
+#: tools/gnome-session-inhibit.c:108
 #, c-format
 msgid ""
-"%s [OPTION...] COMMAND\n"
+"%s [OPTION…] COMMAND\n"
 "\n"
 "Execute COMMAND while inhibiting some session functionality.\n"
 "\n"
@@ -217,69 +217,69 @@ msgstr ""
 "                    logout, switch-user, suspend, idle, automount\n"
 "  --inhibit-only    不启动 命令，而是无限等待\n"
 "\n"
-"若未指定 --inhibit 参数，将假设为 idle\n"
+"若未指定 --inhibit 参数，将假设为 idle。\n"
 
-#: ../tools/gnome-session-inhibit.c:146
+#: tools/gnome-session-inhibit.c:146
 #, c-format
 msgid "Failed to execute %s\n"
 msgstr "执行 %s 失败\n"
 
-#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216
-#: ../tools/gnome-session-inhibit.c:226
+#: tools/gnome-session-inhibit.c:206 tools/gnome-session-inhibit.c:216
+#: tools/gnome-session-inhibit.c:226
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s 需要一个参数\n"
 
-#: ../tools/gnome-session-selector.c:61
+#: tools/gnome-session-selector.c:61
 #, c-format
 msgid "Session %d"
 msgstr "会话 %d"
 
-#: ../tools/gnome-session-selector.c:107
+#: tools/gnome-session-selector.c:107
 msgid ""
-"Session names are not allowed to start with ‘.’ or contain ‘/’ characters"
+"Session names are not allowed to start with “.” or contain “/” characters"
 msgstr "会话名称不允许以“.”开头或包含“/”字符"
 
-#: ../tools/gnome-session-selector.c:111
-msgid "Session names are not allowed to start with ‘.’"
+#: tools/gnome-session-selector.c:111
+msgid "Session names are not allowed to start with “.”"
 msgstr "会话名称不允许以“.”开头"
 
-#: ../tools/gnome-session-selector.c:115
-msgid "Session names are not allowed to contain ‘/’ characters"
+#: tools/gnome-session-selector.c:115
+msgid "Session names are not allowed to contain “/” characters"
 msgstr "会话名称不允许包含“/”字符"
 
-#: ../tools/gnome-session-selector.c:123
+#: tools/gnome-session-selector.c:123
 #, c-format
-msgid "A session named ‘%s’ already exists"
+msgid "A session named “%s” already exists"
 msgstr "名为“%s”的会话已存在"
 
 # gsm/logout.c:248
-#: ../tools/gnome-session-quit.c:50
+#: tools/gnome-session-quit.c:50
 msgid "Log out"
 msgstr "注销"
 
-#: ../tools/gnome-session-quit.c:51
+#: tools/gnome-session-quit.c:51
 msgid "Power off"
 msgstr "关机"
 
-#: ../tools/gnome-session-quit.c:52
+#: tools/gnome-session-quit.c:52
 msgid "Reboot"
 msgstr "重启"
 
-#: ../tools/gnome-session-quit.c:53
+#: tools/gnome-session-quit.c:53
 msgid "Ignoring any existing inhibitors"
 msgstr "忽略现有限制因素"
 
-#: ../tools/gnome-session-quit.c:54
-msgid "Don't prompt for user confirmation"
+#: tools/gnome-session-quit.c:54
+msgid "Don’t prompt for user confirmation"
 msgstr "不提示用户确认"
 
 # gsm/save-session.c:86
-#: ../tools/gnome-session-quit.c:88 ../tools/gnome-session-quit.c:102
+#: tools/gnome-session-quit.c:88 tools/gnome-session-quit.c:102
 msgid "Could not connect to the session manager"
 msgstr "无法连接到会话管理器"
 
-#: ../tools/gnome-session-quit.c:198
+#: tools/gnome-session-quit.c:198
 msgid "Program called with conflicting options"
 msgstr "调用程序的选项互相冲突"