summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS14
-rw-r--r--common/configuration.c17
-rw-r--r--configure.ac2
-rw-r--r--data/apparmor/abstractions/lightdm7
-rw-r--r--data/lightdm.conf4
-rw-r--r--debian/changelog33
-rw-r--r--debian/lightdm.logrotate9
-rw-r--r--debian/patches/04_language_handling.patch2
-rw-r--r--debian/patches/autologin-session-workaround.patch2
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/xorg-1.17.patch26
-rw-r--r--debian/po/af.po4
-rw-r--r--debian/po/am.po4
-rw-r--r--debian/po/an.po4
-rw-r--r--debian/po/ar.po4
-rw-r--r--debian/po/ast.po4
-rw-r--r--debian/po/az.po4
-rw-r--r--debian/po/be.po4
-rw-r--r--debian/po/bg.po4
-rw-r--r--debian/po/bn.po4
-rw-r--r--debian/po/bo.po4
-rw-r--r--debian/po/br.po4
-rw-r--r--debian/po/bs.po4
-rw-r--r--debian/po/ca.po4
-rw-r--r--debian/po/ca@valencia.po4
-rw-r--r--debian/po/ce.po4
-rw-r--r--debian/po/ckb.po4
-rw-r--r--debian/po/cs.po4
-rw-r--r--debian/po/cy.po4
-rw-r--r--debian/po/da.po4
-rw-r--r--debian/po/de.po4
-rw-r--r--debian/po/el.po4
-rw-r--r--debian/po/en_AU.po4
-rw-r--r--debian/po/en_CA.po4
-rw-r--r--debian/po/en_GB.po4
-rw-r--r--debian/po/eo.po4
-rw-r--r--debian/po/es.po4
-rw-r--r--debian/po/et.po4
-rw-r--r--debian/po/eu.po4
-rw-r--r--debian/po/fa.po4
-rw-r--r--debian/po/fi.po4
-rw-r--r--debian/po/fo.po4
-rw-r--r--debian/po/fr.po4
-rw-r--r--debian/po/fr_CA.po4
-rw-r--r--debian/po/fy.po4
-rw-r--r--debian/po/ga.po4
-rw-r--r--debian/po/gd.po4
-rw-r--r--debian/po/gl.po4
-rw-r--r--debian/po/gu.po4
-rw-r--r--debian/po/he.po4
-rw-r--r--debian/po/hi.po4
-rw-r--r--debian/po/hr.po4
-rw-r--r--debian/po/ht.po4
-rw-r--r--debian/po/hu.po4
-rw-r--r--debian/po/hy.po4
-rw-r--r--debian/po/ia.po4
-rw-r--r--debian/po/id.po4
-rw-r--r--debian/po/is.po4
-rw-r--r--debian/po/it.po4
-rw-r--r--debian/po/ja.po4
-rw-r--r--debian/po/kk.po4
-rw-r--r--debian/po/kl.po4
-rw-r--r--debian/po/km.po4
-rw-r--r--debian/po/kn.po4
-rw-r--r--debian/po/ko.po4
-rw-r--r--debian/po/ku.po4
-rw-r--r--debian/po/lb.po4
-rw-r--r--debian/po/lt.po4
-rw-r--r--debian/po/lv.po4
-rw-r--r--debian/po/mhr.po4
-rw-r--r--debian/po/mi.po4
-rw-r--r--debian/po/ml.po4
-rw-r--r--debian/po/mr.po4
-rw-r--r--debian/po/ms.po4
-rw-r--r--debian/po/my.po4
-rw-r--r--debian/po/nb.po4
-rw-r--r--debian/po/nl.po4
-rw-r--r--debian/po/nn.po4
-rw-r--r--debian/po/oc.po4
-rw-r--r--debian/po/pa.po4
-rw-r--r--debian/po/pl.po4
-rw-r--r--debian/po/pt.po4
-rw-r--r--debian/po/pt_BR.po4
-rw-r--r--debian/po/ro.po4
-rw-r--r--debian/po/ru.po4
-rw-r--r--debian/po/sc.po4
-rw-r--r--debian/po/sd.po4
-rw-r--r--debian/po/shn.po4
-rw-r--r--debian/po/si.po4
-rw-r--r--debian/po/sk.po4
-rw-r--r--debian/po/sl.po4
-rw-r--r--debian/po/sq.po4
-rw-r--r--debian/po/sr.po4
-rw-r--r--debian/po/sv.po4
-rw-r--r--debian/po/ta.po4
-rw-r--r--debian/po/te.po4
-rw-r--r--debian/po/tg.po4
-rw-r--r--debian/po/th.po4
-rw-r--r--debian/po/tl.po4
-rw-r--r--debian/po/tr.po4
-rw-r--r--debian/po/ug.po4
-rw-r--r--debian/po/uk.po4
-rw-r--r--debian/po/ur.po4
-rw-r--r--debian/po/uz.po4
-rw-r--r--debian/po/vi.po4
-rw-r--r--debian/po/wae.po4
-rw-r--r--debian/po/zh_CN.po4
-rw-r--r--debian/po/zh_HK.po4
-rw-r--r--debian/po/zh_TW.po4
-rw-r--r--src/Makefile.am2
-rw-r--r--src/lightdm.c13
-rw-r--r--src/log-file.c53
-rw-r--r--src/log-file.h26
-rw-r--r--src/process.c21
-rw-r--r--src/process.h4
-rw-r--r--src/seat.c18
-rw-r--r--src/session-child.c13
-rw-r--r--src/session.c10
-rw-r--r--src/session.h3
-rw-r--r--src/unity-system-compositor.c5
-rw-r--r--src/x-server-local.c5
-rw-r--r--src/x-server-xvnc.c5
-rw-r--r--src/xdmcp-server.c6
-rw-r--r--tests/Makefile.am6
-rw-r--r--tests/scripts/xdmcp-client-xorg-1.16.conf (renamed from tests/scripts/xdmcp-client.conf)5
-rw-r--r--tests/scripts/xdmcp-client-xorg-1.17.conf30
-rwxr-xr-xtests/test-xdmcp-client2
-rwxr-xr-xtests/test-xdmcp-client-xorg-1.162
-rwxr-xr-xtests/test-xdmcp-client-xorg-1.172
129 files changed, 454 insertions, 286 deletions
diff --git a/NEWS b/NEWS
index 34208d2e..06cdc229 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Overview of changes in lightdm 1.17.0
+
+ * Disable log backups - this interferes with logrotate.
+ * Support using libaudit to generate audit events.
+ * Handle trailing whitespace on boolean values in configuration.
+ * Update example configuration to more correctly match allowed options.
+ * Fix unnecessary X server from being launched when locking seats.
+ * Check the version of the X server we are running so we correctly pass -listen tcp when required.
+ * Allow reading /proc/<PID>/net/dev from within a guest session.
+ * Allow guest sessions to write in /{,var/}run/screen folder.
+ * Update guest-session AppArmor profile to be suitable for openSUSE.
+ * Fix apparmor profiles for running Chromium in guest sessions.
+ * Fix configure failing without Vala installed.
+
Overview of changes in lightdm 1.16.0
* Update default configuration better explaining the seat configuration name
diff --git a/common/configuration.c b/common/configuration.c
index dc7831a8..e7bee309 100644
--- a/common/configuration.c
+++ b/common/configuration.c
@@ -317,7 +317,22 @@ config_set_boolean (Configuration *config, const gchar *section, const gchar *ke
gboolean
config_get_boolean (Configuration *config, const gchar *section, const gchar *key)
{
- return g_key_file_get_boolean (config->priv->key_file, section, key, NULL);
+ /* We don't use the standard function because it doesn't work with trailing whitespace:
+ * https://bugzilla.gnome.org/show_bug.cgi?id=664740
+ */
+ /*return g_key_file_get_boolean (config->priv->key_file, section, key, NULL);*/
+
+ gchar *value;
+ gboolean v;
+
+ value = g_key_file_get_value (config->priv->key_file, section, key, NULL);
+ if (!value)
+ return FALSE;
+ g_strchomp (value);
+ v = strcmp (value, "true") == 0;
+ g_free (value);
+
+ return v;
}
static void
diff --git a/configure.ac b/configure.ac
index 008b9753..3c606174 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(lightdm, 1.16.0)
+AC_INIT(lightdm, 1.17.0)
AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
diff --git a/data/apparmor/abstractions/lightdm b/data/apparmor/abstractions/lightdm
index f6984bf0..5289a927 100644
--- a/data/apparmor/abstractions/lightdm
+++ b/data/apparmor/abstractions/lightdm
@@ -33,14 +33,16 @@
/etc/ r,
/etc/** rmk,
/etc/gdm/Xsession ix,
+ /etc/X11/xdm/** ix, # needed for openSUSE's default session-wrapper
+ /etc/X11/xinit/** ix, # needed for openSUSE's default session-wrapper
/lib/ r,
/lib/** rmixk,
/lib32/ r,
/lib32/** rmixk,
/lib64/ r,
/lib64/** rmixk,
- owner /media/ r,
- owner /media/** rmwlixk, # we want access to USB sticks and the like
+ owner /{,run/}media/ r,
+ owner /{,run/}media/** rmwlixk, # we want access to USB sticks and the like
/opt/ r,
/opt/** rmixk,
@{PROC}/ r,
@@ -75,6 +77,7 @@
/{,var/}run/ r,
# necessary for writing to sockets, etc.
/{,var/}run/** rmkix,
+ /{,var/}run/screen/** wl,
/{,var/}run/shm/** wl,
/{,var/}run/uuidd/request w,
# libpam-xdg-support/logind
diff --git a/data/lightdm.conf b/data/lightdm.conf
index 301c489a..e55ac175 100644
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -15,6 +15,7 @@
# sessions-directory = Directory to find sessions
# remote-sessions-directory = Directory to find remote sessions
# greeters-directory = Directory to find greeters
+# backup-logs = True to move add a .old suffix to old log files when opening new ones
#
[LightDM]
#start-default-seat=true
@@ -31,6 +32,7 @@
#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
#remote-sessions-directory=/usr/share/lightdm/remote-sessions
#greeters-directory=/usr/share/lightdm/greeters:/usr/share/xgreeters
+#backup-logs=false
#
# Seat configuration
@@ -38,7 +40,7 @@
# Seat configuration is matched against the seat name glob in the section, for example:
# [Seat:*] matches all seats and is applied first.
# [Seat:seat0] matches the seat named "seat0".
-# [Seat:thin-client*] matches all seats that have names that start with "thin-client".
+# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
#
# type = Seat type (xlocal, xremote, unity)
# pam-service = PAM service to use for login
diff --git a/debian/changelog b/debian/changelog
index 36f20f84..ded77a27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,29 @@
-lightdm (1.17.0-0ubuntu1) UNRELEASED; urgency=medium
-
- * New upstream release:
- - ...
+lightdm (1.17.0-0ubuntu1) xenial; urgency=medium
+
+ * New upstream release:
+ - Disable log backups - this interferes with logrotate.
+ - Support using libaudit to generate audit events.
+ - Handle trailing whitespace on boolean values in configuration.
+ - Update example configuration to more correctly match allowed options.
+ - Fix unnecessary X server from being launched when locking seats.
+ - Check the version of the X server we are running so we correctly pass
+ -listen tcp when required.
+ - Allow reading /proc/<PID>/net/dev from within a guest session.
+ (LP: #1442609)
+ - Allow guest sessions to write in /{,var/}run/screen folder.
+ (LP: #1442611)
+ - Update guest-session AppArmor profile to be suitable for openSUSE.
+ - Fix apparmor profiles for running Chromium in guest sessions.
+ (LP: #1504049, LP: #1464958)
+ - Fix configure failing without Vala installed.
* Build with multi-arch
- * debian/patches/xorg-1.17.patch:
- - Fix xserver-allow-tcp=true option not working with X.org 1.17
- * data/apparmor/abstractions/lightdm_chromium-browser: cgroups support for
- guest sessions. (LP: #1504049, LP: #1464958)
+ * debian/lightdm.logrotate:
+ - Use logrotate to handle log files placed in the default system log
+ directory (/var/log/lightdm).
+ * debian/guest*:
+ - Optimize guest account creation, use OverlayFS of AuFS if available.
- -- Robert Ancell <robert.ancell@canonical.com> Mon, 12 Oct 2015 14:57:47 +0100
+ -- Robert Ancell <robert.ancell@canonical.com> Wed, 28 Oct 2015 15:02:46 +1300
lightdm (1.16.0-0ubuntu1) wily; urgency=medium
diff --git a/debian/lightdm.logrotate b/debian/lightdm.logrotate
new file mode 100644
index 00000000..fed4a02b
--- /dev/null
+++ b/debian/lightdm.logrotate
@@ -0,0 +1,9 @@
+/var/log/lightdm/*.log {
+ daily
+ missingok
+ rotate 7
+ compress
+ notifempty
+ maxsize 10M
+ copytruncate
+}
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 09d56244..f25923ef 100644
--- a/debian/patches/04_language_handling.patch
+++ b/debian/patches/04_language_handling.patch
@@ -75,7 +75,7 @@ Index: trunk/src/seat.c
===================================================================
--- trunk.orig/src/seat.c
+++ trunk/src/seat.c
-@@ -1003,7 +1003,7 @@ configure_session (Session *session, Ses
+@@ -1018,7 +1018,7 @@ configure_session (Session *session, Ses
}
if (language && language[0] != '\0')
{
diff --git a/debian/patches/autologin-session-workaround.patch b/debian/patches/autologin-session-workaround.patch
index 1d977d7b..fb46d817 100644
--- a/debian/patches/autologin-session-workaround.patch
+++ b/debian/patches/autologin-session-workaround.patch
@@ -6,7 +6,7 @@ Index: trunk/src/seat.c
===================================================================
--- trunk.orig/src/seat.c
+++ trunk/src/seat.c
-@@ -1033,7 +1033,12 @@ create_user_session (Seat *seat, const g
+@@ -1048,7 +1048,12 @@ create_user_session (Seat *seat, const g
if (autostart)
{
const gchar *autologin_session_name = seat_get_string_property (seat, "autologin-session");
diff --git a/debian/patches/series b/debian/patches/series
index 7f14c0ad..d3ba2550 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
04_language_handling.patch
05_translate_debian_files.patch
autologin-session-workaround.patch
-xorg-1.17.patch
diff --git a/debian/patches/xorg-1.17.patch b/debian/patches/xorg-1.17.patch
deleted file mode 100644
index 9f7ecfd2..00000000
--- a/debian/patches/xorg-1.17.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: The X.org X server 1.17 doesn't listen on TCP by default, we need to pass -listen to enable it
-Author: Robert Ancell <robert.ancell@canonical.com>
-Bug: https://bugs.launchpad.net/bugs/1449282
-
-=== modified file 'src/x-server-local.c'
-Index: 1.16/src/x-server-local.c
-===================================================================
---- 1.16.orig/src/x-server-local.c
-+++ 1.16/src/x-server-local.c
-@@ -477,6 +477,7 @@ x_server_local_start (DisplayServer *dis
- /* Connect to a remote server using XDMCP */
- if (server->priv->xdmcp_server != NULL)
- {
-+ g_string_append (command, " -listen tcp");
- if (server->priv->xdmcp_port != 0)
- g_string_append_printf (command, " -port %d", server->priv->xdmcp_port);
- g_string_append_printf (command, " -query %s", server->priv->xdmcp_server);
-@@ -485,6 +486,8 @@ x_server_local_start (DisplayServer *dis
- }
- else if (!server->priv->allow_tcp)
- g_string_append (command, " -nolisten tcp");
-+ else
-+ g_string_append (command, " -listen tcp");
-
- if (server->priv->vt >= 0)
- g_string_append_printf (command, " vt%d -novtswitch", server->priv->vt);
diff --git a/debian/po/af.po b/debian/po/af.po
index 322ba5e6..e1544fc5 100644
--- a/debian/po/af.po
+++ b/debian/po/af.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/am.po b/debian/po/am.po
index 28f38a1f..009e74b5 100644
--- a/debian/po/am.po
+++ b/debian/po/am.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/an.po b/debian/po/an.po
index 8e161b74..90bf59ac 100644
--- a/debian/po/an.po
+++ b/debian/po/an.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ar.po b/debian/po/ar.po
index fbebcbdb..524d8ca5 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ast.po b/debian/po/ast.po
index af51fd73..f3a35494 100644
--- a/debian/po/ast.po
+++ b/debian/po/ast.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/az.po b/debian/po/az.po
index 6e42a4f4..29546536 100644
--- a/debian/po/az.po
+++ b/debian/po/az.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/be.po b/debian/po/be.po
index bc349981..70d7c6c2 100644
--- a/debian/po/be.po
+++ b/debian/po/be.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/bg.po b/debian/po/bg.po
index e1b4d536..47fc405a 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/bn.po b/debian/po/bn.po
index 6df0aa99..467460ef 100644
--- a/debian/po/bn.po
+++ b/debian/po/bn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/bo.po b/debian/po/bo.po
index 8c361d57..9b76529b 100644
--- a/debian/po/bo.po
+++ b/debian/po/bo.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/br.po b/debian/po/br.po
index c0aa2c1a..7b68eec5 100644
--- a/debian/po/br.po
+++ b/debian/po/br.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/bs.po b/debian/po/bs.po
index b6a648f3..1f4734ad 100644
--- a/debian/po/bs.po
+++ b/debian/po/bs.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ca.po b/debian/po/ca.po
index c9caae15..03b69b0c 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ca@valencia.po b/debian/po/ca@valencia.po
index e2c3d711..2093faaf 100644
--- a/debian/po/ca@valencia.po
+++ b/debian/po/ca@valencia.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ce.po b/debian/po/ce.po
index 26f7be6f..9b093f89 100644
--- a/debian/po/ce.po
+++ b/debian/po/ce.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ckb.po b/debian/po/ckb.po
index 51ce6680..8c96a812 100644
--- a/debian/po/ckb.po
+++ b/debian/po/ckb.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 4d40b82f..6ef71cf4 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/cy.po b/debian/po/cy.po
index 8e1aea31..dde6f203 100644
--- a/debian/po/cy.po
+++ b/debian/po/cy.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/da.po b/debian/po/da.po
index 2097ea26..db758c38 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index 88b99b47..437119a7 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/el.po b/debian/po/el.po
index cdd0cbdb..d4e5fe5f 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/en_AU.po b/debian/po/en_AU.po
index 246c89ac..3eaeb834 100644
--- a/debian/po/en_AU.po
+++ b/debian/po/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/en_CA.po b/debian/po/en_CA.po
index f7b56336..78428a62 100644
--- a/debian/po/en_CA.po
+++ b/debian/po/en_CA.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po
index c13ff48b..8f2315db 100644
--- a/debian/po/en_GB.po
+++ b/debian/po/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/eo.po b/debian/po/eo.po
index ef246bca..9af1f68f 100644
--- a/debian/po/eo.po
+++ b/debian/po/eo.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/es.po b/debian/po/es.po
index dc509f08..6b4d49c1 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/et.po b/debian/po/et.po
index 0a1a58e6..82cd0eee 100644
--- a/debian/po/et.po
+++ b/debian/po/et.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 8a3d3900..6f4c8e9a 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/fa.po b/debian/po/fa.po
index a2aaf59c..b22cc4fc 100644
--- a/debian/po/fa.po
+++ b/debian/po/fa.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 4f1c5f14..f0140e11 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/fo.po b/debian/po/fo.po
index 46a35762..67b7f853 100644
--- a/debian/po/fo.po
+++ b/debian/po/fo.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 55c2439c..1532d7b2 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/fr_CA.po b/debian/po/fr_CA.po
index 50bf3eff..298af839 100644
--- a/debian/po/fr_CA.po
+++ b/debian/po/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/fy.po b/debian/po/fy.po
index 75da8a35..0640e94c 100644
--- a/debian/po/fy.po
+++ b/debian/po/fy.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ga.po b/debian/po/ga.po
index 4c50a0f3..8372c12c 100644
--- a/debian/po/ga.po
+++ b/debian/po/ga.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/gd.po b/debian/po/gd.po
index 0439ad15..7091a402 100644
--- a/debian/po/gd.po
+++ b/debian/po/gd.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/gl.po b/debian/po/gl.po
index c5bfe390..06ed15fc 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/gu.po b/debian/po/gu.po
index 9d5d93e5..71d347b8 100644
--- a/debian/po/gu.po
+++ b/debian/po/gu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/he.po b/debian/po/he.po
index 65e57432..5d83552e 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/hi.po b/debian/po/hi.po
index ee4511ec..62336ec0 100644
--- a/debian/po/hi.po
+++ b/debian/po/hi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 7e3b58a9..fddf4322 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ht.po b/debian/po/ht.po
index e514c77a..0b223281 100644
--- a/debian/po/ht.po
+++ b/debian/po/ht.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/hu.po b/debian/po/hu.po
index f944a654..30919112 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/hy.po b/debian/po/hy.po
index 3d45cbd6..538f115e 100644
--- a/debian/po/hy.po
+++ b/debian/po/hy.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ia.po b/debian/po/ia.po
index e296ed4b..f61b9474 100644
--- a/debian/po/ia.po
+++ b/debian/po/ia.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/id.po b/debian/po/id.po
index f3b5c342..7c93829b 100644
--- a/debian/po/id.po
+++ b/debian/po/id.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/is.po b/debian/po/is.po
index d7dc1e82..38e54258 100644
--- a/debian/po/is.po
+++ b/debian/po/is.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/it.po b/debian/po/it.po
index 7646b572..f4c96d1e 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 21622dbc..f4f1825f 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/kk.po b/debian/po/kk.po
index dd4831e7..d8a9e2aa 100644
--- a/debian/po/kk.po
+++ b/debian/po/kk.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/kl.po b/debian/po/kl.po
index f062aae2..9f9355dc 100644
--- a/debian/po/kl.po
+++ b/debian/po/kl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/km.po b/debian/po/km.po
index 0290f642..e29309a8 100644
--- a/debian/po/km.po
+++ b/debian/po/km.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/kn.po b/debian/po/kn.po
index 321f973e..1e9845eb 100644
--- a/debian/po/kn.po
+++ b/debian/po/kn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 1b2b798c..f5b3b1c4 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ku.po b/debian/po/ku.po
index a15c8fac..8f3bdcdc 100644
--- a/debian/po/ku.po
+++ b/debian/po/ku.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/lb.po b/debian/po/lb.po
index 560b8341..bf0e4032 100644
--- a/debian/po/lb.po
+++ b/debian/po/lb.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/lt.po b/debian/po/lt.po
index b9077850..83269ece 100644
--- a/debian/po/lt.po
+++ b/debian/po/lt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/lv.po b/debian/po/lv.po
index a5ab06b3..57c4edb7 100644
--- a/debian/po/lv.po
+++ b/debian/po/lv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/mhr.po b/debian/po/mhr.po
index 9ccca723..823347b5 100644
--- a/debian/po/mhr.po
+++ b/debian/po/mhr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/mi.po b/debian/po/mi.po
index 103d53fe..a07bb05d 100644
--- a/debian/po/mi.po
+++ b/debian/po/mi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ml.po b/debian/po/ml.po
index 010a85b3..e882f7d4 100644
--- a/debian/po/ml.po
+++ b/debian/po/ml.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/mr.po b/debian/po/mr.po
index bf1e0912..5e88bae7 100644
--- a/debian/po/mr.po
+++ b/debian/po/mr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ms.po b/debian/po/ms.po
index 6312dd20..27e6a978 100644
--- a/debian/po/ms.po
+++ b/debian/po/ms.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/my.po b/debian/po/my.po
index 944bb7f8..9ecc8b83 100644
--- a/debian/po/my.po
+++ b/debian/po/my.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/nb.po b/debian/po/nb.po
index a73b1203..9ca652f8 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index d873779d..1cf0582e 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/nn.po b/debian/po/nn.po
index e790bfb9..8a8cdc96 100644
--- a/debian/po/nn.po
+++ b/debian/po/nn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/oc.po b/debian/po/oc.po
index badeaac1..6fc90f0d 100644
--- a/debian/po/oc.po
+++ b/debian/po/oc.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/pa.po b/debian/po/pa.po
index 13b452b6..8051b740 100644
--- a/debian/po/pa.po
+++ b/debian/po/pa.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/pl.po b/debian/po/pl.po
index b8e89a9f..55dab695 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/pt.po b/debian/po/pt.po
index d1869fb3..9e57017f 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 0f89bb86..7967ed87 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ro.po b/debian/po/ro.po
index f7fd8118..8383ac4c 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index d692b1ea..f8700a0b 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/sc.po b/debian/po/sc.po
index 4d3a85b4..3e60a79f 100644
--- a/debian/po/sc.po
+++ b/debian/po/sc.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/sd.po b/debian/po/sd.po
index 8ed94234..269dae11 100644
--- a/debian/po/sd.po
+++ b/debian/po/sd.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/shn.po b/debian/po/shn.po
index 94d249e9..90bb272c 100644
--- a/debian/po/shn.po
+++ b/debian/po/shn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/si.po b/debian/po/si.po
index fada85db..988cf5ca 100644
--- a/debian/po/si.po
+++ b/debian/po/si.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 4e16b2be..71961505 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/sl.po b/debian/po/sl.po
index bfeeee7c..cc4d6955 100644
--- a/debian/po/sl.po
+++ b/debian/po/sl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/sq.po b/debian/po/sq.po
index 23d3d5f9..ea23c9aa 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/sr.po b/debian/po/sr.po
index 5af216fe..f1b6eb29 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:24+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
"Language: sr\n"
#. Type: select
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 681878be..b794828a 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ta.po b/debian/po/ta.po
index 2d3286d1..f73e70a6 100644
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/te.po b/debian/po/te.po
index 1829912e..60b605bb 100644
--- a/debian/po/te.po
+++ b/debian/po/te.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/tg.po b/debian/po/tg.po
index b0d497b8..d0554980 100644
--- a/debian/po/tg.po
+++ b/debian/po/tg.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/th.po b/debian/po/th.po
index 065628d7..19feef12 100644
--- a/debian/po/th.po
+++ b/debian/po/th.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/tl.po b/debian/po/tl.po
index 9981de00..66b27b10 100644
--- a/debian/po/tl.po
+++ b/debian/po/tl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/tr.po b/debian/po/tr.po
index c8911c70..51027cca 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ug.po b/debian/po/ug.po
index 5224aa2b..68f3f959 100644
--- a/debian/po/ug.po
+++ b/debian/po/ug.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/uk.po b/debian/po/uk.po
index d3be1a4e..5f0b1374 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/ur.po b/debian/po/ur.po
index 5208615d..47f06439 100644
--- a/debian/po/ur.po
+++ b/debian/po/ur.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/uz.po b/debian/po/uz.po
index 9ce04ba8..99ff030a 100644
--- a/debian/po/uz.po
+++ b/debian/po/uz.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 2fdfed6c..8d0e7d77 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/wae.po b/debian/po/wae.po
index 7d238654..fb8b45e9 100644
--- a/debian/po/wae.po
+++ b/debian/po/wae.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 2502d1a7..c8facc07 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/zh_HK.po b/debian/po/zh_HK.po
index c7757aa2..d90ee685 100644
--- a/debian/po/zh_HK.po
+++ b/debian/po/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 4dcb12e1..65712121 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-05 05:25+0000\n"
-"X-Generator: Launchpad (build 17783)\n"
+"X-Launchpad-Export-Date: 2015-10-28 05:16+0000\n"
+"X-Generator: Launchpad (build 17833)\n"
#. Type: select
#. Description
diff --git a/src/Makefile.am b/src/Makefile.am
index 50139f91..e99509ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,8 @@ lightdm_SOURCES = \
logger.h \
login1.c \
login1.h \
+ log-file.c \
+ log-file.h \
mir-server.c \
mir-server.h \
plymouth.c \
diff --git a/src/lightdm.c b/src/lightdm.c
index d9ec9aff..a7e03056 100644
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -33,6 +33,7 @@
#include "shared-data-manager.h"
#include "user-list.h"
#include "login1.h"
+#include "log-file.h"
static gchar *config_path = NULL;
static GMainLoop *loop = NULL;
@@ -124,7 +125,8 @@ log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message,
static void
log_init (void)
{
- gchar *log_dir, *path, *old_path;
+ gchar *log_dir, *path;
+ gboolean backup_logs;
log_timer = g_timer_new ();
@@ -133,13 +135,8 @@ log_init (void)
path = g_build_filename (log_dir, "lightdm.log", NULL);
g_free (log_dir);
- /* Move old file out of the way */
- old_path = g_strdup_printf ("%s.old", path);
- rename (path, old_path);
- g_free (old_path);
-
- /* Create new file and log to it */
- log_fd = open (path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+ backup_logs = config_get_boolean (config_get_instance (), "LightDM", "backup-logs");
+ log_fd = log_file_open (path, backup_logs ? LOG_MODE_BACKUP_AND_TRUNCATE : LOG_MODE_APPEND);
fcntl (log_fd, F_SETFD, FD_CLOEXEC);
g_log_set_default_handler (log_cb, NULL);
diff --git a/src/log-file.c b/src/log-file.c
new file mode 100644
index 00000000..36d1e8ff
--- /dev/null
+++ b/src/log-file.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2015 Alexandros Frantzis
+ * Author: Alexandros Frantzis <alexandros.frantzis@canonical.com>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
+ * license.
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+#include "log-file.h"
+
+int
+log_file_open (const gchar *log_filename, LogMode log_mode)
+{
+ int open_flags = O_WRONLY | O_CREAT;
+ int log_fd;
+
+ if (log_mode == LOG_MODE_BACKUP_AND_TRUNCATE)
+ {
+ /* Move old file out of the way */
+ gchar *old_filename;
+
+ old_filename = g_strdup_printf ("%s.old", log_filename);
+ rename (log_filename, old_filename);
+ g_free (old_filename);
+
+ open_flags |= O_TRUNC;
+ }
+ else if (log_mode == LOG_MODE_APPEND)
+ {
+ /* Keep appending to it */
+ open_flags |= O_APPEND;
+ }
+ else
+ {
+ g_warning ("Failed to open log file %s: invalid log mode %d specified",
+ log_filename, log_mode);
+ return -1;
+ }
+
+ /* Open file and log to it */
+ log_fd = open (log_filename, open_flags, 0600);
+ if (log_fd < 0)
+ g_warning ("Failed to open log file %s: %s", log_filename, g_strerror (errno));
+
+ return log_fd;
+}
diff --git a/src/log-file.h b/src/log-file.h
new file mode 100644
index 00000000..5081bf45
--- /dev/null
+++ b/src/log-file.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 Alexandros Frantzis
+ * Author: Alexandros Frantzis <alexandros.frantzis@canonical.com>
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
+ * license.
+ */
+
+#ifndef LOG_FILE_H_
+#define LOG_FILE_H_
+
+#include <glib.h>
+
+typedef enum
+{
+ LOG_MODE_INVALID = -1,
+ LOG_MODE_BACKUP_AND_TRUNCATE,
+ LOG_MODE_APPEND
+} LogMode;
+
+int log_file_open (const gchar *log_filename, LogMode log_mode);
+
+#endif /* LOG_FILE_H_ */
diff --git a/src/process.c b/src/process.c
index ebd12743..d9b7eb9a 100644
--- a/src/process.c
+++ b/src/process.c
@@ -17,9 +17,9 @@
#include <fcntl.h>
#include <signal.h>
#include <grp.h>
-#include <glib/gstdio.h>
#include <config.h>
+#include "log-file.h"
#include "process.h"
enum {
@@ -39,6 +39,7 @@ struct ProcessPrivate
/* File to log to */
gchar *log_file;
gboolean log_stdout;
+ LogMode log_mode;
/* Command to run */
gchar *command;
@@ -90,16 +91,18 @@ process_new (ProcessRunFunc run_func, gpointer run_func_data)
Process *process = g_object_new (PROCESS_TYPE, NULL);
process->priv->run_func = run_func;
process->priv->run_func_data = run_func_data;
+ process->priv->log_mode = LOG_MODE_INVALID;
return process;
}
void
-process_set_log_file (Process *process, const gchar *path, gboolean log_stdout)
+process_set_log_file (Process *process, const gchar *path, gboolean log_stdout, LogMode log_mode)
{
g_return_if_fail (process != NULL);
g_free (process->priv->log_file);
process->priv->log_file = g_strdup (path);
process->priv->log_stdout = log_stdout;
+ process->priv->log_mode = log_mode;
}
void
@@ -193,19 +196,7 @@ process_start (Process *process, gboolean block)
}
if (process->priv->log_file)
- {
- gchar *old_filename;
-
- /* Move old file out of the way */
- old_filename = g_strdup_printf ("%s.old", process->priv->log_file);
- rename (process->priv->log_file, old_filename);
- g_free (old_filename);
-
- /* Create new file and log to it */
- log_fd = g_open (process->priv->log_file, O_WRONLY | O_CREAT | O_TRUNC, 0600);
- if (log_fd < 0)
- g_warning ("Failed to open log file %s: %s", process->priv->log_file, g_strerror (errno));
- }
+ log_fd = log_file_open (process->priv->log_file, process->priv->log_mode);
/* Work out variables to set */
env_length = g_hash_table_size (process->priv->env);
diff --git a/src/process.h b/src/process.h
index b8c50926..c358048a 100644
--- a/src/process.h
+++ b/src/process.h
@@ -14,6 +14,8 @@
#include <glib-object.h>
+#include "log-file.h"
+
G_BEGIN_DECLS
#define PROCESS_TYPE (process_get_type())
@@ -49,7 +51,7 @@ Process *process_get_current (void);
Process *process_new (ProcessRunFunc run_func, gpointer run_func_data);
-void process_set_log_file (Process *process, const gchar *path, gboolean log_stdout);
+void process_set_log_file (Process *process, const gchar *path, gboolean log_stdout, LogMode log_mode);
void process_set_clear_environment (Process *process, gboolean clear_environment);
diff --git a/src/seat.c b/src/seat.c
index 2e2afd0a..fa9699bc 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -147,7 +147,19 @@ seat_get_string_list_property (Seat *seat, const gchar *name)
gboolean
seat_get_boolean_property (Seat *seat, const gchar *name)
{
- return g_strcmp0 (seat_get_string_property (seat, name), "true") == 0;
+ const gchar *value;
+ gint i, length = 0;
+
+ value = seat_get_string_property (seat, name);
+ if (!value)
+ return FALSE;
+
+ /* Count the number of non-whitespace characters */
+ for (i = 0; value[i]; i++)
+ if (!g_ascii_isspace (value[i]))
+ length = i + 1;
+
+ return strncmp (value, "true", MAX (length, 4)) == 0;
}
gint
@@ -596,13 +608,15 @@ start_session (Seat *seat, Session *session)
if (IS_GREETER (session))
{
gchar *log_dir, *filename, *log_filename;
+ gboolean backup_logs;
log_dir = config_get_string (config_get_instance (), "LightDM", "log-directory");
filename = g_strdup_printf ("%s-greeter.log", display_server_get_name (session_get_display_server (session)));
log_filename = g_build_filename (log_dir, filename, NULL);
g_free (log_dir);
g_free (filename);
- session_set_log_file (session, log_filename);
+ backup_logs = config_get_boolean (config_get_instance (), "LightDM", "backup-logs");
+ session_set_log_file (session, log_filename, backup_logs ? LOG_MODE_BACKUP_AND_TRUNCATE : LOG_MODE_APPEND);
g_free (log_filename);
}
diff --git a/src/session-child.c b/src/session-child.c
index c5b5c211..9dd079c0 100644
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -26,6 +26,7 @@
#include "session.h"
#include "console-kit.h"
#include "login1.h"
+#include "log-file.h"
#include "privileges.h"
#include "x-authority.h"
#include "configuration.h"
@@ -257,7 +258,8 @@ session_child_run (int argc, char **argv)
int i, version, fd, result;
gboolean auth_complete = TRUE;
User *user = NULL;
- gchar *log_filename, *log_backup_filename = NULL;
+ gchar *log_filename;
+ LogMode log_mode = LOG_MODE_BACKUP_AND_TRUNCATE;
gsize env_length;
gsize command_argc;
gchar **command_argv;
@@ -488,6 +490,8 @@ session_child_run (int argc, char **argv)
/* Get the command to run (blocks) */
log_filename = read_string ();
+ if (version >= 3)
+ read_data (&log_mode, sizeof (log_mode));
if (version >= 1)
{
g_free (tty);
@@ -522,11 +526,9 @@ session_child_run (int argc, char **argv)
/* Redirect stderr to a log file */
if (log_filename)
{
- log_backup_filename = g_strdup_printf ("%s.old", log_filename);
if (g_path_is_absolute (log_filename))
{
- rename (log_filename, log_backup_filename);
- fd = open (log_filename, O_WRONLY | O_APPEND | O_CREAT, 0600);
+ fd = log_file_open (log_filename, log_mode);
dup2 (fd, STDERR_FILENO);
close (fd);
g_free (log_filename);
@@ -680,8 +682,7 @@ session_child_run (int argc, char **argv)
if (log_filename)
{
- rename (log_filename, log_backup_filename);
- fd = open (log_filename, O_WRONLY | O_APPEND | O_CREAT, 0600);
+ fd = log_file_open (log_filename, log_mode);
if (fd >= 0)
{
dup2 (fd, STDERR_FILENO);
diff --git a/src/session.c b/src/session.c
index f7f4ac09..663a3c70 100644
--- a/src/session.c
+++ b/src/session.c
@@ -84,6 +84,7 @@ struct SessionPrivate
/* File to log to */
gchar *log_filename;
+ LogMode log_mode;
/* tty this session is running on */
gchar *tty;
@@ -198,11 +199,12 @@ session_get_is_guest (Session *session)
}
void
-session_set_log_file (Session *session, const gchar *filename)
+session_set_log_file (Session *session, const gchar *filename, LogMode log_mode)
{
g_return_if_fail (session != NULL);
g_free (session->priv->log_filename);
session->priv->log_filename = g_strdup (filename);
+ session->priv->log_mode = log_mode;
}
void
@@ -619,7 +621,7 @@ session_real_start (Session *session)
close (from_child_input);
/* Indicate what version of the protocol we are using */
- version = 2;
+ version = 3;
write_data (session, &version, sizeof (version));
/* Send configuration */
@@ -791,6 +793,7 @@ session_real_run (Session *session)
if (session->priv->log_filename)
l_debug (session, "Logging to %s", session->priv->log_filename);
write_string (session, session->priv->log_filename);
+ write_data (session, &session->priv->log_mode, sizeof (session->priv->log_mode));
write_string (session, session->priv->tty);
write_string (session, x_authority_filename);
g_free (x_authority_filename);
@@ -857,9 +860,11 @@ session_stop (Session *session)
if (session_get_is_authenticated (session) && !session->priv->command_run)
{
gsize n = 0;
+ LogMode log_mode = LOG_MODE_INVALID;
session->priv->command_run = TRUE;
write_string (session, NULL); // log filename
+ write_data (session, &log_mode, sizeof (log_mode)); // log mode
write_string (session, NULL); // tty
write_string (session, NULL); // xauth filename
write_string (session, NULL); // xdisplay
@@ -903,6 +908,7 @@ session_init (Session *session)
{
session->priv = G_TYPE_INSTANCE_GET_PRIVATE (session, SESSION_TYPE, SessionPrivate);
session->priv->log_filename = g_strdup (".xsession-errors");
+ session->priv->log_mode = LOG_MODE_BACKUP_AND_TRUNCATE;
session->priv->to_child_input = -1;
session->priv->from_child_output = -1;
}
diff --git a/src/session.h b/src/session.h
index c62303e6..800d0a71 100644
--- a/src/session.h
+++ b/src/session.h
@@ -23,6 +23,7 @@ typedef struct Session Session;
#include "accounts.h"
#include "x-authority.h"
#include "logger.h"
+#include "log-file.h"
G_BEGIN_DECLS
@@ -84,7 +85,7 @@ void session_set_is_guest (Session *session, gboolean is_guest);
gboolean session_get_is_guest (Session *session);
-void session_set_log_file (Session *session, const gchar *filename);
+void session_set_log_file (Session *session, const gchar *filename, LogMode log_mode);
void session_set_display_server (Session *session, DisplayServer *display_server);
diff --git a/src/unity-system-compositor.c b/src/unity-system-compositor.c
index 0b89d2c2..069e11a8 100644
--- a/src/unity-system-compositor.c
+++ b/src/unity-system-compositor.c
@@ -374,7 +374,7 @@ static gboolean
unity_system_compositor_start (DisplayServer *server)
{
UnitySystemCompositor *compositor = UNITY_SYSTEM_COMPOSITOR (server);
- gboolean result;
+ gboolean result, backup_logs;
GString *command;
gchar *dir, *log_file, *absolute_command, *value;
@@ -407,7 +407,8 @@ unity_system_compositor_start (DisplayServer *server)
/* Setup environment */
compositor->priv->process = process_new (run_cb, compositor);
- process_set_log_file (compositor->priv->process, log_file, TRUE);
+ backup_logs = config_get_boolean (config_get_instance (), "LightDM", "backup-logs");
+ process_set_log_file (compositor->priv->process, log_file, TRUE, backup_logs ? LOG_MODE_BACKUP_AND_TRUNCATE : LOG_MODE_APPEND);
g_free (log_file);
process_set_clear_environment (compositor->priv->process, TRUE);
process_set_env (compositor->priv->process, "XDG_SEAT", "seat0");
diff --git a/src/x-server-local.c b/src/x-server-local.c
index dcbfbc0a..a7827432 100644
--- a/src/x-server-local.c
+++ b/src/x-server-local.c
@@ -474,7 +474,7 @@ static gboolean
x_server_local_start (DisplayServer *display_server)
{
XServerLocal *server = X_SERVER_LOCAL (display_server);
- gboolean result;
+ gboolean result, backup_logs;
gchar *filename, *dir, *log_file, *absolute_command;
GString *command;
@@ -493,7 +493,8 @@ x_server_local_start (DisplayServer *display_server)
filename = g_strdup_printf ("%s.log", display_server_get_name (display_server));
dir = config_get_string (config_get_instance (), "LightDM", "log-directory");
log_file = g_build_filename (dir, filename, NULL);
- process_set_log_file (server->priv->x_server_process, log_file, TRUE);
+ backup_logs = config_get_boolean (config_get_instance (), "LightDM", "backup-logs");
+ process_set_log_file (server->priv->x_server_process, log_file, TRUE, backup_logs ? LOG_MODE_BACKUP_AND_TRUNCATE : LOG_MODE_APPEND);
l_debug (display_server, "Logging to %s", log_file);
g_free (log_file);
g_free (filename);
diff --git a/src/x-server-xvnc.c b/src/x-server-xvnc.c
index aea28177..4c5597c9 100644
--- a/src/x-server-xvnc.c
+++ b/src/x-server-xvnc.c
@@ -182,7 +182,7 @@ x_server_xvnc_start (DisplayServer *display_server)
{
XServerXVNC *server = X_SERVER_XVNC (display_server);
XAuthority *authority;
- gboolean result;
+ gboolean result, backup_logs;
gchar *filename, *run_dir, *dir, *log_file, *absolute_command;
GString *command;
gchar hostname[1024], *number;
@@ -201,7 +201,8 @@ x_server_xvnc_start (DisplayServer *display_server)
filename = g_strdup_printf ("%s.log", display_server_get_name (display_server));
dir = config_get_string (config_get_instance (), "LightDM", "log-directory");
log_file = g_build_filename (dir, filename, NULL);
- process_set_log_file (server->priv->x_server_process, log_file, FALSE);
+ backup_logs = config_get_boolean (config_get_instance (), "LightDM", "backup-logs");
+ process_set_log_file (server->priv->x_server_process, log_file, FALSE, backup_logs ? LOG_MODE_BACKUP_AND_TRUNCATE : LOG_MODE_APPEND);
l_debug (display_server, "Logging to %s", log_file);
g_free (log_file);
g_free (filename);
diff --git a/src/xdmcp-server.c b/src/xdmcp-server.c
index 4761b7b0..085352e7 100644
--- a/src/xdmcp-server.c
+++ b/src/xdmcp-server.c
@@ -625,7 +625,11 @@ read_cb (GSocket *socket, GIOCondition condition, XDMCPServer *server)
packet = xdmcp_packet_decode ((guint8 *)data, n_read);
if (packet)
{
- g_debug ("Got %s", xdmcp_packet_tostring (packet));
+ gchar *packet_string;
+
+ packet_string = xdmcp_packet_tostring (packet);
+ g_debug ("Got %s", packet_string);
+ g_free (packet_string);
switch (packet->opcode)
{
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a96c77f1..27b6b538 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -173,7 +173,8 @@ TESTS = \
test-vnc-guest \
test-xremote-autologin \
test-xremote-login \
- test-xdmcp-client \
+ test-xdmcp-client-xorg-1.16 \
+ test-xdmcp-client-xorg-1.17 \
test-xdmcp-server-autologin \
test-xdmcp-server-login \
test-xdmcp-server-double-login \
@@ -591,7 +592,8 @@ EXTRA_DIST = \
scripts/xauthority.conf \
scripts/xdg-current-desktop.conf \
scripts/xdg-current-desktop-legacy.conf \
- scripts/xdmcp-client.conf \
+ scripts/xdmcp-client-xorg-1.16.conf \
+ scripts/xdmcp-client-xorg-1.17.conf \
scripts/xdmcp-server-autologin.conf \
scripts/xdmcp-server-double-login.conf \
scripts/xdmcp-server-guest.conf \
diff --git a/tests/scripts/xdmcp-client.conf b/tests/scripts/xdmcp-client-xorg-1.16.conf
index f29bb41c..c41cb13e 100644
--- a/tests/scripts/xdmcp-client.conf
+++ b/tests/scripts/xdmcp-client-xorg-1.16.conf
@@ -1,7 +1,10 @@
#
-# Check can run a local XDMCP client
+# Check can run a local XDMCP client in X.Org < 1.17 (default is listening enabled)
#
+[test-xserver-config]
+version=1.16.0
+
[Seat:*]
xdmcp-manager=127.0.0.1
diff --git a/tests/scripts/xdmcp-client-xorg-1.17.conf b/tests/scripts/xdmcp-client-xorg-1.17.conf
new file mode 100644
index 00000000..584004e6
--- /dev/null
+++ b/tests/scripts/xdmcp-client-xorg-1.17.conf
@@ -0,0 +1,30 @@
+#
+# Check can run a local XDMCP client in X.Org >= 1.17 (default is listening disabled)
+#
+
+[test-xserver-config]
+version=1.17.0
+
+[Seat:*]
+xdmcp-manager=127.0.0.1
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7 LISTEN-TCP SEAT=seat0
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Starts sending XDMCP queries
+#?*XSERVER-0 START-XDMCP
+#?XSERVER-0 SEND-QUERY
+
+# Wait to check a greeter is not started
+#?*WAIT
+
+# Cleanup
+#?*STOP-DAEMON
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/test-xdmcp-client b/tests/test-xdmcp-client
deleted file mode 100755
index fe34787e..00000000
--- a/tests/test-xdmcp-client
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner xdmcp-client test-gobject-greeter
diff --git a/tests/test-xdmcp-client-xorg-1.16 b/tests/test-xdmcp-client-xorg-1.16
new file mode 100755
index 00000000..d6e2f56e
--- /dev/null
+++ b/tests/test-xdmcp-client-xorg-1.16
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner xdmcp-client-xorg-1.16 test-gobject-greeter
diff --git a/tests/test-xdmcp-client-xorg-1.17 b/tests/test-xdmcp-client-xorg-1.17
new file mode 100755
index 00000000..b3d41fc7
--- /dev/null
+++ b/tests/test-xdmcp-client-xorg-1.17
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner xdmcp-client-xorg-1.17 test-gobject-greeter