[SCM] live-debconfig branch, upstream, updated. upstream/4.0_a3-1-gf22e25e

Daniel Baumann daniel at debian.org
Fri Aug 17 14:58:52 UTC 2012 

The following commit has been merged in the upstream branch:
commit f22e25e4b8153feb6827df76df630c9a9c906d33
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Aug 17 16:58:45 2012 +0200

    Adding upstream version 4.0~a4.

diff --git a/VERSION b/VERSION
index 80ca3a5..ccb6a78 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a3-1
+4.0~a4-1
diff --git a/bin/live-debconfig b/bin/live-debconfig
index e813bc7..d98a5bc 100755
--- a/bin/live-debconfig
+++ b/bin/live-debconfig
@@ -62,8 +62,6 @@ EOF
 
 fi
 
-DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
-
 if [ "${1}" = "--noscripts" ]
 then
 	exit
@@ -75,6 +73,6 @@ do
 	if [ -x "${_SCRIPT}" ]
 	then
 		# FIXME: make scripts a multiselect
-		"${_SCRIPT}"
+		DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc" "${_SCRIPT}"
 	fi
 done
diff --git a/bin/live-initscripts-empty-stop b/bin/live-initscripts-empty-stop
new file mode 100755
index 0000000..a8799f1
--- /dev/null
+++ b/bin/live-initscripts-empty-stop
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+## live-debconfig contains the scripts that configure a Debian Live system during
+## the build process (live-build).
+##
+## This is the sysvinit script for live-debconfig.
+
+
+### BEGIN INIT INFO
+# Provides:		live-debconfig
+# Required-Start:
+# Required-Stop:
+# Should-Start:
+# Should-Stop:
+# Default-Start:
+# Default-Stop:		0 6
+# Short-Description:	Debian Live - System Configuration Scripts
+# Description:		live-debconfig contains the scripts that configure a
+#			Debian Live system during the build process
+#			(live-build).
+# X-Start-Before:
+# X-Stop-After:
+# X-Interactive:
+### END INIT INFO
+
+exit 0
diff --git a/manpages/ca/live-debconfig.ca.7 b/manpages/ca/live-debconfig.ca.7
new file mode 100644
index 0000000..37c7b9e
--- /dev/null
+++ b/manpages/ca/live-debconfig.ca.7
@@ -0,0 +1,68 @@
+.\" live-debconfig(7) - System Configuration Scripts
+.\" Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+.\"
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This is free software, and you are welcome to redistribute it
+.\" under certain conditions; see COPYING for details.
+.\"
+.\"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH LIVE\-DEBCONFIG 7 2012\-08\-17 4.0~a4\-1 "Projecte Debian Live"
+
+.SH NOM
+\fBlive\-debconfig\fP \- Scripts de Configuració del Sistema
+
+.SH DESCRIPCIÓ
+\fBlive\-debconfig\fP conté els scripts que configuren un sistema Debian Live
+durant el procés de construcció (live\-build).
+
+.SH SCRIPTS
+\fBlive\-debconfig\fP actualment compta amb els següents scripts a
+/lib/live/debconfig.
+
+.IP \fBhostname\fP 4
+estableix el nom del amfitrió del sistema (/etc/hostname), veure
+\fIlive\-debconfig_hostname\fP(5).
+.IP \fBifupdown\fP 4
+configura la connexió de xarxa del sistema (/etc/network/interfaces,
+/etc/resolv.conf, /etc/hosts), veure \fIlive\-debconfig_ifupdown\fP(5).
+.IP \fBsysvinit\fP 4
+configura el tipus de sistema per als Linux Containers, LXC (/etc/inittab) i
+desactiva alguns serveis que no són necessaris per LXC. veure
+\fIlive\-debconfig_sysvinit\fP(5).
+.IP \fButil\-linux\fP 4
+configura l'accés al rellotge del maquinari (/etc/default/hwclock), veure
+\fIlive\-debconfig_util\-linux\fP(5).
+.IP \fBselinux\fP 4
+activa o desactiva selinux (/selinux), veure \fIlive\-debconfig_selinux\fP(5).
+.IP \fBopenssh\-server\fP 4
+recrea les claus de l'amfitrió del openssh\-server (/etc/ssh/ssh_host_key*),
+veure \fIlive\-debconfig_openssh\-server\fP(5).
+
+.SH "VEURE TAMBÉ"
+\fIlive\-boot\fP(7)
+.PP
+\fIlive\-build\fP(7)
+.PP
+\fIlive\-config\fP(7)
+.PP
+\fIlive\-tools\fP(7)
+
+.SH "PÀGINA WEB"
+Es pot trobar més informació sobre live\-debconfig i el projecte Debian Live
+a la pàgina web <\fIhttp://live.debian.net/\fP> i al manual a
+<\fIhttp://live.debian.net/manual/\fP>.
+
+.SH ERRORS
+Es pot informar sobre els errors mitjançant la presentació d'un informe
+d'errors sobre al paquet live\-debconfig al Debian Bug Tracking System a
+<\fIhttp://bugs.debian.org/\fP> o escrivint un correu a la llista de
+correu de Debian Live a <\fIdebian\-live at lists.debian.org\fP>.
+
+.SH AUTOR
+live\-debconfig va ser escrit per Daniel Baumann
+<\fIdaniel at debian.org\fP>.
diff --git a/manpages/ca/live-debconfig_hostname.ca.5 b/manpages/ca/live-debconfig_hostname.ca.5
new file mode 100644
index 0000000..368eeea
--- /dev/null
+++ b/manpages/ca/live-debconfig_hostname.ca.5
@@ -0,0 +1,91 @@
+.\" live-debconfig(7) - System Configuration Scripts
+.\" Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+.\"
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This is free software, and you are welcome to redistribute it
+.\" under certain conditions; see COPYING for details.
+.\"
+.\"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH LIVE\-DEBCONFIG 5 2012\-08\-17 4.0~a4\-1 "Projecte Debian Live"
+
+.SH NOM
+\fBlive\-debconfig\fP \- script hostname
+
+.SH DESCRIPCIÓ
+\fBlive\-debconfig\fP conté els scripts que configuren un sistema Debian Live
+durant el procés de construcció (live\-build).
+.PP
+Aquest script estableix el nom del amfitrió del sistema al fitxer
+/etc/hostname
+
+.SH PRECONFIGURACIÓ
+El script hostname actualment inclou les opcions de preconfiguració
+següents.
+
+.IP "\fBlive\-debconfig live\-debconfig/hostname/hostname string\fP \fIHOSTNAME\fP" 8
+Permet establir el nom d'amfitrió del sistema.
+.br
+
+.br
+Si no hi ha cap valor preconfigurat, es suggereix un valor per defecte en un
+prompt de debconf. Si no s'introdueix cap valor al prompt de debconf,
+s'utilitza el valor per defecte. El valor per defecte es determina de forma
+automàtica:
+.br
+
+.br
+  1. \fIHOSTNAME\fP s'estableix al fitxer /etc/hostname si existeix i no és buit.
+.br
+
+.br
+  2. \fIHOSTNAME\fP s'estableix a l'ID del distribuïdor, com al fitxer /etc/os\-release, si existeix i no és buit.
+.br
+
+.br
+  3. \fIHOSTNAME\fP s'estableix a l'ID del distribuïdor, com al programa \fIlsb_release\fP(1) si està instaŀlat in no és buit.
+.br
+
+.br
+  4. \fIHOSTNAME\fP s'estableix a \fBprogress\fP si existeix el fitxer /etc/progress_version
+.br
+
+.br
+  5. \fIHOSTNAME\fP s'estableix a \fBdebian\fP com a forma alternativa.
+.br
+
+.br
+\fBAdvertència:\fP el nou nom d'amfitrió s'afegirà al fitxer /etc/hostname
+sobreescrivint qualsevol contingut anterior sense previ avís o còpia de
+seguretat.
+.br
+
+.SH "VEURE TAMBÉ"
+\fIlive\-boot\fP(7)
+.PP
+\fIlive\-build\fP(7)
+.PP
+\fIlive\-config\fP(7)
+.PP
+\fIlive\-debconfig\fP(7)
+.PP
+\fIlive\-tools\fP(7)
+
+.SH "PÀGINA WEB"
+Es pot trobar més informació sobre live\-debconfig i el projecte Debian Live
+a la pàgina web <\fIhttp://live.debian.net/\fP> i al manual a
+<\fIhttp://live.debian.net/manual/\fP>.
+
+.SH ERRORS
+Es pot informar sobre els errors mitjançant la presentació d'un informe
+d'errors sobre al paquet live\-debconfig al Debian Bug Tracking System a
+<\fIhttp://bugs.debian.org/\fP> o escrivint un correu a la llista de
+correu de Debian Live a <\fIdebian\-live at lists.debian.org\fP>.
+
+.SH AUTOR
+live\-debconfig va ser escrit per Daniel Baumann
+<\fIdaniel at debian.org\fP>.
diff --git a/manpages/de/live-debconfig.de.7 b/manpages/de/live-debconfig.de.7
index 6e33164..620ae6e 100644
--- a/manpages/de/live-debconfig.de.7
+++ b/manpages/de/live-debconfig.de.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-DEBCONFIG 7 16.08.2012 4.0~a3\-1 "Debian Live Projekt"
+.TH LIVE\-DEBCONFIG 7 17.08.2012 4.0~a4\-1 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-debconfig\fP \- System Konfiguration Skripte
@@ -31,9 +31,10 @@ konfiguriert die Netzwerkeinstellungen des Systems (/etc/network/interfaces,
 /etc/resolv.conf, /etc/hosts), siehe \fIlive\-debconfig_ifupdown\fP(5).
 .IP \fBsysvinit\fP 4
 konfiguriert den Typ des Systems für Linux Container, LXC (/etc/inittab),
-siehe \fIlive\-debconfig_sysvinit\fP(5).
+und schaltet einige Services ab die für LXC nicht benötigt werden, siehe
+\fIlive\-debconfig_sysvinit\fP(5).
 .IP \fButil\-linux\fP 4
-konfiguriert den Zugriff auf die Hardware Uhr, siehe
+konfiguriert den Zugriff auf die Hardware Uhr (/etc/default/hwclock), siehe
 \fIlive\-debconfig_util\-linux\fP(5).
 .IP \fBselinux\fP 4
 schaltet SELinux ein oder aus (/selinux), siehe
diff --git a/manpages/de/live-debconfig_hostname.de.5 b/manpages/de/live-debconfig_hostname.de.5
index 92ce88d..fa8fce5 100644
--- a/manpages/de/live-debconfig_hostname.de.5
+++ b/manpages/de/live-debconfig_hostname.de.5
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-DEBCONFIG 5 16.08.2012 4.0~a3\-1 "Debian Live Projekt"
+.TH LIVE\-DEBCONFIG 5 17.08.2012 4.0~a4\-1 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-debconfig\fP \- Hostname Skript
diff --git a/manpages/en/live-debconfig.7 b/manpages/en/live-debconfig.7
index 7a0d4da..534f9c5 100644
--- a/manpages/en/live-debconfig.7
+++ b/manpages/en/live-debconfig.7
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-DEBCONFIG 7 2012\-08\-16 4.0~a3-1 "Debian Live Project"
+.TH LIVE\-DEBCONFIG 7 2012\-08\-17 4.0~a4-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-debconfig\fR \- System Configuration Scripts
@@ -22,9 +22,9 @@ sets the systems hostname (/etc/hostname), see \fIlive\-debconfig_hostname\fR(5)
 .IP "\fBifupdown\fR" 4
 configures the systems network settings (/etc/network/interfaces, /etc/resolv.conf, /etc/hosts), see \fIlive\-debconfig_ifupdown\fR(5).
 .IP "\fBsysvinit\fR" 4
-configures the systems type for Linux Containers, LXC (/etc/inittab), see \fIlive\-debconfig_sysvinit\fR(5).
+configures the systems type for Linux Containers, LXC (/etc/inittab) and disables some services not needed for LXC, see \fIlive\-debconfig_sysvinit\fR(5).
 .IP "\fButil\-linux\fR" 4
-configure the access to the hardware clock, see \fIlive\-debconfig_util\-linux\fR(5).
+configure the access to the hardware clock (/etc/default/hwclock), see \fIlive\-debconfig_util\-linux\fR(5).
 .IP "\fBselinux\fR" 4
 enables or disables selinux (/selinux), see \fIlive\-debconfig_selinux\fR(5).
 .IP "\fBopenssh\-server\fR" 4
diff --git a/manpages/en/live-debconfig_hostname.5 b/manpages/en/live-debconfig_hostname.5
index cfa4def..c1e7238 100644
--- a/manpages/en/live-debconfig_hostname.5
+++ b/manpages/en/live-debconfig_hostname.5
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-DEBCONFIG 5 2012\-08\-16 4.0~a3-1 "Debian Live Project"
+.TH LIVE\-DEBCONFIG 5 2012\-08\-17 4.0~a4-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-debconfig\fR \- hostname script
diff --git a/manpages/es/live-debconfig.es.7 b/manpages/es/live-debconfig.es.7
index d4438df..8cc426b 100644
--- a/manpages/es/live-debconfig.es.7
+++ b/manpages/es/live-debconfig.es.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-DEBCONFIG 7 16.08.2012 4.0~a3\-1 "Proyecto Debian Live"
+.TH LIVE\-DEBCONFIG 7 17.08.2012 4.0~a4\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-debconfig\fP \- Scripts de Configuración del Sistema
@@ -31,10 +31,11 @@ establece el nombre del anfitrión del sistema (/etc/hostname), ver
 establece la configuración de red del sistema (/etc/network/interfaces,
 /etc/resolv.conf, /etc/hosts), ver \fIlive\-debconfig_ifupdown\fP(5).
 .IP \fBsysvinit\fP 4
-configura el tipo de sistema para los Linux Containers, LXC (/etc/inittab),
-ver \fIlive\-debconfig_sysvinit\fP(5).
+configura el tipo de sistema para los Linux Containers, LXC (/etc/inittab) y
+desactiva algunos servicios que no son necesarios para LXC, ver
+\fIlive\-debconfig_sysvinit\fP(5).
 .IP \fButil\-linux\fP 4
-configure the access to the hardware clock, see
+configura el acceso al reloj del sistema (/etc/default/hwclock), ver
 \fIlive\-debconfig_util\-linux\fP(5).
 .IP \fBselinux\fP 4
 activa o desactiva selinux (/selinux), ver \fIlive\-debconfig_selinux\fP(5).
diff --git a/manpages/es/live-debconfig_hostname.es.5 b/manpages/es/live-debconfig_hostname.es.5
index 8f45894..d17510d 100644
--- a/manpages/es/live-debconfig_hostname.es.5
+++ b/manpages/es/live-debconfig_hostname.es.5
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-DEBCONFIG 5 16.08.2012 4.0~a3\-1 "Proyecto Debian Live"
+.TH LIVE\-DEBCONFIG 5 17.08.2012 4.0~a4\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-debconfig\fP \- script hostname
diff --git a/manpages/fr/live-debconfig.fr.7 b/manpages/fr/live-debconfig.fr.7
new file mode 100644
index 0000000..6f1520e
--- /dev/null
+++ b/manpages/fr/live-debconfig.fr.7
@@ -0,0 +1,67 @@
+.\" live-debconfig(7) - System Configuration Scripts
+.\" Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+.\"
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This is free software, and you are welcome to redistribute it
+.\" under certain conditions; see COPYING for details.
+.\"
+.\"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH LIVE\-DEBCONFIG 7 2012\-08\-17 4.0~a4\-1 "Projet Debian Live"
+
+.SH NOM
+\fBlive\-debconfig\fP \- Scripts de configuration du système
+
+.SH DESCRIPTION
+\fBlive\-debconfig\fP contient les scripts qui configurent un système Debian
+Live pendant le processus de construction (live\-build).
+
+.SH SCRIPTS
+\fBlive\-debconfig\fP contient les scripts suivants sur /lib/live/debconfig.
+
+.IP \fBhostname\fP 4
+fixe le nom d'hôte du système (/etc/hostname), voir
+\fIlive\-debconfig_hostname\fP(5).
+.IP \fBifupdown\fP 4
+configure les paramètres de réseau du système (/etc/network/interfaces,
+/etc/resolv.conf, /etc/hosts), voir \fIlive\-debconfig_ifupdown\fP(5).
+.IP \fBsysvinit\fP 4
+configure le type de système pour les Linux Containers, LXC (/etc/inittab)
+et désactive certains services qui ne sont pas nécessaires pour LXC, voir
+\fIlive\-debconfig_sysvinit\fP(5).
+.IP \fButil\-linux\fP 4
+configure l'accès à l'horloge du système /etc/default/hwclock), voir
+\fIlive\-debconfig_util\-linux\fP(5).
+.IP \fBselinux\fP 4
+active ou désactive selinux (/selinux), voir \fIlive\-debconfig_selinux\fP(5).
+.IP \fBopenssh\-server\fP 4
+recrée les clés de l'hôte openssh\-server (/etc/ssh/ssh_host_key*), voir
+\fIlive\-debconfig_openssh\-server\fP(5).
+
+.SH "VOIR AUSSI"
+\fIlive\-boot\fP(7)
+.PP
+\fIlive\-build\fP(7)
+.PP
+\fIlive\-config\fP(7)
+.PP
+\fIlive\-tools\fP(7)
+
+.SH "PAGE D'ACCUEIL"
+Plus d'informations sur live\-debconfig et le projet Debian Live peuvent être
+trouvées sur la page <\fIhttp://live.debian.net/\fP> et dans le manuel
+sur <\fIhttp://live.debian.net/manual/\fP>.
+
+.SH BOGUES
+Les bogues peuvent être signalés en soumettant un rapport de bogue à propos
+du paquet live\-debconfig via le Debian Bug Tracking System sur
+<\fIhttp://bugs.debian.org/\fP> ou en envoyant un mail à la liste de
+diffusion de Debian Live sur <\fIdebian\-live at lists.debian.org\fP>
+
+.SH AUTEUR
+live\-debconfig a été conçu par Daniel Baumann
+<\fIdaniel at debian.org\fP>.
diff --git a/manpages/fr/live-debconfig_hostname.fr.5 b/manpages/fr/live-debconfig_hostname.fr.5
new file mode 100644
index 0000000..204c862
--- /dev/null
+++ b/manpages/fr/live-debconfig_hostname.fr.5
@@ -0,0 +1,89 @@
+.\" live-debconfig(7) - System Configuration Scripts
+.\" Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
+.\"
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This is free software, and you are welcome to redistribute it
+.\" under certain conditions; see COPYING for details.
+.\"
+.\"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH LIVE\-DEBCONFIG 5 2012\-08\-17 4.0~a4\-1 "Projet Debian Live"
+
+.SH NOM
+\fBlive\-debconfig\fP \- script hostname
+
+.SH DESCRIPTION
+\fBlive\-debconfig\fP contient les scripts qui configurent un système Debian
+Live pendant le processus de construction (live\-build).
+.PP
+Ce script définit le nom d'hôte dans le fichier /etc/hostname
+
+.SH PRECONFIGURATION
+Le script hostname comprend actuellement les options de préconfiguration
+suivantes.
+
+.IP "\fBlive\-debconfig live\-debconfig/hostname/hostname string\fP \fIHOSTNAME\fP" 8
+Permet de définir le nom d'hôte du système.
+.br
+
+.br
+Si aucune valeur n'est préconfigurée, une valeur par défaut appropriée est
+suggérée en un prompt de debconf. Si aucune valeur n'est entrée dans le
+prompt debconf, la valeur par défaut est utilisée. La valeur par défaut est
+déterminée automatiquement:
+.br
+
+.br
+  1. \fIHOSTNAME\fP est fixé dans le fichier /etc/hostname si existant et non\-vide.
+.br
+
+.br
+  2. \fIHOSTNAME\fP est fixé a l'ID du distributeur comme dans le fichier /etc/os\-release, si existant et non\-vide.
+.br
+
+.br
+  3. \fIHOSTNAME\fP est fixé a l'ID du distributeur comme dans le logiciel \fIlsb_release\fP(1) s'il est installé et non\-vide.
+.br
+
+.br
+  4. \fIHOSTNAME\fP est fixé a \fBprogress\fP si le fichier /etc/progress_version existe.
+.br
+
+.br
+  5. \fIHOSTNAME\fP est fixé a \fBdebian\fP en dernier recours.
+.br
+
+.br
+\fBAttention:\fP le nouveau nom d'hôte sera fixé dans le fichier /etc/hostname,
+écrasant tout le contenu précédent sans avis préalable ou sauvegarde.
+.br
+
+.SH "VOIR AUSSI"
+\fIlive\-boot\fP(7)
+.PP
+\fIlive\-build\fP(7)
+.PP
+\fIlive\-config\fP(7)
+.PP
+\fIlive\-debconfig\fP(7)
+.PP
+\fIlive\-tools\fP(7)
+
+.SH "PAGE D'ACCUEIL"
+Plus d'informations sur live\-debconfig et le projet Debian Live peuvent être
+trouvées sur la page <\fIhttp://live.debian.net/\fP> et dans le manuel
+sur <\fIhttp://live.debian.net/manual/\fP>.
+
+.SH BOGUES
+Les bogues peuvent être signalés en soumettant un rapport de bogue à propos
+du paquet live\-debconfig via le Debian Bug Tracking System sur
+<\fIhttp://bugs.debian.org/\fP> ou en envoyant un mail à la liste de
+diffusion de Debian Live sur <\fIdebian\-live at lists.debian.org\fP>
+
+.SH AUTEUR
+live\-debconfig a été conçu par Daniel Baumann
+<\fIdaniel at debian.org\fP>.
diff --git a/manpages/po/es/live-debconfig.7.po b/manpages/po/ca/live-debconfig.7.po
similarity index 67%
copy from manpages/po/es/live-debconfig.7.po
copy to manpages/po/ca/live-debconfig.7.po
index 0931c68..d2608ca 100644
--- a/manpages/po/es/live-debconfig.7.po
+++ b/manpages/po/ca/live-debconfig.7.po
@@ -1,15 +1,15 @@
-# Spanish translations for live-debconfig
+# Catalan translations for live-debconfig package
+# Copyright (C) 2012 Carlos Zuferri <chals at altorricon.com>
 # This file is distributed under the same license as the live-debconfig package.
-# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
-"PO-Revision-Date: 2012-07-30 14:08+0200\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
+"PO-Revision-Date: 2012-08-17 00:41+0100\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team: none\n"
-"Language: es\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,37 +24,37 @@ msgstr "LIVE-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
-msgstr "16.08.2012"
+msgid "2012-08-17"
+msgstr "2012-08-17"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
 msgid "Debian Live Project"
-msgstr "Proyecto Debian Live"
+msgstr "Projecte Debian Live"
 
 #. type: SH
 #: en/live-debconfig.7:11 en/live-debconfig_hostname.5:11
 #, no-wrap
 msgid "NAME"
-msgstr "NOMBRE"
+msgstr "NOM"
 
 #. type: Plain text
 #: en/live-debconfig.7:13
 msgid "B<live-debconfig> - System Configuration Scripts"
-msgstr "B<live-debconfig> - Scripts de Configuración del Sistema"
+msgstr "B<live-debconfig> - Scripts de Configuració del Sistema"
 
 #. type: SH
 #: en/live-debconfig.7:14 en/live-debconfig_hostname.5:14
 #, no-wrap
 msgid "DESCRIPTION"
-msgstr "DESCRIPCIÓN"
+msgstr "DESCRIPCIÓ"
 
 #. type: Plain text
 #: en/live-debconfig.7:16 en/live-debconfig_hostname.5:16
@@ -62,8 +62,8 @@ msgid ""
 "B<live-debconfig> contains the scripts that configure a Debian Live system "
 "during the build process (live-build)."
 msgstr ""
-"B<live-debconfig> contiene los scripts que configuran un sistema Debian Live "
-"durante el proceso de construcción (live-build)."
+"B<live-debconfig> conté els scripts que configuren un sistema Debian Live "
+"durant el procés de construcció (live-build)."
 
 #. type: SH
 #: en/live-debconfig.7:17
@@ -77,7 +77,7 @@ msgid ""
 "B<live-debconfig> currently features the following scripts in /lib/live/"
 "debconfig."
 msgstr ""
-"B<live-debconfig> actualmente cuenta con los siguientes scripts en /lib/live/"
+"B<live-debconfig> actualment compta amb els següents scripts a /lib/live/"
 "debconfig."
 
 #. type: IP
@@ -91,7 +91,7 @@ msgstr "B<hostname>"
 msgid ""
 "sets the systems hostname (/etc/hostname), see I<live-debconfig_hostname>(5)."
 msgstr ""
-"establece el nombre del anfitrión del sistema (/etc/hostname), ver I<live-"
+"estableix el nom del amfitrió del sistema (/etc/hostname), veure I<live-"
 "debconfig_hostname>(5)."
 
 #. type: IP
@@ -106,8 +106,8 @@ msgid ""
 "configures the systems network settings (/etc/network/interfaces, /etc/"
 "resolv.conf, /etc/hosts), see I<live-debconfig_ifupdown>(5)."
 msgstr ""
-"establece la configuración de red del sistema (/etc/network/interfaces, /etc/"
-"resolv.conf, /etc/hosts), ver I<live-debconfig_ifupdown>(5)."
+"configura la connexió de xarxa del sistema (/etc/network/interfaces, /etc/"
+"resolv.conf, /etc/hosts), veure I<live-debconfig_ifupdown>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:24
@@ -118,11 +118,12 @@ msgstr "B<sysvinit>"
 #. type: Plain text
 #: en/live-debconfig.7:26
 msgid ""
-"configures the systems type for Linux Containers, LXC (/etc/inittab), see "
-"I<live-debconfig_sysvinit>(5)."
+"configures the systems type for Linux Containers, LXC (/etc/inittab) and "
+"disables some services not needed for LXC, see I<live-debconfig_sysvinit>(5)."
 msgstr ""
-"configura el tipo de sistema para los Linux Containers, LXC (/etc/inittab), "
-"ver I<live-debconfig_sysvinit>(5)."
+"configura el tipus de sistema per als Linux Containers, LXC (/etc/inittab) i "
+"desactiva alguns serveis que no són necessaris per LXC. veure I<live-"
+"debconfig_sysvinit>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:26
@@ -133,9 +134,11 @@ msgstr "B<util-linux>"
 #. type: Plain text
 #: en/live-debconfig.7:28
 msgid ""
-"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
-"(5)."
+"configure the access to the hardware clock (/etc/default/hwclock), see "
+"I<live-debconfig_util-linux>(5)."
 msgstr ""
+"configura l'accés al rellotge del maquinari (/etc/default/hwclock), veure "
+"I<live-debconfig_util-linux>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:28
@@ -148,7 +151,7 @@ msgstr "B<selinux>"
 msgid ""
 "enables or disables selinux (/selinux), see I<live-debconfig_selinux>(5)."
 msgstr ""
-"activa o desactiva selinux (/selinux), ver I<live-debconfig_selinux>(5)."
+"activa o desactiva selinux (/selinux), veure I<live-debconfig_selinux>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:30
@@ -162,14 +165,14 @@ msgid ""
 "recreates openssh-server host keys (/etc/ssh/ssh_host_key*), see I<live-"
 "debconfig_openssh-server>(5)."
 msgstr ""
-"recrea las claves del anfitrión del openssh-server (/etc/ssh/ssh_host_key*), "
-"ver I<live-debconfig_openssh-server>(5)."
+"recrea les claus de l'amfitrió del openssh-server (/etc/ssh/ssh_host_key*), "
+"veure I<live-debconfig_openssh-server>(5)."
 
 #. type: SH
 #: en/live-debconfig.7:33 en/live-debconfig_hostname.5:54
 #, no-wrap
 msgid "SEE ALSO"
-msgstr "VER TAMBIÉN"
+msgstr "VEURE TAMBÉ"
 
 #. type: Plain text
 #: en/live-debconfig.7:35 en/live-debconfig_hostname.5:56
@@ -195,7 +198,7 @@ msgstr "I<live-tools>(7)"
 #: en/live-debconfig.7:42 en/live-debconfig_hostname.5:65
 #, no-wrap
 msgid "HOMEPAGE"
-msgstr "PÁGINA WEB"
+msgstr "PÀGINA WEB"
 
 #. type: Plain text
 #: en/live-debconfig.7:44 en/live-debconfig_hostname.5:67
@@ -204,15 +207,15 @@ msgid ""
 "found on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the "
 "manual at E<lt>I<http://live.debian.net/manual/>E<gt>."
 msgstr ""
-"Se puede encontrar más información acerca de live-debconfig y el proyecto "
-"Debian Live en su página principal en E<lt>I<http://live.debian.net/>E<gt> y "
-"en el manual en E<lt>I<http://live.debian.net/manual/>E<gt>."
+"Es pot trobar més informació sobre live-debconfig i el projecte Debian Live "
+"a la pàgina web E<lt>I<http://live.debian.net/>E<gt> i al manual a "
+"E<lt>I<http://live.debian.net/manual/>E<gt>."
 
 #. type: SH
 #: en/live-debconfig.7:45 en/live-debconfig_hostname.5:68
 #, no-wrap
 msgid "BUGS"
-msgstr "ERRORES"
+msgstr "ERRORS"
 
 #. type: Plain text
 #: en/live-debconfig.7:47 en/live-debconfig_hostname.5:70
@@ -222,10 +225,10 @@ msgid ""
 ">E<gt> or by writing a mail to the Debian Live mailing list at E<lt>I<debian-"
 "live at lists.debian.org>E<gt>."
 msgstr ""
-"Se puede notificar los fallos enviando un informe de errores sobre el "
-"paquete live-debconfig en el Debian Bug Tracking System en E<lt>I<http://"
-"bugs.debian.org/>E<gt> o escribiendo un mensaje a la lista de correo de "
-"Debian Live a la dirección E<lt>I<debian-live at lists.debian.org>E<gt>."
+"Es pot informar sobre els errors mitjançant la presentació d'un informe "
+"d'errors sobre al paquet live-debconfig al Debian Bug Tracking System a "
+"E<lt>I<http://bugs.debian.org/>E<gt> o escrivint un correu a la llista de "
+"correu de Debian Live a E<lt>I<debian-live at lists.debian.org>E<gt>."
 
 #. type: SH
 #: en/live-debconfig.7:48 en/live-debconfig_hostname.5:71
@@ -238,4 +241,5 @@ msgstr "AUTOR"
 msgid ""
 "live-debconfig was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
 msgstr ""
-"live-debconfig fue escrito por Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
+"live-debconfig va ser escrit per Daniel Baumann E<lt>I<daniel at debian."
+"org>E<gt>."
diff --git a/manpages/po/es/live-debconfig_hostname.5.po b/manpages/po/ca/live-debconfig_hostname.5.po
similarity index 68%
copy from manpages/po/es/live-debconfig_hostname.5.po
copy to manpages/po/ca/live-debconfig_hostname.5.po
index 8300100..aa9d0e6 100644
--- a/manpages/po/es/live-debconfig_hostname.5.po
+++ b/manpages/po/ca/live-debconfig_hostname.5.po
@@ -1,15 +1,15 @@
-# Spanish translations for live-debconfig
+# Catalan translations for live-debconfig package
+# Copyright (C) 2012 Carlos Zuferri <chals at altorricon.com>
 # This file is distributed under the same license as the live-debconfig package.
-# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
-"PO-Revision-Date: 2012-07-30 14:39+0200\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
+"PO-Revision-Date: 2012-07-31 14:56+0200\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team: none\n"
-"Language: es\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,32 +24,32 @@ msgstr "LIVE-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
-msgstr "16.08.2012"
+msgid "2012-08-17"
+msgstr "2012-08-17"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
 msgid "Debian Live Project"
-msgstr "Proyecto Debian Live"
+msgstr "Projecte Debian Live"
 
 #. type: SH
 #: en/live-debconfig.7:11 en/live-debconfig_hostname.5:11
 #, no-wrap
 msgid "NAME"
-msgstr "NOMBRE"
+msgstr "NOM"
 
 #. type: SH
 #: en/live-debconfig.7:14 en/live-debconfig_hostname.5:14
 #, no-wrap
 msgid "DESCRIPTION"
-msgstr "DESCRIPCIÓN"
+msgstr "DESCRIPCIÓ"
 
 #. type: Plain text
 #: en/live-debconfig.7:16 en/live-debconfig_hostname.5:16
@@ -57,14 +57,14 @@ msgid ""
 "B<live-debconfig> contains the scripts that configure a Debian Live system "
 "during the build process (live-build)."
 msgstr ""
-"B<live-debconfig> contiene los scripts que configuran un sistema Debian Live "
-"durante el proceso de construcción (live-build)."
+"B<live-debconfig> conté els scripts que configuren un sistema Debian Live "
+"durant el procés de construcció (live-build)."
 
 #. type: SH
 #: en/live-debconfig.7:33 en/live-debconfig_hostname.5:54
 #, no-wrap
 msgid "SEE ALSO"
-msgstr "VER TAMBIÉN"
+msgstr "VEURE TAMBÉ"
 
 #. type: Plain text
 #: en/live-debconfig.7:35 en/live-debconfig_hostname.5:56
@@ -90,7 +90,7 @@ msgstr "I<live-tools>(7)"
 #: en/live-debconfig.7:42 en/live-debconfig_hostname.5:65
 #, no-wrap
 msgid "HOMEPAGE"
-msgstr "PÁGINA WEB"
+msgstr "PÀGINA WEB"
 
 #. type: Plain text
 #: en/live-debconfig.7:44 en/live-debconfig_hostname.5:67
@@ -99,15 +99,15 @@ msgid ""
 "found on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the "
 "manual at E<lt>I<http://live.debian.net/manual/>E<gt>."
 msgstr ""
-"Se puede encontrar más información acerca de live-debconfig y el proyecto "
-"Debian Live en su página principal en E<lt>I<http://live.debian.net/>E<gt> y "
-"en el manual en E<lt>I<http://live.debian.net/manual/>E<gt>."
+"Es pot trobar més informació sobre live-debconfig i el projecte Debian Live "
+"a la pàgina web E<lt>I<http://live.debian.net/>E<gt> i al manual a "
+"E<lt>I<http://live.debian.net/manual/>E<gt>."
 
 #. type: SH
 #: en/live-debconfig.7:45 en/live-debconfig_hostname.5:68
 #, no-wrap
 msgid "BUGS"
-msgstr "ERRORES"
+msgstr "ERRORS"
 
 #. type: Plain text
 #: en/live-debconfig.7:47 en/live-debconfig_hostname.5:70
@@ -117,10 +117,10 @@ msgid ""
 ">E<gt> or by writing a mail to the Debian Live mailing list at E<lt>I<debian-"
 "live at lists.debian.org>E<gt>."
 msgstr ""
-"Se puede notificar los fallos enviando un informe de errores sobre el "
-"paquete live-debconfig en el Debian Bug Tracking System en E<lt>I<http://"
-"bugs.debian.org/>E<gt> o escribiendo un mensaje a la lista de correo de "
-"Debian Live a la dirección E<lt>I<debian-live at lists.debian.org>E<gt>."
+"Es pot informar sobre els errors mitjançant la presentació d'un informe "
+"d'errors sobre al paquet live-debconfig al Debian Bug Tracking System a "
+"E<lt>I<http://bugs.debian.org/>E<gt> o escrivint un correu a la llista de "
+"correu de Debian Live a E<lt>I<debian-live at lists.debian.org>E<gt>."
 
 #. type: SH
 #: en/live-debconfig.7:48 en/live-debconfig_hostname.5:71
@@ -133,7 +133,8 @@ msgstr "AUTOR"
 msgid ""
 "live-debconfig was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
 msgstr ""
-"live-debconfig fue escrito por Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
+"live-debconfig va ser escrit per Daniel Baumann E<lt>I<daniel at debian."
+"org>E<gt>."
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:13
@@ -144,22 +145,21 @@ msgstr "B<live-debconfig> - script hostname"
 #: en/live-debconfig_hostname.5:18
 msgid "This script sets the systems hostname in the /etc/hostname file."
 msgstr ""
-"Este script establece el nombre del anfitrión del sistema en el fichero /etc/"
+"Aquest script estableix el nom del amfitrió del sistema al fitxer /etc/"
 "hostname"
 
 #. type: SH
 #: en/live-debconfig_hostname.5:19
 #, no-wrap
 msgid "PRESEEDING"
-msgstr "PRECONFIGURACIÓN"
+msgstr "PRECONFIGURACIÓ"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:21
 msgid ""
 "The hostname script currently features the following preseeding options."
 msgstr ""
-"El script hostname actualmente incluye las siguientes opciones de "
-"preconfiguración."
+"El script hostname actualment inclou les opcions de preconfiguració següents."
 
 #. type: IP
 #: en/live-debconfig_hostname.5:22
@@ -170,7 +170,7 @@ msgstr "B<live-debconfig live-debconfig/hostname/hostname string> I<HOSTNAME>"
 #. type: Plain text
 #: en/live-debconfig_hostname.5:24
 msgid "Allows to set the hostname of the system."
-msgstr "Permite establecer el nombre del anfitrión del sistema."
+msgstr "Permet establir el nom d'amfitrió del sistema."
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:28
@@ -179,40 +179,40 @@ msgid ""
 "prompt. If no value is entered in the debconf prompt, the default value is "
 "being used. The default value is determined automatically:"
 msgstr ""
-"Si no hay ningún valor preconfigurado, se sugiere un valor por defecto "
-"adecuado en el prompt de debconf. Si no se introduce ningún valor en el "
-"prompt de debconf, se utiliza el valor por defecto. El valor por defecto se "
-"determina de forma automática:"
+"Si no hi ha cap valor preconfigurat, es suggereix un valor per defecte en un "
+"prompt de debconf. Si no s'introdueix cap valor al prompt de debconf, "
+"s'utilitza el valor per defecte. El valor per defecte es determina de forma "
+"automàtica:"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:32
 #, no-wrap
 msgid "  1. I<HOSTNAME> is set to the string in the /etc/hostname file, if existing and non-empty.\n"
-msgstr "  1. I<HOSTNAME> se establece con el fichero /etc/hostname, si este existe y no está vacio.\n"
+msgstr "  1. I<HOSTNAME> s'estableix al fitxer /etc/hostname si existeix i no és buit.\n"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:36
 #, no-wrap
 msgid "  2. I<HOSTNAME> is set to the distributor's ID as in the /etc/os-release file, if existing and non-empty.\n"
-msgstr "  2. I<HOSTNAME> se establece con la ID del distribuidor en el fichero /etc/os-release, si este existe y no está vacio.\n"
+msgstr "  2. I<HOSTNAME> s'estableix a l'ID del distribuïdor, com al fitxer /etc/os-release, si existeix i no és buit.\n"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:40
 #, no-wrap
 msgid "  3. I<HOSTNAME> is set to the distributor's ID as in the I<lsb_release>(1) program, if installed and non-empty.\n"
-msgstr "  3. I<HOSTNAME> se establece con la ID del distribuidor como en el programa I<lsb_release>(1) si está instalado y no está vacio.\n"
+msgstr "  3. I<HOSTNAME> s'estableix a l'ID del distribuïdor, com al programa I<lsb_release>(1) si està instaŀlat in no és buit.\n"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:44
 #, no-wrap
 msgid "  4. I<HOSTNAME> is set to B<progress> if the /etc/progress_version file is existing.\n"
-msgstr "  4. I<HOSTNAME> se establece en B<progress> si existe el fichero /etc/progress_version.\n"
+msgstr "  4. I<HOSTNAME> s'estableix a B<progress> si existeix el fitxer /etc/progress_version\n"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:48
 #, no-wrap
 msgid "  5. I<HOSTNAME> is set to B<debian> as a fallback.\n"
-msgstr "  5. I<HOSTNAME> se establece en  B<debian> como forma alternativa.\n"
+msgstr "  5. I<HOSTNAME> s'estableix a B<debian> com a forma alternativa.\n"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:52
@@ -220,9 +220,9 @@ msgid ""
 "B<Warning:> the new hostname will be set in the /etc/hostname file, "
 "overwriting any previous content without prior prompt or backup."
 msgstr ""
-"B<Atención:> el nuevo nombre del anfitrión se añadirá al fichero /etc/"
-"hostname sobreescribiendo cualquier contenido anterior sin aviso o copia de "
-"seguridad."
+"B<Advertència:> el nou nom d'amfitrió s'afegirà al fitxer /etc/hostname "
+"sobreescrivint qualsevol contingut anterior sense previ avís o còpia de "
+"seguretat."
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:62
diff --git a/manpages/po/de/live-debconfig.7.po b/manpages/po/de/live-debconfig.7.po
index 6cfa593..897e2f4 100644
--- a/manpages/po/de/live-debconfig.7.po
+++ b/manpages/po/de/live-debconfig.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
-msgstr "16.08.2012"
+msgid "2012-08-17"
+msgstr "17.08.2012"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
@@ -118,11 +118,12 @@ msgstr "B<sysvinit>"
 #. type: Plain text
 #: en/live-debconfig.7:26
 msgid ""
-"configures the systems type for Linux Containers, LXC (/etc/inittab), see "
-"I<live-debconfig_sysvinit>(5)."
+"configures the systems type for Linux Containers, LXC (/etc/inittab) and "
+"disables some services not needed for LXC, see I<live-debconfig_sysvinit>(5)."
 msgstr ""
 "konfiguriert den Typ des Systems für Linux Container, LXC (/etc/inittab), "
-"siehe I<live-debconfig_sysvinit>(5)."
+"und schaltet einige Services ab die für LXC nicht benötigt werden, siehe "
+"I<live-debconfig_sysvinit>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:26
@@ -133,11 +134,11 @@ msgstr "B<util-linux>"
 #. type: Plain text
 #: en/live-debconfig.7:28
 msgid ""
-"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
-"(5)."
+"configure the access to the hardware clock (/etc/default/hwclock), see "
+"I<live-debconfig_util-linux>(5)."
 msgstr ""
-"konfiguriert den Zugriff auf die Hardware Uhr, siehe I<live-debconfig_util-"
-"linux>(5)."
+"konfiguriert den Zugriff auf die Hardware Uhr (/etc/default/hwclock), siehe "
+"I<live-debconfig_util-linux>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:28
diff --git a/manpages/po/de/live-debconfig_hostname.5.po b/manpages/po/de/live-debconfig_hostname.5.po
index 057695b..9cb35f2 100644
--- a/manpages/po/de/live-debconfig_hostname.5.po
+++ b/manpages/po/de/live-debconfig_hostname.5.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
-msgstr "16.08.2012"
+msgid "2012-08-17"
+msgstr "17.08.2012"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/es/live-debconfig.7.po b/manpages/po/es/live-debconfig.7.po
index 0931c68..2db3dd7 100644
--- a/manpages/po/es/live-debconfig.7.po
+++ b/manpages/po/es/live-debconfig.7.po
@@ -1,12 +1,12 @@
-# Spanish translations for live-debconfig
+# Spanish translations for live-debconfig package
+# Copyright (C) 2012 Carlos Zuferri <chals at altorricon.com>
 # This file is distributed under the same license as the live-debconfig package.
-# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
-"PO-Revision-Date: 2012-07-30 14:08+0200\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
+"PO-Revision-Date: 2012-08-17 00:17+0100\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
-msgstr "16.08.2012"
+msgid "2012-08-17"
+msgstr "17.08.2012"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
@@ -118,11 +118,12 @@ msgstr "B<sysvinit>"
 #. type: Plain text
 #: en/live-debconfig.7:26
 msgid ""
-"configures the systems type for Linux Containers, LXC (/etc/inittab), see "
-"I<live-debconfig_sysvinit>(5)."
+"configures the systems type for Linux Containers, LXC (/etc/inittab) and "
+"disables some services not needed for LXC, see I<live-debconfig_sysvinit>(5)."
 msgstr ""
-"configura el tipo de sistema para los Linux Containers, LXC (/etc/inittab), "
-"ver I<live-debconfig_sysvinit>(5)."
+"configura el tipo de sistema para los Linux Containers, LXC (/etc/inittab) y "
+"desactiva algunos servicios que no son necesarios para LXC, ver I<live-"
+"debconfig_sysvinit>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:26
@@ -133,9 +134,11 @@ msgstr "B<util-linux>"
 #. type: Plain text
 #: en/live-debconfig.7:28
 msgid ""
-"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
-"(5)."
+"configure the access to the hardware clock (/etc/default/hwclock), see "
+"I<live-debconfig_util-linux>(5)."
 msgstr ""
+"configura el acceso al reloj del sistema (/etc/default/hwclock), ver I<live-"
+"debconfig_util-linux>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:28
diff --git a/manpages/po/es/live-debconfig_hostname.5.po b/manpages/po/es/live-debconfig_hostname.5.po
index 8300100..6edd91b 100644
--- a/manpages/po/es/live-debconfig_hostname.5.po
+++ b/manpages/po/es/live-debconfig_hostname.5.po
@@ -1,11 +1,11 @@
-# Spanish translations for live-debconfig
+# Spanish translations for live-debconfig package
+# Copyright (C) 2012 Carlos Zuferri <chals at altorricon.com>
 # This file is distributed under the same license as the live-debconfig package.
-# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
 "PO-Revision-Date: 2012-07-30 14:39+0200\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
-msgstr "16.08.2012"
+msgid "2012-08-17"
+msgstr "17.08.2012"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/es/live-debconfig.7.po b/manpages/po/fr/live-debconfig.7.po
similarity index 67%
copy from manpages/po/es/live-debconfig.7.po
copy to manpages/po/fr/live-debconfig.7.po
index 0931c68..be25b1d 100644
--- a/manpages/po/es/live-debconfig.7.po
+++ b/manpages/po/fr/live-debconfig.7.po
@@ -1,19 +1,18 @@
-# Spanish translations for live-debconfig
+# French translations for live-debconfig package
+# Copyright (C) 2012 Carlos Zuferri <chals at altorricon.com>
 # This file is distributed under the same license as the live-debconfig package.
-# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
-"PO-Revision-Date: 2012-07-30 14:08+0200\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
+"PO-Revision-Date: 2012-08-17 00:35+0100\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team: none\n"
-"Language: es\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
@@ -24,37 +23,37 @@ msgstr "LIVE-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
-msgstr "16.08.2012"
+msgid "2012-08-17"
+msgstr "2012-08-17"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
 msgid "Debian Live Project"
-msgstr "Proyecto Debian Live"
+msgstr "Projet Debian Live"
 
 #. type: SH
 #: en/live-debconfig.7:11 en/live-debconfig_hostname.5:11
 #, no-wrap
 msgid "NAME"
-msgstr "NOMBRE"
+msgstr "NOM"
 
 #. type: Plain text
 #: en/live-debconfig.7:13
 msgid "B<live-debconfig> - System Configuration Scripts"
-msgstr "B<live-debconfig> - Scripts de Configuración del Sistema"
+msgstr "B<live-debconfig> - Scripts de configuration du système"
 
 #. type: SH
 #: en/live-debconfig.7:14 en/live-debconfig_hostname.5:14
 #, no-wrap
 msgid "DESCRIPTION"
-msgstr "DESCRIPCIÓN"
+msgstr "DESCRIPTION"
 
 #. type: Plain text
 #: en/live-debconfig.7:16 en/live-debconfig_hostname.5:16
@@ -62,8 +61,8 @@ msgid ""
 "B<live-debconfig> contains the scripts that configure a Debian Live system "
 "during the build process (live-build)."
 msgstr ""
-"B<live-debconfig> contiene los scripts que configuran un sistema Debian Live "
-"durante el proceso de construcción (live-build)."
+"B<live-debconfig> contient les scripts qui configurent un système Debian "
+"Live pendant le processus de construction (live-build)."
 
 #. type: SH
 #: en/live-debconfig.7:17
@@ -77,8 +76,7 @@ msgid ""
 "B<live-debconfig> currently features the following scripts in /lib/live/"
 "debconfig."
 msgstr ""
-"B<live-debconfig> actualmente cuenta con los siguientes scripts en /lib/live/"
-"debconfig."
+"B<live-debconfig> contient les scripts suivants sur /lib/live/debconfig."
 
 #. type: IP
 #: en/live-debconfig.7:20
@@ -91,7 +89,7 @@ msgstr "B<hostname>"
 msgid ""
 "sets the systems hostname (/etc/hostname), see I<live-debconfig_hostname>(5)."
 msgstr ""
-"establece el nombre del anfitrión del sistema (/etc/hostname), ver I<live-"
+"fixe le nom d'hôte du système (/etc/hostname), voir I<live-"
 "debconfig_hostname>(5)."
 
 #. type: IP
@@ -106,8 +104,8 @@ msgid ""
 "configures the systems network settings (/etc/network/interfaces, /etc/"
 "resolv.conf, /etc/hosts), see I<live-debconfig_ifupdown>(5)."
 msgstr ""
-"establece la configuración de red del sistema (/etc/network/interfaces, /etc/"
-"resolv.conf, /etc/hosts), ver I<live-debconfig_ifupdown>(5)."
+"configure les paramètres de réseau du système (/etc/network/interfaces, /etc/"
+"resolv.conf, /etc/hosts), voir I<live-debconfig_ifupdown>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:24
@@ -118,11 +116,12 @@ msgstr "B<sysvinit>"
 #. type: Plain text
 #: en/live-debconfig.7:26
 msgid ""
-"configures the systems type for Linux Containers, LXC (/etc/inittab), see "
-"I<live-debconfig_sysvinit>(5)."
+"configures the systems type for Linux Containers, LXC (/etc/inittab) and "
+"disables some services not needed for LXC, see I<live-debconfig_sysvinit>(5)."
 msgstr ""
-"configura el tipo de sistema para los Linux Containers, LXC (/etc/inittab), "
-"ver I<live-debconfig_sysvinit>(5)."
+"configure le type de système pour les Linux Containers, LXC (/etc/inittab) "
+"et désactive certains services qui ne sont pas nécessaires pour LXC, voir "
+"I<live-debconfig_sysvinit>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:26
@@ -133,9 +132,11 @@ msgstr "B<util-linux>"
 #. type: Plain text
 #: en/live-debconfig.7:28
 msgid ""
-"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
-"(5)."
+"configure the access to the hardware clock (/etc/default/hwclock), see "
+"I<live-debconfig_util-linux>(5)."
 msgstr ""
+"configure l'accès à l'horloge du système /etc/default/hwclock), voir I<live-"
+"debconfig_util-linux>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:28
@@ -148,7 +149,7 @@ msgstr "B<selinux>"
 msgid ""
 "enables or disables selinux (/selinux), see I<live-debconfig_selinux>(5)."
 msgstr ""
-"activa o desactiva selinux (/selinux), ver I<live-debconfig_selinux>(5)."
+"active ou désactive selinux (/selinux), voir I<live-debconfig_selinux>(5)."
 
 #. type: IP
 #: en/live-debconfig.7:30
@@ -162,14 +163,14 @@ msgid ""
 "recreates openssh-server host keys (/etc/ssh/ssh_host_key*), see I<live-"
 "debconfig_openssh-server>(5)."
 msgstr ""
-"recrea las claves del anfitrión del openssh-server (/etc/ssh/ssh_host_key*), "
-"ver I<live-debconfig_openssh-server>(5)."
+"recrée les clés de l'hôte openssh-server (/etc/ssh/ssh_host_key*), voir "
+"I<live-debconfig_openssh-server>(5)."
 
 #. type: SH
 #: en/live-debconfig.7:33 en/live-debconfig_hostname.5:54
 #, no-wrap
 msgid "SEE ALSO"
-msgstr "VER TAMBIÉN"
+msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/live-debconfig.7:35 en/live-debconfig_hostname.5:56
@@ -195,7 +196,7 @@ msgstr "I<live-tools>(7)"
 #: en/live-debconfig.7:42 en/live-debconfig_hostname.5:65
 #, no-wrap
 msgid "HOMEPAGE"
-msgstr "PÁGINA WEB"
+msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/live-debconfig.7:44 en/live-debconfig_hostname.5:67
@@ -204,15 +205,15 @@ msgid ""
 "found on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the "
 "manual at E<lt>I<http://live.debian.net/manual/>E<gt>."
 msgstr ""
-"Se puede encontrar más información acerca de live-debconfig y el proyecto "
-"Debian Live en su página principal en E<lt>I<http://live.debian.net/>E<gt> y "
-"en el manual en E<lt>I<http://live.debian.net/manual/>E<gt>."
+"Plus d'informations sur live-debconfig et le projet Debian Live peuvent être "
+"trouvées sur la page E<lt>I<http://live.debian.net/>E<gt> et dans le manuel "
+"sur E<lt>I<http://live.debian.net/manual/>E<gt>."
 
 #. type: SH
 #: en/live-debconfig.7:45 en/live-debconfig_hostname.5:68
 #, no-wrap
 msgid "BUGS"
-msgstr "ERRORES"
+msgstr "BOGUES"
 
 #. type: Plain text
 #: en/live-debconfig.7:47 en/live-debconfig_hostname.5:70
@@ -222,20 +223,20 @@ msgid ""
 ">E<gt> or by writing a mail to the Debian Live mailing list at E<lt>I<debian-"
 "live at lists.debian.org>E<gt>."
 msgstr ""
-"Se puede notificar los fallos enviando un informe de errores sobre el "
-"paquete live-debconfig en el Debian Bug Tracking System en E<lt>I<http://"
-"bugs.debian.org/>E<gt> o escribiendo un mensaje a la lista de correo de "
-"Debian Live a la dirección E<lt>I<debian-live at lists.debian.org>E<gt>."
+"Les bogues peuvent être signalés en soumettant un rapport de bogue à propos "
+"du paquet live-debconfig via le Debian Bug Tracking System sur E<lt>I<http://"
+"bugs.debian.org/>E<gt> ou en envoyant un mail à la liste de diffusion de "
+"Debian Live sur E<lt>I<debian-live at lists.debian.org>E<gt>"
 
 #. type: SH
 #: en/live-debconfig.7:48 en/live-debconfig_hostname.5:71
 #, no-wrap
 msgid "AUTHOR"
-msgstr "AUTOR"
+msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/live-debconfig.7:49 en/live-debconfig_hostname.5:72
 msgid ""
 "live-debconfig was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
 msgstr ""
-"live-debconfig fue escrito por Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
+"live-debconfig a été conçu par Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
diff --git a/manpages/po/es/live-debconfig_hostname.5.po b/manpages/po/fr/live-debconfig_hostname.5.po
similarity index 66%
copy from manpages/po/es/live-debconfig_hostname.5.po
copy to manpages/po/fr/live-debconfig_hostname.5.po
index 8300100..411ca46 100644
--- a/manpages/po/es/live-debconfig_hostname.5.po
+++ b/manpages/po/fr/live-debconfig_hostname.5.po
@@ -1,19 +1,18 @@
-# Spanish translations for live-debconfig
+# French translations for live-debconfig package
+# Copyright (C) 2012 Carlos Zuferri <chals at altorricon.com>
 # This file is distributed under the same license as the live-debconfig package.
-# Carlos Zuferri <chals at altorricon.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
-"PO-Revision-Date: 2012-07-30 14:39+0200\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
+"PO-Revision-Date: 2012-08-17 00:35+0100\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team: none\n"
-"Language: es\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
@@ -24,32 +23,32 @@ msgstr "LIVE-DEBCONFIG"
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
-msgstr "16.08.2012"
+msgid "2012-08-17"
+msgstr "2012-08-17"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
 msgid "Debian Live Project"
-msgstr "Proyecto Debian Live"
+msgstr "Projet Debian Live"
 
 #. type: SH
 #: en/live-debconfig.7:11 en/live-debconfig_hostname.5:11
 #, no-wrap
 msgid "NAME"
-msgstr "NOMBRE"
+msgstr "NOM"
 
 #. type: SH
 #: en/live-debconfig.7:14 en/live-debconfig_hostname.5:14
 #, no-wrap
 msgid "DESCRIPTION"
-msgstr "DESCRIPCIÓN"
+msgstr "DESCRIPTION"
 
 #. type: Plain text
 #: en/live-debconfig.7:16 en/live-debconfig_hostname.5:16
@@ -57,14 +56,14 @@ msgid ""
 "B<live-debconfig> contains the scripts that configure a Debian Live system "
 "during the build process (live-build)."
 msgstr ""
-"B<live-debconfig> contiene los scripts que configuran un sistema Debian Live "
-"durante el proceso de construcción (live-build)."
+"B<live-debconfig> contient les scripts qui configurent un système Debian "
+"Live pendant le processus de construction (live-build)."
 
 #. type: SH
 #: en/live-debconfig.7:33 en/live-debconfig_hostname.5:54
 #, no-wrap
 msgid "SEE ALSO"
-msgstr "VER TAMBIÉN"
+msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/live-debconfig.7:35 en/live-debconfig_hostname.5:56
@@ -90,7 +89,7 @@ msgstr "I<live-tools>(7)"
 #: en/live-debconfig.7:42 en/live-debconfig_hostname.5:65
 #, no-wrap
 msgid "HOMEPAGE"
-msgstr "PÁGINA WEB"
+msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/live-debconfig.7:44 en/live-debconfig_hostname.5:67
@@ -99,15 +98,15 @@ msgid ""
 "found on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the "
 "manual at E<lt>I<http://live.debian.net/manual/>E<gt>."
 msgstr ""
-"Se puede encontrar más información acerca de live-debconfig y el proyecto "
-"Debian Live en su página principal en E<lt>I<http://live.debian.net/>E<gt> y "
-"en el manual en E<lt>I<http://live.debian.net/manual/>E<gt>."
+"Plus d'informations sur live-debconfig et le projet Debian Live peuvent être "
+"trouvées sur la page E<lt>I<http://live.debian.net/>E<gt> et dans le manuel "
+"sur E<lt>I<http://live.debian.net/manual/>E<gt>."
 
 #. type: SH
 #: en/live-debconfig.7:45 en/live-debconfig_hostname.5:68
 #, no-wrap
 msgid "BUGS"
-msgstr "ERRORES"
+msgstr "BOGUES"
 
 #. type: Plain text
 #: en/live-debconfig.7:47 en/live-debconfig_hostname.5:70
@@ -117,49 +116,47 @@ msgid ""
 ">E<gt> or by writing a mail to the Debian Live mailing list at E<lt>I<debian-"
 "live at lists.debian.org>E<gt>."
 msgstr ""
-"Se puede notificar los fallos enviando un informe de errores sobre el "
-"paquete live-debconfig en el Debian Bug Tracking System en E<lt>I<http://"
-"bugs.debian.org/>E<gt> o escribiendo un mensaje a la lista de correo de "
-"Debian Live a la dirección E<lt>I<debian-live at lists.debian.org>E<gt>."
+"Les bogues peuvent être signalés en soumettant un rapport de bogue à propos "
+"du paquet live-debconfig via le Debian Bug Tracking System sur E<lt>I<http://"
+"bugs.debian.org/>E<gt> ou en envoyant un mail à la liste de diffusion de "
+"Debian Live sur E<lt>I<debian-live at lists.debian.org>E<gt>"
 
 #. type: SH
 #: en/live-debconfig.7:48 en/live-debconfig_hostname.5:71
 #, no-wrap
 msgid "AUTHOR"
-msgstr "AUTOR"
+msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/live-debconfig.7:49 en/live-debconfig_hostname.5:72
 msgid ""
 "live-debconfig was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
 msgstr ""
-"live-debconfig fue escrito por Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
+"live-debconfig a été conçu par Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:13
 msgid "B<live-debconfig> - hostname script"
-msgstr "B<live-debconfig> - script hostname"
+msgstr "B<live-debconfig> - script hostname "
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:18
 msgid "This script sets the systems hostname in the /etc/hostname file."
-msgstr ""
-"Este script establece el nombre del anfitrión del sistema en el fichero /etc/"
-"hostname"
+msgstr "Ce script définit le nom d'hôte dans le fichier /etc/hostname"
 
 #. type: SH
 #: en/live-debconfig_hostname.5:19
 #, no-wrap
 msgid "PRESEEDING"
-msgstr "PRECONFIGURACIÓN"
+msgstr "PRECONFIGURATION"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:21
 msgid ""
 "The hostname script currently features the following preseeding options."
 msgstr ""
-"El script hostname actualmente incluye las siguientes opciones de "
-"preconfiguración."
+"Le script hostname comprend actuellement les options de préconfiguration "
+"suivantes."
 
 #. type: IP
 #: en/live-debconfig_hostname.5:22
@@ -170,7 +167,7 @@ msgstr "B<live-debconfig live-debconfig/hostname/hostname string> I<HOSTNAME>"
 #. type: Plain text
 #: en/live-debconfig_hostname.5:24
 msgid "Allows to set the hostname of the system."
-msgstr "Permite establecer el nombre del anfitrión del sistema."
+msgstr "Permet de définir le nom d'hôte du système."
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:28
@@ -179,40 +176,40 @@ msgid ""
 "prompt. If no value is entered in the debconf prompt, the default value is "
 "being used. The default value is determined automatically:"
 msgstr ""
-"Si no hay ningún valor preconfigurado, se sugiere un valor por defecto "
-"adecuado en el prompt de debconf. Si no se introduce ningún valor en el "
-"prompt de debconf, se utiliza el valor por defecto. El valor por defecto se "
-"determina de forma automática:"
+"Si aucune valeur n'est préconfigurée, une valeur par défaut appropriée est "
+"suggérée en un prompt de debconf. Si aucune valeur n'est entrée dans le "
+"prompt debconf, la valeur par défaut est utilisée. La valeur par défaut est "
+"déterminée automatiquement:"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:32
 #, no-wrap
 msgid "  1. I<HOSTNAME> is set to the string in the /etc/hostname file, if existing and non-empty.\n"
-msgstr "  1. I<HOSTNAME> se establece con el fichero /etc/hostname, si este existe y no está vacio.\n"
+msgstr "  1. I<HOSTNAME> est fixé dans le fichier /etc/hostname si existant et non-vide.\n"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:36
 #, no-wrap
 msgid "  2. I<HOSTNAME> is set to the distributor's ID as in the /etc/os-release file, if existing and non-empty.\n"
-msgstr "  2. I<HOSTNAME> se establece con la ID del distribuidor en el fichero /etc/os-release, si este existe y no está vacio.\n"
+msgstr "  2. I<HOSTNAME> est fixé a l'ID du distributeur comme dans le fichier /etc/os-release, si existant et non-vide.\n"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:40
 #, no-wrap
 msgid "  3. I<HOSTNAME> is set to the distributor's ID as in the I<lsb_release>(1) program, if installed and non-empty.\n"
-msgstr "  3. I<HOSTNAME> se establece con la ID del distribuidor como en el programa I<lsb_release>(1) si está instalado y no está vacio.\n"
+msgstr "  3. I<HOSTNAME> est fixé a l'ID du distributeur comme dans le logiciel I<lsb_release>(1) s'il est installé et non-vide.\n"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:44
 #, no-wrap
 msgid "  4. I<HOSTNAME> is set to B<progress> if the /etc/progress_version file is existing.\n"
-msgstr "  4. I<HOSTNAME> se establece en B<progress> si existe el fichero /etc/progress_version.\n"
+msgstr "  4. I<HOSTNAME> est fixé a B<progress> si le fichier /etc/progress_version existe.\n"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:48
 #, no-wrap
 msgid "  5. I<HOSTNAME> is set to B<debian> as a fallback.\n"
-msgstr "  5. I<HOSTNAME> se establece en  B<debian> como forma alternativa.\n"
+msgstr "  5. I<HOSTNAME> est fixé a B<debian> en dernier recours.\n"
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:52
@@ -220,9 +217,8 @@ msgid ""
 "B<Warning:> the new hostname will be set in the /etc/hostname file, "
 "overwriting any previous content without prior prompt or backup."
 msgstr ""
-"B<Atención:> el nuevo nombre del anfitrión se añadirá al fichero /etc/"
-"hostname sobreescribiendo cualquier contenido anterior sin aviso o copia de "
-"seguridad."
+"B<Attention:> le nouveau nom d'hôte sera fixé dans le fichier /etc/hostname, "
+"écrasant tout le contenu précédent sans avis préalable ou sauvegarde."
 
 #. type: Plain text
 #: en/live-debconfig_hostname.5:62
diff --git a/manpages/po4a.cfg b/manpages/po4a.cfg
index 737691e..1505e83 100644
--- a/manpages/po4a.cfg
+++ b/manpages/po4a.cfg
@@ -1,4 +1,4 @@
-[po4a_langs] de es
+[po4a_langs] ca de es fr
 [po4a_paths] pot/$master.pot $lang:po/$lang/$master.po
 [type: man] en/live-debconfig.7 $lang:$lang/live-debconfig.$lang.7
 [type: man] en/live-debconfig_hostname.5 $lang:$lang/live-debconfig_hostname.$lang.5
diff --git a/manpages/pot/live-debconfig.7.pot b/manpages/pot/live-debconfig.7.pot
index 0c59500..11c5ca2 100644
--- a/manpages/pot/live-debconfig.7.pot
+++ b/manpages/pot/live-debconfig.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
+msgid "2012-08-17"
 msgstr ""
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "4.0~a3-1"
+msgid "4.0~a4-1"
 msgstr ""
 
 #. type: TH
@@ -111,8 +111,8 @@ msgstr ""
 #. type: Plain text
 #: en/live-debconfig.7:26
 msgid ""
-"configures the systems type for Linux Containers, LXC (/etc/inittab), see "
-"I<live-debconfig_sysvinit>(5)."
+"configures the systems type for Linux Containers, LXC (/etc/inittab) and "
+"disables some services not needed for LXC, see I<live-debconfig_sysvinit>(5)."
 msgstr ""
 
 #. type: IP
@@ -124,8 +124,8 @@ msgstr ""
 #. type: Plain text
 #: en/live-debconfig.7:28
 msgid ""
-"configure the access to the hardware clock, see I<live-debconfig_util-linux>"
-"(5)."
+"configure the access to the hardware clock (/etc/default/hwclock), see "
+"I<live-debconfig_util-linux>(5)."
 msgstr ""
 
 #. type: IP
diff --git a/manpages/pot/live-debconfig_hostname.5.pot b/manpages/pot/live-debconfig_hostname.5.pot
index 035bbe3..bc3d0b2 100644
--- a/manpages/pot/live-debconfig_hostname.5.pot
+++ b/manpages/pot/live-debconfig_hostname.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-16 15:41+0300\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "2012-08-16"
+msgid "2012-08-17"
 msgstr ""
 
 #. type: TH
 #: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
 #, no-wrap
-msgid "4.0~a3-1"
+msgid "4.0~a4-1"
 msgstr ""
 
 #. type: TH
diff --git a/scripts/debconfig/0010-hostname.templates b/scripts/debconfig/0010-hostname.templates
index 91d90f8..5261d02 100644
--- a/scripts/debconfig/0010-hostname.templates
+++ b/scripts/debconfig/0010-hostname.templates
@@ -4,7 +4,7 @@ Description: live-debconfig: System Configuration
 
 Template: live-debconfig/hostname/hostname
 Type: string
-Default: debian
+Default:
 Description: live-debconfig: Hostname?
  What should be the hostname of the current system?
  .
diff --git a/scripts/debconfig/0020-ifupdown b/scripts/debconfig/0020-ifupdown
index aa2fa09..6af5c2b 100755
--- a/scripts/debconfig/0020-ifupdown
+++ b/scripts/debconfig/0020-ifupdown
@@ -20,15 +20,20 @@ set -e
 Defaults ()
 {
 	_LO_ENABLE="${_LO_ENABLE:-true}"
+
 	_ETH0_METHOD="${_ETH0_METHOD:-dhcp}"
 	_ETH0_ADDRESS="${_ETH0_ADDRESS:-192.168.1.2}"
+	_ETH0_NETMASK="${_ETH0_NETMASK:-255.255.255.0}"
 
 	if [ -e /etc/resolv.conf ]
 	then
-		_NAMESERVER_ADDRESSES="${_NAMESERVER_ADDRESSES:-$(awk '/^nameserver / {$1=""; print $0}' /etc/resolv.conf)}"
-		_NAMESERVER_DOMAIN="${_NAMESERVER_DOMAIN:-$(awk '/^domain / {$1=""; print $0}' /etc/resolv.conf)}"
-		_NAMESERVER_SEARCH="${_NAMESERVER_SEARCH:-$(awk '/^search / {$1=""; print $0}' /etc/resolv.conf)}"
-		_NAMESERVER_OPTIONS="${_NAMESERVER_OPTIONS:-$(awk '/^options / {$1=""; print $0}' /etc/resolv.conf)}"
+		_NAMESERVER_ADDRESSES="${_NAMESERVER_ADDRESSES:-$(if [ -e /etc/resolv.conf ]; then awk '/^nameserver / {$1=""; print $0}' /etc/resolv.conf; fi)}"
+		# Workaround to get rid of newlines since debconf can not handle multiline return value in assignments
+		_NAMESERVER_ADDRESSES="$(echo ${_NAMESERVER_ADDRESSES})"
+
+		_NAMESERVER_DOMAIN="${_NAMESERVER_DOMAIN:-$(if [ -e /etc/resolv.conf ]; then awk '/^domain / {$1=""; print $0}' /etc/resolv.conf; fi)}"
+		_NAMESERVER_SEARCH="${_NAMESERVER_SEARCH:-$(if [ -e /etc/resolv.conf ]; then awk '/^search / {$1=""; print $0}' /etc/resolv.conf; fi)}"
+		_NAMESERVER_OPTIONS="${_NAMESERVER_OPTIONS:-$(if [ -e /etc/resolv.conf ]; then awk '/^options / {$1=""; print $0}' /etc/resolv.conf; fi)}"
 	fi
 }
 
@@ -54,7 +59,7 @@ db_get live-debconfig/ifupdown/eth0-gateway
 _ETH0_GATEWAY="${RET}" # string (w/ empty)
 
 db_get live-debconfig/ifupdown/eth0-netmask
-_ETH0_NETMASK="${RET}" # string (w/ empty)
+_ETH0_NETMASK="${RET}" # string (w/o empty)
 
 db_get live-debconfig/ifupdown/eth0-network
 _ETH0_NETWORK="${RET}" # string (w/ empty)
@@ -65,7 +70,7 @@ _NAMESERVER_ADDRESSES="${RET}" # string (w/ empty)
 db_get live-debconfig/ifupdown/nameserver-domain
 _NAMESERVER_DOMAIN="${RET}" # string (w/ empty)
 
-dg_get live-debconfig/ifupdown/nameserver-search
+db_get live-debconfig/ifupdown/nameserver-search
 _NAMESERVER_SEARCH="${RET}" # string (w/ empty)
 
 db_get live-debconfig/ifupdown/nameserver-options
@@ -135,8 +140,8 @@ case "${_ETH0_METHOD}" in
 		;;
 
 	static)
-		db_setttile live-debconfig/title
-		dh_input high live-debconfig/ifupdown/eth0-comment || true
+		db_settitle live-debconfig/title
+		db_input high live-debconfig/ifupdown/eth0-comment || true
 		db_go
 
 		db_settitle live-debconfig/title
@@ -196,7 +201,7 @@ do
 
 	if db_get live-debconfig/ifupdown/eth${_NUMBER}-netmask
 	then
-		eval _ETH${_NUMBER}_NETMASK="\"${RET}\"" # string (w/ empty)
+		eval _ETH${_NUMBER}_NETMASK="\"${RET}\"" # string (w/o empty)
 	fi
 
 	if db_get live-debconfig/ifupdown/eth${_NUMBER}-network
@@ -230,7 +235,6 @@ db_stop
 cat > /etc/network/interfaces.tmp << EOF
 # Used by ifup(8) and ifdown(8). See the interfaces(5) manpage or
 # /usr/share/doc/ifupdown/examples for more information.
-
 EOF
 
 case "${_LO_ENABLE}" in
@@ -241,6 +245,7 @@ case "${_LO_ENABLE}" in
 		fi
 
 cat >> /etc/network/interfaces.tmp << EOF
+
 auto lo
 iface lo inet loopback
 EOF
@@ -274,6 +279,7 @@ do
 		none)
 
 cat >> /etc/network/interfaces.tmp << EOF
+
 iface eth${_NUMBER} inet manual
 EOF
 
@@ -282,6 +288,7 @@ EOF
 		dhcp)
 
 cat >> /etc/network/interfaces.tmp << EOF
+
 auto eth${_NUMBER}
 iface eth${_NUMBER} inet dhcp
 EOF
@@ -291,6 +298,7 @@ EOF
 		static)
 
 cat >> /etc/network/interfaces.tmp << EOF
+
 auto eth${_NUMBER}
 iface eth${_NUMBER} inet static
 	address		${_ADDRESS}
@@ -338,6 +346,11 @@ fi
 
 if [ -n "${_NAMESERVER_ADDRESSES}" ]
 then
+	if [ -e /etc/resolv.conf.tmp ]
+	then
+		echo "" >> /etc/resolv.conf.tmp
+	fi
+
 	for _NAMESERVER_ADDRESS in $(echo ${_NAMESERVER_ADDRESSES} | sed -e 's|,| |g')
 	do
 		echo "nameserver ${_NAMESERVER_ADDRESS}" >> /etc/resolv.conf.tmp
@@ -346,6 +359,11 @@ fi
 
 if [ -n "${_NAMESERVER_OPTIONS}" ]
 then
+	if [ -e /etc/resolv.conf.tmp ]
+	then
+		echo "" >> /etc/resolv.conf.tmp
+	fi
+
 	echo "options ${_NAMESERVER_OPTIONS}" >> /etc/resolv.conf.tmp
 fi
 
diff --git a/scripts/debconfig/0020-ifupdown.templates b/scripts/debconfig/0020-ifupdown.templates
index 7359908..1ba92e8 100644
--- a/scripts/debconfig/0020-ifupdown.templates
+++ b/scripts/debconfig/0020-ifupdown.templates
@@ -4,7 +4,7 @@ Description: live-debconfig: System Configuration
 
 Template: live-debconfig/ifupdown/lo-enable
 Type: boolean
-Default: true
+Default:
 Description: live-debconfig: Enable Loopback Interface?
  Should the loopback interface be enabled?
  .
@@ -26,7 +26,7 @@ Description: live-debconfig: Loopback Interface Comment?
 Template: live-debconfig/ifupdown/eth0-method
 Type: select
 Choices: dhcp, static, none
-Default: dhcp
+Default:
 Description: live-debconfig: Ethernet Interface Method?
  What method should be used to configure the ethernet interface?
  .
@@ -43,7 +43,7 @@ Description: live-debconfig: Ethernet Interface Comment?
 
 Template: live-debconfig/ifupdown/eth0-address
 Type: string
-Default: 192.168.1.2
+Default:
 Description: live-debconfig: Ethernet IP Address?
  What should be the IP address of the current system?
  .
@@ -51,7 +51,7 @@ Description: live-debconfig: Ethernet IP Address?
 
 Template: live-debconfig/ifupdown/eth0-broadcast
 Type: string
-Default: 192.168.1.255
+Default:
 Description: live-debconfig: Ethernet Broadcast Address?
  What should be the broadcast address of the current system?
  .
@@ -59,7 +59,7 @@ Description: live-debconfig: Ethernet Broadcast Address?
 
 Template: live-debconfig/ifupdown/eth0-gateway
 Type: string
-Default: 192.168.1.1
+Default:
 Description: live-debconfig: Ethernet Gateway Address?
  What should be the gateway address of the current system?
  .
@@ -67,7 +67,7 @@ Description: live-debconfig: Ethernet Gateway Address?
 
 Template: live-debconfig/ifupdown/eth0-netmask
 Type: string
-Default: 255.255.255.0
+Default:
 Description: live-debconfig: Ethernet Network Mask?
  What should be the netmask of the current system?
  .
@@ -75,7 +75,7 @@ Description: live-debconfig: Ethernet Network Mask?
 
 Template: live-debconfig/ifupdown/eth0-network
 Type: string
-Default: 192.168.1.0
+Default:
 Description: live-debconfig: Ethernet Network Address?
  What should be the network address of the current system?
  .
diff --git a/scripts/debconfig/0030-sysvinit b/scripts/debconfig/0030-sysvinit
index 78dedc0..e50c6b7 100755
--- a/scripts/debconfig/0030-sysvinit
+++ b/scripts/debconfig/0030-sysvinit
@@ -147,40 +147,49 @@ case "${_LXC_ENABLE}" in
 				continue
 			fi
 
+			_ALREADY_DISABLED="false"
+
 			# service is already disabled
 			for _RUNLEVEL in /etc/rc*.d
 			do
-				if [ ! -e "${_RUNLEVEL}/K*${_SERVICE}" ]
+				if ! ls ${_RUNLEVEL}/K*${_SERVICE} > /dev/null 2>&1
 				then
 					# disabled services have stop links in all runlevels
 					# if at least one runlevel does not have a stop link,
 					# then the service was not disabled and we need to continue
 					# with disabling the service later on
+					_ALREADY_DISABLED="false"
 					break
 				fi
 
 				# service is indeed already disabled
-				continue
+				_ALREADY_DISABLED="true"
 			done
 
-			if ls /etc/rc*.d/K*${_SERVICE} > /dev/null 2>&1 && \
-			   ! ls /etc/rc*.d/S*${_SERVICE} > /dev/null 2>&1
+			if [ "${_ALREADY_DISABLED}" = "false" ]
 			then
-				# service has only stop links
-				# therefore, using 'update-rc.d disable' does not work,
-				# and using 'update-rc.d remove' is not upgrade safe
-				# (on upgrades, the stop links would be re-added).
-				for _SYMLINK in /etc/rc*.d/K*${_SERVICE}
-				do
-					rm -f ${_SYMLINK}
-					ln -s /bin/true ${_SYMLINK}
-				done
-			fi
+				if ls /etc/rc*.d/K*${_SERVICE} > /dev/null 2>&1 && \
+				   ! ls /etc/rc*.d/S*${_SERVICE} > /dev/null 2>&1
+				then
+					# service has only stop links
+					# therefore, using 'update-rc.d disable' does not work,
+					# and using 'update-rc.d remove' is not upgrade safe
+					# (on upgrades, the stop links would be re-added).
+					for _SYMLINK in /etc/rc*.d/K*${_SERVICE}
+					do
+						rm -f ${_SYMLINK}
+						ln -s /bin/live-initscripts-empty-stop ${_SYMLINK}
+					done
+				fi
 
-			# service is a normal service with both start and stop links
-			update-rc.d -f ${_SERVICE} disable 2>&1 | \
-			grep -v "update-rc.d: using dependency based boot sequencing" | \
-			grep -v "update-rc.d: error: cannot find a LSB script for mountroot" || true
+				# service is a normal service with both start and stop links
+				update-rc.d -f ${_SERVICE} disable 2>&1 | \
+					grep -v -e "^insserv: warning:" \
+						-e "^update-rc.d: warning:" \
+						-e "^update-rc.d: using dependency based boot sequencing" \
+						-e "^update-rc.d: error: .* Default-Start contains no runlevels, aborting." \
+					|| true
+			fi
 		done
 		;;
 
@@ -196,9 +205,12 @@ case "${_LXC_ENABLE}" in
 				rm -f /etc/rc*.d/S*${_SERVICE}
 				rm -f /etc/rc*.d/K*${_SERVICE}
 
-				update-rc.d -f ${_SERVICE} defaults | \
-				grep -v "update-rc.d: using dependency based boot sequencing" | \
-				grep -v "update-rc.d: error: cannot find a LSB script for mountroot" || true
+				update-rc.d -f ${_SERVICE} defaults 2>&1 | \
+					grep -v -e "^insserv: warning:" \
+						-e "^update-rc.d: warning:" \
+						-e "^update-rc.d: using dependency based boot sequencing" \
+						-e "^update-rc.d: error: .* Default-Start contains no runlevels, aborting." \
+					|| true
 			fi
 		done
 		;;
diff --git a/scripts/debconfig/0030-sysvinit.templates b/scripts/debconfig/0030-sysvinit.templates
index cf68195..8cb19ca 100644
--- a/scripts/debconfig/0030-sysvinit.templates
+++ b/scripts/debconfig/0030-sysvinit.templates
@@ -4,7 +4,7 @@ Description: live-debconfig: System Configuration
 
 Template: live-debconfig/sysvinit/lxc-enable
 Type: boolean
-Default: false
+Default:
 Description: live-debconfig: Enable LXC?
  Should Linux Container (LXC) support  be enabled?
  .
@@ -12,7 +12,7 @@ Description: live-debconfig: Enable LXC?
 
 Template: live-debconfig/sysvinit/lxc-consoles
 Type: string
-Default: 6
+Default:
 Description: live-debconfig: How many consoles for LXC?
  How many concurrent consoles should the current container provide?
  .
@@ -20,7 +20,7 @@ Description: live-debconfig: How many consoles for LXC?
 
 Template: live-debconfig/sysvinit/lxc-disable-services
 Type: string
-Default: checkroot.sh hwclockfirst.sh hwclock.sh kmod module-init-tools mountall.sh mountkernfs.sh umountfs umountroot
+Default:
 Description: live-debconfig: Which services to disable for LXC?
  Some services are not useful in containers and should be disabled.
  .
diff --git a/scripts/debconfig/0040-util-linux b/scripts/debconfig/0040-util-linux
index 225606f..a9018c0 100755
--- a/scripts/debconfig/0040-util-linux
+++ b/scripts/debconfig/0040-util-linux
@@ -30,7 +30,7 @@ Defaults ()
 # /etc/default/hwclock is supported as of util-linux version 2.20.1-5
 _UTIL_LINUX_VERSION="$(dpkg -l util-linux | awk '/^ii/ { print $3 }')"
 
-if ! dpkg --compare-versions ${_UTIL_LINUX_VERSION} lt 2.20.1-5~
+if dpkg --compare-versions "${_UTIL_LINUX_VERSION}" lt 2.20.1-5~
 then
 	exit 0
 fi
@@ -67,16 +67,19 @@ case "${_HWCLOCKACCESS}" in
 		;;
 esac
 
-# HWCLOCKACCESS is commented in /etc/default/hwclock
-if [ -z "${HWCLOCKACCESS}" ]
+if [ -e /etc/default/hwclock ]
 then
-	# uncommenting it
-	sed -e "s|^# *HWCLOCKACCESS=|HWCLOCKACCESS=|" \
-		/etc/default/hwclock > /etc/default/hwclock.tmp
-
-	mv /etc/default/hwclock.tmp /etc/default/hwclock
+	# HWCLOCKACCESS is commented in /etc/default/hwclock
+	if [ -z "${HWCLOCKACCESS}" ]
+	then
+		# uncommenting it
+		sed -e "s|^# *HWCLOCKACCESS=|HWCLOCKACCESS=|" \
+			/etc/default/hwclock > /etc/default/hwclock.tmp
+	else
+		cp /etc/default/hwclock /etc/default/hwclock.tmp
+	fi
 else
-	cp /etc/default/hwclock /etc/default/hwclock.tmp
+	touch /etc/default/hwclock.tmp
 fi
 
 # Set the hwclock parameters
diff --git a/scripts/debconfig/0040-util-linux.templates b/scripts/debconfig/0040-util-linux.templates
index 5e25c52..aa83b17 100644
--- a/scripts/debconfig/0040-util-linux.templates
+++ b/scripts/debconfig/0040-util-linux.templates
@@ -4,7 +4,7 @@ Description: live-debconfig: System Configuration
 
 Template: live-debconfig/util-linux/hwclockaccess
 Type: boolean
-Default: yes
+Default:
 Description: live-debconfig: access the hardware clock?
  Is it possible to access the hardare clock?
  .
diff --git a/scripts/debconfig/0100-selinux.templates b/scripts/debconfig/0100-selinux.templates
index 8c7363c..93d26c8 100644
--- a/scripts/debconfig/0100-selinux.templates
+++ b/scripts/debconfig/0100-selinux.templates
@@ -4,7 +4,7 @@ Description: live-debconfig: System Configuration
 
 Template: live-debconfig/selinux/enable
 Type: boolean
-Default: false
+Default:
 Description: live-debconfig: Enable SELinux?
  Should Security-Enhanced Linux (SELinux) be enabled?
  .

-- 
live-debconfig

More information about the debian-live-changes mailing list