Drop all references to live-systems.org and update copyright file

Also fix the version string in the manual pages.

Closes: #859290

62 files changed, 4363 insertions, 3212 deletions

diff --git a/debian/changelog b/debian/changelog
index 2420af072..a218d0df6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ live-build (1:20170808) UNRELEASED; urgency=medium
   * Initialize /etc/default/locale with LANG=C.UTF-8 so that we always
     have a valid UTF-8 locale even when we don't have the "locales"
     package installed.
+  * Drop all references to live-systems.org. Closes: #859290
+  * Update copyright file.
 
  -- Raphaël Hertzog <hertzog@debian.org>  Thu, 10 Aug 2017 14:53:06 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 950e4eae5..0e9eecf33 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: live-build
-Upstream-Contact: Live Systems Project <debian-live@lists.debian.org>
-Source: http://live-systems.org/archive/packages/live-build/
+Upstream-Contact: Debian Live Project <debian-live@lists.debian.org>
 
 Files: *
-Copyright: 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
+Copyright:
+ 2016-2017 Raphaël Hertzog <hertzog@debian.org>
+ 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/live-build.bug-presubj b/debian/live-build.bug-presubj
index e36358b80..cb3dff721 100644
--- a/debian/live-build.bug-presubj
+++ b/debian/live-build.bug-presubj
@@ -1,7 +1,7 @@
 Before submitting a bug report against live-build, please make sure
 that you have read your guidelines for live systems bug reports:
 
-  http://live-systems.org/manual/
+  https://debian-live.alioth.debian.org/live-manual/unstable/manual/html/live-manual.en.html
 
 By providing the required information as outlined in the guidelines makes
 sure that we can optimally reproduce and fix bugs, not doing so wastes a
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 8ee4f6c84..dc6020758 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -651,7 +651,7 @@ Set_defaults ()
 	esac
 
 	# Set iso preparer
-	LB_ISO_PREPARER="${LB_ISO_PREPARER:-live-build \$VERSION; http://live-systems.org/devel/live-build}"
+	LB_ISO_PREPARER="${LB_ISO_PREPARER:-live-build \$VERSION; https://debian-live.alioth.debian.org/devel/live-build}"
 
 	# Set iso publisher
 	case "${LB_MODE}" in
@@ -660,7 +660,7 @@ Set_defaults ()
 			;;
 
 		*)
-			LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER:-Live Systems project; http://live-systems.org/; debian-live@lists.debian.org}"
+			LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER:-Live Systems project; https://debian-live.alioth.debian.org/; debian-live@lists.debian.org}"
 			;;
 	esac
 
diff --git a/functions/help.sh b/functions/help.sh
index cd9344bad..f48d2a985 100755
--- a/functions/help.sh
+++ b/functions/help.sh
@@ -31,6 +31,6 @@ Help ()
 		echo
 	fi
 
-	Echo "Report bugs to the Live Systems project <http://live-systems.org/>."
+	Echo "Report bugs to the Live Systems project <https://debian-live.alioth.debian.org/>."
 	exit 0
 }
diff --git a/manpages/Makefile b/manpages/Makefile
index 0eeb3d406..563ca503b 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -47,7 +47,7 @@ build: check po4a.cfg
 		exit 1; \
 	fi
 
-	po4a --copyright-holder "Live Systems Project" --keep 0 --package-name live-build --package-version $(shell cat ../VERSION) po4a.cfg
+	po4a --copyright-holder "Live Systems Project" --keep 0 --package-name live-build --package-version $(shell cd .. && dpkg-parsechangelog -S Version) po4a.cfg
 
 clean:
 	rm -f po/*/*.po~
diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index f1c8afdb5..d1d699429 100755
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -11,7 +11,7 @@
 set -e
 
 PROGRAM="LIVE\\\-BUILD"
-VERSION="$(cat ../VERSION)"
+VERSION="$(cd .. && dpkg-parsechangelog -S Version)"
 
 DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)"
 
diff --git a/manpages/en/lb.1 b/manpages/en/lb.1
index 772d9b106..847bcfe31 100644
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project"
 
 .SH NAME
 \fBlb\fR \- wrapper for live\-build programs
@@ -25,7 +25,7 @@
 This program is a part of live\-build.
 
 .SH HOMEPAGE
-More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttps://debian-live.alioth.debian.org/\fR>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-build package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1
index d729ae866..ecc93816e 100644
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project"
 
 .SH NAME
 \fBlb_binary\fR \- Complete the binary stage
@@ -23,7 +23,7 @@
 This program is a part of live\-build.
 
 .SH HOMEPAGE
-More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttps://debian-live.alioth.debian.org/\fR>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-build package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1
index 4e5fa2678..387f7a6c9 100644
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project"
 
 .SH NAME
 \fBlb_bootstrap\fR \- Complete the bootstrap stage
@@ -23,7 +23,7 @@
 This program is a part of live\-build.
 
 .SH HOMEPAGE
-More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttps://debian-live.alioth.debian.org/\fR>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-build package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1
index d32756d4a..5bf98474e 100644
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project"
 
 .SH NAME
 \fBlb_build\fR \- Complete the bootstrap, chroot, binary, and source stages
@@ -25,7 +25,7 @@
 This program is a part of live\-build.
 
 .SH HOMEPAGE
-More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttps://debian-live.alioth.debian.org/\fR>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-build package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1
index 9e59b2b1f..f35e934eb 100644
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project"
 
 .SH NAME
 \fBlb_chroot\fR \- Complete the chroot stage
@@ -23,7 +23,7 @@
 This program is a part of live\-build.
 
 .SH HOMEPAGE
-More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttps://debian-live.alioth.debian.org/\fR>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-build package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1
index 02459f27d..f5329bd15 100644
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project"
 
 .SH NAME
 \fBlb_clean\fR \- Clean build directory
@@ -46,7 +46,7 @@ removes all source related caches, files, directories, and stage files.
 This program is a part of live\-build.
 
 .SH HOMEPAGE
-More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttps://debian-live.alioth.debian.org/\fR>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-build package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 79e27e9a7..5110e96e3 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project"
 
 .SH NAME
 \fBlb_config\fR \- Create config directory
@@ -488,7 +488,7 @@ An optional, global configuration file for \fBlb config\fR variables. It is usef
 This program is a part of live\-build.
 
 .SH HOMEPAGE
-More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttps://debian-live.alioth.debian.org/\fR>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-build package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
diff --git a/manpages/en/lb_installer.1 b/manpages/en/lb_installer.1
index 05784275e..c3371476a 100644
--- a/manpages/en/lb_installer.1
+++ b/manpages/en/lb_installer.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2015\-01\-04 5.0~a1-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project"
 
 .SH NAME
 \fBlb_installer\fR \- Complete the installer stage
@@ -23,7 +23,7 @@
 This program is a part of live\-build.
 
 .SH HOMEPAGE
-More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttps://debian-live.alioth.debian.org/\fR>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-build package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index 6a414292f..c9327d4e4 100644
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project"
 
 .SH NAME
 \fBlb_source\fR \- Complete the source stage
@@ -23,7 +23,7 @@
 This program is a part of live\-build.
 
 .SH HOMEPAGE
-More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttps://debian-live.alioth.debian.org/\fR>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-build package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index 7c6628d79..fd490258b 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2015\-10\-21 5.0~a11-1 "Live Systems Project"
+.TH LIVE\-BUILD 7 2017\-08\-29 1:20170807kali1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-build\fR \- the live systems tool suite
@@ -14,7 +14,7 @@ live\-build is a set of scripts to build live system images. The idea behind liv
 .PP
 The \fICOMMAND\fR is a name of a live\-build command (see below).
 .PP
-More documentation about how to use live\-build is available in the individual manpages for each helper and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More documentation about how to use live\-build is available in the individual manpages for each helper and in the manual at <\fIhttps://debian-live.alioth.debian.org/manual/\fR>.
 .\" FIXME
 
 .SH OPTIONS
@@ -238,7 +238,7 @@ All config files are shell scripts which are sourced by a live\-build program. T
 This program is a part of live\-build.
 
 .SH HOMEPAGE
-More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttp://live-systems.org/\fR> and in the manual at <\fIhttp://live-systems.org/manual/\fR>.
+More information about live\-build and the Live Systems project can be found on the homepage at <\fIhttps://debian-live.alioth.debian.org/\fR>.
 
 .SH BUGS
 Bugs can be reported by submitting a bugreport for the live\-build package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
diff --git a/manpages/fr/lb.fr.1 b/manpages/fr/lb.fr.1
index aeab5bc5b..596793f36 100644
--- a/manpages/fr/lb.fr.1
+++ b/manpages/fr/lb.fr.1
@@ -33,10 +33,8 @@ toutes les options génériques de live\-build options.
 Ce programme est une partie de live\-build.
 
 .SH "PAGE D'ACCUEIL"
-Davantage d'informations à propos de live\-build et du projet Live Systems
-peuvent être trouvées sur la page d'accueil à
-<\fIhttp://live\-systems.org/\fP> et dans le manuel à
-<\fIhttp://live\-systems.org/manual/\fP>.
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH BOGUES
 Les bogues peuvent être signalés en soumettant un rapport de bogue pour le
diff --git a/manpages/fr/lb_binary.fr.1 b/manpages/fr/lb_binary.fr.1
index cf15457e7..4d5f26e0f 100644
--- a/manpages/fr/lb_binary.fr.1
+++ b/manpages/fr/lb_binary.fr.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems"
 
 .SH NOM
-\fBlb binary\fP \- Complète le stage bianire
+\fBlb_binary\fP \- Complete the binary stage
 
 .SH SYNOPSIS
 \fBlb binary\fP [\fIlive\-build options\fP]
@@ -32,10 +32,8 @@ complète de toutes les options génériques de live\-build options.
 Ce programme est une partie de live\-build.
 
 .SH "PAGE D'ACCUEIL"
-Davantage d'informations à propos de live\-build et du projet Live Systems
-peuvent être trouvées sur la page d'accueil à
-<\fIhttp://live\-systems.org/\fP> et dans le manuel à
-<\fIhttp://live\-systems.org/manual/\fP>.
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH BOGUES
 Les bogues peuvent être signalés en soumettant un rapport de bogue pour le
diff --git a/manpages/fr/lb_bootstrap.fr.1 b/manpages/fr/lb_bootstrap.fr.1
index c04103db9..6bd499d0d 100644
--- a/manpages/fr/lb_bootstrap.fr.1
+++ b/manpages/fr/lb_bootstrap.fr.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems"
 
 .SH NOM
-\fBlb bootstrap\fP \- Complète le stage d'amorçage
+\fBlb_bootstrap\fP \- Complete the bootstrap stage
 
 .SH SYNOPSIS
 \fBlb bootstrap\fP [\fIlive\-build options\fP]
@@ -32,10 +32,8 @@ complète de toutes les options génériques de live\-build options.
 Ce programme est une partie de live\-build.
 
 .SH "PAGE D'ACCUEIL"
-Davantage d'informations à propos de live\-build et du projet Live Systems
-peuvent être trouvées sur la page d'accueil à
-<\fIhttp://live\-systems.org/\fP> et dans le manuel à
-<\fIhttp://live\-systems.org/manual/\fP>.
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH BOGUES
 Les bogues peuvent être signalés en soumettant un rapport de bogue pour le
diff --git a/manpages/fr/lb_build.fr.1 b/manpages/fr/lb_build.fr.1
index c788f8bd9..f43c91871 100644
--- a/manpages/fr/lb_build.fr.1
+++ b/manpages/fr/lb_build.fr.1
@@ -6,8 +6,7 @@
 .TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems"
 
 .SH NOM
-\fBlb build\fP \- Complète les stages d'amorçage (bootstrap), de chroot,
-binaire, et source
+\fBlb_build\fP \- Complete the bootstrap, chroot, binary, and source stages
 
 .SH SYNOPSIS
 \fBlb build\fP [\fIlive\-build options\fP]
@@ -35,10 +34,8 @@ complète de toutes les options génériques de live\-build options.
 Ce programme est une partie de live\-build.
 
 .SH "PAGE D'ACCUEIL"
-Davantage d'informations à propos de live\-build et du projet Live Systems
-peuvent être trouvées sur la page d'accueil à
-<\fIhttp://live\-systems.org/\fP> et dans le manuel à
-<\fIhttp://live\-systems.org/manual/\fP>.
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH BOGUES
 Les bogues peuvent être signalés en soumettant un rapport de bogue pour le
diff --git a/manpages/fr/lb_chroot.fr.1 b/manpages/fr/lb_chroot.fr.1
index 5880865dd..09ace0def 100644
--- a/manpages/fr/lb_chroot.fr.1
+++ b/manpages/fr/lb_chroot.fr.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems"
 
 .SH NOM
-\fBlb chroot\fP \- Complète le stage de chroot
+\fBlb_chroot\fP \- Complete the chroot stage
 
 .SH SYNOPSIS
 \fBlb chroot\fP [\fIlive\-build options\fP]
@@ -32,10 +32,8 @@ complète de toutes les options génériques de live\-build options.
 Ce programme est une partie de live\-build.
 
 .SH "PAGE D'ACCUEIL"
-Davantage d'informations à propos de live\-build et du projet Live Systems
-peuvent être trouvées sur la page d'accueil à
-<\fIhttp://live\-systems.org/\fP> et dans le manuel à
-<\fIhttp://live\-systems.org/manual/\fP>.
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH BOGUES
 Les bogues peuvent être signalés en soumettant un rapport de bogue pour le
diff --git a/manpages/fr/lb_clean.fr.1 b/manpages/fr/lb_clean.fr.1
index 539e7bb97..f02e51c6f 100644
--- a/manpages/fr/lb_clean.fr.1
+++ b/manpages/fr/lb_clean.fr.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems"
 
 .SH NOM
-\fBlb clean\fP \- Nettoie le répertoire de construction
+\fBlb_clean\fP \- Clean build directory
 
 .SH SYNOPSIS
 \fBlb clean\fP [\fIlive\-build options\fP]
@@ -63,10 +63,8 @@ relatifs aux sources.
 Ce programme est une partie de live\-build.
 
 .SH "PAGE D'ACCUEIL"
-Davantage d'informations à propos de live\-build et du projet Live Systems
-peuvent être trouvées sur la page d'accueil à
-<\fIhttp://live\-systems.org/\fP> et dans le manuel à
-<\fIhttp://live\-systems.org/manual/\fP>.
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH BOGUES
 Les bogues peuvent être signalés en soumettant un rapport de bogue pour le
diff --git a/manpages/fr/lb_config.fr.1 b/manpages/fr/lb_config.fr.1
index b2a1a9eb5..8a0dfd50c 100644
--- a/manpages/fr/lb_config.fr.1
+++ b/manpages/fr/lb_config.fr.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems"
 
 .SH NOM
-\fBlb config\fP \- Crée un répertoire de configuration
+\fBlb_config\fP \- Create config directory
 
 .SH SYNOPSIS
 \fBlb config\fP [\fIlive\-build options\fP]
@@ -44,7 +44,9 @@
 .br
   [\fB\-\-bootappend\-live\fP \fIPARAMÈTRES\fP|\fI"PARAMÈTRES"\fP]
 .br
-  [\fB\-\-bootloader\fP grub|grub2|syslinux]
+  [\fB\-\-bootappend\-live\-failsafe\fP \fIPARAMETER\fP|\fI"PARAMETERS"\fP]
+.br
+  [\fB\-\-bootloaders\fP grub\-legacy|grub\-pc|syslinux|grub\-efi]
 .br
   [\fB\-\-cache\fP true|false]
 .br
@@ -80,6 +82,10 @@
 .br
   [\fB\-\-debian\-installer\-gui\fP true|false]
 .br
+  [\fB\-\-debootstrap\-options\fP \fIOPTIONS\fP]
+.br
+  [\fB\-\-debootstrap\-script\fP \fISCRIPT\fP]
+.br
   [\fB\-\-debug\fP]
 .br
   [\-d|\fB\-\-distribution\fP \fINOM_DE_CODE\fP]
@@ -312,39 +318,40 @@ syslinux, ceci est paramétré pour iso\-hybrid pour construire des images
 CD/DVD qui peuvent également être utilisée comme images hdd, pour les images
 non\-syslinux, le défaut est iso.
 .IP "\fB\-\-binary\-filesystem\fP fat16|fat32|ext2|ext3|ext4" 4
-définit le système de fichier à utiliser dans le type d'image. Ceci a un
-effet si le type d'image binaire sélectionnée permet de choisir un système
-de fichier. Par exemple, lorsque iso est sélectionné, le CD/DVD résultant a
-toujours un système de fichier ISO9660. Lors de la construction d'une image
-hdd pour des clefs usb, ceci est actif. Notez que ceci sélectionne fat16 par
-défaut sur toutes les architectures excepté sparc où le défaut est
-ext4. Notez également que si vous choisissez fat16 et que votre image
-binaire résultante est plus grosse que 2GB, alors le système de fichier
-binaire sera automatiquement passé à fat32.
+defines the filesystem to be used in the image type. This only has an effect
+if the selected binary image type lets you choose a filesystem. For example,
+when selection iso the resulting CD/DVD has always the filesystem
+ISO9660. When building hdd images for usb sticks, this is active. Note that
+it defaults to fat16 on all architectures except sparc where it defaults to
+ext4. Also note that if you choose fat16 and your resulting binary image
+gets bigger than 2GB, the binary filesystem automatically gets switched to
+fat32.
 .IP "\fB\-\-bootappend\-install\fP \fIPARAMÈTRE\fP|\(dq\fIPARAMÈTRES\fP\(dq" 4
 paramètre les options de démarrage spécifiques à debian\-installer, si inclu.
 .IP "\fB\-\-bootappend\-live\fP \fIPARAMÈTRE\fP|\(dq\fIPARAMÈTRES\fP\(dq" 4
 paramètre les options de démarrage spécifiques à debian\-live. Une liste
 complète des paramètres de démarrage peut être trouvée dans les pages de
 manuel \fIlive\-boot\fP(7) et \fIlive\-config\fP(7).
-.IP "\fB\-\-bootloader\fP grub|grub2|syslinux" 4
-définit quel chargeur de démarrage est utilisé dans l'image générée. Ceci a
-effet seulement si l'image binaire sélectionnée permet de choisir le
-chargeur de démarrage. Par exemple, si vous construisez une iso, syslinux
-(ou plus précisément, isolinux) est toujours utilisé. Notez également que
-certaines combinaisons de types d'images binaires et de chargeurs de
-démarrage peuvent être possibles mais que live\-build ne les prend pas encore
-en charge. \fBlb config\fP échouera a créer une de ses configurations pas
-encore supportées et donnera une explication à ce propos. Pour des images
-hdd sur amd64 et i386, le défaut est syslinux.
+.IP "\fB\-\-bootappend\-live\-failsafe\fP \fIPARAMETER\fP|\(dq\fIPARAMETERS\fP\(dq" 4
+sets boot parameters specific to debian\-live failsafe boot entries. A
+complete list of boot parameters can be found in the \fIlive\-boot\fP(7) and
+\fIlive\-config\fP(7) manual pages.
+.IP "\fB\-\-bootloaders\fP grub\-legacy|grub\-pc|syslinux|grub\-efi" 4
+defines which bootloader is being used in the generated image. This has only
+an effect if the selected binary image type lets you choose the
+bootloader. For example, if you build a iso, always syslinux (or more
+precise, isolinux) is being used. Also note that some combinations of binary
+images types and bootloaders may be possible but live\-build does not support
+them yet. \fBlb config\fP will fail to create such a not yet supported
+configuration and give a explanation about it. For hdd images on amd64 and
+i386, the default is syslinux.
 .IP "\fB\-\-cache\fP true|false" 4
 définit globalement si un cache devrait être utilisé. Les différents caches
 peuvent être controlés à travers leurs propres options.
 .IP "\fB\-\-cache\-indices\fP true|false" 4
-définit si les indices et les listes de paquets téléchargés devrait être
-cachés ce qui est faux (false) par défaut. L'activer autoriserait la
-reconstruction d'une image complétement hors\-ligne, vous n'auriez donc plus
-les mises\-à\-jour.
+defines if downloaded package indices and lists should be cached which is
+false by default. Enabling it lets you rebuild an image completely offline,
+however, you would not get updates anymore then.
 .IP "\fB\-\-cache\-packages\fP true|false" 4
 définit si les fichiers de paquets téléchargés pourrait être cachés ce qui
 est vrai (true) par défaut. Le désactiver économise la consomation d'espace
@@ -375,9 +382,8 @@ sommes de vérification.
 définit le programme de compression à utiliser pour compresser les
 tarballs. Par défaut : gzip.
 .IP "\fB\-\-config\fP \fIGIT_URL\fP::\fIGIT_ID\fP" 4
-permet d'amorcer un arbre de configuration depuis un dépôt GIT,
-optionnellement avec un numéro d'identification GIT (branche, commit, tag,
-etc.).
+bootstrap the config tree from a git repository, optionally appended by a
+Git Id (branch, commit, tag, etc.).
 .IP "\fB\-\-build\-with\-chroot\fP true|false" 4
 définit si live\-build devrait utiliser les outils de l'intérieur du chroot
 pour construire l'image binaire ou non en utilisant et incluant les outils
@@ -439,6 +445,11 @@ défaut.
 définit si l'interface graphique GTK de l'installateur\-debian devrait être
 vraie ou pas. En mode Debian et pour la plupart des versions d'Ubuntu, cette
 option est vraie, tandis que sinon fausse, par défaut.
+.IP "\fB\-\-debootstrap\-options\fP \fIOPTIONS\fP" 4
+passes the given options to debootstrap when setting up the base system.
+.IP "\fB\-\-debootstrap\-script\fP \fISCRIPT\fP" 4
+tells debootstrap to use an alternate bootstrap script (last parameter to
+debootstrap).
 .IP \fB\-\-debug\fP 4
 active les messages d'information de déboguage.
 .IP "\-d|\fB\-\-distribution\fP \fINOM_DE_CODE\fP" 4
@@ -452,7 +463,7 @@ du système live résultant.
 .IP \fB\-\-dump\fP 4
 prepares a report of the currently present live system configuration and the
 version of live\-build used. This is useful to provide if you submit bug
-reports, we do get all informations required for us to locate and replicate
+reports, we do get all information required for us to locate and replicate
 an error.
 .IP "\fB\-\-fdisk\fP fdisk|fdisk.dist" 4
 sets the filename of the fdisk binary from the host system that should be
@@ -536,10 +547,11 @@ debian kernel packages, you will not have to adjust it. If you decide to use
 custom kernel packages that do not follow the debian naming scheme, remember
 to set this option to the stub of the packages only (for debian this is
 linux\-image\-2.6), so that \fISTUB\fP\-\fIFLAVOUR\fP results in a valid package name
-(for debian e.g. linux\-image\-686\-pae). Preferably you use the meta package name,
-if any, for the stub, so that your configuration is ABI independent. Also
-don't forget that you have to include stubs of the binary modules packages
-for unionfs or aufs, and squashfs if you built them out\-of\-tree.
+(for debian e.g. linux\-image\-686\-pae). Preferably you use the meta package
+name, if any, for the stub, so that your configuration is ABI
+independent. Also don't forget that you have to include stubs of the binary
+modules packages for unionfs or aufs, and squashfs if you built them
+out\-of\-tree.
 .IP "\fB\-\-losetup\fP losetup|losetup.orig" 4
 sets the filename of the losetup binary from the host system that should be
 used. This is autodetected and does generally not need any customization.
@@ -768,10 +780,8 @@ LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the
 Ce programme est une partie de live\-build.
 
 .SH "PAGE D'ACCUEIL"
-Davantage d'informations à propos de live\-build et du projet Live Systems
-peuvent être trouvées sur la page d'accueil à
-<\fIhttp://live\-systems.org/\fP> et dans le manuel à
-<\fIhttp://live\-systems.org/manual/\fP>.
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH BOGUES
 Les bogues peuvent être signalés en soumettant un rapport de bogue pour le
diff --git a/manpages/fr/lb_source.fr.1 b/manpages/fr/lb_source.fr.1
index fb0333c29..9df8001ff 100644
--- a/manpages/fr/lb_source.fr.1
+++ b/manpages/fr/lb_source.fr.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems"
 
 .SH NOM
-\fBlb source\fP \- Complète le stage source
+\fBlb_source\fP \- Complete the source stage
 
 .SH SYNOPSIS
 \fBlb source\fP [\fIlive\-build options\fP]
@@ -32,10 +32,8 @@ complète de toutes les options génériques de live\-build options.
 Ce programme est une partie de live\-build.
 
 .SH "PAGE D'ACCUEIL"
-Davantage d'informations à propos de live\-build et du projet Live Systems
-peuvent être trouvées sur la page d'accueil à
-<\fIhttp://live\-systems.org/\fP> et dans le manuel à
-<\fIhttp://live\-systems.org/manual/\fP>.
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH BOGUES
 Les bogues peuvent être signalés en soumettant un rapport de bogue pour le
diff --git a/manpages/fr/live-build.fr.7 b/manpages/fr/live-build.fr.7
index c276c7d41..8331564dd 100644
--- a/manpages/fr/live-build.fr.7
+++ b/manpages/fr/live-build.fr.7
@@ -25,9 +25,9 @@ tous les aspects de la construction d'une image Live.
 La \fICOMMANDE\fP est un nom d'une commande live\-build (voir ci\-dessous).
 .PP
 .\" FIXME
-Davantage de documentation à propos de la façon d'utiliser live\-build est
-disponible dans les pages de manuel individuelles de chaque assistant ainsi
-que dans le manual à <\fIhttp://live\-systems.org/manual/\fP>.
+More documentation about how to use live\-build is available in the
+individual manpages for each helper and in the manual at
+<\fIhttps://debian\-live.alioth.debian.org/manual/\fP>.
 
 .SH OPTIONS
 .\" FIXME
@@ -73,30 +73,29 @@ documentation additionnelle.
 Nous séparons les commandes porcelaine en commandes principales et en
 utilitaires utilisateur auxiliaires.
 .SS "Commandes porcelaine principales"
-.IP \fBlb_config\fP(1) 4
-crée une configuration pour live\-build
-.IP \fBlb_bootstrap\fP(1) 4
-crée le premier stage en amorçant un système debian basique
-.IP \fBlb_chroot\fP(1) 4
-crée un deuxième stage en personnalisant le chroot
-.IP \fBlb_binary\fP(1) 4
-crée le troisième stage en générant une image binaire
-.IP \fBlb_source\fP(1) 4
-crée le quatrième stage optionel en générant une image source
-.IP \fBlb_clean\fP(1) 4
-nettoie les répertoires de construction du système
+.IP "\fBlb config\fP(1)" 4
+creates configuration for live\-build
+.IP "\fBlb bootstrap\fP(1)" 4
+executes the first build stage, creating (bootstraping) a basic Debian root
+filesystem
+.IP "\fBlb chroot\fP(1)" 4
+executes the second build stage, building the live OS filesystem
+.IP "\fBlb installer\fP(1)" 4
+executes the third build stage, obtaining installer components (optional)
+.IP "\fBlb binary\fP(1)" 4
+executes the fourth build stage, generating a binary image
+.IP "\fBlb source\fP(1)" 4
+executes the fifth build stage, generating a source image (optional)
+.IP "\fBlb clean\fP(1)" 4
+cleans up system build directories
 .SS "Commandes auxiliaires"
 .IP \fBlb\fP(1) 4
-emballage live\-build générique
-.IP \fBlb_build\fP(1) 4
-alias pour tous les stages
-.IP \fBlb_local\fP(1) 4
-assistant pour l'utilisation d'un live\-build local
-.IP \fBlb_testroot\fP(1) 4
+generic live\-build script execution wrapper
+.IP "\fBlb build\fP(1)" 4
 .\" FIXME
-s'assure que le système est construit en tant qu'administrateur (root)
+alias for all build stages
 
-.SH "COMMANDES BAS\-NIVEAU (PLOMBERIE)"
+.SH "LOW\-LEVEL COMMANDS (PLUMBING) \- BUILD STAGE COMPONENTS"
 .\" FIXME
 Le travail réel de live\-build est implémenté dans les commandes bas\-niveau,
 appelées plomberie. Elles ne sont pas supposées être utilisées par les
@@ -111,119 +110,176 @@ commandes bas\-niveau sont pensées pour être beaucoup plus stables que les
 commandes de niveau Porcelaine. D'un autre côté, l'interface des commandes
 Porcelaine sont sujettes à changement afin d'améliorer l'expérience de
 l'utilisateur final.
-.SS "Commandes d'amorçage"
-.IP \fBlb_bootstrap_cache\fP(1) 4
-stage d'amorçage cache
-.IP \fBlb_bootstrap_debootstrap\fP(1) 4
-amorçcer un système Debian avec debootstrap(8)
-.SS "Commandes chroot"
-.IP \fBlb_chroot_apt\fP(1) 4
-gère /etc/apt/apt.conf
-.IP \fBlb_chroot_cache\fP(1) 4
-stage de chroot cache
-.IP \fBlb_chroot_debianchroot\fP(1) 4
-gère /etc/debian_chroot
-.IP \fBlb_chroot_devpts\fP(1) 4
-monte /dev/pts
-.IP \fBlb_chroot_dpkg\fP(1) 4
-gère /sbin/dpkg
-.IP \fBlb_chroot_hacks\fP(1) 4
-exécute les hacks dans le chroot
-.IP \fBlb_chroot_hostname\fP(1) 4
-gère /bin/hostname
-.IP \fBlb_chroot_hosts\fP(1) 4
-gère /etc/hosts
-.IP \fBlb_chroot_install\-packages\fP(1) 4
-installe les paquets en attente dans le chroot
-.IP \fBlb_chroot_interactive\fP(1) 4
-rend la construction intéractive
-.IP \fBlb_chroot_linux\-image\fP(1) 4
-gère /etc/kernel\-img.conf
-.IP \fBlb_chroot_hooks\fP(1) 4
-exécute les hooks locaux dans le chroot
-.IP \fBlb_chroot_local\-includes\fP(1) 4
-copie les fichiers locaux dans le chroot
-.IP \fBlb_chroot_packages\fP(1) 4
-met en attente l'installation des paquets dans le chroot
-.IP \fBlb_chroot_local\-patches\fP(1) 4
-appliques les rustines locales dans le chroot
-.IP \fBlb_chroot_local\-preseed\fP(1) 4
-utilise un fichier de pré\-configuration local debconf
-.IP \fBlb_chroot_packagelists\fP(1) 4
-met en attente l'installation des listes de paquets dans le chroot
-.IP \fBlb_chroot_proc\fP(1) 4
-monte /proc
-.IP \fBlb_chroot_resolv\fP(1) 4
-gère /etc/resolv.conf
-.IP \fBlb_chroot_selinuxfs\fP(1) 4
-monte /selinux
-.IP \fBlb_chroot_archives\fP(1) 4
-gère /etc/apt/sources.list
-.IP \fBlb_chroot_sysfs\fP(1) 4
-gère /sys
-.IP \fBlb_chroot_sysv\-rc\fP(1) 4
-gère /usr/sbin/policy\-rc.d
-.IP \fBlb_chroot_task\-lists\fP(1) 4
-installe les listes de tâches dans le chroot
-.SS "Commandes binaires"
-.IP \fBlb_binary_chroot\fP(1) 4
-copie le chroot dans le chroot
-.IP \fBlb_binary_debian\-installer\fP(1) 4
-installe debian\-installer dans le binaire
-.IP \fBlb_binary_disk\fP(1) 4
-installe les informations de disque dans le binaire
-.IP \fBlb_binary_grub\fP(1) 4
-installe grub dans le binaire
-.IP \fBlb_binary_grub2\fP(1) 4
-installe grub2 dans le binaire
-.IP \fBlb_binary_includes\fP(1) 4
-copie les fichiers dans le binaire
-.IP \fBlb_binary_iso\fP(1) 4
-construit l'image binaire iso
-.IP \fBlb_binary_linux\-image\fP(1) 4
-installe linux\-image dans le binaire
-.IP \fBlb_binary_local\-hooks\fP(1) 4
-exécute les hooks locaux dans le binaire
-.IP \fBlb_binary_local\-includes\fP(1) 4
-copie les fichiers dans le binaire
-.IP \fBlb_binary_local\-packagelists\fP(1) 4
-installe les listes de paquets locaux dans le binaire
-.IP \fBlb_binary_manifest\fP(1) 4
-crée le manifeste
-.IP \fBlb_binary_checksums\fP(1) 4
-crée les sommes de vérification binaires (md5, sha1, et/ou sha256)
-.IP \fBlb_binary_memtest\fP(1) 4
-installe memtest dans le binaire
-.IP \fBlb_binary_net\fP(1) 4
-construit l'image binaire netboot
-.IP \fBlb_binary_rootfs\fP(1) 4
-construit l'image rootfs
-.IP \fBlb_binary_syslinux\fP(1) 4
-installe syslinux dans le binaire
-.IP \fBlb_binary_tar\fP(1) 4
-construit une image binaire pour disque dur
-.IP \fBlb_binary_hdd\fP(1) 4
-construit une image binaire hdd
-.IP \fBlb_binary_win32\-loader\fP(1) 4
-installe win32\-loader dans le binaire
-.SS "Commandes source"
-.IP \fBlb_source_debian\fP(1) 4
-télécharge les sources
-.IP \fBlb_source_debian\-live\fP(1) 4
-copie la configuration debian\-live dans la source
-.IP \fBlb_source_disk\fP(1) 4
-installe les informations de disque dans la source
-.IP \fBlb_source_iso\fP(1) 4
-construit l'image source iso
-.IP \fBlb_source_checksums\fP(1) 4
-crée les sommes de vérification binaires (md5, sha1, et/ou sha256)
-.IP \fBlb_source_net\fP(1) 4
-construit l'image net source
-.IP \fBlb_source_tar\fP(1) 4
-construit le tarball source
-.IP \fBlb_source_hdd\fP(1) 4
+.SS "Bootstrap stage specific commands"
+.IP "\fBlb bootstrap_archives\fP(1)" 4
+applies apt archive configuration
+.IP "\fBlb bootstrap_cache\fP(1)" 4
+in save mode, saves to cache a copy of the generated bootstrap directory,
+and in restore mode, restores from cache a previously generated copy
+.IP "\fBlb bootstrap_debootstrap\fP(1)" 4
+creates (bootstrap) a basic Debian root filesystem using debootstrap(8)
+.SS "Chroot stage specific commands"
+.PP
+Note: The following chroot_ prefixed commands are used in building the live
+OS filesystem. Another set of similarly prefixed files are listed separately
+(see further down).
+.IP "\fBlb chroot_cache\fP(1)" 4
+in save mode, saves to cache a copy of the chroot directory, and in restore
+mode, restores from cache a previously generated copy
+.IP "\fBlb chroot_firmware\fP(1)" 4
+compiles a list of firmware packages to be installed in the live OS root
+filesystem
+.IP "\fBlb chroot_hacks\fP(1)" 4
+executes local hacks against the live OS root filesystem, if any are
+provided
+.IP "\fBlb chroot_hooks\fP(1)" 4
+executes local hooks against the live OS root filesystem, if any are
+provided
+.IP "\fBlb chroot_includes\fP(1)" 4
+copies a set of local files from the config directory into the live OS root
+filesystem, if any are provided
+.IP "\fBlb chroot_install\-packages\fP(1)" 4
+installs into the live OS root filesystem any packages listed in local
+package lists
+.IP "\fBlb chroot_interactive\fP(1)" 4
+pauses the build process and starts an interactive shell from the live OS
+root filesystem, providing an oportunity for manual modifications or
+testing; note that this is (currently) usually executed with several chroot
+prep modifications applied (see description of these further down)
+.IP "\fBlb chroot_linux\-image\fP(1)" 4
+compiles a list of kernel images to be installed in the live OS root
+filesystem
+.IP "\fBlb chroot_live\-packages\fP(1)" 4
+installs a set of live system specific packages to the live OS root
+filesystem
+.IP "\fBlb chroot_package\-lists\fP(1)" 4
+compiles a list of packages provided in the user\' local config to be
+installed in the live OS root filesystem
+.IP "\fBlb chroot_preseed\fP(1)" 4
+installs pre\-configured answers to certain install prompts into the live OS
+root filesystem
+.SS "Installer stage specific commands"
+.IP "\fBlb installer_debian\-installer\fP(1)" 4
+obtains and sets up Debian installer(d\-i) components
+.IP "\fBlb installer_preseed\fP(1)" 4
+installs pre\-configured answers to certain install prompts
+.SS "Binary stage specific commands"
+.IP "\fBlb binary_checksums\fP(1)" 4
+creates checksums (md5, sha1, and/or sha256) for live image content
+.IP "\fBlb binary_chroot\fP(1)" 4
+duplicates the chroot directory, to place a copy of what whould be the
+completed live OS root filesystem to one side, allowing the original to
+continue to be used in executing certain parts of the remainder of the build
+process
+.IP "\fBlb binary_disk\fP(1)" 4
+creates disk information files to be added to live image
+.IP "\fBlb binary_grub\fP(1)" 4
+installs grub into live image to provide image boot capability
+.IP "\fBlb binary_grub2\fP(1)" 4
+installs grub2 into live image to provide image boot capability
+.IP "\fBlb binary_hdd\fP(1)" 4
+compiles the final live image into an hdd image file
+.IP "\fBlb binary_hooks\fP(1)" 4
+executes local hooks against the live image, if any are provided
+.IP "\fBlb binary_includes\fP(1)" 4
+copies a set of local files from the config directory into the live image,
+if any are provided
+.IP "\fBlb binary_iso\fP(1)" 4
+compiles the final live image into an iso file
+.IP "\fBlb binary_linux\-image\fP(1)" 4
+copies the linux\-image into the live image
+.IP "\fBlb binary_loadlin\fP(1)" 4
+bundles a copy of loadlin into the live image
+.IP "\fBlb binary_manifest\fP(1)" 4
+creates manifest of packages installed into live OS filesystem, and list of
+packages to be excluded by a persistence mechanism installing the live OS to
+disk
+.IP "\fBlb binary_memtest\fP(1)" 4
+bundles a copy of memtest into the live image
+.IP "\fBlb binary_netboot\fP(1)" 4
+compiles the final live image into a netboot tar archive
+.IP "\fBlb binary_package\-lists\fP(1)" 4
+processes local lists of packages to obtain and bundle into image (from
+which they could later be installed if not already)
+.IP "\fBlb binary_rootfs\fP(1)" 4
+wraps up the completed live OS root filesystem into a virtual file system
+image
+.IP "\fBlb binary_syslinux\fP(1)" 4
+installs syslinux into live image to provide image boot capability
+.IP "\fBlb binary_tar\fP(1)" 4
+compiles the final live image into a tar archive
+.IP "\fBlb binary_win32\-loader\fP(1)" 4
+bundles a copy of win32\-loader into the live image and creates an
+autorun.inf file
+.IP "\fBlb binary_zsync\fP(1)" 4
+builds zsync control files
+.SS "Source stage specific commands"
+.IP "\fBlb source_checksums\fP(1)" 4
+creates checksums (md5, sha1, and/or sha256) for source image content
+.IP "\fBlb source_debian\fP(1)" 4
+downloads source packages for bundling into source image
+.IP "\fBlb source_disk\fP(1)" 4
+creates disk information files to be added to source image
+.IP "\fBlb source_hdd\fP(1)" 4
+compiles the final source image into an hdd image file
+.IP "\fBlb source_hooks\fP(1)" 4
+executes local hooks against the source image, if any are provided
+.IP "\fBlb source_iso\fP(1)" 4
+compiles the final source image into an iso file
+.IP "\fBlb source_live\fP(1)" 4
+copies live\-build config into source
+.IP "\fBlb source_tar\fP(1)" 4
+.\" FIXME
+compiles the final source image into a tar archive
+
+.SH "LOW\-LEVEL COMMANDS (PLUMBING) \- CHROOT PREP COMPONENTS"
+.\" FIXME
+The notes above under the section regarding build\-stage specific low\-level
+plumbing commands also apply here.
+.PP
+The following chroot_ prefixed commands are used throughout the various
+primary stages of the build process to apply and remove modifications to a
+chroot root filesystem. Generally these are used to apply modification that
+setup the chroot for use (execution of programs within it) during the build
+process, and later to remove those modification, unmounting things that were
+mounted, and making the chroot suitable for use as the root filesystem of
+the live OS to be bundled into the live image.
+.IP "\fBlb chroot_apt\fP(1)" 4
+manages apt configuration; in apply mode it applies configuration for use
+during build process, and in remove mode removes that configuration
+.IP "\fBlb chroot_archives\fP(1)" 4
+manages apt archive source lists; in apply mode it applies source list
+configurations suitable for use of the chroot in the build process, and in
+remove mode replaces that with a configuration suitable for the final live
+OS
+.IP "\fBlb chroot_debianchroot\fP(1)" 4
+manages a /etc/debian_chroot file
+.IP "\fBlb chroot_devpts\fP(1)" 4
+manages mounting of /dev/pts
+.IP "\fBlb chroot_dpkg\fP(1)" 4
+manages dpkg; in apply mode disabling things like the start\-stop\-daemon, and
+in remove mode enabling them again
+.IP "\fBlb chroot_hostname\fP(1)" 4
+manages the hostname configuration
+.IP "\fBlb chroot_hosts\fP(1)" 4
+manages the /etc/hosts file
+.IP "\fBlb chroot_proc\fP(1)" 4
+manages mounting of /proc
+.IP "\fBlb chroot_resolv\fP(1)" 4
+manages configuration of the /etc/resolv.conf file
+.IP "\fBlb chroot_selinuxfs\fP(1)" 4
+manages mounting of /sys/fs/selinux
+.IP "\fBlb chroot_sysfs\fP(1)" 4
+manages mounting of /sys
+.IP "\fBlb chroot_sysv\-rc\fP(1)" 4
+manages the /usr/sbin/policy\-rc.d file
+.IP "\fBlb chroot_tmpfs\fP(1)" 4
+manages configuration of dpkg to use a tmpfs filesystem
+.IP "\fBlb chroot_upstart\fP(1)" 4
 .\" FIXME
-construit l'image hdd source
+manages use of upstart /sbin/initctl program; in apply mode blocking
+execution through a dpkg diversion, and in remove mode enabling execution
+again
 
 .SH "FICHIERS DE CONFIGURATION"
 .\" FIXME
@@ -236,14 +292,12 @@ config/stage ou config/stage_assistant (où "stage" est évidemment remplacé
 par le nom du stage auquel il appartient, "assistant" par le nom de
 l'assistant).
 .PP
-Par exemple, lb_bootstrap_debootstrap utilise des fichiers nommés
-config/bootstrap et config/bootstrap_debootstrap pour lire les options qu'il
-utilisera. Voir les pages des commandes individuelles de manuel pour des
-détails à propos des noms et des formats de fichiers qu'ils
-utilisent. Généralement, ces fichiers contiennent des variables avec des
-valeurs assignées, une variable par ligne. Plusieurs programmes dans
-live\-build utilisent des paires de valeur ou des assignations de variables
-légèrement plus compliquées.
+For example, lb bootstrap_debootstrap uses files named config/bootstrap and
+config/bootstrap_debootstrap to read the options it will use. See the man
+pages of individual commands for details about the names and formats of the
+files they use. Generally, these files contain variables with values
+assigned, one variable per line. Some programs in live\-build use pairs of
+values or slightly more complicated variable assignments.
 .PP
 Notez que live\-build respectera les variables d'environment présentes dans
 le contexte du shell lancé. Si les variables peuvent être lues depuis les
@@ -279,10 +333,8 @@ fichiers; les lignes commençant par des "#" sont ignorées.
 Ce programme est une partie de live\-build.
 
 .SH "PAGE D'ACCUEIL"
-Davantage d'informations à propos de live\-build et du projet Live Systems
-peuvent être trouvées sur la page d'accueil à
-<\fIhttp://live\-systems.org/\fP> et dans le manuel à
-<\fIhttp://live\-systems.org/manual/\fP>.
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH BOGUES
 Les bogues peuvent être signalés en soumettant un rapport de bogue pour le
diff --git a/manpages/ja/lb.ja.1 b/manpages/ja/lb.ja.1
index fef161c70..7c83d890b 100644
--- a/manpages/ja/lb.ja.1
+++ b/manpages/ja/lb.ja.1
@@ -31,9 +31,8 @@
 このプログラムは live\-build の一部です。
 
 .SH ホームページ
-live\-build 及び Live
-システムプロジェクトについてのさらなる情報は、<\fIhttp://live\-systems.org/\fP> のホームページや
-<\fIhttp://live\-systems.org/manual/\fP> のマニュアルにあります。
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH バグ
 バグは <\fIhttp://bugs.debian.org/\fP> にあるバグ追跡システムに live\-build
diff --git a/manpages/ja/lb_binary.ja.1 b/manpages/ja/lb_binary.ja.1
index 2274828fc..f17d4d956 100644
--- a/manpages/ja/lb_binary.ja.1
+++ b/manpages/ja/lb_binary.ja.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト"
 
 .SH 名前
-\fBlb binary\fP \- バイナリ段階を完了させます
+\fBlb_binary\fP \- Complete the binary stage
 
 .SH 概要
 \fBlb binary\fP [\fIlive\-build オプション\fP]
@@ -29,9 +29,8 @@
 このプログラムは live\-build の一部です。
 
 .SH ホームページ
-live\-build 及び Live
-システムプロジェクトについてのさらなる情報は、<\fIhttp://live\-systems.org/\fP> のホームページや
-<\fIhttp://live\-systems.org/manual/\fP> のマニュアルにあります。
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH バグ
 バグは <\fIhttp://bugs.debian.org/\fP> にあるバグ追跡システムに live\-build
diff --git a/manpages/ja/lb_bootstrap.ja.1 b/manpages/ja/lb_bootstrap.ja.1
index d902d5cd3..d21eedbf7 100644
--- a/manpages/ja/lb_bootstrap.ja.1
+++ b/manpages/ja/lb_bootstrap.ja.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト"
 
 .SH 名前
-\fBlb bootstrap\fP \- パッケージ収集段階を完了させます
+\fBlb_bootstrap\fP \- Complete the bootstrap stage
 
 .SH 概要
 \fBlb bootstrap\fP [\fIlive\-build オプション\fP]
@@ -29,9 +29,8 @@
 このプログラムは live\-build の一部です。
 
 .SH ホームページ
-live\-build 及び Live
-システムプロジェクトについてのさらなる情報は、<\fIhttp://live\-systems.org/\fP> のホームページや
-<\fIhttp://live\-systems.org/manual/\fP> のマニュアルにあります。
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH バグ
 バグは <\fIhttp://bugs.debian.org/\fP> にあるバグ追跡システムに live\-build
diff --git a/manpages/ja/lb_build.ja.1 b/manpages/ja/lb_build.ja.1
index 024bef811..d617ecd20 100644
--- a/manpages/ja/lb_build.ja.1
+++ b/manpages/ja/lb_build.ja.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト"
 
 .SH 名前
-\fBlb build\fP \- パッケージ収集、chroot、バイナリ、ソース段階を完了させます
+\fBlb_build\fP \- Complete the bootstrap, chroot, binary, and source stages
 
 .SH 概要
 \fBlb build\fP [\fIlive\-build オプション\fP]
@@ -32,9 +32,8 @@
 このプログラムは live\-build の一部です。
 
 .SH ホームページ
-live\-build 及び Live
-システムプロジェクトについてのさらなる情報は、<\fIhttp://live\-systems.org/\fP> のホームページや
-<\fIhttp://live\-systems.org/manual/\fP> のマニュアルにあります。
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH バグ
 バグは <\fIhttp://bugs.debian.org/\fP> にあるバグ追跡システムに live\-build
diff --git a/manpages/ja/lb_chroot.ja.1 b/manpages/ja/lb_chroot.ja.1
index 1e6084218..7e97bf1c3 100644
--- a/manpages/ja/lb_chroot.ja.1
+++ b/manpages/ja/lb_chroot.ja.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト"
 
 .SH 名前
-\fBlb chroot\fP \- chroot 段階を完了させます
+\fBlb_chroot\fP \- Complete the chroot stage
 
 .SH 概要
 \fBlb chroot\fP [\fIlive\-build オプション\fP]
@@ -29,9 +29,8 @@
 このプログラムは live\-build の一部です。
 
 .SH ホームページ
-live\-build 及び Live
-システムプロジェクトについてのさらなる情報は、<\fIhttp://live\-systems.org/\fP> のホームページや
-<\fIhttp://live\-systems.org/manual/\fP> のマニュアルにあります。
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH バグ
 バグは <\fIhttp://bugs.debian.org/\fP> にあるバグ追跡システムに live\-build
diff --git a/manpages/ja/lb_clean.ja.1 b/manpages/ja/lb_clean.ja.1
index 7e360d7cb..b19ff3132 100644
--- a/manpages/ja/lb_clean.ja.1
+++ b/manpages/ja/lb_clean.ja.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト"
 
 .SH 名前
-\fBlb clean\fP \- 設定ディレクトリを掃除します
+\fBlb_clean\fP \- Clean build directory
 
 .SH 概要
 \fBlb clean\fP [\fIlive\-build オプション\fP]
@@ -53,9 +53,8 @@ chroot ディレクトリをマウント解除、削除します。
 このプログラムは live\-build の一部です。
 
 .SH ホームページ
-live\-build 及び Live
-システムプロジェクトについてのさらなる情報は、<\fIhttp://live\-systems.org/\fP> のホームページや
-<\fIhttp://live\-systems.org/manual/\fP> のマニュアルにあります。
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH バグ
 バグは <\fIhttp://bugs.debian.org/\fP> にあるバグ追跡システムに live\-build
diff --git a/manpages/ja/lb_config.ja.1 b/manpages/ja/lb_config.ja.1
index 8c602aa79..834c3fcdd 100644
--- a/manpages/ja/lb_config.ja.1
+++ b/manpages/ja/lb_config.ja.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト"
 
 .SH 名前
-\fBlb config\fP \- 設定ディレクトリを作成します
+\fBlb_config\fP \- Create config directory
 
 .SH 概要
 \fBlb config\fP [\fIlive\-build オプション\fP]
@@ -44,7 +44,9 @@
 .br
   [\fB\-\-bootappend\-live\fP \fIパラメータ\fP|\fI"パラメータ"\fP]
 .br
-  [\fB\-\-bootloader\fP grub|grub2|syslinux]
+  [\fB\-\-bootappend\-live\-failsafe\fP \fIPARAMETER\fP|\fI"PARAMETERS"\fP]
+.br
+  [\fB\-\-bootloaders\fP grub\-legacy|grub\-pc|syslinux|grub\-efi]
 .br
   [\fB\-\-cache\fP true|false]
 .br
@@ -80,6 +82,10 @@
 .br
   [\fB\-\-debian\-installer\-gui\fP true|false]
 .br
+  [\fB\-\-debootstrap\-options\fP \fIOPTIONS\fP]
+.br
+  [\fB\-\-debootstrap\-script\fP \fISCRIPT\fP]
+.br
   [\fB\-\-debug\fP]
 .br
   [\-d|\fB\-\-distribution\fP \fIコード名\fP]
@@ -284,29 +290,38 @@ i386 系列プロセッサ及び適切なカーネルを使っている場合に
 ビルドするイメージの種類を決定します。デフォルトで、syslinux を利用するイメージではハードディスク向けイメージと同じようにも利用できる
 CD/DVD イメージをビルドするため iso\-hybrid が、syslinux 以外のイメージでは iso がセットされます。
 .IP "\fB\-\-binary\-filesystem\fP fat16|fat32|ext2|ext3|ext4" 4
-指定した種類のイメージで利用するファイルシステムを指定します。これは選択した種類のバイナリイメージでファイルシステムを選択できる場合にのみ効果があります。例えば
-iso 選択時に作成される CD/DVD のファイルシステムは常に ISO9660
-となります。USBメモリ向けのhddイメージをビルドする場合にはこれが有効になります。sparc のデフォルトが ext4
-である例外を除く全アーキテクチャでデフォルトが fat16 となっていることに注意してください。また、fat16
-選択時に出来上がったバイナリイメージのサイズが2GBを超えた場合はそのバイナリのファイルシステムは自動的に fat32
-に切り替えられることに注意してください。
+defines the filesystem to be used in the image type. This only has an effect
+if the selected binary image type lets you choose a filesystem. For example,
+when selection iso the resulting CD/DVD has always the filesystem
+ISO9660. When building hdd images for usb sticks, this is active. Note that
+it defaults to fat16 on all architectures except sparc where it defaults to
+ext4. Also note that if you choose fat16 and your resulting binary image
+gets bigger than 2GB, the binary filesystem automatically gets switched to
+fat32.
 .IP "\fB\-\-bootappend\-install\fP \fIパラメータ\fP|\(dq\fIパラメータ\fP\(dq" 4
 debian\-installer を収録した場合、debian\-installer 特有のブートパラメータをセットします。
 .IP "\fB\-\-bootappend\-live\fP \fIパラメータ\fP|\(dq\fIパラメータ\fP\(dq" 4
 debian\-live 特有のブートパラメータをセットします。ブートパラメータの全容は \fIlive\-boot\fP(7) 及び
 \fIlive\-config\fP(7) マニュアルページにあります。
-.IP "\fB\-\-bootloader\fP grub|grub2|syslinux" 4
-生成されたイメージで利用するブートローダを選択します。これは選択した種類のバイナリイメージでブートローダを選択できる場合にのみ効果があります。例えば
-iso をビルドする場合は常に syslinux (さらに言えば isolinux)
-が利用されます。また、バイナリイメージの種類とブートローダの組み合わせの中には、可能ではあるものの live\-build
-でのサポートが追いついていないものがあり得ることに注意してください。\fBlb config\fP
-はそういった未サポートの設定の作成には失敗し、そのことについて説明します。amd64 や i386 用のhddイメージでは syslinux
-がデフォルトとなっています。
+.IP "\fB\-\-bootappend\-live\-failsafe\fP \fIPARAMETER\fP|\(dq\fIPARAMETERS\fP\(dq" 4
+sets boot parameters specific to debian\-live failsafe boot entries. A
+complete list of boot parameters can be found in the \fIlive\-boot\fP(7) and
+\fIlive\-config\fP(7) manual pages.
+.IP "\fB\-\-bootloaders\fP grub\-legacy|grub\-pc|syslinux|grub\-efi" 4
+defines which bootloader is being used in the generated image. This has only
+an effect if the selected binary image type lets you choose the
+bootloader. For example, if you build a iso, always syslinux (or more
+precise, isolinux) is being used. Also note that some combinations of binary
+images types and bootloaders may be possible but live\-build does not support
+them yet. \fBlb config\fP will fail to create such a not yet supported
+configuration and give a explanation about it. For hdd images on amd64 and
+i386, the default is syslinux.
 .IP "\fB\-\-cache\fP true|false" 4
 全体としてキャッシュを使うか否か大域的に決定します。異なるキャッシュを、キャッシュそれぞれのオプションで制御できます。
 .IP "\fB\-\-cache\-indices\fP true|false" 4
-ダウンロードしたパッケージ索引や一覧をキャッシュするか否かを決定します。デフォルトで false
-となっています。有効にするとイメージを完全にオフラインで再ビルドできるようになりますが、以後の更新は得られなくなります。
+defines if downloaded package indices and lists should be cached which is
+false by default. Enabling it lets you rebuild an image completely offline,
+however, you would not get updates anymore then.
 .IP "\fB\-\-cache\-packages\fP true|false" 4
 ダウンロードしたパッケージファイルをキャッシュするか否かを決定します。デフォルトで true
 となっています。無効化するとビルドディレクトリの容量を節約できますが、再ビルドした場合には不要な転送が発生することを覚えておいてください。一般にこれは常に
@@ -325,7 +340,8 @@ Live
 .IP "\fB\-\-compression\fP bzip2|gzip|lzip|none" 4
 tar アーカイブの圧縮に利用する圧縮プログラムを決定します。デフォルトは gzip です。
 .IP "\fB\-\-config\fP \fIGIT_URL\fP::\fIGIT_ID\fP" 4
-設定ツリーをgitリポジトリから取得できます。オプションとして Git Id (ブランチやコミット、タグ等) を指定できます。
+bootstrap the config tree from a git repository, optionally appended by a
+Git Id (branch, commit, tag, etc.).
 .IP "\fB\-\-build\-with\-chroot\fP true|false" 4
 live\-build がバイナリイメージのビルドに chroot 内のツールを使うのか、chroot
 ではなくホストのシステムツールを取り込んで使うのかを決定します。これは非常に危険なオプションであり、ホストシステムのツールを利用することで汚染され、必要とするツール
@@ -361,6 +377,11 @@ debian\-installer のファイルを取得するディストリビューショ�
 .IP "\fB\-\-debian\-installer\-gui\fP true|false" 4
 debian\-installer グラフィカルGTKインターフェイスを true にするか否かを決定します。デフォルトでは、Debian モードや
 Ubuntu のほとんどのバージョンで true、それ以外では false となっています。
+.IP "\fB\-\-debootstrap\-options\fP \fIOPTIONS\fP" 4
+passes the given options to debootstrap when setting up the base system.
+.IP "\fB\-\-debootstrap\-script\fP \fISCRIPT\fP" 4
+tells debootstrap to use an alternate bootstrap script (last parameter to
+debootstrap).
 .IP \fB\-\-debug\fP 4
 デバッグ情報のメッセージを表示します。
 .IP "\-d|\fB\-\-distribution\fP \fIコード名\fP" 4
@@ -370,8 +391,10 @@ Ubuntu のほとんどのバージョンで true、それ以外では false と�
 .IP "\-d|\fB\-\-parent\-debian\-installer\-distribution\fP \fIコード名\fP" 4
 出来上がる Live システムの派生元の debian\-installer のディストリビューションを決定します。
 .IP \fB\-\-dump\fP 4
-現在存在している Live システムの設定と利用されている live\-build
-のバージョンの報告を作成します。これはバグ報告の際に有用で、エラーが起きている部分を見つけ出し、再現するのに必要となる情報を全て提供します。
+prepares a report of the currently present live system configuration and the
+version of live\-build used. This is useful to provide if you submit bug
+reports, we do get all information required for us to locate and replicate
+an error.
 .IP "\fB\-\-fdisk\fP fdisk|fdisk.dist" 4
 利用するホストシステムの fdisk バイナリのファイル名を指定します。これは自動的に検出されるため通常は独自に指定する必要はありません。
 .IP \fB\-\-force\fP 4
@@ -428,7 +451,8 @@ JFFS2 (Second Journaling Flash File System) ファイルシステムの eraseblo
 .IP "\fB\-\-linux\-packages\fP \(dq\fIパッケージ\fP\(dq" 4
 カーネルのパッケージ命名規則に従った内部名をセットします。Debian のカーネルパッケージを利用している場合は調整する必要はありません。Debian
 の命名規則に従わない独自のカーネルパッケージを利用する場合にはこのオプションでパッケージの前半部 (Debian の場合は
-linux\-image\-2.6) だけを忘れずに指定し、\fI前半部\fP\-\fIフレーバー\fP (Debian の場合は例えば linux\-image\-686\-pae)
+linux\-image\-2.6) だけを忘れずに指定し、\fI前半部\fP\-\fIフレーバー\fP (Debian の場合は例えば
+linux\-image\-686\-pae)
 が有効なパッケージ名になるようにしてください。好ましいのは、メタパッケージがある場合にはその名前を前半部に使うことで、そうすると設定とABIが独立します。また、unionfs
 や aufs、squashfs
 のバイナリモジュールパッケージについても、ツリー外でビルドした場合にはその前半部を含める必要があることを忘れないようにしてください。
@@ -601,9 +625,8 @@ APT_OPTIONS や GZIP_OPTIONS と同様に LB_ を付加しません。
 このプログラムは live\-build の一部です。
 
 .SH ホームページ
-live\-build 及び Live
-システムプロジェクトについてのさらなる情報は、<\fIhttp://live\-systems.org/\fP> のホームページや
-<\fIhttp://live\-systems.org/manual/\fP> のマニュアルにあります。
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH バグ
 バグは <\fIhttp://bugs.debian.org/\fP> にあるバグ追跡システムに live\-build
diff --git a/manpages/ja/lb_source.ja.1 b/manpages/ja/lb_source.ja.1
index 1041b70fc..a09cfb3d6 100644
--- a/manpages/ja/lb_source.ja.1
+++ b/manpages/ja/lb_source.ja.1
@@ -6,7 +6,7 @@
 .TH LIVE\-BUILD 1 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト"
 
 .SH 名前
-\fBlb source\fP \- ソース段階を完了させます
+\fBlb_source\fP \- Complete the source stage
 
 .SH 概要
 \fBlb source\fP [\fIlive\-build オプション\fP]
@@ -29,9 +29,8 @@
 このプログラムは live\-build の一部です。
 
 .SH ホームページ
-live\-build 及び Live
-システムプロジェクトについてのさらなる情報は、<\fIhttp://live\-systems.org/\fP> のホームページや
-<\fIhttp://live\-systems.org/manual/\fP> のマニュアルにあります。
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH バグ
 バグは <\fIhttp://bugs.debian.org/\fP> にあるバグ追跡システムに live\-build
diff --git a/manpages/ja/live-build.ja.7 b/manpages/ja/live-build.ja.7
index a6c63accd..19a6113d4 100644
--- a/manpages/ja/live-build.ja.7
+++ b/manpages/ja/live-build.ja.7
@@ -23,8 +23,9 @@ live\-build は Live システムのイメージをビルドするためのス�
 \fIコマンド\fPは live\-build コマンドの名前です (以下参照)。
 .PP
 .\" FIXME
-live\-build 及び Live システムプロジェクトについてのさらなる情報は、それぞれの man ページや
-<\fIhttp://live\-systems.org/manual/\fP> のマニュアルにあります。
+More documentation about how to use live\-build is available in the
+individual manpages for each helper and in the manual at
+<\fIhttps://debian\-live.alioth.debian.org/manual/\fP>.
 
 .SH オプション
 .\" FIXME
@@ -64,30 +65,29 @@ live\-build は高レベル (「porcelain」) コマンドと低レベル (「pl
 .\" FIXME
 高レベルコマンドは主要コマンドといくらかの副次的なユーザ向けユーティリティに分けられています。
 .SS 主要コマンド
-.IP \fBlb_config\fP(1) 4
-live\-build の設定ファイルを作成します
-.IP \fBlb_bootstrap\fP(1) 4
-第1の段階で基本的な debian システムのパッケージ収集を行います
-.IP \fBlb_chroot\fP(1) 4
-第2の段階で chroot の独自化を行います
-.IP \fBlb_binary\fP(1) 4
-第3の段階でバイナリイメージの生成を行います
-.IP \fBlb_source\fP(1) 4
-オプションの第4の段階でソースイメージの生成を行います
-.IP \fBlb_clean\fP(1) 4
-システムのビルド用ディレクトリを掃除します
+.IP "\fBlb config\fP(1)" 4
+creates configuration for live\-build
+.IP "\fBlb bootstrap\fP(1)" 4
+executes the first build stage, creating (bootstraping) a basic Debian root
+filesystem
+.IP "\fBlb chroot\fP(1)" 4
+executes the second build stage, building the live OS filesystem
+.IP "\fBlb installer\fP(1)" 4
+executes the third build stage, obtaining installer components (optional)
+.IP "\fBlb binary\fP(1)" 4
+executes the fourth build stage, generating a binary image
+.IP "\fBlb source\fP(1)" 4
+executes the fifth build stage, generating a source image (optional)
+.IP "\fBlb clean\fP(1)" 4
+cleans up system build directories
 .SS 副次的なコマンド
 .IP \fBlb\fP(1) 4
-live\-build の包括的なラッパー
-.IP \fBlb_build\fP(1) 4
-全段階のラッパーです
-.IP \fBlb_local\fP(1) 4
-ローカルの live\-build を利用する支援コマンド
-.IP \fBlb_testroot\fP(1) 4
+generic live\-build script execution wrapper
+.IP "\fBlb build\fP(1)" 4
 .\" FIXME
-システムが root により構成されていることを確認します
+alias for all build stages
 
-.SH "低レベルコマンド (PLUMBING)"
+.SH "LOW\-LEVEL COMMANDS (PLUMBING) \- BUILD STAGE COMPONENTS"
 .\" FIXME
 live\-build
 の実際の作業は低レベルコマンドにより実装されています。低レベルコマンドはエンドユーザが直接実行することは想定していません。高レベルの主要コマンドに操作させることにより、様々な低レベルコマンドを必ず正しい順で実行するようにしています。しかし、live\-build
@@ -95,119 +95,176 @@ live\-build
 .PP
 この低レベルコマンドへのインターフェイス (オプション群やセマンティクス)
 は高レベルの主要コマンドよりもはるかに安定していることが求められることに注意してください。それに対して高レベルの主要コマンドへのインターフェイスは、エンドユーザの使い勝手改善のために変更される対象となります。
-.SS パッケージ収集用のコマンド
-.IP \fBlb_bootstrap_cache\fP(1) 4
-パッケージ収集段階をキャッシュします
-.IP \fBlb_bootstrap_debootstrap\fP(1) 4
-debootstrap(8) により Debian システムのパッケージ収集を行います
-.SS "chroot コマンド"
-.IP \fBlb_chroot_apt\fP(1) 4
-/etc/apt/apt.conf の管理
-.IP \fBlb_chroot_cache\fP(1) 4
-chroot 段階をキャッシュします
-.IP \fBlb_chroot_debianchroot\fP(1) 4
-/etc/debian_chroot の管理
-.IP \fBlb_chroot_devpts\fP(1) 4
-/dev/pts をマウントします。
-.IP \fBlb_chroot_dpkg\fP(1) 4
-/sbin/dpkg の管理
-.IP \fBlb_chroot_hacks\fP(1) 4
-hacks (応急的な操作を行うスクリプト) を chroot で実行します
-.IP \fBlb_chroot_hostname\fP(1) 4
-/bin/hostname の管理
-.IP \fBlb_chroot_hosts\fP(1) 4
-/etc/hosts の管理
-.IP \fBlb_chroot_install\-packages\fP(1) 4
-キューにあるパッケージを chroot にインストールします
-.IP \fBlb_chroot_interactive\fP(1) 4
-対話的にビルドします
-.IP \fBlb_chroot_linux\-image\fP(1) 4
-/etc/kernel\-img.conf の管理
-.IP \fBlb_chroot_hooks\fP(1) 4
-ローカルフックを chroot で実行します
-.IP \fBlb_chroot_local\-includes\fP(1) 4
-ローカルファイルを chroot にコピーします
-.IP \fBlb_chroot_packages\fP(1) 4
-chroot にインストールするパッケージをキューに追加します
-.IP \fBlb_chroot_local\-patches\fP(1) 4
-ローカルのパッチを chroot に適用させます
-.IP \fBlb_chroot_local\-preseed\fP(1) 4
-ローカルにある debconf の preseed 用ファイルを利用します
-.IP \fBlb_chroot_packagelists\fP(1) 4
-chroot にインストールするパッケージ一覧をキューに追加します
-.IP \fBlb_chroot_proc\fP(1) 4
-/proc をマウントします。
-.IP \fBlb_chroot_resolv\fP(1) 4
-/etc/resolv.conf の管理
-.IP \fBlb_chroot_selinuxfs\fP(1) 4
-/selinux をマウントします。
-.IP \fBlb_chroot_archives\fP(1) 4
-/etc/apt/sources.list の管理
-.IP \fBlb_chroot_sysfs\fP(1) 4
-/sys をマウントします。
-.IP \fBlb_chroot_sysv\-rc\fP(1) 4
-/usr/sbin/policy\-rc.d の管理
-.IP \fBlb_chroot_task\-lists\fP(1) 4
-タスク一覧を chroot にインストールします
-.SS バイナリコマンド
-.IP \fBlb_binary_chroot\fP(1) 4
-chroot を chroot にコピーします
-.IP \fBlb_binary_debian\-installer\fP(1) 4
-debian\-installer をバイナリにインストールします
-.IP \fBlb_binary_disk\fP(1) 4
-ディスク情報をバイナリにインストールします
-.IP \fBlb_binary_grub\fP(1) 4
-grub をバイナリにインストールします
-.IP \fBlb_binary_grub2\fP(1) 4
-grub2 をバイナリにインストールします
-.IP \fBlb_binary_includes\fP(1) 4
-ファイルをバイナリにコピーします
-.IP \fBlb_binary_iso\fP(1) 4
-ISOバイナリイメージをビルドします
-.IP \fBlb_binary_linux\-image\fP(1) 4
-linux\-image をバイナリにインストールします
-.IP \fBlb_binary_local\-hooks\fP(1) 4
-ローカルフックをバイナリで実行します
-.IP \fBlb_binary_local\-includes\fP(1) 4
-ファイルをバイナリにコピーします
-.IP \fBlb_binary_local\-packagelists\fP(1) 4
-ローカルパッケージ一覧をバイナリにインストールします
-.IP \fBlb_binary_manifest\fP(1) 4
-名簿ファイルを作成します
-.IP \fBlb_binary_checksums\fP(1) 4
-バイナリのチェックサム (md5、sha1、sha256 のどれか) を作成します
-.IP \fBlb_binary_memtest\fP(1) 4
-memtest をバイナリにインストールします
-.IP \fBlb_binary_net\fP(1) 4
-ネットワークブート用バイナリイメージをビルドします
-.IP \fBlb_binary_rootfs\fP(1) 4
-rootfs イメージをビルドします
-.IP \fBlb_binary_syslinux\fP(1) 4
-syslinux をバイナリにインストールします
-.IP \fBlb_binary_tar\fP(1) 4
-ハードディスクバイナリイメージをビルドします
-.IP \fBlb_binary_hdd\fP(1) 4
-バイナリhddイメージをビルドします
-.IP \fBlb_binary_win32\-loader\fP(1) 4
-win32\-loader をバイナリにインストールします
-.SS ソースコマンド
-.IP \fBlb_source_debian\fP(1) 4
-ソースをダウンロードします
-.IP \fBlb_source_debian\-live\fP(1) 4
-debian\-live の設定をソースにコピーします。
-.IP \fBlb_source_disk\fP(1) 4
-ディスク情報をソースにインストールします
-.IP \fBlb_source_iso\fP(1) 4
-ISOソースイメージをビルドします
-.IP \fBlb_source_checksums\fP(1) 4
-ソースのチェックサム (md5、sha1、sha256 のどれか) を作成します
-.IP \fBlb_source_net\fP(1) 4
-build source net image
-.IP \fBlb_source_tar\fP(1) 4
-ソースの tar アーカイブをビルドします
-.IP \fBlb_source_hdd\fP(1) 4
+.SS "Bootstrap stage specific commands"
+.IP "\fBlb bootstrap_archives\fP(1)" 4
+applies apt archive configuration
+.IP "\fBlb bootstrap_cache\fP(1)" 4
+in save mode, saves to cache a copy of the generated bootstrap directory,
+and in restore mode, restores from cache a previously generated copy
+.IP "\fBlb bootstrap_debootstrap\fP(1)" 4
+creates (bootstrap) a basic Debian root filesystem using debootstrap(8)
+.SS "Chroot stage specific commands"
+.PP
+Note: The following chroot_ prefixed commands are used in building the live
+OS filesystem. Another set of similarly prefixed files are listed separately
+(see further down).
+.IP "\fBlb chroot_cache\fP(1)" 4
+in save mode, saves to cache a copy of the chroot directory, and in restore
+mode, restores from cache a previously generated copy
+.IP "\fBlb chroot_firmware\fP(1)" 4
+compiles a list of firmware packages to be installed in the live OS root
+filesystem
+.IP "\fBlb chroot_hacks\fP(1)" 4
+executes local hacks against the live OS root filesystem, if any are
+provided
+.IP "\fBlb chroot_hooks\fP(1)" 4
+executes local hooks against the live OS root filesystem, if any are
+provided
+.IP "\fBlb chroot_includes\fP(1)" 4
+copies a set of local files from the config directory into the live OS root
+filesystem, if any are provided
+.IP "\fBlb chroot_install\-packages\fP(1)" 4
+installs into the live OS root filesystem any packages listed in local
+package lists
+.IP "\fBlb chroot_interactive\fP(1)" 4
+pauses the build process and starts an interactive shell from the live OS
+root filesystem, providing an oportunity for manual modifications or
+testing; note that this is (currently) usually executed with several chroot
+prep modifications applied (see description of these further down)
+.IP "\fBlb chroot_linux\-image\fP(1)" 4
+compiles a list of kernel images to be installed in the live OS root
+filesystem
+.IP "\fBlb chroot_live\-packages\fP(1)" 4
+installs a set of live system specific packages to the live OS root
+filesystem
+.IP "\fBlb chroot_package\-lists\fP(1)" 4
+compiles a list of packages provided in the user\' local config to be
+installed in the live OS root filesystem
+.IP "\fBlb chroot_preseed\fP(1)" 4
+installs pre\-configured answers to certain install prompts into the live OS
+root filesystem
+.SS "Installer stage specific commands"
+.IP "\fBlb installer_debian\-installer\fP(1)" 4
+obtains and sets up Debian installer(d\-i) components
+.IP "\fBlb installer_preseed\fP(1)" 4
+installs pre\-configured answers to certain install prompts
+.SS "Binary stage specific commands"
+.IP "\fBlb binary_checksums\fP(1)" 4
+creates checksums (md5, sha1, and/or sha256) for live image content
+.IP "\fBlb binary_chroot\fP(1)" 4
+duplicates the chroot directory, to place a copy of what whould be the
+completed live OS root filesystem to one side, allowing the original to
+continue to be used in executing certain parts of the remainder of the build
+process
+.IP "\fBlb binary_disk\fP(1)" 4
+creates disk information files to be added to live image
+.IP "\fBlb binary_grub\fP(1)" 4
+installs grub into live image to provide image boot capability
+.IP "\fBlb binary_grub2\fP(1)" 4
+installs grub2 into live image to provide image boot capability
+.IP "\fBlb binary_hdd\fP(1)" 4
+compiles the final live image into an hdd image file
+.IP "\fBlb binary_hooks\fP(1)" 4
+executes local hooks against the live image, if any are provided
+.IP "\fBlb binary_includes\fP(1)" 4
+copies a set of local files from the config directory into the live image,
+if any are provided
+.IP "\fBlb binary_iso\fP(1)" 4
+compiles the final live image into an iso file
+.IP "\fBlb binary_linux\-image\fP(1)" 4
+copies the linux\-image into the live image
+.IP "\fBlb binary_loadlin\fP(1)" 4
+bundles a copy of loadlin into the live image
+.IP "\fBlb binary_manifest\fP(1)" 4
+creates manifest of packages installed into live OS filesystem, and list of
+packages to be excluded by a persistence mechanism installing the live OS to
+disk
+.IP "\fBlb binary_memtest\fP(1)" 4
+bundles a copy of memtest into the live image
+.IP "\fBlb binary_netboot\fP(1)" 4
+compiles the final live image into a netboot tar archive
+.IP "\fBlb binary_package\-lists\fP(1)" 4
+processes local lists of packages to obtain and bundle into image (from
+which they could later be installed if not already)
+.IP "\fBlb binary_rootfs\fP(1)" 4
+wraps up the completed live OS root filesystem into a virtual file system
+image
+.IP "\fBlb binary_syslinux\fP(1)" 4
+installs syslinux into live image to provide image boot capability
+.IP "\fBlb binary_tar\fP(1)" 4
+compiles the final live image into a tar archive
+.IP "\fBlb binary_win32\-loader\fP(1)" 4
+bundles a copy of win32\-loader into the live image and creates an
+autorun.inf file
+.IP "\fBlb binary_zsync\fP(1)" 4
+builds zsync control files
+.SS "Source stage specific commands"
+.IP "\fBlb source_checksums\fP(1)" 4
+creates checksums (md5, sha1, and/or sha256) for source image content
+.IP "\fBlb source_debian\fP(1)" 4
+downloads source packages for bundling into source image
+.IP "\fBlb source_disk\fP(1)" 4
+creates disk information files to be added to source image
+.IP "\fBlb source_hdd\fP(1)" 4
+compiles the final source image into an hdd image file
+.IP "\fBlb source_hooks\fP(1)" 4
+executes local hooks against the source image, if any are provided
+.IP "\fBlb source_iso\fP(1)" 4
+compiles the final source image into an iso file
+.IP "\fBlb source_live\fP(1)" 4
+copies live\-build config into source
+.IP "\fBlb source_tar\fP(1)" 4
+.\" FIXME
+compiles the final source image into a tar archive
+
+.SH "LOW\-LEVEL COMMANDS (PLUMBING) \- CHROOT PREP COMPONENTS"
+.\" FIXME
+The notes above under the section regarding build\-stage specific low\-level
+plumbing commands also apply here.
+.PP
+The following chroot_ prefixed commands are used throughout the various
+primary stages of the build process to apply and remove modifications to a
+chroot root filesystem. Generally these are used to apply modification that
+setup the chroot for use (execution of programs within it) during the build
+process, and later to remove those modification, unmounting things that were
+mounted, and making the chroot suitable for use as the root filesystem of
+the live OS to be bundled into the live image.
+.IP "\fBlb chroot_apt\fP(1)" 4
+manages apt configuration; in apply mode it applies configuration for use
+during build process, and in remove mode removes that configuration
+.IP "\fBlb chroot_archives\fP(1)" 4
+manages apt archive source lists; in apply mode it applies source list
+configurations suitable for use of the chroot in the build process, and in
+remove mode replaces that with a configuration suitable for the final live
+OS
+.IP "\fBlb chroot_debianchroot\fP(1)" 4
+manages a /etc/debian_chroot file
+.IP "\fBlb chroot_devpts\fP(1)" 4
+manages mounting of /dev/pts
+.IP "\fBlb chroot_dpkg\fP(1)" 4
+manages dpkg; in apply mode disabling things like the start\-stop\-daemon, and
+in remove mode enabling them again
+.IP "\fBlb chroot_hostname\fP(1)" 4
+manages the hostname configuration
+.IP "\fBlb chroot_hosts\fP(1)" 4
+manages the /etc/hosts file
+.IP "\fBlb chroot_proc\fP(1)" 4
+manages mounting of /proc
+.IP "\fBlb chroot_resolv\fP(1)" 4
+manages configuration of the /etc/resolv.conf file
+.IP "\fBlb chroot_selinuxfs\fP(1)" 4
+manages mounting of /sys/fs/selinux
+.IP "\fBlb chroot_sysfs\fP(1)" 4
+manages mounting of /sys
+.IP "\fBlb chroot_sysv\-rc\fP(1)" 4
+manages the /usr/sbin/policy\-rc.d file
+.IP "\fBlb chroot_tmpfs\fP(1)" 4
+manages configuration of dpkg to use a tmpfs filesystem
+.IP "\fBlb chroot_upstart\fP(1)" 4
 .\" FIXME
-ソースhddイメージをビルドします
+manages use of upstart /sbin/initctl program; in apply mode blocking
+execution through a dpkg diversion, and in remove mode enabling execution
+again
 
 .SH 設定ファイル
 .\" FIXME
@@ -217,11 +274,12 @@ config/bootstrap_debootstrap
 ページを見てください。こういったファイルには一般的に、変数とそれに指定する値を1行に1件ずつ収録します。live\-build
 の一部のプログラムでは組にした値や、変数の指定にわずかに複雑な方法を採っているものがあります。
 .PP
-例えば lb_bootstrap_debootstrap は利用するオプションを読み取るのに config/bootstrap 及び
-config/bootstrap_debootstrap
-という名のファイルを使います。利用するファイルの名前やフォーマットの詳細については個々のコマンドの man
-ページを見てください。こういったファイルには一般的に、変数とそれに指定する値を1行に1件ずつ収録します。live\-build
-の一部のプログラムでは組にした値や、変数の指定にわずかに複雑な方法を採っているものがあります。
+For example, lb bootstrap_debootstrap uses files named config/bootstrap and
+config/bootstrap_debootstrap to read the options it will use. See the man
+pages of individual commands for details about the names and formats of the
+files they use. Generally, these files contain variables with values
+assigned, one variable per line. Some programs in live\-build use pairs of
+values or slightly more complicated variable assignments.
 .PP
 live\-build
 は実行中のシェルに存在する環境変数を尊重することに注意してください。変数が設定ファイルから読み取れる場合にはそれが環境変数より優先され、コマンドラインオプションで指定された場合にはそれが設定ファイルの値より優先されます。ある変数が見つからない、つまり値がセットされていない場合は
@@ -247,9 +305,8 @@ live\-build が自動的にデフォルト値をセットします。
 このプログラムは live\-build の一部です。
 
 .SH ホームページ
-live\-build 及び Live
-システムプロジェクトについてのさらなる情報は、<\fIhttp://live\-systems.org/\fP> のホームページや
-<\fIhttp://live\-systems.org/manual/\fP> のマニュアルにあります。
+More information about live\-build and the Live Systems project can be found
+on the homepage at <\fIhttps://debian\-live.alioth.debian.org/\fP>.
 
 .SH バグ
 バグは <\fIhttp://bugs.debian.org/\fP> にあるバグ追跡システムに live\-build
diff --git a/manpages/po/fr/lb.1.po b/manpages/po/fr/lb.1.po
index e9d2dfe70..cb41c5941 100644
--- a/manpages/po/fr/lb.1.po
+++ b/manpages/po/fr/lb.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2015-09-20 14:53+0200\n"
 "Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: none\n"
@@ -28,7 +28,7 @@ msgstr "LIVE-BUILD"
 #: en/live-build.7:1
 #, no-wrap
 msgid "2015-10-21"
-msgstr "21.10.2015"
+msgstr "29.08.2017"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
@@ -79,7 +79,7 @@ msgstr "B<lb> [I<live-build\\ options>]"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -96,7 +96,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -115,8 +115,8 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
@@ -130,58 +130,64 @@ msgstr "B<aucun>"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "Ce programme est une partie de live-build."
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "Davantage d'informations à propos de live-build et du projet Live Systems "
-"peuvent être trouvées sur la page d'accueil à E<lt>I<http://live-systems.org/"
-">E<gt> et dans le manuel à E<lt>I<http://live-systems.org/manual/>E<gt>."
+"peuvent être trouvées sur la page d'accueil à E<lt>I<https://debian-live."
+"alioth.debian.org/>E<gt> et dans le manuel à E<lt>I<https://debian-live."
+"alioth.debian.org/manual/>E<gt>."
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -195,16 +201,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
diff --git a/manpages/po/fr/lb_binary.1.po b/manpages/po/fr/lb_binary.1.po
index 8383e60cc..070d39bdd 100644
--- a/manpages/po/fr/lb_binary.1.po
+++ b/manpages/po/fr/lb_binary.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2015-09-20 14:53+0200\n"
 "Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: none\n"
@@ -28,7 +28,7 @@ msgstr "LIVE-BUILD"
 #: en/live-build.7:1
 #, no-wrap
 msgid "2015-10-21"
-msgstr "21.10.2015"
+msgstr "29.08.2017"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
@@ -64,7 +64,7 @@ msgstr "SYNOPSIS"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "DESCRIPTION"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,8 +80,8 @@ msgstr "OPTIONS"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
@@ -95,58 +95,64 @@ msgstr "B<aucun>"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "Ce programme est une partie de live-build."
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "Davantage d'informations à propos de live-build et du projet Live Systems "
-"peuvent être trouvées sur la page d'accueil à E<lt>I<http://live-systems.org/"
-">E<gt> et dans le manuel à E<lt>I<http://live-systems.org/manual/>E<gt>."
+"peuvent être trouvées sur la page d'accueil à E<lt>I<https://debian-live."
+"alioth.debian.org/>E<gt> et dans le manuel à E<lt>I<https://debian-live."
+"alioth.debian.org/manual/>E<gt>."
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -160,16 +166,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -178,7 +184,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_binary.1:5
-msgid "B<lb binary> - Complete the binary stage"
+#, fuzzy
+#| msgid "B<lb binary> - Complete the binary stage"
+msgid "B<lb_binary> - Complete the binary stage"
 msgstr "B<lb binary> - Complète le stage bianire"
 
 #. type: Plain text
diff --git a/manpages/po/fr/lb_bootstrap.1.po b/manpages/po/fr/lb_bootstrap.1.po
index aa27aeecb..6b385990c 100644
--- a/manpages/po/fr/lb_bootstrap.1.po
+++ b/manpages/po/fr/lb_bootstrap.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2015-09-20 14:53+0200\n"
 "Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: none\n"
@@ -28,7 +28,7 @@ msgstr "LIVE-BUILD"
 #: en/live-build.7:1
 #, no-wrap
 msgid "2015-10-21"
-msgstr "21.10.2015"
+msgstr "29.08.2017"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
@@ -64,7 +64,7 @@ msgstr "SYNOPSIS"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "DESCRIPTION"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,8 +80,8 @@ msgstr "OPTIONS"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
@@ -95,58 +95,64 @@ msgstr "B<aucun>"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "Ce programme est une partie de live-build."
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "Davantage d'informations à propos de live-build et du projet Live Systems "
-"peuvent être trouvées sur la page d'accueil à E<lt>I<http://live-systems.org/"
-">E<gt> et dans le manuel à E<lt>I<http://live-systems.org/manual/>E<gt>."
+"peuvent être trouvées sur la page d'accueil à E<lt>I<https://debian-live."
+"alioth.debian.org/>E<gt> et dans le manuel à E<lt>I<https://debian-live."
+"alioth.debian.org/manual/>E<gt>."
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -160,16 +166,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -178,7 +184,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_bootstrap.1:5
-msgid "B<lb bootstrap> - Complete the bootstrap stage"
+#, fuzzy
+#| msgid "B<lb bootstrap> - Complete the bootstrap stage"
+msgid "B<lb_bootstrap> - Complete the bootstrap stage"
 msgstr "B<lb bootstrap> - Complète le stage d'amorçage"
 
 #. type: Plain text
diff --git a/manpages/po/fr/lb_build.1.po b/manpages/po/fr/lb_build.1.po
index 6dceb79aa..778ab2045 100644
--- a/manpages/po/fr/lb_build.1.po
+++ b/manpages/po/fr/lb_build.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2015-09-20 14:53+0200\n"
 "Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: none\n"
@@ -28,7 +28,7 @@ msgstr "LIVE-BUILD"
 #: en/live-build.7:1
 #, no-wrap
 msgid "2015-10-21"
-msgstr "21.10.2015"
+msgstr "29.08.2017"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
@@ -64,7 +64,7 @@ msgstr "SYNOPSIS"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "DESCRIPTION"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,66 +80,72 @@ msgstr "OPTIONS"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "Ce programme est une partie de live-build."
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "Davantage d'informations à propos de live-build et du projet Live Systems "
-"peuvent être trouvées sur la page d'accueil à E<lt>I<http://live-systems.org/"
-">E<gt> et dans le manuel à E<lt>I<http://live-systems.org/manual/>E<gt>."
+"peuvent être trouvées sur la page d'accueil à E<lt>I<https://debian-live."
+"alioth.debian.org/>E<gt> et dans le manuel à E<lt>I<https://debian-live."
+"alioth.debian.org/manual/>E<gt>."
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -153,16 +159,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -171,7 +177,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_build.1:5
-msgid "B<lb build> - Complete the bootstrap, chroot, binary, and source stages"
+#, fuzzy
+#| msgid ""
+#| "B<lb build> - Complete the bootstrap, chroot, binary, and source stages"
+msgid "B<lb_build> - Complete the bootstrap, chroot, binary, and source stages"
 msgstr ""
 "B<lb build> - Complète les stages d'amorçage (bootstrap), de chroot, "
 "binaire, et source"
diff --git a/manpages/po/fr/lb_chroot.1.po b/manpages/po/fr/lb_chroot.1.po
index 1c30d5cc2..3981fd011 100644
--- a/manpages/po/fr/lb_chroot.1.po
+++ b/manpages/po/fr/lb_chroot.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2015-09-20 14:53+0200\n"
 "Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: none\n"
@@ -28,7 +28,7 @@ msgstr "LIVE-BUILD"
 #: en/live-build.7:1
 #, no-wrap
 msgid "2015-10-21"
-msgstr "21.10.2015"
+msgstr "29.08.2017"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
@@ -64,7 +64,7 @@ msgstr "SYNOPSIS"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "DESCRIPTION"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,8 +80,8 @@ msgstr "OPTIONS"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
@@ -95,58 +95,64 @@ msgstr "B<aucun>"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "Ce programme est une partie de live-build."
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "Davantage d'informations à propos de live-build et du projet Live Systems "
-"peuvent être trouvées sur la page d'accueil à E<lt>I<http://live-systems.org/"
-">E<gt> et dans le manuel à E<lt>I<http://live-systems.org/manual/>E<gt>."
+"peuvent être trouvées sur la page d'accueil à E<lt>I<https://debian-live."
+"alioth.debian.org/>E<gt> et dans le manuel à E<lt>I<https://debian-live."
+"alioth.debian.org/manual/>E<gt>."
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -160,16 +166,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -178,7 +184,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_chroot.1:5
-msgid "B<lb chroot> - Complete the chroot stage"
+#, fuzzy
+#| msgid "B<lb chroot> - Complete the chroot stage"
+msgid "B<lb_chroot> - Complete the chroot stage"
 msgstr "B<lb chroot> - Complète le stage de chroot"
 
 #. type: Plain text
diff --git a/manpages/po/fr/lb_clean.1.po b/manpages/po/fr/lb_clean.1.po
index a3aca3c70..cfe89c6d9 100644
--- a/manpages/po/fr/lb_clean.1.po
+++ b/manpages/po/fr/lb_clean.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2015-09-20 14:53+0200\n"
 "Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: none\n"
@@ -28,7 +28,7 @@ msgstr "LIVE-BUILD"
 #: en/live-build.7:1
 #, no-wrap
 msgid "2015-10-21"
-msgstr "21.10.2015"
+msgstr "29.08.2017"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
@@ -64,7 +64,7 @@ msgstr "SYNOPSIS"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "DESCRIPTION"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,66 +80,72 @@ msgstr "OPTIONS"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "Ce programme est une partie de live-build."
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "Davantage d'informations à propos de live-build et du projet Live Systems "
-"peuvent être trouvées sur la page d'accueil à E<lt>I<http://live-systems.org/"
-">E<gt> et dans le manuel à E<lt>I<http://live-systems.org/manual/>E<gt>."
+"peuvent être trouvées sur la page d'accueil à E<lt>I<https://debian-live."
+"alioth.debian.org/>E<gt> et dans le manuel à E<lt>I<https://debian-live."
+"alioth.debian.org/manual/>E<gt>."
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -153,16 +159,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -171,7 +177,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_clean.1:5
-msgid "B<lb clean> - Clean build directory"
+#, fuzzy
+#| msgid "B<lb clean> - Clean build directory"
+msgid "B<lb_clean> - Clean build directory"
 msgstr "B<lb clean> - Nettoie le répertoire de construction"
 
 #. type: Plain text
diff --git a/manpages/po/fr/lb_config.1.po b/manpages/po/fr/lb_config.1.po
index 0a20625b1..b8836ba5d 100644
--- a/manpages/po/fr/lb_config.1.po
+++ b/manpages/po/fr/lb_config.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2015-09-20 14:53+0200\n"
 "Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: none\n"
@@ -28,7 +28,7 @@ msgstr "LIVE-BUILD"
 #: en/live-build.7:1
 #, no-wrap
 msgid "2015-10-21"
-msgstr "21.10.2015"
+msgstr "29.08.2017"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
@@ -64,7 +64,7 @@ msgstr "SYNOPSIS"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "DESCRIPTION"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,66 +80,72 @@ msgstr "OPTIONS"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "Ce programme est une partie de live-build."
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "Davantage d'informations à propos de live-build et du projet Live Systems "
-"peuvent être trouvées sur la page d'accueil à E<lt>I<http://live-systems.org/"
-">E<gt> et dans le manuel à E<lt>I<http://live-systems.org/manual/>E<gt>."
+"peuvent être trouvées sur la page d'accueil à E<lt>I<https://debian-live."
+"alioth.debian.org/>E<gt> et dans le manuel à E<lt>I<https://debian-live."
+"alioth.debian.org/manual/>E<gt>."
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -153,16 +159,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -171,7 +177,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:5
-msgid "B<lb config> - Create config directory"
+#, fuzzy
+#| msgid "B<lb config> - Create config directory"
+msgid "B<lb_config> - Create config directory"
 msgstr "B<lb config> - Crée un répertoire de configuration"
 
 #. type: Plain text
@@ -262,403 +270,426 @@ msgstr "  [B<--bootappend-live> I<PARAMÈTRES>|I<\"PARAMÈTRES\">]"
 
 #. type: Plain text
 #: en/lb_config.1:43
-msgid "  [B<--bootloader> grub|grub2|syslinux]"
-msgstr "  [B<--bootloader> grub|grub2|syslinux]"
+#, fuzzy
+#| msgid "  [B<--bootappend-live> I<PARAMETER>|I<\"PARAMETERS\">]"
+msgid "  [B<--bootappend-live-failsafe> I<PARAMETER>|I<\"PARAMETERS\">]"
+msgstr "  [B<--bootappend-live> I<PARAMÈTRES>|I<\"PARAMÈTRES\">]"
 
 #. type: Plain text
 #: en/lb_config.1:45
+#, fuzzy
+#| msgid "  [B<--bootloader> grub|grub2|syslinux]"
+msgid "  [B<--bootloaders> grub-legacy|grub-pc|syslinux|grub-efi]"
+msgstr "  [B<--bootloader> grub|grub2|syslinux]"
+
+#. type: Plain text
+#: en/lb_config.1:47
 msgid "  [B<--cache> true|false]"
 msgstr "  [B<--cache> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:47
+#: en/lb_config.1:49
 msgid "  [B<--cache-indices> true|false]"
 msgstr "  [B<--cache-indices> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:49
+#: en/lb_config.1:51
 msgid "  [B<--cache-packages> true|false]"
 msgstr "  [B<--cache-packages> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:51
+#: en/lb_config.1:53
 msgid "  [B<--cache-stages> I<STAGE>|I<\"STAGES\">]"
 msgstr "  [B<--cache-stages> I<STAGE>|I<\"STAGES\">]"
 
 #. type: Plain text
-#: en/lb_config.1:53
+#: en/lb_config.1:55
 msgid "  [B<--checksums> md5|sha1|sha256|none]"
 msgstr "  [B<--checksums> md5|sha1|sha256|none]"
 
 #. type: Plain text
-#: en/lb_config.1:55
+#: en/lb_config.1:57
 msgid "  [B<--compression> bzip2|gzip|lzip|none]"
 msgstr "  [B<--compression> bzip2|gzip|lzip|none]"
 
 #. type: Plain text
-#: en/lb_config.1:57
+#: en/lb_config.1:59
 msgid "  [B<--config> I<GIT_URL::GIT_ID>]"
 msgstr "  [B<--config> I<GIT_URL::GIT_ID>]"
 
 #. type: Plain text
-#: en/lb_config.1:59
+#: en/lb_config.1:61
 msgid "  [B<--build-with-chroot> true|false]"
 msgstr "  [B<--build-with-chroot> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:61
+#: en/lb_config.1:63
 msgid "  [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]"
 msgstr "  [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]"
 
 #. type: Plain text
-#: en/lb_config.1:63
+#: en/lb_config.1:65
 msgid "  [B<--clean>]"
 msgstr "  [B<--clean>]"
 
 #. type: Plain text
-#: en/lb_config.1:65
+#: en/lb_config.1:67
 msgid "  [-c|B<--conffile> I<FILE>]"
 msgstr "  [-c|B<--conffile> I<FICHIER>]"
 
 #. type: Plain text
-#: en/lb_config.1:67
+#: en/lb_config.1:69
 msgid "  [B<--debconf-frontend> dialog|editor|noninteractive|readline]"
 msgstr "  [B<--debconf-frontend> dialog|editor|noninteractive|readline]"
 
 #. type: Plain text
-#: en/lb_config.1:69
+#: en/lb_config.1:71
 msgid "  [B<--debconf-priority> low|medium|high|critical]"
 msgstr "  [B<--debconf-priority> low|medium|high|critical]"
 
 #. type: Plain text
-#: en/lb_config.1:71
+#: en/lb_config.1:73
 msgid ""
 "  [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]"
 msgstr ""
 "  [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]"
 
 #. type: Plain text
-#: en/lb_config.1:73
+#: en/lb_config.1:75
 msgid "  [B<--debian-installer-distribution> daily|I<CODENAME>]"
 msgstr "  [B<--debian-installer-distribution> daily|I<NOM_DE_CODE>]"
 
 #. type: Plain text
-#: en/lb_config.1:75
+#: en/lb_config.1:77
 msgid "  [B<--debian-installer-preseedfile> I<FILE>|I<URL>]"
 msgstr "  [B<--debian-installer-preseedfile> I<FICHIER>|I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:77
+#: en/lb_config.1:79
 msgid "  [B<--debian-installer-gui> true|false]"
 msgstr "  [B<--debian-installer-gui> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:79
+#: en/lb_config.1:81
+#, fuzzy
+#| msgid "  [B<--net-root-mountoptions> I<OPTIONS>]"
+msgid "  [B<--debootstrap-options> I<OPTIONS>]"
+msgstr "  [B<--net-root-mountoptions> I<OPTIONS>]"
+
+#. type: Plain text
+#: en/lb_config.1:83
+#, fuzzy
+#| msgid "  [B<--mirror-bootstrap> I<URL>]"
+msgid "  [B<--debootstrap-script> I<SCRIPT>]"
+msgstr "  [B<--mirror-bootstrap> I<URL>]"
+
+#. type: Plain text
+#: en/lb_config.1:85
 msgid "  [B<--debug>]"
 msgstr "  [B<--debug>]"
 
 #. type: Plain text
-#: en/lb_config.1:81
+#: en/lb_config.1:87
 msgid "  [-d|B<--distribution> I<CODENAME>]"
 msgstr "  [-d|B<--distribution> I<NOM_DE_CODE>]"
 
 #. type: Plain text
-#: en/lb_config.1:83
+#: en/lb_config.1:89
 msgid "  [B<--parent-distribution> I<CODENAME>]"
 msgstr "  [B<--parent-distribution> I<NOM_DE_CODE>]"
 
 #. type: Plain text
-#: en/lb_config.1:85
+#: en/lb_config.1:91
 msgid "  [B<--parent-debian-installer-distribution> I<CODENAME>]"
 msgstr "  [B<--parent-debian-installer-distribution> I<NOM_DE_CODE>]"
 
 #. type: Plain text
-#: en/lb_config.1:87
+#: en/lb_config.1:93
 msgid "  [B<--dump>]"
 msgstr "  [B<--dump>]"
 
 #. type: Plain text
-#: en/lb_config.1:89
+#: en/lb_config.1:95
 msgid "  [B<--fdisk> fdisk|fdisk.dist]"
 msgstr "  [B<--fdisk> fdisk|fdisk.dist]"
 
 #. type: Plain text
-#: en/lb_config.1:91
+#: en/lb_config.1:97
 msgid "  [B<--firmware-binary true|false>]"
 msgstr "  [B<--firmware-binary true|false>]"
 
 #. type: Plain text
-#: en/lb_config.1:93
+#: en/lb_config.1:99
 msgid "  [B<--firmware-chroot true|false>]"
 msgstr "  [B<--firmware-chroot true|false>]"
 
 #. type: Plain text
-#: en/lb_config.1:95
+#: en/lb_config.1:101
 msgid "  [B<--force>]"
 msgstr "  [B<--force>]"
 
 #. type: Plain text
-#: en/lb_config.1:97
+#: en/lb_config.1:103
 msgid "  [B<--grub-splash> I<FILE>]"
 msgstr "  [B<--grub-splash> I<FICHIER>]"
 
 #. type: Plain text
-#: en/lb_config.1:99
+#: en/lb_config.1:105
 msgid "  [B<--gzip-options> I<OPTION>|\"I<OPTIONS>\"]"
 msgstr "  [B<--gzip-options> I<OPTION>|\"I<OPTIONS>\"]"
 
 #. type: Plain text
-#: en/lb_config.1:101
+#: en/lb_config.1:107
 msgid "  [B<--hooks> I<FILE>]"
 msgstr "  [B<--hooks> I<FICHIER>]"
 
 #. type: Plain text
-#: en/lb_config.1:103
+#: en/lb_config.1:109
 msgid "  [B<--ignore-system-defaults>]"
 msgstr "  [B<--ignore-system-defaults>]"
 
 #. type: Plain text
-#: en/lb_config.1:105
+#: en/lb_config.1:111
 msgid "  [B<--initramfs> auto|none|live-boot|casper]"
 msgstr "  [B<--initramfs> auto|none|live-boot|casper]"
 
 #. type: Plain text
-#: en/lb_config.1:107
+#: en/lb_config.1:113
 msgid "  [B<--initramfs-compression> bzip2|gzip|lzma]"
 msgstr "  [B<--initramfs-compression> bzip2|gzip|lzma]"
 
 #. type: Plain text
-#: en/lb_config.1:109
+#: en/lb_config.1:115
 msgid "  [B<--initsystem> sysvinit|runit|systemd|upstart|none]"
 msgstr "  [B<--initsystem> sysvinit|runit|systemd|upstart|none]"
 
 #. type: Plain text
-#: en/lb_config.1:111
+#: en/lb_config.1:117
 msgid "  [B<--interactive> shell]"
 msgstr "  [B<--interactive> shell]"
 
 #. type: Plain text
-#: en/lb_config.1:113
+#: en/lb_config.1:119
 msgid "  [B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\"]"
 msgstr "  [B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\"]"
 
 #. type: Plain text
-#: en/lb_config.1:115
+#: en/lb_config.1:121
 msgid "  [B<--iso-application> I<NAME>]"
 msgstr "  [B<--iso-application> I<NOM>]"
 
 #. type: Plain text
-#: en/lb_config.1:117
+#: en/lb_config.1:123
 msgid "  [B<--iso-preparer> I<NAME>]"
 msgstr "  [B<--iso-preparer> I<NOM>]"
 
 #. type: Plain text
-#: en/lb_config.1:119
+#: en/lb_config.1:125
 msgid "  [B<--iso-publisher> I<NAME>]"
 msgstr "  [B<--iso-publisher> I<NOM>]"
 
 #. type: Plain text
-#: en/lb_config.1:121
+#: en/lb_config.1:127
 msgid "  [B<--iso-volume> I<NAME>]"
 msgstr "  [B<--iso-volume> I<NOM>]"
 
 #. type: Plain text
-#: en/lb_config.1:123
+#: en/lb_config.1:129
 msgid "  [B<--jffs2-eraseblock> I<SIZE>]"
 msgstr "  [B<--jffs2-eraseblock> I<TAILLE>]"
 
 #. type: Plain text
-#: en/lb_config.1:125
+#: en/lb_config.1:131
 msgid "  [B<--keyring-packages> I<PACKAGE|\"PACKAGES\">]"
 msgstr "  [B<--keyring-packages> I<PAQUET|\"PAQUETS\">]"
 
 #. type: Plain text
-#: en/lb_config.1:127
+#: en/lb_config.1:133
 msgid "  [-k|B<--linux-flavours> I<FLAVOUR>|I<\"FLAVOURS\">]"
 msgstr "  [-k|B<--linux-flavours> I<VARIÉTÉ>|I<\"VARIÉTÉS\">]"
 
 #. type: Plain text
-#: en/lb_config.1:129
+#: en/lb_config.1:135
 msgid "  [B<--linux-packages> I<\"PACKAGES\">]"
 msgstr "  [B<--linux-packages> I<\"PAQUETS\">]"
 
 #. type: Plain text
-#: en/lb_config.1:131
+#: en/lb_config.1:137
 msgid "  [B<--losetup> losetup|losetup.orig]"
 msgstr "  [B<--losetup> losetup|losetup.orig]"
 
 #. type: Plain text
-#: en/lb_config.1:133
+#: en/lb_config.1:139
 msgid "  [B<--memtest> memtest86+|memtest86|none]"
 msgstr "  [B<--memtest> memtest86+|memtest86|none]"
 
 #. type: Plain text
-#: en/lb_config.1:135
+#: en/lb_config.1:141
 msgid "  [-m|B<--parent-mirror-bootstrap> I<URL>]"
 msgstr "  [-m|B<--parent-mirror-bootstrap> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:137
+#: en/lb_config.1:143
 msgid "  [B<--parent-mirror-chroot> I<URL>]"
 msgstr "  [B<--parent-mirror-chroot> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:139
+#: en/lb_config.1:145
 msgid "  [B<--parent-mirror-chroot-security> I<URL>]"
 msgstr "  [B<--parent-mirror-chroot-security> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:141
+#: en/lb_config.1:147
 msgid "  [B<--parent-mirror-chroot-updates> I<URL>]"
 msgstr "  [B<--parent-mirror-chroot-updates> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:143
+#: en/lb_config.1:149
 msgid "  [B<--parent-mirror-chroot-backports> I<URL>]"
 msgstr "  [B<--parent-mirror-chroot-backports> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:145
+#: en/lb_config.1:151
 msgid "  [B<--parent-mirror-binary> I<URL>]"
 msgstr "  [B<--parent-mirror-binary> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:147
+#: en/lb_config.1:153
 msgid "  [B<--parent-mirror-binary-security> I<URL>]"
 msgstr "  [B<--parent-mirror-binary-security> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:149
+#: en/lb_config.1:155
 msgid "  [B<--parent-mirror-binary-updates> I<URL>]"
 msgstr "  [B<--parent-mirror-binary-updates> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:151
+#: en/lb_config.1:157
 msgid "  [B<--parent-mirror-binary-backports> I<URL>]"
 msgstr "  [B<--parent-mirror-binary-backports> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:153
+#: en/lb_config.1:159
 msgid "  [B<--parent-mirror-debian-installer> I<URL>]"
 msgstr "  [B<--parent-mirror-debian-installer> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:155
+#: en/lb_config.1:161
 msgid "  [B<--mirror-bootstrap> I<URL>]"
 msgstr "  [B<--mirror-bootstrap> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:157
+#: en/lb_config.1:163
 msgid "  [B<--mirror-chroot> I<URL>]"
 msgstr "  [B<--mirror-chroot> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:159
+#: en/lb_config.1:165
 msgid "  [B<--mirror-chroot-security> I<URL>]"
 msgstr "  [B<--mirror-chroot-security> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:161
+#: en/lb_config.1:167
 msgid "  [B<--mirror-chroot-updates> I<URL>]"
 msgstr "  [B<--mirror-chroot-updates> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:163
+#: en/lb_config.1:169
 msgid "  [B<--mirror-chroot-backports> I<URL>]"
 msgstr "  [B<--mirror-chroot-backports> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:165
+#: en/lb_config.1:171
 msgid "  [B<--mirror-binary> I<URL>]"
 msgstr "  [B<--mirror-binary> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:167
+#: en/lb_config.1:173
 msgid "  [B<--mirror-binary-security> I<URL>]"
 msgstr "  [B<--mirror-binary-security> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:169
+#: en/lb_config.1:175
 msgid "  [B<--mirror-binary-updates> I<URL>]"
 msgstr "  [B<--mirror-binary-updates> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:171
+#: en/lb_config.1:177
 msgid "  [B<--mirror-binary-backports> I<URL>]"
 msgstr "  [B<--mirror-binary-backports> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:173
+#: en/lb_config.1:179
 msgid "  [B<--mirror-debian-installer> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:175
+#: en/lb_config.1:181
 msgid "  [B<--mode> debian|progress-linux|ubuntu]"
 msgstr "  [B<--mode> debian|progress-linux|ubuntu]"
 
 #. type: Plain text
-#: en/lb_config.1:177
+#: en/lb_config.1:183
 msgid "  [B<--system> live|normal]"
 msgstr "  [B<--system> live|normal]"
 
 #. type: Plain text
-#: en/lb_config.1:179
+#: en/lb_config.1:185
 msgid "  [B<--net-root-filesystem> nfs|cfs]"
 msgstr "  [B<--net-root-filesystem> nfs|cfs]"
 
 #. type: Plain text
-#: en/lb_config.1:181
+#: en/lb_config.1:187
 msgid "  [B<--net-root-mountoptions> I<OPTIONS>]"
 msgstr "  [B<--net-root-mountoptions> I<OPTIONS>]"
 
 #. type: Plain text
-#: en/lb_config.1:183
+#: en/lb_config.1:189
 msgid "  [B<--net-root-path> I<PATH>]"
 msgstr "  [B<--net-root-path> I<CHEMIN>]"
 
 #. type: Plain text
-#: en/lb_config.1:185
+#: en/lb_config.1:191
 msgid "  [B<--net-root-server> I<IP>|I<HOSTNAME>]"
 msgstr "  [B<--net-root-server> I<IP>|I<NOM_D_HÔTE>]"
 
 #. type: Plain text
-#: en/lb_config.1:187
+#: en/lb_config.1:193
 msgid "  [B<--net-cow-filesystem> nfs|cfs]"
 msgstr "  [B<--net-cow-filesystem> nfs|cfs]"
 
 #. type: Plain text
-#: en/lb_config.1:189
+#: en/lb_config.1:195
 msgid "  [B<--net-cow-mountoptions> I<OPTIONS>]"
 msgstr "  [B<--net-cow-mountoptions> I<OPTIONS>]"
 
 #. type: Plain text
-#: en/lb_config.1:191
+#: en/lb_config.1:197
 msgid "  [B<--net-cow-path> I<PATH>]"
 msgstr "  [B<--net-cow-path> I<CHEMIN>]"
 
 #. type: Plain text
-#: en/lb_config.1:193
+#: en/lb_config.1:199
 msgid "  [B<--net-cow-server> I<IP>|I<HOSTNAME>]"
 msgstr "  [B<--net-cow-server> I<IP>|I<NOM_D_HÔTE>]"
 
 #. type: Plain text
-#: en/lb_config.1:195
+#: en/lb_config.1:201
 msgid "  [B<--net-tarball> true|false]"
 msgstr "  [B<--net-tarball> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:197
+#: en/lb_config.1:203
 msgid "  [B<--quiet>]"
 msgstr "  [B<--quiet>]"
 
 #. type: Plain text
-#: en/lb_config.1:199
+#: en/lb_config.1:205
 msgid "  [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
 msgstr "  [B<--archive-areas> I<DOMAINE_D'ARCHIVE>|I<\"DOMAINES_D'ARCHIVE\">]"
 
 #. type: Plain text
-#: en/lb_config.1:201
+#: en/lb_config.1:207
 msgid ""
 "  [B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|I<\"PARENT_ARCHIVE_AREAS"
 "\">]"
@@ -667,58 +698,58 @@ msgstr ""
 "\"DOMAINE_D'ARCHIVE_PARENT\">]"
 
 #. type: Plain text
-#: en/lb_config.1:203
+#: en/lb_config.1:209
 msgid "  [B<--security> true|false]"
 msgstr "  [B<--security> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:205
+#: en/lb_config.1:211
 msgid "  [B<--source> true|false]"
 msgstr "  [B<--source> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:207
+#: en/lb_config.1:213
 msgid "  [-s|B<--source-images> iso|netboot|tar|hdd]"
 msgstr "  [-s|B<--source-images> iso|netboot|tar|hdd]"
 
 #. type: Plain text
-#: en/lb_config.1:209
+#: en/lb_config.1:215
 msgid "  [B<--tasksel> apt|aptitude|tasksel]"
 msgstr "  [B<--tasksel> apt|aptitude|tasksel]"
 
 #. type: Plain text
-#: en/lb_config.1:211
+#: en/lb_config.1:217
 msgid "  [B<--templates> I<PATH>]"
 msgstr "  [B<--templates> I<CHEMIN>]"
 
 #. type: Plain text
-#: en/lb_config.1:213
+#: en/lb_config.1:219
 msgid "  [B<--hdd-size >I<MB>]"
 msgstr "  [B<--hdd-size >I<MB>]"
 
 #. type: Plain text
-#: en/lb_config.1:215
+#: en/lb_config.1:221
 msgid "  [B<--updates> true|false]"
 msgstr "  [B<--updates> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:217
+#: en/lb_config.1:223
 msgid "  [B<--backports> true|false]"
 msgstr "  [B<--backports> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:219
+#: en/lb_config.1:225
 msgid "  [B<--verbose>]"
 msgstr "  [B<--verbose>]"
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:222
+#: en/lb_config.1:228
 msgid "  [B<--win32-loader true|false]>"
 msgstr "  [B<--win32-loader true|false]>"
 
 #. type: Plain text
-#: en/lb_config.1:225
+#: en/lb_config.1:231
 msgid ""
 "B<lb config> is a high-level command (porcelain) of I<live-build>(7), the "
 "live systems tool suite."
@@ -728,7 +759,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:228
+#: en/lb_config.1:234
 msgid ""
 "B<lb config> populates the configuration directory for live-build. By "
 "default, this directory is named 'config' and is created in the current "
@@ -740,7 +771,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:231
+#: en/lb_config.1:237
 msgid ""
 "Note: Currently B<lb config> tries to be smart and sets defaults for some "
 "options depending on the setting of other options (e.g. which linux packages "
@@ -770,7 +801,7 @@ msgstr ""
 "source} et rappeler B<lb config>."
 
 #. type: Plain text
-#: en/lb_config.1:234
+#: en/lb_config.1:240
 msgid ""
 "In addition to its specific options B<lb config> understands all generic "
 "live-build options. See I<live-build>(7) for a complete list of all generic "
@@ -782,13 +813,13 @@ msgstr ""
 
 #.  FIXME
 #. type: IP
-#: en/lb_config.1:236
+#: en/lb_config.1:242
 #, no-wrap
 msgid "B<--apt> apt|aptitude"
 msgstr "B<--apt> apt|aptitude"
 
 #. type: Plain text
-#: en/lb_config.1:238
+#: en/lb_config.1:244
 msgid ""
 "defines if apt-get or aptitude is used to install packages when building the "
 "image. The default is apt."
@@ -797,13 +828,13 @@ msgstr ""
 "de la construction de l'image. Par défaut : apt."
 
 #. type: IP
-#: en/lb_config.1:238
+#: en/lb_config.1:244
 #, no-wrap
 msgid "B<--apt-ftp-proxy> I<URL>"
 msgstr "B<--apt-ftp-proxy> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:240
+#: en/lb_config.1:246
 msgid ""
 "sets the ftp proxy to be used by apt. By default, this is empty. Note that "
 "this variable is only for the proxy that gets used by apt internally within "
@@ -814,13 +845,13 @@ msgstr ""
 "par apt à l'intérieur du chroot, il n'est utilisé pour rien d'autre."
 
 #. type: IP
-#: en/lb_config.1:240
+#: en/lb_config.1:246
 #, no-wrap
 msgid "B<--apt-http-proxy> I<URL>"
 msgstr "B<--apt-http-proxy> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:242
+#: en/lb_config.1:248
 msgid ""
 "sets the http proxy to be used by apt. By default, this is empty. Note that "
 "this variable is only for the proxy that gets used by apt internally within "
@@ -831,13 +862,13 @@ msgstr ""
 "par apt à l'intérieur du chroot, il n'est utilisé pour rien d'autre."
 
 #. type: IP
-#: en/lb_config.1:242
+#: en/lb_config.1:248
 #, no-wrap
 msgid "B<--apt-indices> true|false|none"
 msgstr "B<--apt-indices> true|false|none"
 
 #. type: Plain text
-#: en/lb_config.1:244
+#: en/lb_config.1:250
 msgid ""
 "defines if the resulting images should have apt indices or not and defaults "
 "to true. If set to none, no indices are included at all."
@@ -846,13 +877,13 @@ msgstr ""
 "paramètre true par défaut. Si paramétré à none, aucun indice ne sera inclu."
 
 #. type: IP
-#: en/lb_config.1:244
+#: en/lb_config.1:250
 #, no-wrap
 msgid "B<--apt-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr "B<--apt-options> I<OPTION>|\"I<OPTIONS>\""
 
 #. type: Plain text
-#: en/lb_config.1:246
+#: en/lb_config.1:252
 msgid ""
 "defines the default options that will be appended to every apt call that is "
 "made inside chroot during the building of the image. By default, this is set "
@@ -864,13 +895,13 @@ msgstr ""
 "interactive de paquets."
 
 #. type: IP
-#: en/lb_config.1:246
+#: en/lb_config.1:252
 #, no-wrap
 msgid "B<--aptitude-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr "B<--aptitude-options> I<OPTION>|\"I<OPTIONS>\""
 
 #. type: Plain text
-#: en/lb_config.1:248
+#: en/lb_config.1:254
 msgid ""
 "defines the default options that will be appended to every aptitude call "
 "that is made inside chroot during building of the image. By default, this is "
@@ -882,13 +913,13 @@ msgstr ""
 "interactive de paquets."
 
 #. type: IP
-#: en/lb_config.1:248
+#: en/lb_config.1:254
 #, no-wrap
 msgid "B<--apt-pipeline> I<DEPTH>"
 msgstr "B<--apt-pipeline> I<PROFONDEUR>"
 
 #. type: Plain text
-#: en/lb_config.1:250
+#: en/lb_config.1:256
 msgid ""
 "sets the depth of the apt/aptitude pipeline. In cases where the remote "
 "server is not RFC conforming or buggy (such as Squid 2.0.2) this option can "
@@ -908,13 +939,13 @@ msgstr ""
 "option."
 
 #. type: IP
-#: en/lb_config.1:250
+#: en/lb_config.1:256
 #, no-wrap
 msgid "B<--apt-recommends> true|false"
 msgstr "B<--apt-recommends> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:252
+#: en/lb_config.1:258
 msgid ""
 "defines if apt should install recommended packages automatically. By "
 "default, this is true."
@@ -923,26 +954,26 @@ msgstr ""
 "Par défaut : true."
 
 #. type: IP
-#: en/lb_config.1:252
+#: en/lb_config.1:258
 #, no-wrap
 msgid "B<--apt-secure> true|false"
 msgstr "B<--apt-secure> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:254
+#: en/lb_config.1:260
 msgid ""
 "defines if apt should check repository signatures. This is true by default."
 msgstr ""
 "définit si apt devrait vérifier les signatures de dépôt. Par défaut : true."
 
 #. type: IP
-#: en/lb_config.1:254
+#: en/lb_config.1:260
 #, no-wrap
 msgid "B<--apt-source-archives> true|false"
 msgstr "B<--apt-source-archives> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:256
+#: en/lb_config.1:262
 msgid ""
 "defines if deb-src entries should be included in the resulting live image or "
 "not, defaults to true."
@@ -951,13 +982,13 @@ msgstr ""
 "résultante ou non. Par défaut : true."
 
 #. type: IP
-#: en/lb_config.1:256
+#: en/lb_config.1:262
 #, no-wrap
 msgid "-a|B<--architectures> I<ARCHITECTURE>"
 msgstr "-a|B<--architectures> I<ARCHITECTURE>"
 
 #. type: Plain text
-#: en/lb_config.1:258
+#: en/lb_config.1:264
 msgid ""
 "defines the architecture of the to be build image. By default, this is set "
 "to the host architecture. Note that you cannot crossbuild for another "
@@ -975,13 +1006,13 @@ msgstr ""
 "construire des images powerpc sur une système i386 n'est pas possible."
 
 #. type: IP
-#: en/lb_config.1:258
+#: en/lb_config.1:264
 #, no-wrap
 msgid "-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd"
 msgstr "-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd"
 
 #. type: Plain text
-#: en/lb_config.1:260
+#: en/lb_config.1:266
 msgid ""
 "defines the image type to build. By default, for images using syslinux this "
 "is set to iso-hybrid to build CD/DVD images that may also be used like hdd "
@@ -993,19 +1024,29 @@ msgstr ""
 "non-syslinux, le défaut est iso."
 
 #. type: IP
-#: en/lb_config.1:260
+#: en/lb_config.1:266
 #, no-wrap
 msgid "B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4"
 msgstr "B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4"
 
 #. type: Plain text
-#: en/lb_config.1:262
+#: en/lb_config.1:268
+#, fuzzy
+#| msgid ""
+#| "defines the filesystem to be used in the image type. This only has an "
+#| "effect if the selected binary image type does allow to choose a "
+#| "filesystem. For example, when selection iso the resulting CD/DVD has "
+#| "always the filesystem ISO9660. When building hdd images for usb sticks, "
+#| "this is active. Note that it defaults to fat16 on all architectures "
+#| "except sparc where it defaults to ext4. Also note that if you choose "
+#| "fat16 and your resulting binary image gets bigger than 2GB, the binary "
+#| "filesystem automatically gets switched to fat32."
 msgid ""
 "defines the filesystem to be used in the image type. This only has an effect "
-"if the selected binary image type does allow to choose a filesystem. For "
-"example, when selection iso the resulting CD/DVD has always the filesystem "
-"ISO9660. When building hdd images for usb sticks, this is active. Note that "
-"it defaults to fat16 on all architectures except sparc where it defaults to "
+"if the selected binary image type lets you choose a filesystem. For example, "
+"when selection iso the resulting CD/DVD has always the filesystem ISO9660. "
+"When building hdd images for usb sticks, this is active. Note that it "
+"defaults to fat16 on all architectures except sparc where it defaults to "
 "ext4. Also note that if you choose fat16 and your resulting binary image "
 "gets bigger than 2GB, the binary filesystem automatically gets switched to "
 "fat32."
@@ -1021,25 +1062,25 @@ msgstr ""
 "automatiquement passé à fat32."
 
 #. type: IP
-#: en/lb_config.1:262
+#: en/lb_config.1:268
 #, no-wrap
 msgid "B<--bootappend-install> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr "B<--bootappend-install> I<PARAMÈTRE>|\"I<PARAMÈTRES>\""
 
 #. type: Plain text
-#: en/lb_config.1:264
+#: en/lb_config.1:270
 msgid "sets boot parameters specific to debian-installer, if included."
 msgstr ""
 "paramètre les options de démarrage spécifiques à debian-installer, si inclu."
 
 #. type: IP
-#: en/lb_config.1:264
+#: en/lb_config.1:270
 #, no-wrap
 msgid "B<--bootappend-live> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr "B<--bootappend-live> I<PARAMÈTRE>|\"I<PARAMÈTRES>\""
 
 #. type: Plain text
-#: en/lb_config.1:266
+#: en/lb_config.1:272
 msgid ""
 "sets boot parameters specific to debian-live. A complete list of boot "
 "parameters can be found in the I<live-boot>(7) and I<live-config>(7) manual "
@@ -1050,22 +1091,56 @@ msgstr ""
 "manuel I<live-boot>(7) et I<live-config>(7)."
 
 #. type: IP
-#: en/lb_config.1:266
-#, no-wrap
-msgid "B<--bootloader> grub|grub2|syslinux"
+#: en/lb_config.1:272
+#, fuzzy, no-wrap
+#| msgid "B<--bootappend-live> I<PARAMETER>|\"I<PARAMETERS>\""
+msgid "B<--bootappend-live-failsafe> I<PARAMETER>|\"I<PARAMETERS>\""
+msgstr "B<--bootappend-live> I<PARAMÈTRE>|\"I<PARAMÈTRES>\""
+
+#. type: Plain text
+#: en/lb_config.1:274
+#, fuzzy
+#| msgid ""
+#| "sets boot parameters specific to debian-live. A complete list of boot "
+#| "parameters can be found in the I<live-boot>(7) and I<live-config>(7) "
+#| "manual pages."
+msgid ""
+"sets boot parameters specific to debian-live failsafe boot entries. A "
+"complete list of boot parameters can be found in the I<live-boot>(7) and "
+"I<live-config>(7) manual pages."
+msgstr ""
+"paramètre les options de démarrage spécifiques à debian-live. Une liste "
+"complète des paramètres de démarrage peut être trouvée dans les pages de "
+"manuel I<live-boot>(7) et I<live-config>(7)."
+
+#. type: IP
+#: en/lb_config.1:274
+#, fuzzy, no-wrap
+#| msgid "B<--bootloader> grub|grub2|syslinux"
+msgid "B<--bootloaders> grub-legacy|grub-pc|syslinux|grub-efi"
 msgstr "B<--bootloader> grub|grub2|syslinux"
 
 #. type: Plain text
-#: en/lb_config.1:268
+#: en/lb_config.1:276
+#, fuzzy
+#| msgid ""
+#| "defines which bootloader is being used in the generated image. This has "
+#| "only an effect if the selected binary image type does allow to choose the "
+#| "bootloader. For example, if you build a iso, always syslinux (or more "
+#| "precise, isolinux) is being used. Also note that some combinations of "
+#| "binary images types and bootloaders may be possible but live-build does "
+#| "not support them yet. B<lb config> will fail to create such a not yet "
+#| "supported configuration and give a explanation about it. For hdd images "
+#| "on amd64 and i386, the default is syslinux."
 msgid ""
 "defines which bootloader is being used in the generated image. This has only "
-"an effect if the selected binary image type does allow to choose the "
-"bootloader. For example, if you build a iso, always syslinux (or more "
-"precise, isolinux) is being used. Also note that some combinations of binary "
-"images types and bootloaders may be possible but live-build does not support "
-"them yet. B<lb config> will fail to create such a not yet supported "
-"configuration and give a explanation about it. For hdd images on amd64 and "
-"i386, the default is syslinux."
+"an effect if the selected binary image type lets you choose the bootloader. "
+"For example, if you build a iso, always syslinux (or more precise, isolinux) "
+"is being used. Also note that some combinations of binary images types and "
+"bootloaders may be possible but live-build does not support them yet. B<lb "
+"config> will fail to create such a not yet supported configuration and give "
+"a explanation about it. For hdd images on amd64 and i386, the default is "
+"syslinux."
 msgstr ""
 "définit quel chargeur de démarrage est utilisé dans l'image générée. Ceci a "
 "effet seulement si l'image binaire sélectionnée permet de choisir le "
@@ -1078,13 +1153,13 @@ msgstr ""
 "hdd sur amd64 et i386, le défaut est syslinux."
 
 #. type: IP
-#: en/lb_config.1:268
+#: en/lb_config.1:276
 #, no-wrap
 msgid "B<--cache> true|false"
 msgstr "B<--cache> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:270
+#: en/lb_config.1:278
 msgid ""
 "defines globally if any cache should be used at all. Different caches can be "
 "controlled through the their own options."
@@ -1093,17 +1168,22 @@ msgstr ""
 "peuvent être controlés à travers leurs propres options."
 
 #. type: IP
-#: en/lb_config.1:270
+#: en/lb_config.1:278
 #, no-wrap
 msgid "B<--cache-indices> true|false"
 msgstr "B<--cache-indices> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:272
+#: en/lb_config.1:280
+#, fuzzy
+#| msgid ""
+#| "defines if downloaded package indices and lists should be cached which is "
+#| "false by default. Enabling it would allow to rebuild an image completely "
+#| "offline, however, you would not get updates anymore then."
 msgid ""
 "defines if downloaded package indices and lists should be cached which is "
-"false by default. Enabling it would allow to rebuild an image completely "
-"offline, however, you would not get updates anymore then."
+"false by default. Enabling it lets you rebuild an image completely offline, "
+"however, you would not get updates anymore then."
 msgstr ""
 "définit si les indices et les listes de paquets téléchargés devrait être "
 "cachés ce qui est faux (false) par défaut. L'activer autoriserait la "
@@ -1111,13 +1191,13 @@ msgstr ""
 "les mises-à-jour."
 
 #. type: IP
-#: en/lb_config.1:272
+#: en/lb_config.1:280
 #, no-wrap
 msgid "B<--cache-packages> true|false"
 msgstr "B<--cache-packages> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:274
+#: en/lb_config.1:282
 msgid ""
 "defines if downloaded packages files should be cached which is true by "
 "default. Disabling it does save space consumption in your build directory, "
@@ -1136,13 +1216,13 @@ msgstr ""
 "réseau local plutôt que d'utiliser le disque local."
 
 #. type: IP
-#: en/lb_config.1:274
+#: en/lb_config.1:282
 #, no-wrap
 msgid "B<--cache-stages> true|false|I<STAGE>|\"I<STAGES>\""
 msgstr "B<--cache-stages> true|false|I<STAGE>|\"I<STAGES>\""
 
 #. type: Plain text
-#: en/lb_config.1:276
+#: en/lb_config.1:284
 msgid ""
 "sets which stages should be cached. By default set to bootstrap. As an "
 "exception to the normal stage names, also rootfs can be used here which does "
@@ -1158,13 +1238,13 @@ msgstr ""
 "pas régénéré le système de fichier à chaque reprise."
 
 #. type: IP
-#: en/lb_config.1:276
+#: en/lb_config.1:284
 #, no-wrap
 msgid "B<--checksums> md5|sha1|sha256|none"
 msgstr "B<--checksums> md5|sha1|sha256|none"
 
 #. type: Plain text
-#: en/lb_config.1:278
+#: en/lb_config.1:286
 msgid ""
 "defines if the binary image should contain a file called md5sums.txt, "
 "sha1sums.txt and/or sha256sums.txt. These lists all files on the image "
@@ -1185,13 +1265,13 @@ msgstr ""
 "sommes de vérification."
 
 #. type: IP
-#: en/lb_config.1:278
+#: en/lb_config.1:286
 #, no-wrap
 msgid "B<--compression> bzip2|gzip|lzip|none"
 msgstr "B<--compression> bzip2|gzip|lzip|none"
 
 #. type: Plain text
-#: en/lb_config.1:280
+#: en/lb_config.1:288
 msgid ""
 "defines the compression program to be used to compress tarballs. Defaults to "
 "gzip."
@@ -1200,29 +1280,33 @@ msgstr ""
 "Par défaut : gzip."
 
 #. type: IP
-#: en/lb_config.1:280
+#: en/lb_config.1:288
 #, no-wrap
 msgid "B<--config> I<GIT_URL>::I<GIT_ID>"
 msgstr "B<--config> I<GIT_URL>::I<GIT_ID>"
 
 #. type: Plain text
-#: en/lb_config.1:282
+#: en/lb_config.1:290
+#, fuzzy
+#| msgid ""
+#| "allows to bootstrap a config tree from a git repositories, optionally "
+#| "appended by a Git Id (branch, commit, tag, etc.)."
 msgid ""
-"allows to bootstrap a config tree from a git repositories, optionally "
-"appended by a Git Id (branch, commit, tag, etc.)."
+"bootstrap the config tree from a git repository, optionally appended by a "
+"Git Id (branch, commit, tag, etc.)."
 msgstr ""
 "permet d'amorcer un arbre de configuration depuis un dépôt GIT, "
 "optionnellement avec un numéro d'identification GIT (branche, commit, tag, "
 "etc.)."
 
 #. type: IP
-#: en/lb_config.1:282
+#: en/lb_config.1:290
 #, no-wrap
 msgid "B<--build-with-chroot> true|false"
 msgstr "B<--build-with-chroot> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:284
+#: en/lb_config.1:292
 msgid ""
 "defines whether live-build should use the tools from within the chroot to "
 "build the binary image or not by using and including the host system's "
@@ -1248,13 +1332,13 @@ msgstr ""
 "B<complètement>I< les conséquences.>"
 
 #. type: IP
-#: en/lb_config.1:284
+#: en/lb_config.1:292
 #, no-wrap
 msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none"
 msgstr "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none"
 
 #. type: Plain text
-#: en/lb_config.1:286
+#: en/lb_config.1:294
 msgid ""
 "defines which filesystem type should be used for the root filesystem image. "
 "If you use none, then no filesystem image is created and the root filesystem "
@@ -1273,13 +1357,13 @@ msgstr ""
 "puisque linux ne supporte pas directement de fonctionner dessus."
 
 #. type: IP
-#: en/lb_config.1:286
+#: en/lb_config.1:294
 #, no-wrap
 msgid "B<--clean>"
 msgstr "B<--clean>"
 
 #. type: Plain text
-#: en/lb_config.1:288
+#: en/lb_config.1:296
 msgid ""
 "minimizes config directory by automatically removing unused and thus empty "
 "subdirectories."
@@ -1288,13 +1372,13 @@ msgstr ""
 "sous-répertoires non-utilisés et donc vides."
 
 #. type: IP
-#: en/lb_config.1:288
+#: en/lb_config.1:296
 #, no-wrap
 msgid "-c|B<--conffile> I<FILE>"
 msgstr "-c|B<--conffile> I<FICHIER>"
 
 #. type: Plain text
-#: en/lb_config.1:290
+#: en/lb_config.1:298
 msgid ""
 "using a user specified alternative configuration file in addition to the "
 "normally used one in the config directory."
@@ -1304,13 +1388,13 @@ msgstr ""
 "configuration."
 
 #. type: IP
-#: en/lb_config.1:290
+#: en/lb_config.1:298
 #, no-wrap
 msgid "B<--debconf-frontend> dialog|editor|noninteractive|readline"
 msgstr "B<--debconf-frontend> dialog|editor|noninteractive|readline"
 
 #. type: Plain text
-#: en/lb_config.1:292
+#: en/lb_config.1:300
 msgid ""
 "defines what value the debconf frontend should be set to inside the chroot. "
 "Note that setting it to anything but noninteractive, which is the default, "
@@ -1322,13 +1406,13 @@ msgstr ""
 "questions pendant la construction."
 
 #. type: IP
-#: en/lb_config.1:292
+#: en/lb_config.1:300
 #, no-wrap
 msgid "B<--debconf-priority> low|medium|high|critical"
 msgstr "B<--debconf-priority> low|medium|high|critical"
 
 #. type: Plain text
-#: en/lb_config.1:294
+#: en/lb_config.1:302
 msgid ""
 "defines what value the debconf priority should be set to inside the chroot. "
 "By default, it is set to critical, which means that almost no questions are "
@@ -1341,13 +1425,13 @@ msgstr ""
 "si vous utilisez un des frontend debconf n'étant pas noninteractive."
 
 #. type: IP
-#: en/lb_config.1:294
+#: en/lb_config.1:302
 #, no-wrap
 msgid "B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false"
 msgstr "B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false"
 
 #. type: Plain text
-#: en/lb_config.1:296
+#: en/lb_config.1:304
 msgid ""
 "defines which type, if any, of the debian-installer should be included in "
 "the resulting binary image. By default, no installer is included. All "
@@ -1367,13 +1451,13 @@ msgstr ""
 "réseau, il installe le système live sur le disque."
 
 #. type: IP
-#: en/lb_config.1:296
+#: en/lb_config.1:304
 #, no-wrap
 msgid "B<--debian-installer-distribution> daily|I<CODENAME>"
 msgstr "B<--debian-installer-distribution> daily|I<NOM_DE_CODE>"
 
 #. type: Plain text
-#: en/lb_config.1:298
+#: en/lb_config.1:306
 msgid ""
 "defines the distribution where the debian-installer files should be taken "
 "out from. Normally, this should be set to the same distribution as the live "
@@ -1386,13 +1470,13 @@ msgstr ""
 "un installateur plus récent ou même une construction du jour."
 
 #. type: IP
-#: en/lb_config.1:298
+#: en/lb_config.1:306
 #, no-wrap
 msgid "B<--debian-installer-preseedfile> I<FILE>|I<URL>"
 msgstr "B<--debian-installer-preseedfile> I<FICHIER>|I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:300
+#: en/lb_config.1:308
 msgid ""
 "sets the filename or URL for an optionally used and included preseeding file "
 "for debian-installer. If config/binary_debian-installer/preseed.cfg exists, "
@@ -1403,13 +1487,13 @@ msgstr ""
 "binary_debian-installer/preseed.cfg existe, il sera utilisé par défaut. "
 
 #. type: IP
-#: en/lb_config.1:300
+#: en/lb_config.1:308
 #, no-wrap
 msgid "B<--debian-installer-gui> true|false"
 msgstr "B<--debian-installer-gui> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:302
+#: en/lb_config.1:310
 msgid ""
 "defines if the debian-installer graphical GTK interface should be true or "
 "not. In Debian mode and for most versions of Ubuntu, this option is true, "
@@ -1420,35 +1504,61 @@ msgstr ""
 "option est vraie, tandis que sinon fausse, par défaut."
 
 #. type: IP
-#: en/lb_config.1:302 en/live-build.7:36
+#: en/lb_config.1:310
+#, fuzzy, no-wrap
+#| msgid "  [B<--net-root-mountoptions> I<OPTIONS>]"
+msgid "B<--debootstrap-options> I<OPTIONS>"
+msgstr "  [B<--net-root-mountoptions> I<OPTIONS>]"
+
+#. type: Plain text
+#: en/lb_config.1:312
+msgid ""
+"passes the given options to debootstrap when setting up the base system."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:312
+#, no-wrap
+msgid "B<--debootstrap-script> I<SCRIPT>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:314
+msgid ""
+"tells debootstrap to use an alternate bootstrap script (last parameter to "
+"debootstrap)."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:314 en/live-build.7:36
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: en/lb_config.1:304
+#: en/lb_config.1:316
 msgid "turn on debugging informational messages."
 msgstr "active les messages d'information de déboguage."
 
 #. type: IP
-#: en/lb_config.1:304
+#: en/lb_config.1:316
 #, no-wrap
 msgid "-d|B<--distribution> I<CODENAME>"
 msgstr "-d|B<--distribution> I<NOM_DE_CODE>"
 
 #. type: Plain text
-#: en/lb_config.1:306
+#: en/lb_config.1:318
 msgid "defines the distribution of the resulting live system."
 msgstr "définit la distribution du système live résultant."
 
 #. type: IP
-#: en/lb_config.1:306
+#: en/lb_config.1:318
 #, no-wrap
 msgid "-d|B<--parent-distribution> I<CODENAME>"
 msgstr "-d|B<--parent-distribution> I<NOM_DE_CODE>"
 
 #. type: Plain text
-#: en/lb_config.1:308
+#: en/lb_config.1:320
 msgid ""
 "defines the parent distribution for derivatives of the resulting live system."
 msgstr ""
@@ -1456,13 +1566,13 @@ msgstr ""
 "résultant."
 
 #. type: IP
-#: en/lb_config.1:308
+#: en/lb_config.1:320
 #, no-wrap
 msgid "-d|B<--parent-debian-installer-distribution> I<CODENAME>"
 msgstr "-d|B<--parent-debian-installer-distribution> I<CODENAME>"
 
 #. type: Plain text
-#: en/lb_config.1:310
+#: en/lb_config.1:322
 msgid ""
 "defines the parent debian-installer distribution for derivatives of the "
 "resulting live system."
@@ -1471,41 +1581,41 @@ msgstr ""
 "du système live résultant."
 
 #. type: IP
-#: en/lb_config.1:310
+#: en/lb_config.1:322
 #, no-wrap
 msgid "B<--dump>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:312
+#: en/lb_config.1:324
 msgid ""
 "prepares a report of the currently present live system configuration and the "
 "version of live-build used. This is useful to provide if you submit bug "
-"reports, we do get all informations required for us to locate and replicate "
+"reports, we do get all information required for us to locate and replicate "
 "an error."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:312
+#: en/lb_config.1:324
 #, no-wrap
 msgid "B<--fdisk> fdisk|fdisk.dist"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:314
+#: en/lb_config.1:326
 msgid ""
 "sets the filename of the fdisk binary from the host system that should be "
 "used. This is autodetected and does generally not need any customization."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:314 en/live-build.7:38
+#: en/lb_config.1:326 en/live-build.7:38
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: Plain text
-#: en/lb_config.1:316
+#: en/lb_config.1:328
 msgid ""
 "forces re-execution of already run stages. Use only if you know what you are "
 "doing. It is generally safer to use B<lb clean> to clean up before re-"
@@ -1513,26 +1623,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:316
+#: en/lb_config.1:328
 #, no-wrap
 msgid "B<--grub-splash> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:318
+#: en/lb_config.1:330
 msgid ""
 "defines the name of an optional to be included splash screen graphic for the "
 "grub bootloader."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:318
+#: en/lb_config.1:330
 #, no-wrap
 msgid "B<--gzip-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:320
+#: en/lb_config.1:332
 msgid ""
 "defines the default options that will be appended to (almost) every gzip "
 "call during the building of the image. By default, this is set to --best to "
@@ -1541,13 +1651,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:320
+#: en/lb_config.1:332
 #, no-wrap
 msgid "B<--hooks> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:322
+#: en/lb_config.1:334
 msgid ""
 "defines which hooks available in /usr/share/live/build/examples/hooks should "
 "be activated. Normally, there are no hooks executed. Make sure you know and "
@@ -1555,13 +1665,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:322
+#: en/lb_config.1:334
 #, no-wrap
 msgid "B<--ignore-system-defaults>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:324
+#: en/lb_config.1:336
 msgid ""
 "B<lb config> by default reads system defaults from I</etc/live/build.conf> "
 "and I</etc/live/build/*> when generating a new live system config directory. "
@@ -1570,13 +1680,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:324
+#: en/lb_config.1:336
 #, no-wrap
 msgid "B<--initramfs> auto|none|live-boot|casper"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:326
+#: en/lb_config.1:338
 msgid ""
 "sets the name of package that contains the live system specific initramfs "
 "modification. By default, auto is used, which means that at build time of "
@@ -1587,26 +1697,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:326
+#: en/lb_config.1:338
 #, no-wrap
 msgid "B<--initramfs-compression> bzip2|gzip|lzma]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:328
+#: en/lb_config.1:340
 msgid ""
 "defines the compression program to be used to compress the initramfs. "
 "Defaults to gzip."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:328
+#: en/lb_config.1:340
 #, no-wrap
 msgid "B<--interactive> shell"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:330
+#: en/lb_config.1:342
 msgid ""
 "defines if after the chroot stage and before the beginning of the binary "
 "stage, a interactive shell login should be spawned in the chroot in order to "
@@ -1620,24 +1730,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:330
+#: en/lb_config.1:342
 #, no-wrap
 msgid "B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:332
+#: en/lb_config.1:344
 msgid "defines options to pass to isohybrid."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:332
+#: en/lb_config.1:344
 #, no-wrap
 msgid "B<--iso-application> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:334
+#: en/lb_config.1:346
 msgid ""
 "sets the APPLICATION field in the header of a resulting CD/DVD image and "
 "defaults to \"Debian Live\" in debian mode, and \"Ubuntu Live\" in ubuntu "
@@ -1645,13 +1755,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:334
+#: en/lb_config.1:346
 #, no-wrap
 msgid "B<--iso-preparer> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:336
+#: en/lb_config.1:348
 msgid ""
 "sets the PREPARER field in the header of a resulting CD/DVD image. By "
 "default this is set to \"live-build I<VERSION>; http://packages.qa.debian."
@@ -1660,13 +1770,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:336
+#: en/lb_config.1:348
 #, no-wrap
 msgid "B<--iso-publisher> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:338
+#: en/lb_config.1:350
 msgid ""
 "sets the PUBLISHED field in the header of a resulting CD/DVD image. By "
 "default, this is set to 'Live Systems project; http:/live-systems.org/; "
@@ -1675,13 +1785,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:338
+#: en/lb_config.1:350
 #, no-wrap
 msgid "B<--iso-volume> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:340
+#: en/lb_config.1:352
 msgid ""
 "sets the VOLUME field in the header of a resulting CD/DVD and defaults to "
 "'(I<MODE>) (I<DISTRIBUTION>) (I<DATE>)' whereas MODE is expanded to the name "
@@ -1690,13 +1800,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:340
+#: en/lb_config.1:352
 #, no-wrap
 msgid "B<--jffs2-eraseblock> I<SIZE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:342
+#: en/lb_config.1:354
 msgid ""
 "sets the eraseblock size for a JFFS2 (Second Journaling Flash File System) "
 "filesystem. The default is 64 KiB. If you use an erase block size different "
@@ -1706,72 +1816,72 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:342
+#: en/lb_config.1:354
 #, no-wrap
 msgid "B<--keyring-packages> I<PACKAGE|\"PACKAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:344
+#: en/lb_config.1:356
 msgid ""
 "sets the keyring package or additional keyring packages. By default this is "
 "set to debian-archive-keyring."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:344
+#: en/lb_config.1:356
 #, no-wrap
 msgid "-k|B<--linux-flavours> I<FLAVOUR>|\"I<FLAVOURS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:346
+#: en/lb_config.1:358
 msgid ""
 "sets the kernel flavours to be installed. Note that in case you specify more "
 "than that the first will be configured the default kernel that gets booted."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:346
+#: en/lb_config.1:358
 #, no-wrap
 msgid "B<--linux-packages> \"I<PACKAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:348
+#: en/lb_config.1:360
 msgid ""
 "sets the internal name of the kernel packages naming scheme. If you use "
 "debian kernel packages, you will not have to adjust it. If you decide to use "
 "custom kernel packages that do not follow the debian naming scheme, remember "
 "to set this option to the stub of the packages only (for debian this is "
 "linux-image-2.6), so that I<STUB>-I<FLAVOUR> results in a valid package name "
-"(for debian e.g. linux-image-686-pae). Preferably you use the meta package name, "
-"if any, for the stub, so that your configuration is ABI independent. Also "
-"don't forget that you have to include stubs of the binary modules packages "
-"for unionfs or aufs, and squashfs if you built them out-of-tree."
+"(for debian e.g. linux-image-686-pae). Preferably you use the meta package "
+"name, if any, for the stub, so that your configuration is ABI independent. "
+"Also don't forget that you have to include stubs of the binary modules "
+"packages for unionfs or aufs, and squashfs if you built them out-of-tree."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:348
+#: en/lb_config.1:360
 #, no-wrap
 msgid "B<--losetup> losetup|losetup.orig"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:350
+#: en/lb_config.1:362
 msgid ""
 "sets the filename of the losetup binary from the host system that should be "
 "used. This is autodetected and does generally not need any customization."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:350
+#: en/lb_config.1:362
 #, no-wrap
 msgid "B<--memtest> memtest86+|memtest86|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:352
+#: en/lb_config.1:364
 msgid ""
 "defines if memtest, memtest86+ or no memory tester at all should be included "
 "as secondary bootloader configuration. This is only available on amd64 and "
@@ -1779,13 +1889,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:352
+#: en/lb_config.1:364
 #, no-wrap
 msgid "-m|B<--parent-mirror-bootstrap> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:354
+#: en/lb_config.1:366
 msgid ""
 "sets the location of the debian package mirror that should be used to "
 "bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may "
@@ -1793,13 +1903,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:354
+#: en/lb_config.1:366
 #, no-wrap
 msgid "B<--parent-mirror-chroot> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:356
+#: en/lb_config.1:368
 msgid ""
 "sets the location of the debian package mirror that will be used to fetch "
 "the packages in order to build the live system. By default, this is set to "
@@ -1807,13 +1917,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:356
+#: en/lb_config.1:368
 #, no-wrap
 msgid "B<--parent-mirror-chroot-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:358
+#: en/lb_config.1:370
 msgid ""
 "sets the location of the debian security package mirror that will be used to "
 "fetch the packages in order to build the live system. By default, this "
@@ -1821,13 +1931,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:358
+#: en/lb_config.1:370
 #, no-wrap
 msgid "B<--parent-mirror-chroot-updates> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:360
+#: en/lb_config.1:372
 msgid ""
 "sets the location of the debian updates package mirror that will be used to "
 "fetch packages in order to build the live system. By default, this is set to "
@@ -1835,13 +1945,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:360
+#: en/lb_config.1:372
 #, no-wrap
 msgid "B<--parent-mirror-chroot-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:362
+#: en/lb_config.1:374
 msgid ""
 "sets the location of the debian backports package mirror that will be used "
 "to fetch packages in order to build the live system. By default, this points "
@@ -1849,13 +1959,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:362
+#: en/lb_config.1:374
 #, no-wrap
 msgid "B<--parent-mirror-binary> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:364
+#: en/lb_config.1:376
 msgid ""
 "sets the location of the debian package mirror that should end up configured "
 "in the final image and which is the one a user would see and use. This has "
@@ -1865,13 +1975,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:364
+#: en/lb_config.1:376
 #, no-wrap
 msgid "B<--parent-mirror-binary-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:366
+#: en/lb_config.1:378
 msgid ""
 "sets the location of the debian security package mirror that should end up "
 "configured in the final image. By default, 'http://security.debian.org/' is "
@@ -1879,13 +1989,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:366
+#: en/lb_config.1:378
 #, no-wrap
 msgid "B<--parent-mirror-binary-updates> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:368
+#: en/lb_config.1:380
 msgid ""
 "sets the location of the debian updates package mirror that should end up "
 "configured in the final image. By default, the value of --parent-mirror-"
@@ -1893,13 +2003,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:368
+#: en/lb_config.1:380
 #, no-wrap
 msgid "B<--parent-mirror-binary-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:370
+#: en/lb_config.1:382
 msgid ""
 "sets the location of the debian backports package mirror that should end up "
 "configured in the final image. By default, 'http://backports.debian.org/"
@@ -1907,13 +2017,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:370
+#: en/lb_config.1:382
 #, no-wrap
 msgid "B<--parent-mirror-debian-installer> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:372
+#: en/lb_config.1:384
 msgid ""
 "sets the location of the mirror that will be used to fetch the debian "
 "installer images. By default, this points to the same mirror used to build "
@@ -1921,13 +2031,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:372
+#: en/lb_config.1:384
 #, no-wrap
 msgid "B<--mirror-bootstrap> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:374
+#: en/lb_config.1:386
 msgid ""
 "sets the location of the debian package mirror that should be used to "
 "bootstrap the derivative from. This defaults to http://ftp.de.debian.org/"
@@ -1935,13 +2045,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:374
+#: en/lb_config.1:386
 #, no-wrap
 msgid "B<--mirror-chroot> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:376
+#: en/lb_config.1:388
 msgid ""
 "sets the location of the debian package mirror that will be used to fetch "
 "the packages of the derivative in order to build the live system. By "
@@ -1949,13 +2059,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:376
+#: en/lb_config.1:388
 #, no-wrap
 msgid "B<--mirror-chroot-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:378
+#: en/lb_config.1:390
 msgid ""
 "sets the location of the debian security package mirror that will be used to "
 "fetch the packages of the derivative in order to build the live system. By "
@@ -1963,13 +2073,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:378
+#: en/lb_config.1:390
 #, no-wrap
 msgid "B<--mirror-chroot-updates> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:380
+#: en/lb_config.1:392
 msgid ""
 "sets the location of the debian updates package mirror that will be used to "
 "fetch packages of the derivative in order to build the live system. By "
@@ -1977,13 +2087,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:380
+#: en/lb_config.1:392
 #, no-wrap
 msgid "B<--mirror-chroot-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:382
+#: en/lb_config.1:394
 msgid ""
 "sets the location of the debian backports package mirror that will be used "
 "to fetch packages of the derivative in order to build the live system. By "
@@ -1991,13 +2101,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:382
+#: en/lb_config.1:394
 #, no-wrap
 msgid "B<--mirror-binary> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:384
+#: en/lb_config.1:396
 msgid ""
 "sets the location of the derivative package mirror that should end up "
 "configured in the final image and which is the one a user would see and use. "
@@ -2007,52 +2117,52 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:384
+#: en/lb_config.1:396
 #, no-wrap
 msgid "B<--mirror-binary-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:386
+#: en/lb_config.1:398
 msgid ""
 "sets the location of the derivatives security package mirror that should end "
 "up configured in the final image."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:386
+#: en/lb_config.1:398
 #, no-wrap
 msgid "B<--mirror-binary-updates> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:388
+#: en/lb_config.1:400
 msgid ""
 "sets the location of the derivatives updates package mirror that should end "
 "up configured in the final image."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:388
+#: en/lb_config.1:400
 #, no-wrap
 msgid "B<--mirror-binary-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:390
+#: en/lb_config.1:402
 msgid ""
 "sets the location of the derivatives backports package mirror that should "
 "end up configured in the final image."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:390
+#: en/lb_config.1:402
 #, no-wrap
 msgid "B<--mirror-debian-installer> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:392
+#: en/lb_config.1:404
 msgid ""
 "sets the location of the mirror that will be used to fetch the debian "
 "installer images of the derivative. By default, this points to the same "
@@ -2060,65 +2170,65 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:392
+#: en/lb_config.1:404
 #, no-wrap
 msgid "B<--mode> debian|progress|ubuntu"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:394
+#: en/lb_config.1:406
 msgid ""
 "defines a global mode to load project specific defaults. By default this is "
 "set to debian."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:394
+#: en/lb_config.1:406
 #, no-wrap
 msgid "B<--system> live|normal"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:396
+#: en/lb_config.1:408
 msgid ""
 "defines if the resulting system image should a live system or a normal, non-"
 "live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:396
+#: en/lb_config.1:408
 #, no-wrap
 msgid "B<--net-root-filesystem> nfs|cfs"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:398
+#: en/lb_config.1:410
 msgid ""
 "defines the filesystem that will be configured in the bootloader "
 "configuration for your netboot image. This defaults to nfs."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:398
+#: en/lb_config.1:410
 #, no-wrap
 msgid "B<--net-root-mountoptions> I<OPTIONS>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:400
+#: en/lb_config.1:412
 msgid ""
 "sets additional options for mounting the root filesystem in netboot images "
 "and is by default empty."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:400
+#: en/lb_config.1:412
 #, no-wrap
 msgid "B<--net-root-path> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:402
+#: en/lb_config.1:414
 msgid ""
 "sets the file path that will be configured in the bootloader configuration "
 "for your netboot image. This defaults to /srv/debian-live in debian mode, "
@@ -2126,13 +2236,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:402
+#: en/lb_config.1:414
 #, no-wrap
 msgid "B<--net-root-server> I<IP>|I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:404
+#: en/lb_config.1:416
 msgid ""
 "sets the IP or hostname that will be configured in the bootloader "
 "configuration for the root filesystem of your netboot image. This defaults "
@@ -2140,38 +2250,38 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:404
+#: en/lb_config.1:416
 #, no-wrap
 msgid "B<--net-cow-filesystem> nfs|cfs"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:406
+#: en/lb_config.1:418
 msgid ""
 "defines the filesystem type for the copy-on-write layer and defaults to nfs."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:406
+#: en/lb_config.1:418
 #, no-wrap
 msgid "B<--net-cow-mountoptions> I<OPTIONS>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:408
+#: en/lb_config.1:420
 msgid ""
 "sets additional options for mounting the copy-on-write layer in netboot "
 "images and is by default empty."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:408
+#: en/lb_config.1:420
 #, no-wrap
 msgid "B<--net-cow-path> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:410
+#: en/lb_config.1:422
 msgid ""
 "defines the path to client writable filesystem. Anywhere that "
 "I<client_mac_address> is specified in the path live-boot will substitute the "
@@ -2179,28 +2289,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:413
+#: en/lb_config.1:425
 msgid "Example:"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:415
+#: en/lb_config.1:427
 msgid "/export/hosts/client_mac_address"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:417
+#: en/lb_config.1:429
 msgid "/export/hosts/00-16-D3-33-92-E8"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:417
+#: en/lb_config.1:429
 #, no-wrap
 msgid "B<--net-cow-server> I<IP>|I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:419
+#: en/lb_config.1:431
 msgid ""
 "sets the IP or hostname that will be configured in the bootloader "
 "configuration for the copy-on-write filesystem of your netboot image and is "
@@ -2208,13 +2318,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:419
+#: en/lb_config.1:431
 #, no-wrap
 msgid "B<--net-tarball> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:421
+#: en/lb_config.1:433
 msgid ""
 "defines if a compressed tarball should be created. Disabling this options "
 "leads to no tarball at all, the plain binary directory is considered the "
@@ -2222,24 +2332,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:421 en/live-build.7:40
+#: en/lb_config.1:433 en/live-build.7:40
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: en/lb_config.1:423
+#: en/lb_config.1:435
 msgid "reduces the verbosity of messages output by B<lb build>."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:423
+#: en/lb_config.1:435
 #, no-wrap
 msgid "B<--archive-areas> I<ARCHIVE_AREA>|\"I<ARCHIVE_AREAS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:425
+#: en/lb_config.1:437
 msgid ""
 "defines which package archive areas of a debian packages archive should be "
 "used for configured debian package mirrors. By default, this is set to main. "
@@ -2249,37 +2359,37 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:425
+#: en/lb_config.1:437
 #, no-wrap
 msgid "B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|\"I<PARENT_ARCHIVE_AREAS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:427
+#: en/lb_config.1:439
 msgid "defines the archive areas for derivatives of the resulting live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:427
+#: en/lb_config.1:439
 #, no-wrap
 msgid "B<--security> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:429
+#: en/lb_config.1:441
 msgid ""
 "defines if the security repositories specified in the security mirror "
 "options should be used or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:429
+#: en/lb_config.1:441
 #, no-wrap
 msgid "B<--source> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:431
+#: en/lb_config.1:443
 msgid ""
 "defines if a corresponding source image to the binary image should be build. "
 "By default this is false because most people do not require this and would "
@@ -2289,24 +2399,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:431
+#: en/lb_config.1:443
 #, no-wrap
 msgid "-s|B<--source-images> iso|netboot|tar|hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:433
+#: en/lb_config.1:445
 msgid "defines the image type for the source image. Default is tar."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:433
+#: en/lb_config.1:445
 #, no-wrap
 msgid "B<--firmware-binary> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:435
+#: en/lb_config.1:447
 msgid ""
 "defines if firmware packages should be automatically included into the "
 "binary pool for debian-installer. Note that only firmware packages available "
@@ -2317,13 +2427,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:435
+#: en/lb_config.1:447
 #, no-wrap
 msgid "B<--firmware-chroot> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:437
+#: en/lb_config.1:449
 msgid ""
 "defines if firmware packages should be automatically included into the live "
 "image. Note that only firmware packages available within the configured "
@@ -2333,65 +2443,65 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:437
+#: en/lb_config.1:449
 #, no-wrap
 msgid "B<--swap-file-path> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:439
+#: en/lb_config.1:451
 msgid ""
 "defines the path to a swap file to create in the binary image. Default is "
 "not to create a swap file."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:439
+#: en/lb_config.1:451
 #, no-wrap
 msgid "B<--swap-file-size> I<MB>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:441
+#: en/lb_config.1:453
 msgid ""
 "defines what size in megabytes the swap file should be, if one is to be "
 "created. Default is 512MB."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:441
+#: en/lb_config.1:453
 #, no-wrap
 msgid "B<--tasksel> apt|aptitude|tasksel"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:443
+#: en/lb_config.1:455
 msgid ""
 "selects which program is used to install tasks. By default, this is set to "
 "tasksel."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:443
+#: en/lb_config.1:455
 #, no-wrap
 msgid "B<--templates> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:445
+#: en/lb_config.1:457
 msgid ""
 "sets the path to the templates that live-build is going to use, e.g. for "
 "bootloaders. By default, this is set to /usr/share/live/build/templates/."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:445
+#: en/lb_config.1:457
 #, no-wrap
 msgid "B<--hdd-size> MB"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:447
+#: en/lb_config.1:459
 msgid ""
 "defines what size the hdd image should be. Note that although the default is "
 "set to 10000 (= 10GB), it will not need 10GB space on your harddisk as the "
@@ -2399,63 +2509,63 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:447
+#: en/lb_config.1:459
 #, no-wrap
 msgid "B<--updates> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:449
+#: en/lb_config.1:461
 msgid ""
 "defines if debian updates package archives should be included in the image "
 "or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:449
+#: en/lb_config.1:461
 #, no-wrap
 msgid "B<--backports> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:451
+#: en/lb_config.1:463
 msgid ""
 "defines if debian backports package archives should be included in the image "
 "or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:451 en/live-build.7:42
+#: en/lb_config.1:463 en/live-build.7:42
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: en/lb_config.1:453
+#: en/lb_config.1:465
 msgid "increases the verbosity of messages output by B<lb build>."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:453
+#: en/lb_config.1:465
 #, no-wrap
 msgid "B<--win32-loader true|false>"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:456
+#: en/lb_config.1:468
 msgid "defines if win32-loader should be included in the binary image or not."
 msgstr ""
 
 #. type: SH
-#: en/lb_config.1:457
+#: en/lb_config.1:469
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:460
+#: en/lb_config.1:472
 msgid ""
 "Currently, command line switches can also be specified through the "
 "corresponding environment variable. However, this generally should not be "
@@ -2469,20 +2579,20 @@ msgstr ""
 
 #.  FIXME
 #. type: IP
-#: en/lb_config.1:464
+#: en/lb_config.1:476
 #, no-wrap
 msgid "B<auto/config>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:465
+#: en/lb_config.1:477
 #, no-wrap
 msgid "B</etc/live/build.conf, /etc/live/build/*>"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:468
+#: en/lb_config.1:480
 msgid ""
 "An optional, global configuration file for B<lb config> variables. It is "
 "useful to specify a few system wide defaults, like "
@@ -2491,11 +2601,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:473 en/live-build.7:219
+#: en/lb_config.1:485 en/live-build.7:235
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/lb_config.1:475 en/live-build.7:221
+#: en/lb_config.1:487 en/live-build.7:237
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
diff --git a/manpages/po/fr/lb_source.1.po b/manpages/po/fr/lb_source.1.po
index 2447048d6..dfc1d51a4 100644
--- a/manpages/po/fr/lb_source.1.po
+++ b/manpages/po/fr/lb_source.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2015-09-20 14:53+0200\n"
 "Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: none\n"
@@ -28,7 +28,7 @@ msgstr "LIVE-BUILD"
 #: en/live-build.7:1
 #, no-wrap
 msgid "2015-10-21"
-msgstr "21.10.2015"
+msgstr "29.08.2017"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
@@ -64,7 +64,7 @@ msgstr "SYNOPSIS"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "DESCRIPTION"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,8 +80,8 @@ msgstr "OPTIONS"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
@@ -95,58 +95,64 @@ msgstr "B<aucun>"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "Ce programme est une partie de live-build."
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "Davantage d'informations à propos de live-build et du projet Live Systems "
-"peuvent être trouvées sur la page d'accueil à E<lt>I<http://live-systems.org/"
-">E<gt> et dans le manuel à E<lt>I<http://live-systems.org/manual/>E<gt>."
+"peuvent être trouvées sur la page d'accueil à E<lt>I<https://debian-live."
+"alioth.debian.org/>E<gt> et dans le manuel à E<lt>I<https://debian-live."
+"alioth.debian.org/manual/>E<gt>."
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -160,16 +166,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -178,7 +184,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_source.1:5
-msgid "B<lb source> - Complete the source stage"
+#, fuzzy
+#| msgid "B<lb source> - Complete the source stage"
+msgid "B<lb_source> - Complete the source stage"
 msgstr "B<lb source> - Complète le stage source"
 
 #. type: Plain text
diff --git a/manpages/po/fr/live-build.7.po b/manpages/po/fr/live-build.7.po
index a43a7d448..35c0b6886 100644
--- a/manpages/po/fr/live-build.7.po
+++ b/manpages/po/fr/live-build.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2015-09-20 14:53+0200\n"
 "Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: none\n"
@@ -28,7 +28,7 @@ msgstr "LIVE-BUILD"
 #: en/live-build.7:1
 #, no-wrap
 msgid "2015-10-21"
-msgstr "21.10.2015"
+msgstr "29.08.2017"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
@@ -64,7 +64,7 @@ msgstr "SYNOPSIS"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "DESCRIPTION"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,60 +80,66 @@ msgstr "OPTIONS"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "Ce programme est une partie de live-build."
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PAGE D'ACCUEIL"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "Davantage d'informations à propos de live-build et du projet Live Systems "
-"peuvent être trouvées sur la page d'accueil à E<lt>I<http://live-systems.org/"
-">E<gt> et dans le manuel à E<lt>I<http://live-systems.org/manual/>E<gt>."
+"peuvent être trouvées sur la page d'accueil à E<lt>I<https://debian-live."
+"alioth.debian.org/>E<gt> et dans le manuel à E<lt>I<https://debian-live."
+"alioth.debian.org/manual/>E<gt>."
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -147,16 +153,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -164,36 +170,36 @@ msgstr ""
 "ch>E<gt>."
 
 #. type: IP
-#: en/lb_config.1:302 en/live-build.7:36
+#: en/lb_config.1:314 en/live-build.7:36
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: IP
-#: en/lb_config.1:314 en/live-build.7:38
+#: en/lb_config.1:326 en/live-build.7:38
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: IP
-#: en/lb_config.1:421 en/live-build.7:40
+#: en/lb_config.1:433 en/live-build.7:40
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 #. type: IP
-#: en/lb_config.1:451 en/live-build.7:42
+#: en/lb_config.1:463 en/live-build.7:42
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: en/lb_config.1:473 en/live-build.7:219
+#: en/lb_config.1:485 en/live-build.7:235
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/lb_config.1:475 en/live-build.7:221
+#: en/lb_config.1:487 en/live-build.7:237
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
@@ -236,14 +242,20 @@ msgstr "La I<COMMANDE> est un nom d'une commande live-build (voir ci-dessous)."
 #.  FIXME
 #. type: Plain text
 #: en/live-build.7:19
+#, fuzzy
+#| msgid ""
+#| "More documentation about how to use live-build is available in the "
+#| "individual manpages for each helper and in the manual at E<lt>I<http://"
+#| "live-systems.org/manual/>E<gt>."
 msgid ""
 "More documentation about how to use live-build is available in the "
-"individual manpages for each helper and in the manual at E<lt>I<http://live-"
-"systems.org/manual/>E<gt>."
+"individual manpages for each helper and in the manual at E<lt>I<https://"
+"debian-live.alioth.debian.org/manual/>E<gt>."
 msgstr ""
 "Davantage de documentation à propos de la façon d'utiliser live-build est "
 "disponible dans les pages de manuel individuelles de chaque assistant ainsi "
-"que dans le manual à E<lt>I<http://live-systems.org/manual/>E<gt>."
+"que dans le manual à E<lt>I<https://debian-live.alioth.debian.org/manual/"
+">E<gt>."
 
 #.  FIXME
 #. type: SS
@@ -404,130 +416,145 @@ msgstr "Commandes porcelaine principales"
 
 #. type: IP
 #: en/live-build.7:58
-#, no-wrap
-msgid "B<lb_config>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_config>(1)"
+msgid "B<lb config>(1)"
 msgstr "B<lb_config>(1)"
 
 #. type: Plain text
 #: en/live-build.7:60
-msgid "create configuration for live-build"
+#, fuzzy
+#| msgid "create configuration for live-build"
+msgid "creates configuration for live-build"
 msgstr "crée une configuration pour live-build"
 
 #. type: IP
 #: en/live-build.7:60
-#, no-wrap
-msgid "B<lb_bootstrap>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_bootstrap>(1)"
+msgid "B<lb bootstrap>(1)"
 msgstr "B<lb_bootstrap>(1)"
 
 #. type: Plain text
 #: en/live-build.7:62
-msgid "create the first stage by bootstrapping a basic debian system"
+#, fuzzy
+#| msgid "create the first stage by bootstrapping a basic debian system"
+msgid ""
+"executes the first build stage, creating (bootstraping) a basic Debian root "
+"filesystem"
 msgstr "crée le premier stage en amorçant un système debian basique"
 
 #. type: IP
 #: en/live-build.7:62
-#, no-wrap
-msgid "B<lb_chroot>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot>(1)"
+msgid "B<lb chroot>(1)"
 msgstr "B<lb_chroot>(1)"
 
 #. type: Plain text
 #: en/live-build.7:64
-msgid "create the second stage by customizing the chroot"
-msgstr "crée un deuxième stage en personnalisant le chroot"
+msgid "executes the second build stage, building the live OS filesystem"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:64
-#, no-wrap
-msgid "B<lb_binary>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary>(1)"
+msgid "B<lb installer>(1)"
 msgstr "B<lb_binary>(1)"
 
 #. type: Plain text
 #: en/live-build.7:66
-msgid "create the third stage by generating a binary image"
-msgstr "crée le troisième stage en générant une image binaire"
+msgid ""
+"executes the third build stage, obtaining installer components (optional)"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:66
-#, no-wrap
-msgid "B<lb_source>(1)"
-msgstr "B<lb_source>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary>(1)"
+msgid "B<lb binary>(1)"
+msgstr "B<lb_binary>(1)"
 
 #. type: Plain text
 #: en/live-build.7:68
-msgid "create the optional fourth stage by generating a source image"
-msgstr "crée le quatrième stage optionel en générant une image source"
+#, fuzzy
+#| msgid "create the third stage by generating a binary image"
+msgid "executes the fourth build stage, generating a binary image"
+msgstr "crée le troisième stage en générant une image binaire"
 
 #. type: IP
 #: en/live-build.7:68
-#, no-wrap
-msgid "B<lb_clean>(1)"
-msgstr "B<lb_clean>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source>(1)"
+msgid "B<lb source>(1)"
+msgstr "B<lb_source>(1)"
 
 #. type: Plain text
 #: en/live-build.7:70
-msgid "clean up system build directories"
+#, fuzzy
+#| msgid "create the optional fourth stage by generating a source image"
+msgid "executes the fifth build stage, generating a source image (optional)"
+msgstr "crée le quatrième stage optionel en générant une image source"
+
+#. type: IP
+#: en/live-build.7:70
+#, fuzzy, no-wrap
+#| msgid "B<lb_clean>(1)"
+msgid "B<lb clean>(1)"
+msgstr "B<lb_clean>(1)"
+
+#. type: Plain text
+#: en/live-build.7:72
+#, fuzzy
+#| msgid "clean up system build directories"
+msgid "cleans up system build directories"
 msgstr "nettoie les répertoires de construction du système"
 
 #. type: SS
-#: en/live-build.7:70
+#: en/live-build.7:72
 #, no-wrap
 msgid "Ancillary Commands"
 msgstr "Commandes auxiliaires"
 
 #. type: IP
-#: en/live-build.7:71
+#: en/live-build.7:73
 #, no-wrap
 msgid "B<lb>(1)"
 msgstr "B<lb>(1)"
 
 #. type: Plain text
-#: en/live-build.7:73
-msgid "generic live-build wrapper"
-msgstr "emballage live-build générique"
-
-#. type: IP
-#: en/live-build.7:73
-#, no-wrap
-msgid "B<lb_build>(1)"
-msgstr "B<lb_build>(1)"
-
-#. type: Plain text
 #: en/live-build.7:75
-msgid "alias for all stages"
-msgstr "alias pour tous les stages"
+#, fuzzy
+#| msgid "generic live-build wrapper"
+msgid "generic live-build script execution wrapper"
+msgstr "emballage live-build générique"
 
 #. type: IP
 #: en/live-build.7:75
-#, no-wrap
-msgid "B<lb_local>(1)"
-msgstr "B<lb_local>(1)"
-
-#. type: Plain text
-#: en/live-build.7:77
-msgid "helper for using a local live-build"
-msgstr "assistant pour l'utilisation d'un live-build local"
-
-#. type: IP
-#: en/live-build.7:77
-#, no-wrap
-msgid "B<lb_testroot>(1)"
-msgstr "B<lb_testroot>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_build>(1)"
+msgid "B<lb build>(1)"
+msgstr "B<lb_build>(1)"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:80
-msgid "ensure that a system is built as root"
-msgstr "s'assure que le système est construit en tant qu'administrateur (root)"
+#: en/live-build.7:78
+#, fuzzy
+#| msgid "alias for all stages"
+msgid "alias for all build stages"
+msgstr "alias pour tous les stages"
 
 #. type: SH
-#: en/live-build.7:81
-#, no-wrap
-msgid "LOW-LEVEL COMMANDS (PLUMBING)"
+#: en/live-build.7:79
+#, fuzzy, no-wrap
+#| msgid "LOW-LEVEL COMMANDS (PLUMBING)"
+msgid "LOW-LEVEL COMMANDS (PLUMBING) - BUILD STAGE COMPONENTS"
 msgstr "COMMANDES BAS-NIVEAU (PLOMBERIE)"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:84
+#: en/live-build.7:82
 msgid ""
 "The actual work of live-build is implemented in the low-level commands, "
 "called plumbing. They are not supposed to be used by end users, they should "
@@ -545,7 +572,7 @@ msgstr ""
 "intéresser."
 
 #. type: Plain text
-#: en/live-build.7:86
+#: en/live-build.7:84
 msgid ""
 "Note that the interface (set of options and the semantics) to these low-"
 "level commands are meant to be a lot more stable than Porcelain level "
@@ -559,628 +586,856 @@ msgstr ""
 "l'utilisateur final."
 
 #. type: SS
-#: en/live-build.7:86
-#, no-wrap
-msgid "Bootstrap commands"
+#: en/live-build.7:84
+#, fuzzy, no-wrap
+#| msgid "Bootstrap commands"
+msgid "Bootstrap stage specific commands"
 msgstr "Commandes d'amorçage"
 
 #. type: IP
+#: en/live-build.7:85
+#, fuzzy, no-wrap
+#| msgid "B<lb_bootstrap_cache>(1)"
+msgid "B<lb bootstrap_archives>(1)"
+msgstr "B<lb_bootstrap_cache>(1)"
+
+#. type: Plain text
 #: en/live-build.7:87
-#, no-wrap
-msgid "B<lb_bootstrap_cache>(1)"
+msgid "applies apt archive configuration"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:87
+#, fuzzy, no-wrap
+#| msgid "B<lb_bootstrap_cache>(1)"
+msgid "B<lb bootstrap_cache>(1)"
 msgstr "B<lb_bootstrap_cache>(1)"
 
 #. type: Plain text
 #: en/live-build.7:89
-msgid "cache bootstrap stage"
-msgstr "stage d'amorçage cache"
+msgid ""
+"in save mode, saves to cache a copy of the generated bootstrap directory, "
+"and in restore mode, restores from cache a previously generated copy"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:89
-#, no-wrap
-msgid "B<lb_bootstrap_debootstrap>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_bootstrap_debootstrap>(1)"
+msgid "B<lb bootstrap_debootstrap>(1)"
 msgstr "B<lb_bootstrap_debootstrap>(1)"
 
 #. type: Plain text
 #: en/live-build.7:91
-msgid "bootstrap a Debian system with debootstrap(8)"
+#, fuzzy
+#| msgid "bootstrap a Debian system with debootstrap(8)"
+msgid "creates (bootstrap) a basic Debian root filesystem using debootstrap(8)"
 msgstr "amorçcer un système Debian avec debootstrap(8)"
 
 #. type: SS
 #: en/live-build.7:91
-#, no-wrap
-msgid "Chroot commands"
+#, fuzzy, no-wrap
+#| msgid "Chroot commands"
+msgid "Chroot stage specific commands"
 msgstr "Commandes chroot"
 
-#. type: IP
-#: en/live-build.7:92
-#, no-wrap
-msgid "B<lb_chroot_apt>(1)"
-msgstr "B<lb_chroot_apt>(1)"
-
 #. type: Plain text
 #: en/live-build.7:94
-msgid "manage /etc/apt/apt.conf"
-msgstr "gère /etc/apt/apt.conf"
+msgid ""
+"Note: The following chroot_ prefixed commands are used in building the live "
+"OS filesystem. Another set of similarly prefixed files are listed separately "
+"(see further down)."
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:94
-#, no-wrap
-msgid "B<lb_chroot_cache>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_cache>(1)"
+msgid "B<lb chroot_cache>(1)"
 msgstr "B<lb_chroot_cache>(1)"
 
 #. type: Plain text
 #: en/live-build.7:96
-msgid "cache chroot stage"
-msgstr "stage de chroot cache"
+msgid ""
+"in save mode, saves to cache a copy of the chroot directory, and in restore "
+"mode, restores from cache a previously generated copy"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:96
-#, no-wrap
-msgid "B<lb_chroot_debianchroot>(1)"
-msgstr "B<lb_chroot_debianchroot>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_cache>(1)"
+msgid "B<lb chroot_firmware>(1)"
+msgstr "B<lb_chroot_cache>(1)"
 
 #. type: Plain text
 #: en/live-build.7:98
-msgid "manage /etc/debian_chroot"
-msgstr "gère /etc/debian_chroot"
+msgid ""
+"compiles a list of firmware packages to be installed in the live OS root "
+"filesystem"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:98
-#, no-wrap
-msgid "B<lb_chroot_devpts>(1)"
-msgstr "B<lb_chroot_devpts>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_hacks>(1)"
+msgid "B<lb chroot_hacks>(1)"
+msgstr "B<lb_chroot_hacks>(1)"
 
 #. type: Plain text
 #: en/live-build.7:100
-msgid "mount /dev/pts"
-msgstr "monte /dev/pts"
+msgid ""
+"executes local hacks against the live OS root filesystem, if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:100
-#, no-wrap
-msgid "B<lb_chroot_dpkg>(1)"
-msgstr "B<lb_chroot_dpkg>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_hooks>(1)"
+msgid "B<lb chroot_hooks>(1)"
+msgstr "B<lb_chroot_hooks>(1)"
 
 #. type: Plain text
 #: en/live-build.7:102
-msgid "manage /sbin/dpkg"
-msgstr "gère /sbin/dpkg"
+msgid ""
+"executes local hooks against the live OS root filesystem, if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:102
-#, no-wrap
-msgid "B<lb_chroot_hacks>(1)"
-msgstr "B<lb_chroot_hacks>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_local-includes>(1)"
+msgid "B<lb chroot_includes>(1)"
+msgstr "B<lb_chroot_local-includes>(1)"
 
 #. type: Plain text
 #: en/live-build.7:104
-msgid "execute hacks in chroot"
-msgstr "exécute les hacks dans le chroot"
+msgid ""
+"copies a set of local files from the config directory into the live OS root "
+"filesystem, if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:104
-#, no-wrap
-msgid "B<lb_chroot_hostname>(1)"
-msgstr "B<lb_chroot_hostname>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_install-packages>(1)"
+msgid "B<lb chroot_install-packages>(1)"
+msgstr "B<lb_chroot_install-packages>(1)"
 
 #. type: Plain text
 #: en/live-build.7:106
-msgid "manage /bin/hostname"
-msgstr "gère /bin/hostname"
+msgid ""
+"installs into the live OS root filesystem any packages listed in local "
+"package lists"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:106
-#, no-wrap
-msgid "B<lb_chroot_hosts>(1)"
-msgstr "B<lb_chroot_hosts>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_interactive>(1)"
+msgid "B<lb chroot_interactive>(1)"
+msgstr "B<lb_chroot_interactive>(1)"
 
 #. type: Plain text
 #: en/live-build.7:108
-msgid "manage /etc/hosts"
-msgstr "gère /etc/hosts"
+msgid ""
+"pauses the build process and starts an interactive shell from the live OS "
+"root filesystem, providing an oportunity for manual modifications or "
+"testing; note that this is (currently) usually executed with several chroot "
+"prep modifications applied (see description of these further down)"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:108
-#, no-wrap
-msgid "B<lb_chroot_install-packages>(1)"
-msgstr "B<lb_chroot_install-packages>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_linux-image>(1)"
+msgid "B<lb chroot_linux-image>(1)"
+msgstr "B<lb_chroot_linux-image>(1)"
 
 #. type: Plain text
 #: en/live-build.7:110
-msgid "install queued packages into chroot"
-msgstr "installe les paquets en attente dans le chroot"
+msgid ""
+"compiles a list of kernel images to be installed in the live OS root "
+"filesystem"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:110
-#, no-wrap
-msgid "B<lb_chroot_interactive>(1)"
-msgstr "B<lb_chroot_interactive>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_packages>(1)"
+msgid "B<lb chroot_live-packages>(1)"
+msgstr "B<lb_chroot_packages>(1)"
 
 #. type: Plain text
 #: en/live-build.7:112
-msgid "make build interactive"
-msgstr "rend la construction intéractive"
+msgid ""
+"installs a set of live system specific packages to the live OS root "
+"filesystem"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:112
-#, no-wrap
-msgid "B<lb_chroot_linux-image>(1)"
-msgstr "B<lb_chroot_linux-image>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_packagelists>(1)"
+msgid "B<lb chroot_package-lists>(1)"
+msgstr "B<lb_chroot_packagelists>(1)"
 
 #. type: Plain text
 #: en/live-build.7:114
-msgid "manage /etc/kernel-img.conf"
-msgstr "gère /etc/kernel-img.conf"
+msgid ""
+"compiles a list of packages provided in the user\\' local config to be "
+"installed in the live OS root filesystem"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:114
-#, no-wrap
-msgid "B<lb_chroot_hooks>(1)"
-msgstr "B<lb_chroot_hooks>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_local-preseed>(1)"
+msgid "B<lb chroot_preseed>(1)"
+msgstr "B<lb_chroot_local-preseed>(1)"
 
 #. type: Plain text
 #: en/live-build.7:116
-msgid "execute local hooks in chroot"
-msgstr "exécute les hooks locaux dans le chroot"
+msgid ""
+"installs pre-configured answers to certain install prompts into the live OS "
+"root filesystem"
+msgstr ""
 
-#. type: IP
+#. type: SS
 #: en/live-build.7:116
 #, no-wrap
-msgid "B<lb_chroot_local-includes>(1)"
-msgstr "B<lb_chroot_local-includes>(1)"
-
-#. type: Plain text
-#: en/live-build.7:118
-msgid "copy local files into chroot"
-msgstr "copie les fichiers locaux dans le chroot"
+msgid "Installer stage specific commands"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:118
-#, no-wrap
-msgid "B<lb_chroot_packages>(1)"
-msgstr "B<lb_chroot_packages>(1)"
+#: en/live-build.7:117
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_debian-installer>(1)"
+msgid "B<lb installer_debian-installer>(1)"
+msgstr "B<lb_binary_debian-installer>(1)"
 
 #. type: Plain text
-#: en/live-build.7:120
-msgid "queue install of packages into chroot"
-msgstr "met en attente l'installation des paquets dans le chroot"
+#: en/live-build.7:119
+msgid "obtains and sets up Debian installer(d-i) components"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:120
-#, no-wrap
-msgid "B<lb_chroot_local-patches>(1)"
-msgstr "B<lb_chroot_local-patches>(1)"
+#: en/live-build.7:119
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_local-preseed>(1)"
+msgid "B<lb installer_preseed>(1)"
+msgstr "B<lb_chroot_local-preseed>(1)"
 
 #. type: Plain text
-#: en/live-build.7:122
-msgid "apply local patches against chroot"
-msgstr "appliques les rustines locales dans le chroot"
+#: en/live-build.7:121
+msgid "installs pre-configured answers to certain install prompts"
+msgstr ""
+
+#. type: SS
+#: en/live-build.7:121
+#, fuzzy, no-wrap
+#| msgid "Binary commands"
+msgid "Binary stage specific commands"
+msgstr "Commandes binaires"
 
 #. type: IP
 #: en/live-build.7:122
-#, no-wrap
-msgid "B<lb_chroot_local-preseed>(1)"
-msgstr "B<lb_chroot_local-preseed>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_checksums>(1)"
+msgid "B<lb binary_checksums>(1)"
+msgstr "B<lb_binary_checksums>(1)"
 
 #. type: Plain text
 #: en/live-build.7:124
-msgid "use debconf local preseeding file"
-msgstr "utilise un fichier de pré-configuration local debconf"
+#, fuzzy
+#| msgid "create source checksums (md5, sha1, and/or sha256)"
+msgid "creates checksums (md5, sha1, and/or sha256) for live image content"
+msgstr "crée les sommes de vérification binaires (md5, sha1, et/ou sha256)"
 
 #. type: IP
 #: en/live-build.7:124
-#, no-wrap
-msgid "B<lb_chroot_packagelists>(1)"
-msgstr "B<lb_chroot_packagelists>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_chroot>(1)"
+msgid "B<lb binary_chroot>(1)"
+msgstr "B<lb_binary_chroot>(1)"
 
 #. type: Plain text
 #: en/live-build.7:126
-msgid "queue install of package lists into chroot"
-msgstr "met en attente l'installation des listes de paquets dans le chroot"
+msgid ""
+"duplicates the chroot directory, to place a copy of what whould be the "
+"completed live OS root filesystem to one side, allowing the original to "
+"continue to be used in executing certain parts of the remainder of the build "
+"process"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:126
-#, no-wrap
-msgid "B<lb_chroot_proc>(1)"
-msgstr "B<lb_chroot_proc>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_disk>(1)"
+msgid "B<lb binary_disk>(1)"
+msgstr "B<lb_binary_disk>(1)"
 
 #. type: Plain text
 #: en/live-build.7:128
-msgid "mount /proc"
-msgstr "monte /proc"
+msgid "creates disk information files to be added to live image"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:128
-#, no-wrap
-msgid "B<lb_chroot_resolv>(1)"
-msgstr "B<lb_chroot_resolv>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_grub>(1)"
+msgid "B<lb binary_grub>(1)"
+msgstr "B<lb_binary_grub>(1)"
 
 #. type: Plain text
 #: en/live-build.7:130
-msgid "manage /etc/resolv.conf"
-msgstr "gère /etc/resolv.conf"
+msgid "installs grub into live image to provide image boot capability"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:130
-#, no-wrap
-msgid "B<lb_chroot_selinuxfs>(1)"
-msgstr "B<lb_chroot_selinuxfs>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_grub2>(1)"
+msgid "B<lb binary_grub2>(1)"
+msgstr "B<lb_binary_grub2>(1)"
 
 #. type: Plain text
 #: en/live-build.7:132
-msgid "mount /selinux"
-msgstr "monte /selinux"
+msgid "installs grub2 into live image to provide image boot capability"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:132
-#, no-wrap
-msgid "B<lb_chroot_archives>(1)"
-msgstr "B<lb_chroot_archives>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_hdd>(1)"
+msgid "B<lb binary_hdd>(1)"
+msgstr "B<lb_binary_hdd>(1)"
 
 #. type: Plain text
 #: en/live-build.7:134
-msgid "manage /etc/apt/sources.list"
-msgstr "gère /etc/apt/sources.list"
+msgid "compiles the final live image into an hdd image file"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:134
-#, no-wrap
-msgid "B<lb_chroot_sysfs>(1)"
-msgstr "B<lb_chroot_sysfs>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_rootfs>(1)"
+msgid "B<lb binary_hooks>(1)"
+msgstr "B<lb_binary_rootfs>(1)"
 
 #. type: Plain text
 #: en/live-build.7:136
-msgid "mount /sys"
-msgstr "gère /sys"
+msgid "executes local hooks against the live image, if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:136
-#, no-wrap
-msgid "B<lb_chroot_sysv-rc>(1)"
-msgstr "B<lb_chroot_sysv-rc>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_includes>(1)"
+msgid "B<lb binary_includes>(1)"
+msgstr "B<lb_binary_includes>(1)"
 
 #. type: Plain text
 #: en/live-build.7:138
-msgid "manage /usr/sbin/policy-rc.d"
-msgstr "gère /usr/sbin/policy-rc.d"
+msgid ""
+"copies a set of local files from the config directory into the live image, "
+"if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:138
-#, no-wrap
-msgid "B<lb_chroot_task-lists>(1)"
-msgstr "B<lb_chroot_task-lists>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_iso>(1)"
+msgid "B<lb binary_iso>(1)"
+msgstr "B<lb_binary_iso>(1)"
 
 #. type: Plain text
 #: en/live-build.7:140
-msgid "install task lists into chroot"
-msgstr "installe les listes de tâches dans le chroot"
-
-#. type: SS
-#: en/live-build.7:140
-#, no-wrap
-msgid "Binary commands"
-msgstr "Commandes binaires"
+msgid "compiles the final live image into an iso file"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:141
-#, no-wrap
-msgid "B<lb_binary_chroot>(1)"
-msgstr "B<lb_binary_chroot>(1)"
+#: en/live-build.7:140
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_linux-image>(1)"
+msgid "B<lb binary_linux-image>(1)"
+msgstr "B<lb_binary_linux-image>(1)"
 
 #. type: Plain text
-#: en/live-build.7:143
-msgid "copy chroot into chroot"
-msgstr "copie le chroot dans le chroot"
+#: en/live-build.7:142
+#, fuzzy
+#| msgid "install linux-image into binary"
+msgid "copies the linux-image into the live image"
+msgstr "installe linux-image dans le binaire"
 
 #. type: IP
-#: en/live-build.7:143
-#, no-wrap
-msgid "B<lb_binary_debian-installer>(1)"
-msgstr "B<lb_binary_debian-installer>(1)"
+#: en/live-build.7:142
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_local-includes>(1)"
+msgid "B<lb binary_loadlin>(1)"
+msgstr "B<lb_binary_local-includes>(1)"
 
 #. type: Plain text
-#: en/live-build.7:145
-msgid "install debian-installer into binary"
-msgstr "installe debian-installer dans le binaire"
+#: en/live-build.7:144
+msgid "bundles a copy of loadlin into the live image"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:145
-#, no-wrap
-msgid "B<lb_binary_disk>(1)"
-msgstr "B<lb_binary_disk>(1)"
+#: en/live-build.7:144
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_manifest>(1)"
+msgid "B<lb binary_manifest>(1)"
+msgstr "B<lb_binary_manifest>(1)"
 
 #. type: Plain text
-#: en/live-build.7:147
-msgid "install disk information into binary"
-msgstr "installe les informations de disque dans le binaire"
+#: en/live-build.7:146
+msgid ""
+"creates manifest of packages installed into live OS filesystem, and list of "
+"packages to be excluded by a persistence mechanism installing the live OS to "
+"disk"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:147
-#, no-wrap
-msgid "B<lb_binary_grub>(1)"
-msgstr "B<lb_binary_grub>(1)"
+#: en/live-build.7:146
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_memtest>(1)"
+msgid "B<lb binary_memtest>(1)"
+msgstr "B<lb_binary_memtest>(1)"
 
 #. type: Plain text
-#: en/live-build.7:149
-msgid "installs grub into binary"
-msgstr "installe grub dans le binaire"
+#: en/live-build.7:148
+msgid "bundles a copy of memtest into the live image"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:149
-#, no-wrap
-msgid "B<lb_binary_grub2>(1)"
-msgstr "B<lb_binary_grub2>(1)"
+#: en/live-build.7:148
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_net>(1)"
+msgid "B<lb binary_netboot>(1)"
+msgstr "B<lb_binary_net>(1)"
 
 #. type: Plain text
-#: en/live-build.7:151
-msgid "installs grub2 into binary"
-msgstr "installe grub2 dans le binaire"
+#: en/live-build.7:150
+msgid "compiles the final live image into a netboot tar archive"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:151
-#, no-wrap
-msgid "B<lb_binary_includes>(1)"
-msgstr "B<lb_binary_includes>(1)"
+#: en/live-build.7:150
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_local-packagelists>(1)"
+msgid "B<lb binary_package-lists>(1)"
+msgstr "B<lb_binary_local-packagelists>(1)"
 
 #. type: Plain text
-#: en/live-build.7:153 en/live-build.7:161
-msgid "copy files into binary"
-msgstr "copie les fichiers dans le binaire"
+#: en/live-build.7:152
+msgid ""
+"processes local lists of packages to obtain and bundle into image (from "
+"which they could later be installed if not already)"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:153
-#, no-wrap
-msgid "B<lb_binary_iso>(1)"
-msgstr "B<lb_binary_iso>(1)"
+#: en/live-build.7:152
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_rootfs>(1)"
+msgid "B<lb binary_rootfs>(1)"
+msgstr "B<lb_binary_rootfs>(1)"
 
 #. type: Plain text
-#: en/live-build.7:155
-msgid "build iso binary image"
-msgstr "construit l'image binaire iso"
+#: en/live-build.7:154
+msgid ""
+"wraps up the completed live OS root filesystem into a virtual file system "
+"image"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:155
-#, no-wrap
-msgid "B<lb_binary_linux-image>(1)"
-msgstr "B<lb_binary_linux-image>(1)"
+#: en/live-build.7:154
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_syslinux>(1)"
+msgid "B<lb binary_syslinux>(1)"
+msgstr "B<lb_binary_syslinux>(1)"
 
 #. type: Plain text
-#: en/live-build.7:157
-msgid "install linux-image into binary"
-msgstr "installe linux-image dans le binaire"
+#: en/live-build.7:156
+msgid "installs syslinux into live image to provide image boot capability"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:157
-#, no-wrap
-msgid "B<lb_binary_local-hooks>(1)"
-msgstr "B<lb_binary_local-hooks>(1)"
+#: en/live-build.7:156
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_tar>(1)"
+msgid "B<lb binary_tar>(1)"
+msgstr "B<lb_binary_tar>(1)"
 
 #. type: Plain text
-#: en/live-build.7:159
-msgid "execute local hooks in binary"
-msgstr "exécute les hooks locaux dans le binaire"
+#: en/live-build.7:158
+msgid "compiles the final live image into a tar archive"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:159
-#, no-wrap
-msgid "B<lb_binary_local-includes>(1)"
-msgstr "B<lb_binary_local-includes>(1)"
+#: en/live-build.7:158
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_win32-loader>(1)"
+msgid "B<lb binary_win32-loader>(1)"
+msgstr "B<lb_binary_win32-loader>(1)"
+
+#. type: Plain text
+#: en/live-build.7:160
+msgid ""
+"bundles a copy of win32-loader into the live image and creates an autorun."
+"inf file"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:161
-#, no-wrap
-msgid "B<lb_binary_local-packagelists>(1)"
-msgstr "B<lb_binary_local-packagelists>(1)"
+#: en/live-build.7:160
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_iso>(1)"
+msgid "B<lb binary_zsync>(1)"
+msgstr "B<lb_binary_iso>(1)"
 
 #. type: Plain text
-#: en/live-build.7:163
-msgid "install local package lists into binary"
-msgstr "installe les listes de paquets locaux dans le binaire"
+#: en/live-build.7:162
+msgid "builds zsync control files"
+msgstr ""
+
+#. type: SS
+#: en/live-build.7:162
+#, fuzzy, no-wrap
+#| msgid "Source commands"
+msgid "Source stage specific commands"
+msgstr "Commandes source"
 
 #. type: IP
 #: en/live-build.7:163
-#, no-wrap
-msgid "B<lb_binary_manifest>(1)"
-msgstr "B<lb_binary_manifest>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_checksums>(1)"
+msgid "B<lb source_checksums>(1)"
+msgstr "B<lb_source_checksums>(1)"
 
 #. type: Plain text
 #: en/live-build.7:165
-msgid "create manifest"
-msgstr "crée le manifeste"
+#, fuzzy
+#| msgid "create source checksums (md5, sha1, and/or sha256)"
+msgid "creates checksums (md5, sha1, and/or sha256) for source image content"
+msgstr "crée les sommes de vérification binaires (md5, sha1, et/ou sha256)"
 
 #. type: IP
 #: en/live-build.7:165
-#, no-wrap
-msgid "B<lb_binary_checksums>(1)"
-msgstr "B<lb_binary_checksums>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_debian>(1)"
+msgid "B<lb source_debian>(1)"
+msgstr "B<lb_source_debian>(1)"
 
 #. type: Plain text
 #: en/live-build.7:167
-msgid "create binary checksums (md5, sha1, and/or sha256)"
-msgstr "crée les sommes de vérification binaires (md5, sha1, et/ou sha256)"
+msgid "downloads source packages for bundling into source image"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:167
-#, no-wrap
-msgid "B<lb_binary_memtest>(1)"
-msgstr "B<lb_binary_memtest>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_disk>(1)"
+msgid "B<lb source_disk>(1)"
+msgstr "B<lb_source_disk>(1)"
 
 #. type: Plain text
 #: en/live-build.7:169
-msgid "installs a memtest into binary"
-msgstr "installe memtest dans le binaire"
+#, fuzzy
+#| msgid "install disk information into source"
+msgid "creates disk information files to be added to source image"
+msgstr "installe les informations de disque dans la source"
 
 #. type: IP
 #: en/live-build.7:169
-#, no-wrap
-msgid "B<lb_binary_net>(1)"
-msgstr "B<lb_binary_net>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_hdd>(1)"
+msgid "B<lb source_hdd>(1)"
+msgstr "B<lb_source_hdd>(1)"
 
 #. type: Plain text
 #: en/live-build.7:171
-msgid "build netboot binary image"
-msgstr "construit l'image binaire netboot"
+msgid "compiles the final source image into an hdd image file"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:171
-#, no-wrap
-msgid "B<lb_binary_rootfs>(1)"
-msgstr "B<lb_binary_rootfs>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_hdd>(1)"
+msgid "B<lb source_hooks>(1)"
+msgstr "B<lb_source_hdd>(1)"
 
 #. type: Plain text
 #: en/live-build.7:173
-msgid "build rootfs image"
-msgstr "construit l'image rootfs"
+msgid "executes local hooks against the source image, if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:173
-#, no-wrap
-msgid "B<lb_binary_syslinux>(1)"
-msgstr "B<lb_binary_syslinux>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_iso>(1)"
+msgid "B<lb source_iso>(1)"
+msgstr "B<lb_source_iso>(1)"
 
 #. type: Plain text
 #: en/live-build.7:175
-msgid "installs syslinux into binary"
-msgstr "installe syslinux dans le binaire"
+msgid "compiles the final source image into an iso file"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:175
-#, no-wrap
-msgid "B<lb_binary_tar>(1)"
-msgstr "B<lb_binary_tar>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_iso>(1)"
+msgid "B<lb source_live>(1)"
+msgstr "B<lb_source_iso>(1)"
 
 #. type: Plain text
 #: en/live-build.7:177
-msgid "build harddisk binary image"
-msgstr "construit une image binaire pour disque dur"
+#, fuzzy
+#| msgid "copy debian-live config into source"
+msgid "copies live-build config into source"
+msgstr "copie la configuration debian-live dans la source"
 
 #. type: IP
 #: en/live-build.7:177
-#, no-wrap
-msgid "B<lb_binary_hdd>(1)"
-msgstr "B<lb_binary_hdd>(1)"
-
-#. type: Plain text
-#: en/live-build.7:179
-msgid "build binary hdd image"
-msgstr "construit une image binaire hdd"
-
-#. type: IP
-#: en/live-build.7:179
-#, no-wrap
-msgid "B<lb_binary_win32-loader>(1)"
-msgstr "B<lb_binary_win32-loader>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_tar>(1)"
+msgid "B<lb source_tar>(1)"
+msgstr "B<lb_source_tar>(1)"
 
+#.  FIXME
 #. type: Plain text
-#: en/live-build.7:181
-msgid "installs win32-loader into binary"
-msgstr "installe win32-loader dans le binaire"
+#: en/live-build.7:180
+msgid "compiles the final source image into a tar archive"
+msgstr ""
 
-#. type: SS
+#. type: SH
 #: en/live-build.7:181
-#, no-wrap
-msgid "Source commands"
-msgstr "Commandes source"
-
-#. type: IP
-#: en/live-build.7:182
-#, no-wrap
-msgid "B<lb_source_debian>(1)"
-msgstr "B<lb_source_debian>(1)"
+#, fuzzy, no-wrap
+#| msgid "LOW-LEVEL COMMANDS (PLUMBING)"
+msgid "LOW-LEVEL COMMANDS (PLUMBING) - CHROOT PREP COMPONENTS"
+msgstr "COMMANDES BAS-NIVEAU (PLOMBERIE)"
 
+#.  FIXME
 #. type: Plain text
 #: en/live-build.7:184
-msgid "download sources"
-msgstr "télécharge les sources"
-
-#. type: IP
-#: en/live-build.7:184
-#, no-wrap
-msgid "B<lb_source_debian-live>(1)"
-msgstr "B<lb_source_debian-live>(1)"
+msgid ""
+"The notes above under the section regarding build-stage specific low-level "
+"plumbing commands also apply here."
+msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:186
-msgid "copy debian-live config into source"
-msgstr "copie la configuration debian-live dans la source"
+msgid ""
+"The following chroot_ prefixed commands are used throughout the various "
+"primary stages of the build process to apply and remove modifications to a "
+"chroot root filesystem. Generally these are used to apply modification that "
+"setup the chroot for use (execution of programs within it) during the build "
+"process, and later to remove those modification, unmounting things that were "
+"mounted, and making the chroot suitable for use as the root filesystem of "
+"the live OS to be bundled into the live image."
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:186
-#, no-wrap
-msgid "B<lb_source_disk>(1)"
-msgstr "B<lb_source_disk>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_apt>(1)"
+msgid "B<lb chroot_apt>(1)"
+msgstr "B<lb_chroot_apt>(1)"
 
 #. type: Plain text
 #: en/live-build.7:188
-msgid "install disk information into source"
-msgstr "installe les informations de disque dans la source"
+msgid ""
+"manages apt configuration; in apply mode it applies configuration for use "
+"during build process, and in remove mode removes that configuration"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:188
-#, no-wrap
-msgid "B<lb_source_iso>(1)"
-msgstr "B<lb_source_iso>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_archives>(1)"
+msgid "B<lb chroot_archives>(1)"
+msgstr "B<lb_chroot_archives>(1)"
 
 #. type: Plain text
 #: en/live-build.7:190
-msgid "build iso source image"
-msgstr "construit l'image source iso"
+msgid ""
+"manages apt archive source lists; in apply mode it applies source list "
+"configurations suitable for use of the chroot in the build process, and in "
+"remove mode replaces that with a configuration suitable for the final live OS"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:190
-#, no-wrap
-msgid "B<lb_source_checksums>(1)"
-msgstr "B<lb_source_checksums>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_debianchroot>(1)"
+msgid "B<lb chroot_debianchroot>(1)"
+msgstr "B<lb_chroot_debianchroot>(1)"
 
 #. type: Plain text
 #: en/live-build.7:192
-msgid "create source checksums (md5, sha1, and/or sha256)"
-msgstr "crée les sommes de vérification binaires (md5, sha1, et/ou sha256)"
+#, fuzzy
+#| msgid "manage /etc/debian_chroot"
+msgid "manages a /etc/debian_chroot file"
+msgstr "gère /etc/debian_chroot"
 
 #. type: IP
 #: en/live-build.7:192
-#, no-wrap
-msgid "B<lb_source_net>(1)"
-msgstr "B<lb_source_net>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_devpts>(1)"
+msgid "B<lb chroot_devpts>(1)"
+msgstr "B<lb_chroot_devpts>(1)"
 
 #. type: Plain text
 #: en/live-build.7:194
-msgid "build source net image"
-msgstr "construit l'image net source"
+#, fuzzy
+#| msgid "mount /dev/pts"
+msgid "manages mounting of /dev/pts"
+msgstr "monte /dev/pts"
 
 #. type: IP
 #: en/live-build.7:194
-#, no-wrap
-msgid "B<lb_source_tar>(1)"
-msgstr "B<lb_source_tar>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_dpkg>(1)"
+msgid "B<lb chroot_dpkg>(1)"
+msgstr "B<lb_chroot_dpkg>(1)"
 
 #. type: Plain text
 #: en/live-build.7:196
-msgid "build source tarball"
-msgstr "construit le tarball source"
+msgid ""
+"manages dpkg; in apply mode disabling things like the start-stop-daemon, and "
+"in remove mode enabling them again"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:196
-#, no-wrap
-msgid "B<lb_source_hdd>(1)"
-msgstr "B<lb_source_hdd>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_hostname>(1)"
+msgid "B<lb chroot_hostname>(1)"
+msgstr "B<lb_chroot_hostname>(1)"
+
+#. type: Plain text
+#: en/live-build.7:198
+#, fuzzy
+#| msgid "use custom configuration file."
+msgid "manages the hostname configuration"
+msgstr "utilise un fichier de configuration personnalisé."
+
+#. type: IP
+#: en/live-build.7:198
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_hosts>(1)"
+msgid "B<lb chroot_hosts>(1)"
+msgstr "B<lb_chroot_hosts>(1)"
+
+#. type: Plain text
+#: en/live-build.7:200
+#, fuzzy
+#| msgid "manage /etc/hosts"
+msgid "manages the /etc/hosts file"
+msgstr "gère /etc/hosts"
+
+#. type: IP
+#: en/live-build.7:200
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_proc>(1)"
+msgid "B<lb chroot_proc>(1)"
+msgstr "B<lb_chroot_proc>(1)"
+
+#. type: Plain text
+#: en/live-build.7:202
+#, fuzzy
+#| msgid "mount /proc"
+msgid "manages mounting of /proc"
+msgstr "monte /proc"
+
+#. type: IP
+#: en/live-build.7:202
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_resolv>(1)"
+msgid "B<lb chroot_resolv>(1)"
+msgstr "B<lb_chroot_resolv>(1)"
+
+#. type: Plain text
+#: en/live-build.7:204
+#, fuzzy
+#| msgid "manage /etc/resolv.conf"
+msgid "manages configuration of the /etc/resolv.conf file"
+msgstr "gère /etc/resolv.conf"
+
+#. type: IP
+#: en/live-build.7:204
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_selinuxfs>(1)"
+msgid "B<lb chroot_selinuxfs>(1)"
+msgstr "B<lb_chroot_selinuxfs>(1)"
+
+#. type: Plain text
+#: en/live-build.7:206
+msgid "manages mounting of /sys/fs/selinux"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:206
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_sysfs>(1)"
+msgid "B<lb chroot_sysfs>(1)"
+msgstr "B<lb_chroot_sysfs>(1)"
+
+#. type: Plain text
+#: en/live-build.7:208
+msgid "manages mounting of /sys"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:208
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_sysv-rc>(1)"
+msgid "B<lb chroot_sysv-rc>(1)"
+msgstr "B<lb_chroot_sysv-rc>(1)"
+
+#. type: Plain text
+#: en/live-build.7:210
+#, fuzzy
+#| msgid "manage /usr/sbin/policy-rc.d"
+msgid "manages the /usr/sbin/policy-rc.d file"
+msgstr "gère /usr/sbin/policy-rc.d"
+
+#. type: IP
+#: en/live-build.7:210
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_sysfs>(1)"
+msgid "B<lb chroot_tmpfs>(1)"
+msgstr "B<lb_chroot_sysfs>(1)"
+
+#. type: Plain text
+#: en/live-build.7:212
+msgid "manages configuration of dpkg to use a tmpfs filesystem"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:212
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_apt>(1)"
+msgid "B<lb chroot_upstart>(1)"
+msgstr "B<lb_chroot_apt>(1)"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:199
-msgid "build source hdd image"
-msgstr "construit l'image hdd source"
+#: en/live-build.7:215
+msgid ""
+"manages use of upstart /sbin/initctl program; in apply mode blocking "
+"execution through a dpkg diversion, and in remove mode enabling execution "
+"again"
+msgstr ""
 
 #. type: SH
-#: en/live-build.7:200
+#: en/live-build.7:216
 #, no-wrap
 msgid "CONFIG FILES"
 msgstr "FICHIERS DE CONFIGURATION"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:203
+#: en/live-build.7:219
 msgid ""
 "Many live-build commands make use of files in the I<config/> directory to "
 "control what they do. Besides the common I<config/common>, which is used by "
@@ -1200,9 +1455,17 @@ msgstr ""
 "l'assistant)."
 
 #. type: Plain text
-#: en/live-build.7:205
+#: en/live-build.7:221
+#, fuzzy
+#| msgid ""
+#| "For example, lb_bootstrap_debootstrap uses files named config/bootstrap "
+#| "and config/bootstrap_debootstrap to read the options it will use. See the "
+#| "man pages of individual commands for details about the names and formats "
+#| "of the files they use. Generally, these files contain variables with "
+#| "values assigned, one variable per line. Some programs in live-build use "
+#| "pairs of values or slightly more complicated variable assignments."
 msgid ""
-"For example, lb_bootstrap_debootstrap uses files named config/bootstrap and "
+"For example, lb bootstrap_debootstrap uses files named config/bootstrap and "
 "config/bootstrap_debootstrap to read the options it will use. See the man "
 "pages of individual commands for details about the names and formats of the "
 "files they use. Generally, these files contain variables with values "
@@ -1219,7 +1482,7 @@ msgstr ""
 "plus compliquées."
 
 #. type: Plain text
-#: en/live-build.7:207
+#: en/live-build.7:223
 msgid ""
 "Note that live-build will respect environment variables which are present in "
 "the context of the shell it is running. If variables can be read from config "
@@ -1237,7 +1500,7 @@ msgstr ""
 "build la paramètrera automatiquement à la valeur par défaut."
 
 #. type: Plain text
-#: en/live-build.7:209
+#: en/live-build.7:225
 msgid ""
 "In some rare cases, you may want to have different versions of these files "
 "for different architectures or distributions. If files named config/stage."
@@ -1257,7 +1520,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:212
+#: en/live-build.7:228
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "program. That means they have to follow the normal shell syntax. You can "
@@ -1269,13 +1532,13 @@ msgstr ""
 "fichiers; les lignes commençant par des \"#\" sont ignorées."
 
 #. type: IP
-#: en/live-build.7:214
+#: en/live-build.7:230
 #, no-wrap
 msgid "B</etc/live/build.conf>"
 msgstr "B</etc/live/build.conf>"
 
 #. type: IP
-#: en/live-build.7:215
+#: en/live-build.7:231
 #, no-wrap
 msgid "B</etc/live/build/*>"
 msgstr "B</etc/live/build/*>"
diff --git a/manpages/po/ja/lb.1.po b/manpages/po/ja/lb.1.po
index 94bdda9a8..b4b02e731 100644
--- a/manpages/po/ja/lb.1.po
+++ b/manpages/po/ja/lb.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -79,7 +79,7 @@ msgstr "B<lb> [I<live-build\\ オプション>]"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -96,7 +96,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -115,8 +115,8 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
@@ -130,58 +130,63 @@ msgstr "B<無し>"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "このプログラムは live-build の一部です。"
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "live-build 及び Live システムプロジェクトについてのさらなる情報は、"
-"E<lt>I<http://live-systems.org/>E<gt> のホームページや E<lt>I<http://live-"
-"systems.org/manual/>E<gt> のマニュアルにあります。"
+"E<lt>I<https://debian-live.alioth.debian.org/>E<gt> のホームページや "
+"E<lt>I<http://live-systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -195,16 +200,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
diff --git a/manpages/po/ja/lb_binary.1.po b/manpages/po/ja/lb_binary.1.po
index 1ce988379..6ce5c6858 100644
--- a/manpages/po/ja/lb_binary.1.po
+++ b/manpages/po/ja/lb_binary.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -64,7 +64,7 @@ msgstr "概要"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "説明"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,8 +80,8 @@ msgstr "オプション"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
@@ -95,58 +95,63 @@ msgstr "B<無し>"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "このプログラムは live-build の一部です。"
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "live-build 及び Live システムプロジェクトについてのさらなる情報は、"
-"E<lt>I<http://live-systems.org/>E<gt> のホームページや E<lt>I<http://live-"
-"systems.org/manual/>E<gt> のマニュアルにあります。"
+"E<lt>I<https://debian-live.alioth.debian.org/>E<gt> のホームページや "
+"E<lt>I<http://live-systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -160,16 +165,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -178,7 +183,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_binary.1:5
-msgid "B<lb binary> - Complete the binary stage"
+#, fuzzy
+#| msgid "B<lb binary> - Complete the binary stage"
+msgid "B<lb_binary> - Complete the binary stage"
 msgstr "B<lb binary> - バイナリ段階を完了させます"
 
 #. type: Plain text
diff --git a/manpages/po/ja/lb_bootstrap.1.po b/manpages/po/ja/lb_bootstrap.1.po
index bf5b989eb..236e48cfe 100644
--- a/manpages/po/ja/lb_bootstrap.1.po
+++ b/manpages/po/ja/lb_bootstrap.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2014-08-29 06:25+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -64,7 +64,7 @@ msgstr "概要"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "説明"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,8 +80,8 @@ msgstr "オプション"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
@@ -95,58 +95,63 @@ msgstr "B<無し>"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "このプログラムは live-build の一部です。"
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "live-build 及び Live システムプロジェクトについてのさらなる情報は、"
-"E<lt>I<http://live-systems.org/>E<gt> のホームページや E<lt>I<http://live-"
-"systems.org/manual/>E<gt> のマニュアルにあります。"
+"E<lt>I<https://debian-live.alioth.debian.org/>E<gt> のホームページや "
+"E<lt>I<http://live-systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -160,16 +165,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -178,7 +183,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_bootstrap.1:5
-msgid "B<lb bootstrap> - Complete the bootstrap stage"
+#, fuzzy
+#| msgid "B<lb bootstrap> - Complete the bootstrap stage"
+msgid "B<lb_bootstrap> - Complete the bootstrap stage"
 msgstr "B<lb bootstrap> - パッケージ収集段階を完了させます"
 
 #. type: Plain text
diff --git a/manpages/po/ja/lb_build.1.po b/manpages/po/ja/lb_build.1.po
index 67d6955b0..81793cfc6 100644
--- a/manpages/po/ja/lb_build.1.po
+++ b/manpages/po/ja/lb_build.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -64,7 +64,7 @@ msgstr "概要"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "説明"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,66 +80,71 @@ msgstr "オプション"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "このプログラムは live-build の一部です。"
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "live-build 及び Live システムプロジェクトについてのさらなる情報は、"
-"E<lt>I<http://live-systems.org/>E<gt> のホームページや E<lt>I<http://live-"
-"systems.org/manual/>E<gt> のマニュアルにあります。"
+"E<lt>I<https://debian-live.alioth.debian.org/>E<gt> のホームページや "
+"E<lt>I<http://live-systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -153,16 +158,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -171,7 +176,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_build.1:5
-msgid "B<lb build> - Complete the bootstrap, chroot, binary, and source stages"
+#, fuzzy
+#| msgid ""
+#| "B<lb build> - Complete the bootstrap, chroot, binary, and source stages"
+msgid "B<lb_build> - Complete the bootstrap, chroot, binary, and source stages"
 msgstr ""
 "B<lb build> - パッケージ収集、chroot、バイナリ、ソース段階を完了させます"
 
diff --git a/manpages/po/ja/lb_chroot.1.po b/manpages/po/ja/lb_chroot.1.po
index 9c52239b8..41033fa88 100644
--- a/manpages/po/ja/lb_chroot.1.po
+++ b/manpages/po/ja/lb_chroot.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -64,7 +64,7 @@ msgstr "概要"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "説明"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,8 +80,8 @@ msgstr "オプション"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
@@ -95,58 +95,63 @@ msgstr "B<無し>"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "このプログラムは live-build の一部です。"
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "live-build 及び Live システムプロジェクトについてのさらなる情報は、"
-"E<lt>I<http://live-systems.org/>E<gt> のホームページや E<lt>I<http://live-"
-"systems.org/manual/>E<gt> のマニュアルにあります。"
+"E<lt>I<https://debian-live.alioth.debian.org/>E<gt> のホームページや "
+"E<lt>I<http://live-systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -160,16 +165,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -178,7 +183,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_chroot.1:5
-msgid "B<lb chroot> - Complete the chroot stage"
+#, fuzzy
+#| msgid "B<lb chroot> - Complete the chroot stage"
+msgid "B<lb_chroot> - Complete the chroot stage"
 msgstr "B<lb chroot> - chroot 段階を完了させます"
 
 #. type: Plain text
diff --git a/manpages/po/ja/lb_clean.1.po b/manpages/po/ja/lb_clean.1.po
index 33d05f94d..dfed63b3d 100644
--- a/manpages/po/ja/lb_clean.1.po
+++ b/manpages/po/ja/lb_clean.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -64,7 +64,7 @@ msgstr "概要"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "説明"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,66 +80,71 @@ msgstr "オプション"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "このプログラムは live-build の一部です。"
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "live-build 及び Live システムプロジェクトについてのさらなる情報は、"
-"E<lt>I<http://live-systems.org/>E<gt> のホームページや E<lt>I<http://live-"
-"systems.org/manual/>E<gt> のマニュアルにあります。"
+"E<lt>I<https://debian-live.alioth.debian.org/>E<gt> のホームページや "
+"E<lt>I<http://live-systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -153,16 +158,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -171,7 +176,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_clean.1:5
-msgid "B<lb clean> - Clean build directory"
+#, fuzzy
+#| msgid "B<lb clean> - Clean build directory"
+msgid "B<lb_clean> - Clean build directory"
 msgstr "B<lb clean> - 設定ディレクトリを掃除します"
 
 #. type: Plain text
diff --git a/manpages/po/ja/lb_config.1.po b/manpages/po/ja/lb_config.1.po
index ce3140720..32dc8b0aa 100644
--- a/manpages/po/ja/lb_config.1.po
+++ b/manpages/po/ja/lb_config.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2015-02-07 14:57+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -64,7 +64,7 @@ msgstr "概要"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "説明"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,66 +80,71 @@ msgstr "オプション"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "このプログラムは live-build の一部です。"
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "live-build 及び Live システムプロジェクトについてのさらなる情報は、"
-"E<lt>I<http://live-systems.org/>E<gt> のホームページや E<lt>I<http://live-"
-"systems.org/manual/>E<gt> のマニュアルにあります。"
+"E<lt>I<https://debian-live.alioth.debian.org/>E<gt> のホームページや "
+"E<lt>I<http://live-systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -153,16 +158,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -171,7 +176,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:5
-msgid "B<lb config> - Create config directory"
+#, fuzzy
+#| msgid "B<lb config> - Create config directory"
+msgid "B<lb_config> - Create config directory"
 msgstr "B<lb config> - 設定ディレクトリを作成します"
 
 #. type: Plain text
@@ -262,403 +269,426 @@ msgstr "  [B<--bootappend-live> I<パラメータ>|I<\"パラメータ\">]"
 
 #. type: Plain text
 #: en/lb_config.1:43
-msgid "  [B<--bootloader> grub|grub2|syslinux]"
-msgstr "  [B<--bootloader> grub|grub2|syslinux]"
+#, fuzzy
+#| msgid "  [B<--bootappend-live> I<PARAMETER>|I<\"PARAMETERS\">]"
+msgid "  [B<--bootappend-live-failsafe> I<PARAMETER>|I<\"PARAMETERS\">]"
+msgstr "  [B<--bootappend-live> I<パラメータ>|I<\"パラメータ\">]"
 
 #. type: Plain text
 #: en/lb_config.1:45
+#, fuzzy
+#| msgid "  [B<--bootloader> grub|grub2|syslinux]"
+msgid "  [B<--bootloaders> grub-legacy|grub-pc|syslinux|grub-efi]"
+msgstr "  [B<--bootloader> grub|grub2|syslinux]"
+
+#. type: Plain text
+#: en/lb_config.1:47
 msgid "  [B<--cache> true|false]"
 msgstr "  [B<--cache> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:47
+#: en/lb_config.1:49
 msgid "  [B<--cache-indices> true|false]"
 msgstr "  [B<--cache-indices> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:49
+#: en/lb_config.1:51
 msgid "  [B<--cache-packages> true|false]"
 msgstr "  [B<--cache-packages> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:51
+#: en/lb_config.1:53
 msgid "  [B<--cache-stages> I<STAGE>|I<\"STAGES\">]"
 msgstr "  [B<--cache-stages> I<段階>|I<\"段階\">]"
 
 #. type: Plain text
-#: en/lb_config.1:53
+#: en/lb_config.1:55
 msgid "  [B<--checksums> md5|sha1|sha256|none]"
 msgstr "  [B<--checksums> md5|sha1|sha256|none]"
 
 #. type: Plain text
-#: en/lb_config.1:55
+#: en/lb_config.1:57
 msgid "  [B<--compression> bzip2|gzip|lzip|none]"
 msgstr "  [B<--compression> bzip2|gzip|lzip|none]"
 
 #. type: Plain text
-#: en/lb_config.1:57
+#: en/lb_config.1:59
 msgid "  [B<--config> I<GIT_URL::GIT_ID>]"
 msgstr "  [B<--config> I<GIT_URL::GIT_ID>]"
 
 #. type: Plain text
-#: en/lb_config.1:59
+#: en/lb_config.1:61
 msgid "  [B<--build-with-chroot> true|false]"
 msgstr "  [B<--build-with-chroot> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:61
+#: en/lb_config.1:63
 msgid "  [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]"
 msgstr "  [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]"
 
 #. type: Plain text
-#: en/lb_config.1:63
+#: en/lb_config.1:65
 msgid "  [B<--clean>]"
 msgstr "  [B<--clean>]"
 
 #. type: Plain text
-#: en/lb_config.1:65
+#: en/lb_config.1:67
 msgid "  [-c|B<--conffile> I<FILE>]"
 msgstr "  [-c|B<--conffile> I<ファイル>]"
 
 #. type: Plain text
-#: en/lb_config.1:67
+#: en/lb_config.1:69
 msgid "  [B<--debconf-frontend> dialog|editor|noninteractive|readline]"
 msgstr "  [B<--debconf-frontend> dialog|editor|noninteractive|readline]"
 
 #. type: Plain text
-#: en/lb_config.1:69
+#: en/lb_config.1:71
 msgid "  [B<--debconf-priority> low|medium|high|critical]"
 msgstr "  [B<--debconf-priority> low|medium|high|critical]"
 
 #. type: Plain text
-#: en/lb_config.1:71
+#: en/lb_config.1:73
 msgid ""
 "  [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]"
 msgstr ""
 "  [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]"
 
 #. type: Plain text
-#: en/lb_config.1:73
+#: en/lb_config.1:75
 msgid "  [B<--debian-installer-distribution> daily|I<CODENAME>]"
 msgstr "  [B<--debian-installer-distribution> daily|I<コード名>]"
 
 #. type: Plain text
-#: en/lb_config.1:75
+#: en/lb_config.1:77
 msgid "  [B<--debian-installer-preseedfile> I<FILE>|I<URL>]"
 msgstr "  [B<--debian-installer-preseedfile> I<ファイル>|I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:77
+#: en/lb_config.1:79
 msgid "  [B<--debian-installer-gui> true|false]"
 msgstr "  [B<--debian-installer-gui> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:79
+#: en/lb_config.1:81
+#, fuzzy
+#| msgid "  [B<--net-root-mountoptions> I<OPTIONS>]"
+msgid "  [B<--debootstrap-options> I<OPTIONS>]"
+msgstr "  [B<--net-root-mountoptions> I<オプション>]"
+
+#. type: Plain text
+#: en/lb_config.1:83
+#, fuzzy
+#| msgid "  [B<--mirror-bootstrap> I<URL>]"
+msgid "  [B<--debootstrap-script> I<SCRIPT>]"
+msgstr "  [B<--mirror-bootstrap> I<URL>]"
+
+#. type: Plain text
+#: en/lb_config.1:85
 msgid "  [B<--debug>]"
 msgstr "  [B<--debug>]"
 
 #. type: Plain text
-#: en/lb_config.1:81
+#: en/lb_config.1:87
 msgid "  [-d|B<--distribution> I<CODENAME>]"
 msgstr "  [-d|B<--distribution> I<コード名>]"
 
 #. type: Plain text
-#: en/lb_config.1:83
+#: en/lb_config.1:89
 msgid "  [B<--parent-distribution> I<CODENAME>]"
 msgstr "  [B<--parent-distribution> I<コード名>]"
 
 #. type: Plain text
-#: en/lb_config.1:85
+#: en/lb_config.1:91
 msgid "  [B<--parent-debian-installer-distribution> I<CODENAME>]"
 msgstr "  [B<--parent-debian-installer-distribution> I<コード名>]"
 
 #. type: Plain text
-#: en/lb_config.1:87
+#: en/lb_config.1:93
 msgid "  [B<--dump>]"
 msgstr "  [B<--dump>]"
 
 #. type: Plain text
-#: en/lb_config.1:89
+#: en/lb_config.1:95
 msgid "  [B<--fdisk> fdisk|fdisk.dist]"
 msgstr "  [B<--fdisk> fdisk|fdisk.dist]"
 
 #. type: Plain text
-#: en/lb_config.1:91
+#: en/lb_config.1:97
 msgid "  [B<--firmware-binary true|false>]"
 msgstr "  [B<--firmware-binary true|false>]"
 
 #. type: Plain text
-#: en/lb_config.1:93
+#: en/lb_config.1:99
 msgid "  [B<--firmware-chroot true|false>]"
 msgstr "  [B<--firmware-chroot true|false>]"
 
 #. type: Plain text
-#: en/lb_config.1:95
+#: en/lb_config.1:101
 msgid "  [B<--force>]"
 msgstr "  [B<--force>]"
 
 #. type: Plain text
-#: en/lb_config.1:97
+#: en/lb_config.1:103
 msgid "  [B<--grub-splash> I<FILE>]"
 msgstr "  [B<--grub-splash> I<ファイル>]"
 
 #. type: Plain text
-#: en/lb_config.1:99
+#: en/lb_config.1:105
 msgid "  [B<--gzip-options> I<OPTION>|\"I<OPTIONS>\"]"
 msgstr "  [B<--gzip-options> I<オプション>|\"I<オプション>\"]"
 
 #. type: Plain text
-#: en/lb_config.1:101
+#: en/lb_config.1:107
 msgid "  [B<--hooks> I<FILE>]"
 msgstr "  [B<--hooks> I<ファイル>]"
 
 #. type: Plain text
-#: en/lb_config.1:103
+#: en/lb_config.1:109
 msgid "  [B<--ignore-system-defaults>]"
 msgstr "  [B<--ignore-system-defaults>]"
 
 #. type: Plain text
-#: en/lb_config.1:105
+#: en/lb_config.1:111
 msgid "  [B<--initramfs> auto|none|live-boot|casper]"
 msgstr "  [B<--initramfs> auto|none|live-boot|casper]"
 
 #. type: Plain text
-#: en/lb_config.1:107
+#: en/lb_config.1:113
 msgid "  [B<--initramfs-compression> bzip2|gzip|lzma]"
 msgstr "  [B<--initramfs-compression> bzip2|gzip|lzma]"
 
 #. type: Plain text
-#: en/lb_config.1:109
+#: en/lb_config.1:115
 msgid "  [B<--initsystem> sysvinit|runit|systemd|upstart|none]"
 msgstr "  [B<--initsystem> sysvinit|runit|systemd|upstart|none]"
 
 #. type: Plain text
-#: en/lb_config.1:111
+#: en/lb_config.1:117
 msgid "  [B<--interactive> shell]"
 msgstr "  [B<--interactive> shell]"
 
 #. type: Plain text
-#: en/lb_config.1:113
+#: en/lb_config.1:119
 msgid "  [B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\"]"
 msgstr "  [B<--isohybrid-options> I<オプション>|\"I<オプション>\"]"
 
 #. type: Plain text
-#: en/lb_config.1:115
+#: en/lb_config.1:121
 msgid "  [B<--iso-application> I<NAME>]"
 msgstr "  [B<--iso-application> I<名前>]"
 
 #. type: Plain text
-#: en/lb_config.1:117
+#: en/lb_config.1:123
 msgid "  [B<--iso-preparer> I<NAME>]"
 msgstr "  [B<--iso-preparer> I<NAME>]"
 
 #. type: Plain text
-#: en/lb_config.1:119
+#: en/lb_config.1:125
 msgid "  [B<--iso-publisher> I<NAME>]"
 msgstr "  [B<--iso-publisher> I<名前>]"
 
 #. type: Plain text
-#: en/lb_config.1:121
+#: en/lb_config.1:127
 msgid "  [B<--iso-volume> I<NAME>]"
 msgstr "  [B<--iso-volume> I<名前>]"
 
 #. type: Plain text
-#: en/lb_config.1:123
+#: en/lb_config.1:129
 msgid "  [B<--jffs2-eraseblock> I<SIZE>]"
 msgstr "  [B<--jffs2-eraseblock> I<サイズ>]"
 
 #. type: Plain text
-#: en/lb_config.1:125
+#: en/lb_config.1:131
 msgid "  [B<--keyring-packages> I<PACKAGE|\"PACKAGES\">]"
 msgstr "  [B<--keyring-packages> I<パッケージ|\"パッケージ\">]"
 
 #. type: Plain text
-#: en/lb_config.1:127
+#: en/lb_config.1:133
 msgid "  [-k|B<--linux-flavours> I<FLAVOUR>|I<\"FLAVOURS\">]"
 msgstr "  [-k|B<--linux-flavours> I<フレーバー>|I<\"フレーバー\">]"
 
 #. type: Plain text
-#: en/lb_config.1:129
+#: en/lb_config.1:135
 msgid "  [B<--linux-packages> I<\"PACKAGES\">]"
 msgstr "  [B<--linux-packages> I<\"パッケージ\">]"
 
 #. type: Plain text
-#: en/lb_config.1:131
+#: en/lb_config.1:137
 msgid "  [B<--losetup> losetup|losetup.orig]"
 msgstr "  [B<--losetup> losetup|losetup.orig]"
 
 #. type: Plain text
-#: en/lb_config.1:133
+#: en/lb_config.1:139
 msgid "  [B<--memtest> memtest86+|memtest86|none]"
 msgstr "  [B<--memtest> memtest86+|memtest86|none]"
 
 #. type: Plain text
-#: en/lb_config.1:135
+#: en/lb_config.1:141
 msgid "  [-m|B<--parent-mirror-bootstrap> I<URL>]"
 msgstr "  [-m|B<--parent-mirror-bootstrap> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:137
+#: en/lb_config.1:143
 msgid "  [B<--parent-mirror-chroot> I<URL>]"
 msgstr "  [B<--parent-mirror-chroot> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:139
+#: en/lb_config.1:145
 msgid "  [B<--parent-mirror-chroot-security> I<URL>]"
 msgstr "  [B<--parent-mirror-chroot-security> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:141
+#: en/lb_config.1:147
 msgid "  [B<--parent-mirror-chroot-updates> I<URL>]"
 msgstr "  [B<--parent-mirror-chroot-updates> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:143
+#: en/lb_config.1:149
 msgid "  [B<--parent-mirror-chroot-backports> I<URL>]"
 msgstr "  [B<--parent-mirror-chroot-backports> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:145
+#: en/lb_config.1:151
 msgid "  [B<--parent-mirror-binary> I<URL>]"
 msgstr "  [B<--parent-mirror-binary> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:147
+#: en/lb_config.1:153
 msgid "  [B<--parent-mirror-binary-security> I<URL>]"
 msgstr "  [B<--parent-mirror-binary-security> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:149
+#: en/lb_config.1:155
 msgid "  [B<--parent-mirror-binary-updates> I<URL>]"
 msgstr "  [B<--parent-mirror-binary-updates> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:151
+#: en/lb_config.1:157
 msgid "  [B<--parent-mirror-binary-backports> I<URL>]"
 msgstr "  [B<--parent-mirror-binary-backports> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:153
+#: en/lb_config.1:159
 msgid "  [B<--parent-mirror-debian-installer> I<URL>]"
 msgstr "  [B<--parent-mirror-debian-installer> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:155
+#: en/lb_config.1:161
 msgid "  [B<--mirror-bootstrap> I<URL>]"
 msgstr "  [B<--mirror-bootstrap> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:157
+#: en/lb_config.1:163
 msgid "  [B<--mirror-chroot> I<URL>]"
 msgstr "  [B<--mirror-chroot> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:159
+#: en/lb_config.1:165
 msgid "  [B<--mirror-chroot-security> I<URL>]"
 msgstr "  [B<--mirror-chroot-security> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:161
+#: en/lb_config.1:167
 msgid "  [B<--mirror-chroot-updates> I<URL>]"
 msgstr "  [B<--mirror-chroot-updates> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:163
+#: en/lb_config.1:169
 msgid "  [B<--mirror-chroot-backports> I<URL>]"
 msgstr "  [B<--mirror-chroot-backports> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:165
+#: en/lb_config.1:171
 msgid "  [B<--mirror-binary> I<URL>]"
 msgstr "  [B<--mirror-binary> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:167
+#: en/lb_config.1:173
 msgid "  [B<--mirror-binary-security> I<URL>]"
 msgstr "  [B<--mirror-binary-security> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:169
+#: en/lb_config.1:175
 msgid "  [B<--mirror-binary-updates> I<URL>]"
 msgstr "  [B<--mirror-binary-updates> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:171
+#: en/lb_config.1:177
 msgid "  [B<--mirror-binary-backports> I<URL>]"
 msgstr "  [B<--mirror-binary-backports> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:173
+#: en/lb_config.1:179
 msgid "  [B<--mirror-debian-installer> I<URL>]"
 msgstr "  [B<--mirror-debian-installer> I<URL>]"
 
 #. type: Plain text
-#: en/lb_config.1:175
+#: en/lb_config.1:181
 msgid "  [B<--mode> debian|progress-linux|ubuntu]"
 msgstr "  [B<--mode> debian|progress-linux|ubuntu]"
 
 #. type: Plain text
-#: en/lb_config.1:177
+#: en/lb_config.1:183
 msgid "  [B<--system> live|normal]"
 msgstr "  [B<--system> live|normal]"
 
 #. type: Plain text
-#: en/lb_config.1:179
+#: en/lb_config.1:185
 msgid "  [B<--net-root-filesystem> nfs|cfs]"
 msgstr "  [B<--net-root-filesystem> nfs|cfs]"
 
 #. type: Plain text
-#: en/lb_config.1:181
+#: en/lb_config.1:187
 msgid "  [B<--net-root-mountoptions> I<OPTIONS>]"
 msgstr "  [B<--net-root-mountoptions> I<オプション>]"
 
 #. type: Plain text
-#: en/lb_config.1:183
+#: en/lb_config.1:189
 msgid "  [B<--net-root-path> I<PATH>]"
 msgstr "  [B<--net-root-path> I<パス>]"
 
 #. type: Plain text
-#: en/lb_config.1:185
+#: en/lb_config.1:191
 msgid "  [B<--net-root-server> I<IP>|I<HOSTNAME>]"
 msgstr "  [B<--net-root-server> I<IPアドレス>|I<ホスト名>]"
 
 #. type: Plain text
-#: en/lb_config.1:187
+#: en/lb_config.1:193
 msgid "  [B<--net-cow-filesystem> nfs|cfs]"
 msgstr "  [B<--net-cow-filesystem> nfs|cfs]"
 
 #. type: Plain text
-#: en/lb_config.1:189
+#: en/lb_config.1:195
 msgid "  [B<--net-cow-mountoptions> I<OPTIONS>]"
 msgstr "  [B<--net-cow-mountoptions> I<オプション>]"
 
 #. type: Plain text
-#: en/lb_config.1:191
+#: en/lb_config.1:197
 msgid "  [B<--net-cow-path> I<PATH>]"
 msgstr "  [B<--net-cow-path> I<パス>]"
 
 #. type: Plain text
-#: en/lb_config.1:193
+#: en/lb_config.1:199
 msgid "  [B<--net-cow-server> I<IP>|I<HOSTNAME>]"
 msgstr "  [B<--net-cow-server> I<IPアドレス>|I<ホスト名>]"
 
 #. type: Plain text
-#: en/lb_config.1:195
+#: en/lb_config.1:201
 msgid "  [B<--net-tarball> true|false]"
 msgstr "  [B<--net-tarball> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:197
+#: en/lb_config.1:203
 msgid "  [B<--quiet>]"
 msgstr "  [B<--quiet>]"
 
 #. type: Plain text
-#: en/lb_config.1:199
+#: en/lb_config.1:205
 msgid "  [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
 msgstr "  [B<--archive-areas> I<アーカイブ領域>|I<\"アーカイブ領域\">]"
 
 #. type: Plain text
-#: en/lb_config.1:201
+#: en/lb_config.1:207
 msgid ""
 "  [B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|I<\"PARENT_ARCHIVE_AREAS"
 "\">]"
@@ -666,58 +696,58 @@ msgstr ""
 "  [B<--parent-archive-areas> I<親アーカイブ領域>|I<\"親アーカイブ領域\">]"
 
 #. type: Plain text
-#: en/lb_config.1:203
+#: en/lb_config.1:209
 msgid "  [B<--security> true|false]"
 msgstr "  [B<--security> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:205
+#: en/lb_config.1:211
 msgid "  [B<--source> true|false]"
 msgstr "  [B<--source> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:207
+#: en/lb_config.1:213
 msgid "  [-s|B<--source-images> iso|netboot|tar|hdd]"
 msgstr "  [-s|B<--source-images> iso|netboot|tar|hdd]"
 
 #. type: Plain text
-#: en/lb_config.1:209
+#: en/lb_config.1:215
 msgid "  [B<--tasksel> apt|aptitude|tasksel]"
 msgstr "  [B<--tasksel> apt|aptitude|tasksel]"
 
 #. type: Plain text
-#: en/lb_config.1:211
+#: en/lb_config.1:217
 msgid "  [B<--templates> I<PATH>]"
 msgstr "  [B<--templates> I<パス>]"
 
 #. type: Plain text
-#: en/lb_config.1:213
+#: en/lb_config.1:219
 msgid "  [B<--hdd-size >I<MB>]"
 msgstr "  [B<--hdd-size >I<MB>]"
 
 #. type: Plain text
-#: en/lb_config.1:215
+#: en/lb_config.1:221
 msgid "  [B<--updates> true|false]"
 msgstr "  [B<--updates> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:217
+#: en/lb_config.1:223
 msgid "  [B<--backports> true|false]"
 msgstr "  [B<--backports> true|false]"
 
 #. type: Plain text
-#: en/lb_config.1:219
+#: en/lb_config.1:225
 msgid "  [B<--verbose>]"
 msgstr "  [B<--verbose>]"
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:222
+#: en/lb_config.1:228
 msgid "  [B<--win32-loader true|false]>"
 msgstr "  [B<--win32-loader true|false]>"
 
 #. type: Plain text
-#: en/lb_config.1:225
+#: en/lb_config.1:231
 msgid ""
 "B<lb config> is a high-level command (porcelain) of I<live-build>(7), the "
 "live systems tool suite."
@@ -727,7 +757,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:228
+#: en/lb_config.1:234
 msgid ""
 "B<lb config> populates the configuration directory for live-build. By "
 "default, this directory is named 'config' and is created in the current "
@@ -739,7 +769,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:231
+#: en/lb_config.1:237
 msgid ""
 "Note: Currently B<lb config> tries to be smart and sets defaults for some "
 "options depending on the setting of other options (e.g. which linux packages "
@@ -767,7 +797,7 @@ msgstr ""
 "を削除して再び B<lb config> を実行してください。"
 
 #. type: Plain text
-#: en/lb_config.1:234
+#: en/lb_config.1:240
 msgid ""
 "In addition to its specific options B<lb config> understands all generic "
 "live-build options. See I<live-build>(7) for a complete list of all generic "
@@ -779,13 +809,13 @@ msgstr ""
 
 #.  FIXME
 #. type: IP
-#: en/lb_config.1:236
+#: en/lb_config.1:242
 #, no-wrap
 msgid "B<--apt> apt|aptitude"
 msgstr "B<--apt> apt|aptitude"
 
 #. type: Plain text
-#: en/lb_config.1:238
+#: en/lb_config.1:244
 msgid ""
 "defines if apt-get or aptitude is used to install packages when building the "
 "image. The default is apt."
@@ -794,13 +824,13 @@ msgstr ""
 "ちらを利用するか決定します。デフォルトは apt です。"
 
 #. type: IP
-#: en/lb_config.1:238
+#: en/lb_config.1:244
 #, no-wrap
 msgid "B<--apt-ftp-proxy> I<URL>"
 msgstr "B<--apt-ftp-proxy> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:240
+#: en/lb_config.1:246
 msgid ""
 "sets the ftp proxy to be used by apt. By default, this is empty. Note that "
 "this variable is only for the proxy that gets used by apt internally within "
@@ -811,13 +841,13 @@ msgstr ""
 "注意してください"
 
 #. type: IP
-#: en/lb_config.1:240
+#: en/lb_config.1:246
 #, no-wrap
 msgid "B<--apt-http-proxy> I<URL>"
 msgstr "B<--apt-http-proxy> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:242
+#: en/lb_config.1:248
 msgid ""
 "sets the http proxy to be used by apt. By default, this is empty. Note that "
 "this variable is only for the proxy that gets used by apt internally within "
@@ -828,13 +858,13 @@ msgstr ""
 "に注意してください"
 
 #. type: IP
-#: en/lb_config.1:242
+#: en/lb_config.1:248
 #, no-wrap
 msgid "B<--apt-indices> true|false|none"
 msgstr "B<--apt-indices> true|false|none"
 
 #. type: Plain text
-#: en/lb_config.1:244
+#: en/lb_config.1:250
 msgid ""
 "defines if the resulting images should have apt indices or not and defaults "
 "to true. If set to none, no indices are included at all."
@@ -843,13 +873,13 @@ msgstr ""
 "トは true です。none をセットすると索引ファイルは一切収録されません。"
 
 #. type: IP
-#: en/lb_config.1:244
+#: en/lb_config.1:250
 #, no-wrap
 msgid "B<--apt-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr "B<--apt-options> I<オプション>|\"I<オプション>\""
 
 #. type: Plain text
-#: en/lb_config.1:246
+#: en/lb_config.1:252
 msgid ""
 "defines the default options that will be appended to every apt call that is "
 "made inside chroot during the building of the image. By default, this is set "
@@ -860,13 +890,13 @@ msgstr ""
 "対話的ではないインストール処理ができるようになっています。"
 
 #. type: IP
-#: en/lb_config.1:246
+#: en/lb_config.1:252
 #, no-wrap
 msgid "B<--aptitude-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr "B<--aptitude-options> I<オプション>|\"I<オプション>\""
 
 #. type: Plain text
-#: en/lb_config.1:248
+#: en/lb_config.1:254
 msgid ""
 "defines the default options that will be appended to every aptitude call "
 "that is made inside chroot during building of the image. By default, this is "
@@ -877,13 +907,13 @@ msgstr ""
 "て、パッケージの対話的ではないインストール処理ができるようになっています。"
 
 #. type: IP
-#: en/lb_config.1:248
+#: en/lb_config.1:254
 #, no-wrap
 msgid "B<--apt-pipeline> I<DEPTH>"
 msgstr "B<--apt-pipeline> I<深度>"
 
 #. type: Plain text
-#: en/lb_config.1:250
+#: en/lb_config.1:256
 msgid ""
 "sets the depth of the apt/aptitude pipeline. In cases where the remote "
 "server is not RFC conforming or buggy (such as Squid 2.0.2) this option can "
@@ -902,13 +932,13 @@ msgstr ""
 "ん。"
 
 #. type: IP
-#: en/lb_config.1:250
+#: en/lb_config.1:256
 #, no-wrap
 msgid "B<--apt-recommends> true|false"
 msgstr "B<--apt-recommends> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:252
+#: en/lb_config.1:258
 msgid ""
 "defines if apt should install recommended packages automatically. By "
 "default, this is true."
@@ -917,26 +947,26 @@ msgstr ""
 "は true です。"
 
 #. type: IP
-#: en/lb_config.1:252
+#: en/lb_config.1:258
 #, no-wrap
 msgid "B<--apt-secure> true|false"
 msgstr "B<--apt-secure> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:254
+#: en/lb_config.1:260
 msgid ""
 "defines if apt should check repository signatures. This is true by default."
 msgstr ""
 "aptがリポジトリの署名を確認すべきか否かを決定します。デフォルトは true です。"
 
 #. type: IP
-#: en/lb_config.1:254
+#: en/lb_config.1:260
 #, no-wrap
 msgid "B<--apt-source-archives> true|false"
 msgstr "B<--apt-source-archives> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:256
+#: en/lb_config.1:262
 msgid ""
 "defines if deb-src entries should be included in the resulting live image or "
 "not, defaults to true."
@@ -945,13 +975,13 @@ msgstr ""
 "ルトは true です。"
 
 #. type: IP
-#: en/lb_config.1:256
+#: en/lb_config.1:262
 #, no-wrap
 msgid "-a|B<--architectures> I<ARCHITECTURE>"
 msgstr "-a|B<--architectures> I<アーキテクチャ>"
 
 #. type: Plain text
-#: en/lb_config.1:258
+#: en/lb_config.1:264
 msgid ""
 "defines the architecture of the to be build image. By default, this is set "
 "to the host architecture. Note that you cannot crossbuild for another "
@@ -968,13 +998,13 @@ msgstr ""
 "ます。しかし i386 システムで powerpc 用イメージをビルドするのは不可能です。"
 
 #. type: IP
-#: en/lb_config.1:258
+#: en/lb_config.1:264
 #, no-wrap
 msgid "-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd"
 msgstr "-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd"
 
 #. type: Plain text
-#: en/lb_config.1:260
+#: en/lb_config.1:266
 msgid ""
 "defines the image type to build. By default, for images using syslinux this "
 "is set to iso-hybrid to build CD/DVD images that may also be used like hdd "
@@ -986,19 +1016,29 @@ msgstr ""
 "す。"
 
 #. type: IP
-#: en/lb_config.1:260
+#: en/lb_config.1:266
 #, no-wrap
 msgid "B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4"
 msgstr "B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4"
 
 #. type: Plain text
-#: en/lb_config.1:262
+#: en/lb_config.1:268
+#, fuzzy
+#| msgid ""
+#| "defines the filesystem to be used in the image type. This only has an "
+#| "effect if the selected binary image type does allow to choose a "
+#| "filesystem. For example, when selection iso the resulting CD/DVD has "
+#| "always the filesystem ISO9660. When building hdd images for usb sticks, "
+#| "this is active. Note that it defaults to fat16 on all architectures "
+#| "except sparc where it defaults to ext4. Also note that if you choose "
+#| "fat16 and your resulting binary image gets bigger than 2GB, the binary "
+#| "filesystem automatically gets switched to fat32."
 msgid ""
 "defines the filesystem to be used in the image type. This only has an effect "
-"if the selected binary image type does allow to choose a filesystem. For "
-"example, when selection iso the resulting CD/DVD has always the filesystem "
-"ISO9660. When building hdd images for usb sticks, this is active. Note that "
-"it defaults to fat16 on all architectures except sparc where it defaults to "
+"if the selected binary image type lets you choose a filesystem. For example, "
+"when selection iso the resulting CD/DVD has always the filesystem ISO9660. "
+"When building hdd images for usb sticks, this is active. Note that it "
+"defaults to fat16 on all architectures except sparc where it defaults to "
 "ext4. Also note that if you choose fat16 and your resulting binary image "
 "gets bigger than 2GB, the binary filesystem automatically gets switched to "
 "fat32."
@@ -1013,26 +1053,26 @@ msgstr ""
 "的に fat32 に切り替えられることに注意してください。"
 
 #. type: IP
-#: en/lb_config.1:262
+#: en/lb_config.1:268
 #, no-wrap
 msgid "B<--bootappend-install> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr "B<--bootappend-install> I<パラメータ>|\"I<パラメータ>\""
 
 #. type: Plain text
-#: en/lb_config.1:264
+#: en/lb_config.1:270
 msgid "sets boot parameters specific to debian-installer, if included."
 msgstr ""
 "debian-installer を収録した場合、debian-installer 特有のブートパラメータを"
 "セットします。"
 
 #. type: IP
-#: en/lb_config.1:264
+#: en/lb_config.1:270
 #, no-wrap
 msgid "B<--bootappend-live> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr "B<--bootappend-live> I<パラメータ>|\"I<パラメータ>\""
 
 #. type: Plain text
-#: en/lb_config.1:266
+#: en/lb_config.1:272
 msgid ""
 "sets boot parameters specific to debian-live. A complete list of boot "
 "parameters can be found in the I<live-boot>(7) and I<live-config>(7) manual "
@@ -1042,22 +1082,55 @@ msgstr ""
 "I<live-boot>(7) 及び I<live-config>(7) マニュアルページにあります。"
 
 #. type: IP
-#: en/lb_config.1:266
-#, no-wrap
-msgid "B<--bootloader> grub|grub2|syslinux"
+#: en/lb_config.1:272
+#, fuzzy, no-wrap
+#| msgid "B<--bootappend-live> I<PARAMETER>|\"I<PARAMETERS>\""
+msgid "B<--bootappend-live-failsafe> I<PARAMETER>|\"I<PARAMETERS>\""
+msgstr "B<--bootappend-live> I<パラメータ>|\"I<パラメータ>\""
+
+#. type: Plain text
+#: en/lb_config.1:274
+#, fuzzy
+#| msgid ""
+#| "sets boot parameters specific to debian-live. A complete list of boot "
+#| "parameters can be found in the I<live-boot>(7) and I<live-config>(7) "
+#| "manual pages."
+msgid ""
+"sets boot parameters specific to debian-live failsafe boot entries. A "
+"complete list of boot parameters can be found in the I<live-boot>(7) and "
+"I<live-config>(7) manual pages."
+msgstr ""
+"debian-live 特有のブートパラメータをセットします。ブートパラメータの全容は "
+"I<live-boot>(7) 及び I<live-config>(7) マニュアルページにあります。"
+
+#. type: IP
+#: en/lb_config.1:274
+#, fuzzy, no-wrap
+#| msgid "B<--bootloader> grub|grub2|syslinux"
+msgid "B<--bootloaders> grub-legacy|grub-pc|syslinux|grub-efi"
 msgstr "B<--bootloader> grub|grub2|syslinux"
 
 #. type: Plain text
-#: en/lb_config.1:268
+#: en/lb_config.1:276
+#, fuzzy
+#| msgid ""
+#| "defines which bootloader is being used in the generated image. This has "
+#| "only an effect if the selected binary image type does allow to choose the "
+#| "bootloader. For example, if you build a iso, always syslinux (or more "
+#| "precise, isolinux) is being used. Also note that some combinations of "
+#| "binary images types and bootloaders may be possible but live-build does "
+#| "not support them yet. B<lb config> will fail to create such a not yet "
+#| "supported configuration and give a explanation about it. For hdd images "
+#| "on amd64 and i386, the default is syslinux."
 msgid ""
 "defines which bootloader is being used in the generated image. This has only "
-"an effect if the selected binary image type does allow to choose the "
-"bootloader. For example, if you build a iso, always syslinux (or more "
-"precise, isolinux) is being used. Also note that some combinations of binary "
-"images types and bootloaders may be possible but live-build does not support "
-"them yet. B<lb config> will fail to create such a not yet supported "
-"configuration and give a explanation about it. For hdd images on amd64 and "
-"i386, the default is syslinux."
+"an effect if the selected binary image type lets you choose the bootloader. "
+"For example, if you build a iso, always syslinux (or more precise, isolinux) "
+"is being used. Also note that some combinations of binary images types and "
+"bootloaders may be possible but live-build does not support them yet. B<lb "
+"config> will fail to create such a not yet supported configuration and give "
+"a explanation about it. For hdd images on amd64 and i386, the default is "
+"syslinux."
 msgstr ""
 "生成されたイメージで利用するブートローダを選択します。これは選択した種類のバ"
 "イナリイメージでブートローダを選択できる場合にのみ効果があります。例えば iso "
@@ -1069,13 +1142,13 @@ msgstr ""
 "なっています。"
 
 #. type: IP
-#: en/lb_config.1:268
+#: en/lb_config.1:276
 #, no-wrap
 msgid "B<--cache> true|false"
 msgstr "B<--cache> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:270
+#: en/lb_config.1:278
 msgid ""
 "defines globally if any cache should be used at all. Different caches can be "
 "controlled through the their own options."
@@ -1084,30 +1157,35 @@ msgstr ""
 "キャッシュそれぞれのオプションで制御できます。"
 
 #. type: IP
-#: en/lb_config.1:270
+#: en/lb_config.1:278
 #, no-wrap
 msgid "B<--cache-indices> true|false"
 msgstr "B<--cache-indices> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:272
+#: en/lb_config.1:280
+#, fuzzy
+#| msgid ""
+#| "defines if downloaded package indices and lists should be cached which is "
+#| "false by default. Enabling it would allow to rebuild an image completely "
+#| "offline, however, you would not get updates anymore then."
 msgid ""
 "defines if downloaded package indices and lists should be cached which is "
-"false by default. Enabling it would allow to rebuild an image completely "
-"offline, however, you would not get updates anymore then."
+"false by default. Enabling it lets you rebuild an image completely offline, "
+"however, you would not get updates anymore then."
 msgstr ""
 "ダウンロードしたパッケージ索引や一覧をキャッシュするか否かを決定します。デ"
 "フォルトで false となっています。有効にするとイメージを完全にオフラインで再ビ"
 "ルドできるようになりますが、以後の更新は得られなくなります。"
 
 #. type: IP
-#: en/lb_config.1:272
+#: en/lb_config.1:280
 #, no-wrap
 msgid "B<--cache-packages> true|false"
 msgstr "B<--cache-packages> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:274
+#: en/lb_config.1:282
 msgid ""
 "defines if downloaded packages files should be cached which is true by "
 "default. Disabling it does save space consumption in your build directory, "
@@ -1124,13 +1202,13 @@ msgstr ""
 "が速いことがあります。"
 
 #. type: IP
-#: en/lb_config.1:274
+#: en/lb_config.1:282
 #, no-wrap
 msgid "B<--cache-stages> true|false|I<STAGE>|\"I<STAGES>\""
 msgstr "B<--cache-stages> true|false|I<段階>|\"I<段階>\""
 
 #. type: Plain text
-#: en/lb_config.1:276
+#: en/lb_config.1:284
 msgid ""
 "sets which stages should be cached. By default set to bootstrap. As an "
 "exception to the normal stage names, also rootfs can be used here which does "
@@ -1145,13 +1223,13 @@ msgstr ""
 "のは避けたい場合にこれは有用です。"
 
 #. type: IP
-#: en/lb_config.1:276
+#: en/lb_config.1:284
 #, no-wrap
 msgid "B<--checksums> md5|sha1|sha256|none"
 msgstr "B<--checksums> md5|sha1|sha256|none"
 
 #. type: Plain text
-#: en/lb_config.1:278
+#: en/lb_config.1:286
 msgid ""
 "defines if the binary image should contain a file called md5sums.txt, "
 "sha1sums.txt and/or sha256sums.txt. These lists all files on the image "
@@ -1170,13 +1248,13 @@ msgstr ""
 "ないことによりいくらか時間を節約できる可能性があります。"
 
 #. type: IP
-#: en/lb_config.1:278
+#: en/lb_config.1:286
 #, no-wrap
 msgid "B<--compression> bzip2|gzip|lzip|none"
 msgstr "B<--compression> bzip2|gzip|lzip|none"
 
 #. type: Plain text
-#: en/lb_config.1:280
+#: en/lb_config.1:288
 msgid ""
 "defines the compression program to be used to compress tarballs. Defaults to "
 "gzip."
@@ -1185,28 +1263,32 @@ msgstr ""
 "です。"
 
 #. type: IP
-#: en/lb_config.1:280
+#: en/lb_config.1:288
 #, no-wrap
 msgid "B<--config> I<GIT_URL>::I<GIT_ID>"
 msgstr "B<--config> I<GIT_URL>::I<GIT_ID>"
 
 #. type: Plain text
-#: en/lb_config.1:282
+#: en/lb_config.1:290
+#, fuzzy
+#| msgid ""
+#| "allows to bootstrap a config tree from a git repositories, optionally "
+#| "appended by a Git Id (branch, commit, tag, etc.)."
 msgid ""
-"allows to bootstrap a config tree from a git repositories, optionally "
-"appended by a Git Id (branch, commit, tag, etc.)."
+"bootstrap the config tree from a git repository, optionally appended by a "
+"Git Id (branch, commit, tag, etc.)."
 msgstr ""
 "設定ツリーをgitリポジトリから取得できます。オプションとして Git Id (ブランチ"
 "やコミット、タグ等) を指定できます。"
 
 #. type: IP
-#: en/lb_config.1:282
+#: en/lb_config.1:290
 #, no-wrap
 msgid "B<--build-with-chroot> true|false"
 msgstr "B<--build-with-chroot> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:284
+#: en/lb_config.1:292
 msgid ""
 "defines whether live-build should use the tools from within the chroot to "
 "build the binary image or not by using and including the host system's "
@@ -1230,13 +1312,13 @@ msgstr ""
 "ションを決して無効化することのないようにしてください。 "
 
 #. type: IP
-#: en/lb_config.1:284
+#: en/lb_config.1:292
 #, no-wrap
 msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none"
 msgstr "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none"
 
 #. type: Plain text
-#: en/lb_config.1:286
+#: en/lb_config.1:294
 msgid ""
 "defines which filesystem type should be used for the root filesystem image. "
 "If you use none, then no filesystem image is created and the root filesystem "
@@ -1253,13 +1335,13 @@ msgstr ""
 "では linux からの直接の実行をサポートしていないため機能しません。"
 
 #. type: IP
-#: en/lb_config.1:286
+#: en/lb_config.1:294
 #, no-wrap
 msgid "B<--clean>"
 msgstr "B<--clean>"
 
 #. type: Plain text
-#: en/lb_config.1:288
+#: en/lb_config.1:296
 msgid ""
 "minimizes config directory by automatically removing unused and thus empty "
 "subdirectories."
@@ -1268,13 +1350,13 @@ msgstr ""
 "小にします。"
 
 #. type: IP
-#: en/lb_config.1:288
+#: en/lb_config.1:296
 #, no-wrap
 msgid "-c|B<--conffile> I<FILE>"
 msgstr "-c|B<--conffile> I<ファイル>"
 
 #. type: Plain text
-#: en/lb_config.1:290
+#: en/lb_config.1:298
 msgid ""
 "using a user specified alternative configuration file in addition to the "
 "normally used one in the config directory."
@@ -1283,13 +1365,13 @@ msgstr ""
 "ファイルを使います。"
 
 #. type: IP
-#: en/lb_config.1:290
+#: en/lb_config.1:298
 #, no-wrap
 msgid "B<--debconf-frontend> dialog|editor|noninteractive|readline"
 msgstr "B<--debconf-frontend> dialog|editor|noninteractive|readline"
 
 #. type: Plain text
-#: en/lb_config.1:292
+#: en/lb_config.1:300
 msgid ""
 "defines what value the debconf frontend should be set to inside the chroot. "
 "Note that setting it to anything but noninteractive, which is the default, "
@@ -1300,13 +1382,13 @@ msgstr ""
 "てください。"
 
 #. type: IP
-#: en/lb_config.1:292
+#: en/lb_config.1:300
 #, no-wrap
 msgid "B<--debconf-priority> low|medium|high|critical"
 msgstr "B<--debconf-priority> low|medium|high|critical"
 
 #. type: Plain text
-#: en/lb_config.1:294
+#: en/lb_config.1:302
 msgid ""
 "defines what value the debconf priority should be set to inside the chroot. "
 "By default, it is set to critical, which means that almost no questions are "
@@ -1318,13 +1400,13 @@ msgstr ""
 "noninteractive 以外を指定している場合にのみ有効であることに注意してください"
 
 #. type: IP
-#: en/lb_config.1:294
+#: en/lb_config.1:302
 #, no-wrap
 msgid "B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false"
 msgstr "B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false"
 
 #. type: Plain text
-#: en/lb_config.1:296
+#: en/lb_config.1:304
 msgid ""
 "defines which type, if any, of the debian-installer should be included in "
 "the resulting binary image. By default, no installer is included. All "
@@ -1343,13 +1425,13 @@ msgstr ""
 "ムをインストールします。"
 
 #. type: IP
-#: en/lb_config.1:296
+#: en/lb_config.1:304
 #, no-wrap
 msgid "B<--debian-installer-distribution> daily|I<CODENAME>"
 msgstr "B<--debian-installer-distribution> daily|I<コード名>"
 
 #. type: Plain text
-#: en/lb_config.1:298
+#: en/lb_config.1:306
 msgid ""
 "defines the distribution where the debian-installer files should be taken "
 "out from. Normally, this should be set to the same distribution as the live "
@@ -1361,13 +1443,13 @@ msgstr ""
 "いは日次ビルドのインストーラを使いたいときもあります。"
 
 #. type: IP
-#: en/lb_config.1:298
+#: en/lb_config.1:306
 #, no-wrap
 msgid "B<--debian-installer-preseedfile> I<FILE>|I<URL>"
 msgstr "B<--debian-installer-preseedfile> I<ファイル>|I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:300
+#: en/lb_config.1:308
 msgid ""
 "sets the filename or URL for an optionally used and included preseeding file "
 "for debian-installer. If config/binary_debian-installer/preseed.cfg exists, "
@@ -1378,13 +1460,13 @@ msgstr ""
 "る場合はそれがデフォルトで利用されます。"
 
 #. type: IP
-#: en/lb_config.1:300
+#: en/lb_config.1:308
 #, no-wrap
 msgid "B<--debian-installer-gui> true|false"
 msgstr "B<--debian-installer-gui> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:302
+#: en/lb_config.1:310
 msgid ""
 "defines if the debian-installer graphical GTK interface should be true or "
 "not. In Debian mode and for most versions of Ubuntu, this option is true, "
@@ -1395,47 +1477,74 @@ msgstr ""
 "それ以外では false となっています。"
 
 #. type: IP
-#: en/lb_config.1:302 en/live-build.7:36
+#: en/lb_config.1:310
+#, fuzzy, no-wrap
+#| msgid "B<--net-root-mountoptions> I<OPTIONS>"
+msgid "B<--debootstrap-options> I<OPTIONS>"
+msgstr "B<--net-root-mountoptions> I<オプション>"
+
+#. type: Plain text
+#: en/lb_config.1:312
+msgid ""
+"passes the given options to debootstrap when setting up the base system."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:312
+#, fuzzy, no-wrap
+#| msgid "B<--mirror-bootstrap> I<URL>"
+msgid "B<--debootstrap-script> I<SCRIPT>"
+msgstr "B<--mirror-bootstrap> I<URL>"
+
+#. type: Plain text
+#: en/lb_config.1:314
+msgid ""
+"tells debootstrap to use an alternate bootstrap script (last parameter to "
+"debootstrap)."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:314 en/live-build.7:36
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: Plain text
-#: en/lb_config.1:304
+#: en/lb_config.1:316
 msgid "turn on debugging informational messages."
 msgstr "デバッグ情報のメッセージを表示します。"
 
 #. type: IP
-#: en/lb_config.1:304
+#: en/lb_config.1:316
 #, no-wrap
 msgid "-d|B<--distribution> I<CODENAME>"
 msgstr "-d|B<--distribution> I<コード名>"
 
 #. type: Plain text
-#: en/lb_config.1:306
+#: en/lb_config.1:318
 msgid "defines the distribution of the resulting live system."
 msgstr "出来上がる Live システムのディストリビューションを決定します。"
 
 #. type: IP
-#: en/lb_config.1:306
+#: en/lb_config.1:318
 #, no-wrap
 msgid "-d|B<--parent-distribution> I<CODENAME>"
 msgstr "-d|B<--parent-distribution> I<コード名>"
 
 #. type: Plain text
-#: en/lb_config.1:308
+#: en/lb_config.1:320
 msgid ""
 "defines the parent distribution for derivatives of the resulting live system."
 msgstr "出来上がる Live システムの派生元のディストリビューションを決定します。"
 
 #. type: IP
-#: en/lb_config.1:308
+#: en/lb_config.1:320
 #, no-wrap
 msgid "-d|B<--parent-debian-installer-distribution> I<CODENAME>"
 msgstr "-d|B<--parent-debian-installer-distribution> I<コード名>"
 
 #. type: Plain text
-#: en/lb_config.1:310
+#: en/lb_config.1:322
 msgid ""
 "defines the parent debian-installer distribution for derivatives of the "
 "resulting live system."
@@ -1444,17 +1553,23 @@ msgstr ""
 "を決定します。"
 
 #. type: IP
-#: en/lb_config.1:310
+#: en/lb_config.1:322
 #, no-wrap
 msgid "B<--dump>"
 msgstr "B<--dump>"
 
 #. type: Plain text
-#: en/lb_config.1:312
+#: en/lb_config.1:324
+#, fuzzy
+#| msgid ""
+#| "prepares a report of the currently present live system configuration and "
+#| "the version of live-build used. This is useful to provide if you submit "
+#| "bug reports, we do get all informations required for us to locate and "
+#| "replicate an error."
 msgid ""
 "prepares a report of the currently present live system configuration and the "
 "version of live-build used. This is useful to provide if you submit bug "
-"reports, we do get all informations required for us to locate and replicate "
+"reports, we do get all information required for us to locate and replicate "
 "an error."
 msgstr ""
 "現在存在している Live システムの設定と利用されている live-build のバージョン"
@@ -1462,13 +1577,13 @@ msgstr ""
 "け出し、再現するのに必要となる情報を全て提供します。"
 
 #. type: IP
-#: en/lb_config.1:312
+#: en/lb_config.1:324
 #, no-wrap
 msgid "B<--fdisk> fdisk|fdisk.dist"
 msgstr "B<--fdisk> fdisk|fdisk.dist"
 
 #. type: Plain text
-#: en/lb_config.1:314
+#: en/lb_config.1:326
 msgid ""
 "sets the filename of the fdisk binary from the host system that should be "
 "used. This is autodetected and does generally not need any customization."
@@ -1477,13 +1592,13 @@ msgstr ""
 "に検出されるため通常は独自に指定する必要はありません。"
 
 #. type: IP
-#: en/lb_config.1:314 en/live-build.7:38
+#: en/lb_config.1:326 en/live-build.7:38
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: Plain text
-#: en/lb_config.1:316
+#: en/lb_config.1:328
 msgid ""
 "forces re-execution of already run stages. Use only if you know what you are "
 "doing. It is generally safer to use B<lb clean> to clean up before re-"
@@ -1494,13 +1609,13 @@ msgstr ""
 "して掃除すると安全性は上がります。"
 
 #. type: IP
-#: en/lb_config.1:316
+#: en/lb_config.1:328
 #, no-wrap
 msgid "B<--grub-splash> I<FILE>"
 msgstr "B<--grub-splash> I<ファイル>"
 
 #. type: Plain text
-#: en/lb_config.1:318
+#: en/lb_config.1:330
 msgid ""
 "defines the name of an optional to be included splash screen graphic for the "
 "grub bootloader."
@@ -1509,13 +1624,13 @@ msgstr ""
 "イル名を指定します。"
 
 #. type: IP
-#: en/lb_config.1:318
+#: en/lb_config.1:330
 #, no-wrap
 msgid "B<--gzip-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr "B<--gzip-options> I<オプション>|\"I<オプション>\""
 
 #. type: Plain text
-#: en/lb_config.1:320
+#: en/lb_config.1:332
 msgid ""
 "defines the default options that will be appended to (almost) every gzip "
 "call during the building of the image. By default, this is set to --best to "
@@ -1528,13 +1643,13 @@ msgstr ""
 "rsyncable も動的に付加されます。"
 
 #. type: IP
-#: en/lb_config.1:320
+#: en/lb_config.1:332
 #, no-wrap
 msgid "B<--hooks> I<FILE>"
 msgstr "B<--hooks> I<ファイル>"
 
 #. type: Plain text
-#: en/lb_config.1:322
+#: en/lb_config.1:334
 msgid ""
 "defines which hooks available in /usr/share/live/build/examples/hooks should "
 "be activated. Normally, there are no hooks executed. Make sure you know and "
@@ -1545,13 +1660,13 @@ msgstr ""
 "何をするものなのか、確実に知って理解するようにしてください。"
 
 #. type: IP
-#: en/lb_config.1:322
+#: en/lb_config.1:334
 #, no-wrap
 msgid "B<--ignore-system-defaults>"
 msgstr "B<--ignore-system-defaults>"
 
 #. type: Plain text
-#: en/lb_config.1:324
+#: en/lb_config.1:336
 msgid ""
 "B<lb config> by default reads system defaults from I</etc/live/build.conf> "
 "and I</etc/live/build/*> when generating a new live system config directory. "
@@ -1564,13 +1679,13 @@ msgstr ""
 "す。"
 
 #. type: IP
-#: en/lb_config.1:324
+#: en/lb_config.1:336
 #, no-wrap
 msgid "B<--initramfs> auto|none|live-boot|casper"
 msgstr "B<--initramfs> auto|none|live-boot|casper"
 
 #. type: Plain text
-#: en/lb_config.1:326
+#: en/lb_config.1:338
 msgid ""
 "sets the name of package that contains the live system specific initramfs "
 "modification. By default, auto is used, which means that at build time of "
@@ -1586,13 +1701,13 @@ msgstr ""
 "です (実験的設定値)。"
 
 #. type: IP
-#: en/lb_config.1:326
+#: en/lb_config.1:338
 #, no-wrap
 msgid "B<--initramfs-compression> bzip2|gzip|lzma]"
 msgstr "B<--initramfs-compression> bzip2|gzip|lzma]"
 
 #. type: Plain text
-#: en/lb_config.1:328
+#: en/lb_config.1:340
 msgid ""
 "defines the compression program to be used to compress the initramfs. "
 "Defaults to gzip."
@@ -1601,13 +1716,13 @@ msgstr ""
 "す。"
 
 #. type: IP
-#: en/lb_config.1:328
+#: en/lb_config.1:340
 #, no-wrap
 msgid "B<--interactive> shell"
 msgstr "B<--interactive> shell"
 
 #. type: Plain text
-#: en/lb_config.1:330
+#: en/lb_config.1:342
 msgid ""
 "defines if after the chroot stage and before the beginning of the binary "
 "stage, a interactive shell login should be spawned in the chroot in order to "
@@ -1628,24 +1743,24 @@ msgstr ""
 "ろんデフォルトで false となっています。"
 
 #. type: IP
-#: en/lb_config.1:330
+#: en/lb_config.1:342
 #, no-wrap
 msgid "B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr "B<--isohybrid-options> I<オプション>|\"I<オプション>\""
 
 #. type: Plain text
-#: en/lb_config.1:332
+#: en/lb_config.1:344
 msgid "defines options to pass to isohybrid."
 msgstr "isohybrid に渡すオプションを指定します。"
 
 #. type: IP
-#: en/lb_config.1:332
+#: en/lb_config.1:344
 #, no-wrap
 msgid "B<--iso-application> I<NAME>"
 msgstr "B<--iso-application> I<名前>"
 
 #. type: Plain text
-#: en/lb_config.1:334
+#: en/lb_config.1:346
 msgid ""
 "sets the APPLICATION field in the header of a resulting CD/DVD image and "
 "defaults to \"Debian Live\" in debian mode, and \"Ubuntu Live\" in ubuntu "
@@ -1656,13 +1771,13 @@ msgstr ""
 "となっています。"
 
 #. type: IP
-#: en/lb_config.1:334
+#: en/lb_config.1:346
 #, no-wrap
 msgid "B<--iso-preparer> I<NAME>"
 msgstr "B<--iso-preparer> I<名前>"
 
 #. type: Plain text
-#: en/lb_config.1:336
+#: en/lb_config.1:348
 msgid ""
 "sets the PREPARER field in the header of a resulting CD/DVD image. By "
 "default this is set to \"live-build I<VERSION>; http://packages.qa.debian."
@@ -1675,13 +1790,13 @@ msgstr ""
 "に展開されます。"
 
 #. type: IP
-#: en/lb_config.1:336
+#: en/lb_config.1:348
 #, no-wrap
 msgid "B<--iso-publisher> I<NAME>"
 msgstr "B<--iso-publisher> I<名前>"
 
 #. type: Plain text
-#: en/lb_config.1:338
+#: en/lb_config.1:350
 msgid ""
 "sets the PUBLISHED field in the header of a resulting CD/DVD image. By "
 "default, this is set to 'Live Systems project; http:/live-systems.org/; "
@@ -1694,13 +1809,13 @@ msgstr ""
 "最新の適切な値に変更してください。"
 
 #. type: IP
-#: en/lb_config.1:338
+#: en/lb_config.1:350
 #, no-wrap
 msgid "B<--iso-volume> I<NAME>"
 msgstr "B<--iso-volume> I<名前>"
 
 #. type: Plain text
-#: en/lb_config.1:340
+#: en/lb_config.1:352
 msgid ""
 "sets the VOLUME field in the header of a resulting CD/DVD and defaults to "
 "'(I<MODE>) (I<DISTRIBUTION>) (I<DATE>)' whereas MODE is expanded to the name "
@@ -1713,13 +1828,13 @@ msgstr ""
 "は作成時の日付と時刻に展開されます。"
 
 #. type: IP
-#: en/lb_config.1:340
+#: en/lb_config.1:352
 #, no-wrap
 msgid "B<--jffs2-eraseblock> I<SIZE>"
 msgstr "B<--jffs2-eraseblock> I<サイズ>"
 
 #. type: Plain text
-#: en/lb_config.1:342
+#: en/lb_config.1:354
 msgid ""
 "sets the eraseblock size for a JFFS2 (Second Journaling Flash File System) "
 "filesystem. The default is 64 KiB. If you use an erase block size different "
@@ -1734,13 +1849,13 @@ msgstr ""
 "定します。"
 
 #. type: IP
-#: en/lb_config.1:342
+#: en/lb_config.1:354
 #, no-wrap
 msgid "B<--keyring-packages> I<PACKAGE|\"PACKAGES>\""
 msgstr "B<--keyring-packages> I<パッケージ|\"パッケージ>\""
 
 #. type: Plain text
-#: en/lb_config.1:344
+#: en/lb_config.1:356
 msgid ""
 "sets the keyring package or additional keyring packages. By default this is "
 "set to debian-archive-keyring."
@@ -1749,13 +1864,13 @@ msgstr ""
 "は debian-archive-keyring となっています。"
 
 #. type: IP
-#: en/lb_config.1:344
+#: en/lb_config.1:356
 #, no-wrap
 msgid "-k|B<--linux-flavours> I<FLAVOUR>|\"I<FLAVOURS>\""
 msgstr "-k|B<--linux-flavours> I<フレーバー>|\"I<フレーバー>\""
 
 #. type: Plain text
-#: en/lb_config.1:346
+#: en/lb_config.1:358
 msgid ""
 "sets the kernel flavours to be installed. Note that in case you specify more "
 "than that the first will be configured the default kernel that gets booted."
@@ -1765,42 +1880,42 @@ msgstr ""
 "意してください。"
 
 #. type: IP
-#: en/lb_config.1:346
+#: en/lb_config.1:358
 #, no-wrap
 msgid "B<--linux-packages> \"I<PACKAGES>\""
 msgstr "B<--linux-packages> \"I<パッケージ>\""
 
 #. type: Plain text
-#: en/lb_config.1:348
+#: en/lb_config.1:360
 msgid ""
 "sets the internal name of the kernel packages naming scheme. If you use "
 "debian kernel packages, you will not have to adjust it. If you decide to use "
 "custom kernel packages that do not follow the debian naming scheme, remember "
 "to set this option to the stub of the packages only (for debian this is "
 "linux-image-2.6), so that I<STUB>-I<FLAVOUR> results in a valid package name "
-"(for debian e.g. linux-image-686-pae). Preferably you use the meta package name, "
-"if any, for the stub, so that your configuration is ABI independent. Also "
-"don't forget that you have to include stubs of the binary modules packages "
-"for unionfs or aufs, and squashfs if you built them out-of-tree."
+"(for debian e.g. linux-image-686-pae). Preferably you use the meta package "
+"name, if any, for the stub, so that your configuration is ABI independent. "
+"Also don't forget that you have to include stubs of the binary modules "
+"packages for unionfs or aufs, and squashfs if you built them out-of-tree."
 msgstr ""
 "カーネルのパッケージ命名規則に従った内部名をセットします。Debian のカーネル"
 "パッケージを利用している場合は調整する必要はありません。Debian の命名規則に従"
 "わない独自のカーネルパッケージを利用する場合にはこのオプションでパッケージの"
 "前半部 (Debian の場合は linux-image-2.6) だけを忘れずに指定し、I<前半部>-I<フ"
-"レーバー> (Debian の場合は例えば linux-image-686-pae) が有効なパッケージ名になる"
-"ようにしてください。好ましいのは、メタパッケージがある場合にはその名前を前半"
-"部に使うことで、そうすると設定とABIが独立します。また、unionfs や aufs、"
+"レーバー> (Debian の場合は例えば linux-image-686-pae) が有効なパッケージ名に"
+"なるようにしてください。好ましいのは、メタパッケージがある場合にはその名前を"
+"前半部に使うことで、そうすると設定とABIが独立します。また、unionfs や aufs、"
 "squashfs のバイナリモジュールパッケージについても、ツリー外でビルドした場合に"
 "はその前半部を含める必要があることを忘れないようにしてください。"
 
 #. type: IP
-#: en/lb_config.1:348
+#: en/lb_config.1:360
 #, no-wrap
 msgid "B<--losetup> losetup|losetup.orig"
 msgstr "B<--losetup> losetup|losetup.orig"
 
 #. type: Plain text
-#: en/lb_config.1:350
+#: en/lb_config.1:362
 msgid ""
 "sets the filename of the losetup binary from the host system that should be "
 "used. This is autodetected and does generally not need any customization."
@@ -1809,13 +1924,13 @@ msgstr ""
 "的に検出されるため通常は独自に指定する必要はありません。"
 
 #. type: IP
-#: en/lb_config.1:350
+#: en/lb_config.1:362
 #, no-wrap
 msgid "B<--memtest> memtest86+|memtest86|none"
 msgstr "B<--memtest> memtest86+|memtest86|none"
 
 #. type: Plain text
-#: en/lb_config.1:352
+#: en/lb_config.1:364
 msgid ""
 "defines if memtest, memtest86+ or no memory tester at all should be included "
 "as secondary bootloader configuration. This is only available on amd64 and "
@@ -1826,13 +1941,13 @@ msgstr ""
 "i386 でのみ利用可能で、デフォルトは memtest86+ となっています。"
 
 #. type: IP
-#: en/lb_config.1:352
+#: en/lb_config.1:364
 #, no-wrap
 msgid "-m|B<--parent-mirror-bootstrap> I<URL>"
 msgstr "-m|B<--parent-mirror-bootstrap> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:354
+#: en/lb_config.1:366
 msgid ""
 "sets the location of the debian package mirror that should be used to "
 "bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may "
@@ -1843,13 +1958,13 @@ msgstr ""
 "トではないかもしれません。"
 
 #. type: IP
-#: en/lb_config.1:354
+#: en/lb_config.1:366
 #, no-wrap
 msgid "B<--parent-mirror-chroot> I<URL>"
 msgstr "B<--parent-mirror-chroot> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:356
+#: en/lb_config.1:368
 msgid ""
 "sets the location of the debian package mirror that will be used to fetch "
 "the packages in order to build the live system. By default, this is set to "
@@ -1860,13 +1975,13 @@ msgstr ""
 "た値が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:356
+#: en/lb_config.1:368
 #, no-wrap
 msgid "B<--parent-mirror-chroot-security> I<URL>"
 msgstr "B<--parent-mirror-chroot-security> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:358
+#: en/lb_config.1:370
 msgid ""
 "sets the location of the debian security package mirror that will be used to "
 "fetch the packages in order to build the live system. By default, this "
@@ -1877,13 +1992,13 @@ msgstr ""
 "debian.org/debian/」が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:358
+#: en/lb_config.1:370
 #, no-wrap
 msgid "B<--parent-mirror-chroot-updates> I<URL>"
 msgstr "B<--parent-mirror-chroot-updates> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:360
+#: en/lb_config.1:372
 msgid ""
 "sets the location of the debian updates package mirror that will be used to "
 "fetch packages in order to build the live system. By default, this is set to "
@@ -1894,13 +2009,13 @@ msgstr ""
 "指定された値が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:360
+#: en/lb_config.1:372
 #, no-wrap
 msgid "B<--parent-mirror-chroot-backports> I<URL>"
 msgstr "B<--parent-mirror-chroot-backports> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:362
+#: en/lb_config.1:374
 msgid ""
 "sets the location of the debian backports package mirror that will be used "
 "to fetch packages in order to build the live system. By default, this points "
@@ -1911,13 +2026,13 @@ msgstr ""
 "debian.org/debian-backports/」が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:362
+#: en/lb_config.1:374
 #, no-wrap
 msgid "B<--parent-mirror-binary> I<URL>"
 msgstr "B<--parent-mirror-binary> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:364
+#: en/lb_config.1:376
 msgid ""
 "sets the location of the debian package mirror that should end up configured "
 "in the final image and which is the one a user would see and use. This has "
@@ -1932,13 +2047,13 @@ msgstr ""
 "debian/」を利用します。"
 
 #. type: IP
-#: en/lb_config.1:364
+#: en/lb_config.1:376
 #, no-wrap
 msgid "B<--parent-mirror-binary-security> I<URL>"
 msgstr "B<--parent-mirror-binary-security> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:366
+#: en/lb_config.1:378
 msgid ""
 "sets the location of the debian security package mirror that should end up "
 "configured in the final image. By default, 'http://security.debian.org/' is "
@@ -1948,13 +2063,13 @@ msgstr ""
 "セットします。デフォルトでは「http://security.debian.org/」が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:366
+#: en/lb_config.1:378
 #, no-wrap
 msgid "B<--parent-mirror-binary-updates> I<URL>"
 msgstr "B<--parent-mirror-binary-updates> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:368
+#: en/lb_config.1:380
 msgid ""
 "sets the location of the debian updates package mirror that should end up "
 "configured in the final image. By default, the value of --parent-mirror-"
@@ -1965,13 +2080,13 @@ msgstr ""
 "す。"
 
 #. type: IP
-#: en/lb_config.1:368
+#: en/lb_config.1:380
 #, no-wrap
 msgid "B<--parent-mirror-binary-backports> I<URL>"
 msgstr "B<--parent-mirror-binary-backports> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:370
+#: en/lb_config.1:382
 msgid ""
 "sets the location of the debian backports package mirror that should end up "
 "configured in the final image. By default, 'http://backports.debian.org/"
@@ -1982,13 +2097,13 @@ msgstr ""
 "が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:370
+#: en/lb_config.1:382
 #, no-wrap
 msgid "B<--parent-mirror-debian-installer> I<URL>"
 msgstr "B<--parent-mirror-debian-installer> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:372
+#: en/lb_config.1:384
 msgid ""
 "sets the location of the mirror that will be used to fetch the debian "
 "installer images. By default, this points to the same mirror used to build "
@@ -1999,13 +2114,13 @@ msgstr ""
 "まり --parent-mirror-bootstrap で指定された値が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:372
+#: en/lb_config.1:384
 #, no-wrap
 msgid "B<--mirror-bootstrap> I<URL>"
 msgstr "B<--mirror-bootstrap> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:374
+#: en/lb_config.1:386
 msgid ""
 "sets the location of the debian package mirror that should be used to "
 "bootstrap the derivative from. This defaults to http://ftp.de.debian.org/"
@@ -2016,13 +2131,13 @@ msgstr ""
 "切なデフォルトではないかもしれません。"
 
 #. type: IP
-#: en/lb_config.1:374
+#: en/lb_config.1:386
 #, no-wrap
 msgid "B<--mirror-chroot> I<URL>"
 msgstr "B<--mirror-chroot> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:376
+#: en/lb_config.1:388
 msgid ""
 "sets the location of the debian package mirror that will be used to fetch "
 "the packages of the derivative in order to build the live system. By "
@@ -2033,13 +2148,13 @@ msgstr ""
 "された値が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:376
+#: en/lb_config.1:388
 #, no-wrap
 msgid "B<--mirror-chroot-security> I<URL>"
 msgstr "B<--mirror-chroot-security> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:378
+#: en/lb_config.1:390
 msgid ""
 "sets the location of the debian security package mirror that will be used to "
 "fetch the packages of the derivative in order to build the live system. By "
@@ -2050,13 +2165,13 @@ msgstr ""
 "security.debian.org/debian/」が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:378
+#: en/lb_config.1:390
 #, no-wrap
 msgid "B<--mirror-chroot-updates> I<URL>"
 msgstr "B<--mirror-chroot-updates> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:380
+#: en/lb_config.1:392
 msgid ""
 "sets the location of the debian updates package mirror that will be used to "
 "fetch packages of the derivative in order to build the live system. By "
@@ -2067,13 +2182,13 @@ msgstr ""
 "chroot で指定された値が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:380
+#: en/lb_config.1:392
 #, no-wrap
 msgid "B<--mirror-chroot-backports> I<URL>"
 msgstr "B<--mirror-chroot-backports> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:382
+#: en/lb_config.1:394
 msgid ""
 "sets the location of the debian backports package mirror that will be used "
 "to fetch packages of the derivative in order to build the live system. By "
@@ -2084,13 +2199,13 @@ msgstr ""
 "backports.debian.org/debian-backports/」が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:382
+#: en/lb_config.1:394
 #, no-wrap
 msgid "B<--mirror-binary> I<URL>"
 msgstr "B<--mirror-binary> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:384
+#: en/lb_config.1:396
 msgid ""
 "sets the location of the derivative package mirror that should end up "
 "configured in the final image and which is the one a user would see and use. "
@@ -2105,13 +2220,13 @@ msgstr ""
 "debian/」を利用します。"
 
 #. type: IP
-#: en/lb_config.1:384
+#: en/lb_config.1:396
 #, no-wrap
 msgid "B<--mirror-binary-security> I<URL>"
 msgstr "B<--mirror-binary-security> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:386
+#: en/lb_config.1:398
 msgid ""
 "sets the location of the derivatives security package mirror that should end "
 "up configured in the final image."
@@ -2120,13 +2235,13 @@ msgstr ""
 "所をセットします。"
 
 #. type: IP
-#: en/lb_config.1:386
+#: en/lb_config.1:398
 #, no-wrap
 msgid "B<--mirror-binary-updates> I<URL>"
 msgstr "B<--mirror-binary-updates> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:388
+#: en/lb_config.1:400
 msgid ""
 "sets the location of the derivatives updates package mirror that should end "
 "up configured in the final image."
@@ -2135,13 +2250,13 @@ msgstr ""
 "セットします。"
 
 #. type: IP
-#: en/lb_config.1:388
+#: en/lb_config.1:400
 #, no-wrap
 msgid "B<--mirror-binary-backports> I<URL>"
 msgstr "B<--mirror-binary-backports> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:390
+#: en/lb_config.1:402
 msgid ""
 "sets the location of the derivatives backports package mirror that should "
 "end up configured in the final image."
@@ -2150,13 +2265,13 @@ msgstr ""
 "をセットします。"
 
 #. type: IP
-#: en/lb_config.1:390
+#: en/lb_config.1:402
 #, no-wrap
 msgid "B<--mirror-debian-installer> I<URL>"
 msgstr "B<--mirror-debian-installer> I<URL>"
 
 #. type: Plain text
-#: en/lb_config.1:392
+#: en/lb_config.1:404
 msgid ""
 "sets the location of the mirror that will be used to fetch the debian "
 "installer images of the derivative. By default, this points to the same "
@@ -2167,13 +2282,13 @@ msgstr ""
 "ミラー、つまり --mirror-bootstrap で指定された値が利用されます。"
 
 #. type: IP
-#: en/lb_config.1:392
+#: en/lb_config.1:404
 #, no-wrap
 msgid "B<--mode> debian|progress|ubuntu"
 msgstr "B<--mode> debian|progress|ubuntu"
 
 #. type: Plain text
-#: en/lb_config.1:394
+#: en/lb_config.1:406
 msgid ""
 "defines a global mode to load project specific defaults. By default this is "
 "set to debian."
@@ -2182,13 +2297,13 @@ msgstr ""
 "フォルトでは debian となっています。"
 
 #. type: IP
-#: en/lb_config.1:394
+#: en/lb_config.1:406
 #, no-wrap
 msgid "B<--system> live|normal"
 msgstr "B<--system> live|normal"
 
 #. type: Plain text
-#: en/lb_config.1:396
+#: en/lb_config.1:408
 msgid ""
 "defines if the resulting system image should a live system or a normal, non-"
 "live system."
@@ -2197,13 +2312,13 @@ msgstr ""
 "普通のイメージにするのかを指定します。"
 
 #. type: IP
-#: en/lb_config.1:396
+#: en/lb_config.1:408
 #, no-wrap
 msgid "B<--net-root-filesystem> nfs|cfs"
 msgstr "B<--net-root-filesystem> nfs|cfs"
 
 #. type: Plain text
-#: en/lb_config.1:398
+#: en/lb_config.1:410
 msgid ""
 "defines the filesystem that will be configured in the bootloader "
 "configuration for your netboot image. This defaults to nfs."
@@ -2212,13 +2327,13 @@ msgstr ""
 "ムを指定します。デフォルトは nfs となっています。"
 
 #. type: IP
-#: en/lb_config.1:398
+#: en/lb_config.1:410
 #, no-wrap
 msgid "B<--net-root-mountoptions> I<OPTIONS>"
 msgstr "B<--net-root-mountoptions> I<オプション>"
 
 #. type: Plain text
-#: en/lb_config.1:400
+#: en/lb_config.1:412
 msgid ""
 "sets additional options for mounting the root filesystem in netboot images "
 "and is by default empty."
@@ -2227,13 +2342,13 @@ msgstr ""
 "オプションを指定します。デフォルトは空です。"
 
 #. type: IP
-#: en/lb_config.1:400
+#: en/lb_config.1:412
 #, no-wrap
 msgid "B<--net-root-path> I<PATH>"
 msgstr "B<--net-root-path> I<パス>"
 
 #. type: Plain text
-#: en/lb_config.1:402
+#: en/lb_config.1:414
 msgid ""
 "sets the file path that will be configured in the bootloader configuration "
 "for your netboot image. This defaults to /srv/debian-live in debian mode, "
@@ -2244,13 +2359,13 @@ msgstr ""
 "モードでは「/srv/ubuntu-live」となっています。"
 
 #. type: IP
-#: en/lb_config.1:402
+#: en/lb_config.1:414
 #, no-wrap
 msgid "B<--net-root-server> I<IP>|I<HOSTNAME>"
 msgstr "B<--net-root-server> I<IPアドレス>|I<ホスト名>"
 
 #. type: Plain text
-#: en/lb_config.1:404
+#: en/lb_config.1:416
 msgid ""
 "sets the IP or hostname that will be configured in the bootloader "
 "configuration for the root filesystem of your netboot image. This defaults "
@@ -2261,13 +2376,13 @@ msgstr ""
 "ています。"
 
 #. type: IP
-#: en/lb_config.1:404
+#: en/lb_config.1:416
 #, no-wrap
 msgid "B<--net-cow-filesystem> nfs|cfs"
 msgstr "B<--net-cow-filesystem> nfs|cfs"
 
 #. type: Plain text
-#: en/lb_config.1:406
+#: en/lb_config.1:418
 msgid ""
 "defines the filesystem type for the copy-on-write layer and defaults to nfs."
 msgstr ""
@@ -2275,13 +2390,13 @@ msgstr ""
 "です。"
 
 #. type: IP
-#: en/lb_config.1:406
+#: en/lb_config.1:418
 #, no-wrap
 msgid "B<--net-cow-mountoptions> I<OPTIONS>"
 msgstr "B<--net-cow-mountoptions> I<オプション>"
 
 #. type: Plain text
-#: en/lb_config.1:408
+#: en/lb_config.1:420
 msgid ""
 "sets additional options for mounting the copy-on-write layer in netboot "
 "images and is by default empty."
@@ -2290,13 +2405,13 @@ msgstr ""
 "追加オプションを指定します。デフォルトは空です。"
 
 #. type: IP
-#: en/lb_config.1:408
+#: en/lb_config.1:420
 #, no-wrap
 msgid "B<--net-cow-path> I<PATH>"
 msgstr "B<--net-cow-path> I<パス>"
 
 #. type: Plain text
-#: en/lb_config.1:410
+#: en/lb_config.1:422
 msgid ""
 "defines the path to client writable filesystem. Anywhere that "
 "I<client_mac_address> is specified in the path live-boot will substitute the "
@@ -2307,28 +2422,28 @@ msgstr ""
 "MACアドレスをハイフンで区切ったものに置き換えます。"
 
 #. type: Plain text
-#: en/lb_config.1:413
+#: en/lb_config.1:425
 msgid "Example:"
 msgstr "例:"
 
 #. type: Plain text
-#: en/lb_config.1:415
+#: en/lb_config.1:427
 msgid "/export/hosts/client_mac_address"
 msgstr "/export/hosts/client_mac_address"
 
 #. type: Plain text
-#: en/lb_config.1:417
+#: en/lb_config.1:429
 msgid "/export/hosts/00-16-D3-33-92-E8"
 msgstr "/export/hosts/00-16-D3-33-92-E8"
 
 #. type: IP
-#: en/lb_config.1:417
+#: en/lb_config.1:429
 #, no-wrap
 msgid "B<--net-cow-server> I<IP>|I<HOSTNAME>"
 msgstr "B<--net-cow-server> I<IPアドレス>|I<ホスト名>"
 
 #. type: Plain text
-#: en/lb_config.1:419
+#: en/lb_config.1:431
 msgid ""
 "sets the IP or hostname that will be configured in the bootloader "
 "configuration for the copy-on-write filesystem of your netboot image and is "
@@ -2338,13 +2453,13 @@ msgstr ""
 "ローダ設定で設定するIPアドレスやホスト名をセットします。デフォルトは空です。"
 
 #. type: IP
-#: en/lb_config.1:419
+#: en/lb_config.1:431
 #, no-wrap
 msgid "B<--net-tarball> true|false"
 msgstr "B<--net-tarball> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:421
+#: en/lb_config.1:433
 msgid ""
 "defines if a compressed tarball should be created. Disabling this options "
 "leads to no tarball at all, the plain binary directory is considered the "
@@ -2355,24 +2470,24 @@ msgstr ""
 "リが出力されることになります。デフォルトは true です。"
 
 #. type: IP
-#: en/lb_config.1:421 en/live-build.7:40
+#: en/lb_config.1:433 en/live-build.7:40
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 #. type: Plain text
-#: en/lb_config.1:423
+#: en/lb_config.1:435
 msgid "reduces the verbosity of messages output by B<lb build>."
 msgstr "B<lb build> からのメッセージの出力を少なくします。"
 
 #. type: IP
-#: en/lb_config.1:423
+#: en/lb_config.1:435
 #, no-wrap
 msgid "B<--archive-areas> I<ARCHIVE_AREA>|\"I<ARCHIVE_AREAS>\""
 msgstr "B<--archive-areas> I<アーカイブ領域>|\"I<アーカイブ領域>\""
 
 #. type: Plain text
-#: en/lb_config.1:425
+#: en/lb_config.1:437
 msgid ""
 "defines which package archive areas of a debian packages archive should be "
 "used for configured debian package mirrors. By default, this is set to main. "
@@ -2386,26 +2501,26 @@ msgstr ""
 "能かどうか、各パッケージのライセンスを忘れずに確認してください。"
 
 #. type: IP
-#: en/lb_config.1:425
+#: en/lb_config.1:437
 #, no-wrap
 msgid "B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|\"I<PARENT_ARCHIVE_AREAS>\""
 msgstr "B<--parent-archive-areas> I<親アーカイブ領域>|\"I<親アーカイブ領域>\""
 
 #. type: Plain text
-#: en/lb_config.1:427
+#: en/lb_config.1:439
 msgid "defines the archive areas for derivatives of the resulting live system."
 msgstr ""
 "出来上がる Live システムの派生物のアーカイブ領域のディストリビューションを決"
 "定します。"
 
 #. type: IP
-#: en/lb_config.1:427
+#: en/lb_config.1:439
 #, no-wrap
 msgid "B<--security> true|false"
 msgstr "B<--security> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:429
+#: en/lb_config.1:441
 msgid ""
 "defines if the security repositories specified in the security mirror "
 "options should be used or not."
@@ -2414,13 +2529,13 @@ msgstr ""
 "かを決定します。"
 
 #. type: IP
-#: en/lb_config.1:429
+#: en/lb_config.1:441
 #, no-wrap
 msgid "B<--source> true|false"
 msgstr "B<--source> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:431
+#: en/lb_config.1:443
 msgid ""
 "defines if a corresponding source image to the binary image should be build. "
 "By default this is false because most people do not require this and would "
@@ -2435,24 +2550,24 @@ msgstr ""
 "を確認すべきです。"
 
 #. type: IP
-#: en/lb_config.1:431
+#: en/lb_config.1:443
 #, no-wrap
 msgid "-s|B<--source-images> iso|netboot|tar|hdd"
 msgstr "-s|B<--source-images> iso|netboot|tar|hdd"
 
 #. type: Plain text
-#: en/lb_config.1:433
+#: en/lb_config.1:445
 msgid "defines the image type for the source image. Default is tar."
 msgstr "ソースイメージのイメージの種類を指定します。デフォルトは tar です。"
 
 #. type: IP
-#: en/lb_config.1:433
+#: en/lb_config.1:445
 #, no-wrap
 msgid "B<--firmware-binary> true|false"
 msgstr "B<--firmware-binary> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:435
+#: en/lb_config.1:447
 msgid ""
 "defines if firmware packages should be automatically included into the "
 "binary pool for debian-installer. Note that only firmware packages available "
@@ -2469,13 +2584,13 @@ msgstr ""
 "ん。"
 
 #. type: IP
-#: en/lb_config.1:435
+#: en/lb_config.1:447
 #, no-wrap
 msgid "B<--firmware-chroot> true|false"
 msgstr "B<--firmware-chroot> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:437
+#: en/lb_config.1:449
 msgid ""
 "defines if firmware packages should be automatically included into the live "
 "image. Note that only firmware packages available within the configured "
@@ -2490,13 +2605,13 @@ msgstr ""
 "パッケージ一覧で明示的に指定したパッケージには干渉しません。"
 
 #. type: IP
-#: en/lb_config.1:437
+#: en/lb_config.1:449
 #, no-wrap
 msgid "B<--swap-file-path> I<PATH>"
 msgstr "B<--swap-file-path> I<パス>"
 
 #. type: Plain text
-#: en/lb_config.1:439
+#: en/lb_config.1:451
 msgid ""
 "defines the path to a swap file to create in the binary image. Default is "
 "not to create a swap file."
@@ -2505,13 +2620,13 @@ msgstr ""
 "はスワップファイルを作成しません。"
 
 #. type: IP
-#: en/lb_config.1:439
+#: en/lb_config.1:451
 #, no-wrap
 msgid "B<--swap-file-size> I<MB>"
 msgstr "B<--swap-file-size> I<MB>"
 
 #. type: Plain text
-#: en/lb_config.1:441
+#: en/lb_config.1:453
 msgid ""
 "defines what size in megabytes the swap file should be, if one is to be "
 "created. Default is 512MB."
@@ -2520,13 +2635,13 @@ msgstr ""
 "512MB です。"
 
 #. type: IP
-#: en/lb_config.1:441
+#: en/lb_config.1:453
 #, no-wrap
 msgid "B<--tasksel> apt|aptitude|tasksel"
 msgstr "B<--tasksel> apt|aptitude|tasksel"
 
 #. type: Plain text
-#: en/lb_config.1:443
+#: en/lb_config.1:455
 msgid ""
 "selects which program is used to install tasks. By default, this is set to "
 "tasksel."
@@ -2535,13 +2650,13 @@ msgstr ""
 "となっています。"
 
 #. type: IP
-#: en/lb_config.1:443
+#: en/lb_config.1:455
 #, no-wrap
 msgid "B<--templates> I<PATH>"
 msgstr "B<--templates> I<パス>"
 
 #. type: Plain text
-#: en/lb_config.1:445
+#: en/lb_config.1:457
 msgid ""
 "sets the path to the templates that live-build is going to use, e.g. for "
 "bootloaders. By default, this is set to /usr/share/live/build/templates/."
@@ -2550,13 +2665,13 @@ msgstr ""
 "す。デフォルトでは /usr/share/live/build/templates/ となっています。"
 
 #. type: IP
-#: en/lb_config.1:445
+#: en/lb_config.1:457
 #, no-wrap
 msgid "B<--hdd-size> MB"
 msgstr "B<--hdd-size> MB"
 
 #. type: Plain text
-#: en/lb_config.1:447
+#: en/lb_config.1:459
 msgid ""
 "defines what size the hdd image should be. Note that although the default is "
 "set to 10000 (= 10GB), it will not need 10GB space on your harddisk as the "
@@ -2567,13 +2682,13 @@ msgstr ""
 "10GB の空き容量が必要というわけではないことに注意してください。"
 
 #. type: IP
-#: en/lb_config.1:447
+#: en/lb_config.1:459
 #, no-wrap
 msgid "B<--updates> true|false"
 msgstr "B<--updates> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:449
+#: en/lb_config.1:461
 msgid ""
 "defines if debian updates package archives should be included in the image "
 "or not."
@@ -2581,13 +2696,13 @@ msgstr ""
 "イメージに updates パッケージアーカイブを収録すべきか否かを決定します。"
 
 #. type: IP
-#: en/lb_config.1:449
+#: en/lb_config.1:461
 #, no-wrap
 msgid "B<--backports> true|false"
 msgstr "B<--backports> true|false"
 
 #. type: Plain text
-#: en/lb_config.1:451
+#: en/lb_config.1:463
 msgid ""
 "defines if debian backports package archives should be included in the image "
 "or not."
@@ -2595,37 +2710,37 @@ msgstr ""
 "イメージに backports パッケージアーカイブを収録すべきか否かを決定します。"
 
 #. type: IP
-#: en/lb_config.1:451 en/live-build.7:42
+#: en/lb_config.1:463 en/live-build.7:42
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: en/lb_config.1:453
+#: en/lb_config.1:465
 msgid "increases the verbosity of messages output by B<lb build>."
 msgstr "B<lb build> からのメッセージの出力を多くします。"
 
 #. type: IP
-#: en/lb_config.1:453
+#: en/lb_config.1:465
 #, no-wrap
 msgid "B<--win32-loader true|false>"
 msgstr "B<--win32-loader true|false>"
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:456
+#: en/lb_config.1:468
 msgid "defines if win32-loader should be included in the binary image or not."
 msgstr "バイナリイメージに win32-loader を収録すべきか否かを決定します。"
 
 #. type: SH
-#: en/lb_config.1:457
+#: en/lb_config.1:469
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr "環境変数"
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:460
+#: en/lb_config.1:472
 msgid ""
 "Currently, command line switches can also be specified through the "
 "corresponding environment variable. However, this generally should not be "
@@ -2645,20 +2760,20 @@ msgstr ""
 
 #.  FIXME
 #. type: IP
-#: en/lb_config.1:464
+#: en/lb_config.1:476
 #, no-wrap
 msgid "B<auto/config>"
 msgstr "B<auto/config>"
 
 #. type: IP
-#: en/lb_config.1:465
+#: en/lb_config.1:477
 #, no-wrap
 msgid "B</etc/live/build.conf, /etc/live/build/*>"
 msgstr "B</etc/live/build.conf, /etc/live/build/*>"
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:468
+#: en/lb_config.1:480
 msgid ""
 "An optional, global configuration file for B<lb config> variables. It is "
 "useful to specify a few system wide defaults, like "
@@ -2671,11 +2786,11 @@ msgstr ""
 "無効にできます。"
 
 #. type: Plain text
-#: en/lb_config.1:473 en/live-build.7:219
+#: en/lb_config.1:485 en/live-build.7:235
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/lb_config.1:475 en/live-build.7:221
+#: en/lb_config.1:487 en/live-build.7:237
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
diff --git a/manpages/po/ja/lb_source.1.po b/manpages/po/ja/lb_source.1.po
index 0c2b6b1ae..a76e2f213 100644
--- a/manpages/po/ja/lb_source.1.po
+++ b/manpages/po/ja/lb_source.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -64,7 +64,7 @@ msgstr "概要"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "説明"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,8 +80,8 @@ msgstr "オプション"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
@@ -95,58 +95,63 @@ msgstr "B<無し>"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "このプログラムは live-build の一部です。"
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "live-build 及び Live システムプロジェクトについてのさらなる情報は、"
-"E<lt>I<http://live-systems.org/>E<gt> のホームページや E<lt>I<http://live-"
-"systems.org/manual/>E<gt> のマニュアルにあります。"
+"E<lt>I<https://debian-live.alioth.debian.org/>E<gt> のホームページや "
+"E<lt>I<http://live-systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -160,16 +165,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -178,7 +183,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_source.1:5
-msgid "B<lb source> - Complete the source stage"
+#, fuzzy
+#| msgid "B<lb source> - Complete the source stage"
+msgid "B<lb_source> - Complete the source stage"
 msgstr "B<lb source> - ソース段階を完了させます"
 
 #. type: Plain text
diff --git a/manpages/po/ja/live-build.7.po b/manpages/po/ja/live-build.7.po
index 46c53cbf8..c41ba0e84 100644
--- a/manpages/po/ja/live-build.7.po
+++ b/manpages/po/ja/live-build.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -64,7 +64,7 @@ msgstr "概要"
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -72,7 +72,7 @@ msgstr "説明"
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -80,60 +80,65 @@ msgstr "オプション"
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr "このプログラムは live-build の一部です。"
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
+#, fuzzy
+#| msgid ""
+#| "More information about live-build and the Live Systems project can be "
+#| "found on the homepage at E<lt>I<https://debian-live.alioth.debian.org/"
+#| ">E<gt> and in the manual at E<lt>I<https://debian-live.alioth.debian.org/"
+#| "manual/>E<gt>."
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 "live-build 及び Live システムプロジェクトについてのさらなる情報は、"
-"E<lt>I<http://live-systems.org/>E<gt> のホームページや E<lt>I<http://live-"
-"systems.org/manual/>E<gt> のマニュアルにあります。"
+"E<lt>I<https://debian-live.alioth.debian.org/>E<gt> のホームページや "
+"E<lt>I<http://live-systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -147,16 +152,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -164,36 +169,36 @@ msgstr ""
 "書かれました。"
 
 #. type: IP
-#: en/lb_config.1:302 en/live-build.7:36
+#: en/lb_config.1:314 en/live-build.7:36
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
 
 #. type: IP
-#: en/lb_config.1:314 en/live-build.7:38
+#: en/lb_config.1:326 en/live-build.7:38
 #, no-wrap
 msgid "B<--force>"
 msgstr "B<--force>"
 
 #. type: IP
-#: en/lb_config.1:421 en/live-build.7:40
+#: en/lb_config.1:433 en/live-build.7:40
 #, no-wrap
 msgid "B<--quiet>"
 msgstr "B<--quiet>"
 
 #. type: IP
-#: en/lb_config.1:451 en/live-build.7:42
+#: en/lb_config.1:463 en/live-build.7:42
 #, no-wrap
 msgid "B<--verbose>"
 msgstr "B<--verbose>"
 
 #. type: Plain text
-#: en/lb_config.1:473 en/live-build.7:219
+#: en/lb_config.1:485 en/live-build.7:235
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"
 
 #. type: Plain text
-#: en/lb_config.1:475 en/live-build.7:221
+#: en/lb_config.1:487 en/live-build.7:237
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
@@ -235,14 +240,19 @@ msgstr "I<コマンド>は live-build コマンドの名前です (以下参照)
 #.  FIXME
 #. type: Plain text
 #: en/live-build.7:19
+#, fuzzy
+#| msgid ""
+#| "More documentation about how to use live-build is available in the "
+#| "individual manpages for each helper and in the manual at E<lt>I<http://"
+#| "live-systems.org/manual/>E<gt>."
 msgid ""
 "More documentation about how to use live-build is available in the "
-"individual manpages for each helper and in the manual at E<lt>I<http://live-"
-"systems.org/manual/>E<gt>."
+"individual manpages for each helper and in the manual at E<lt>I<https://"
+"debian-live.alioth.debian.org/manual/>E<gt>."
 msgstr ""
 "live-build 及び Live システムプロジェクトについてのさらなる情報は、それぞれ"
-"の man ページや E<lt>I<http://live-systems.org/manual/>E<gt> のマニュアルにあ"
-"ります。"
+"の man ページや E<lt>I<https://debian-live.alioth.debian.org/manual/>E<gt> の"
+"マニュアルにあります。"
 
 #.  FIXME
 #. type: SS
@@ -402,130 +412,145 @@ msgstr "主要コマンド"
 
 #. type: IP
 #: en/live-build.7:58
-#, no-wrap
-msgid "B<lb_config>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_config>(1)"
+msgid "B<lb config>(1)"
 msgstr "B<lb_config>(1)"
 
 #. type: Plain text
 #: en/live-build.7:60
-msgid "create configuration for live-build"
+#, fuzzy
+#| msgid "create configuration for live-build"
+msgid "creates configuration for live-build"
 msgstr "live-build の設定ファイルを作成します"
 
 #. type: IP
 #: en/live-build.7:60
-#, no-wrap
-msgid "B<lb_bootstrap>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_bootstrap>(1)"
+msgid "B<lb bootstrap>(1)"
 msgstr "B<lb_bootstrap>(1)"
 
 #. type: Plain text
 #: en/live-build.7:62
-msgid "create the first stage by bootstrapping a basic debian system"
+#, fuzzy
+#| msgid "create the first stage by bootstrapping a basic debian system"
+msgid ""
+"executes the first build stage, creating (bootstraping) a basic Debian root "
+"filesystem"
 msgstr "第1の段階で基本的な debian システムのパッケージ収集を行います"
 
 #. type: IP
 #: en/live-build.7:62
-#, no-wrap
-msgid "B<lb_chroot>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot>(1)"
+msgid "B<lb chroot>(1)"
 msgstr "B<lb_chroot>(1)"
 
 #. type: Plain text
 #: en/live-build.7:64
-msgid "create the second stage by customizing the chroot"
-msgstr "第2の段階で chroot の独自化を行います"
+msgid "executes the second build stage, building the live OS filesystem"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:64
-#, no-wrap
-msgid "B<lb_binary>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary>(1)"
+msgid "B<lb installer>(1)"
 msgstr "B<lb_binary>(1)"
 
 #. type: Plain text
 #: en/live-build.7:66
-msgid "create the third stage by generating a binary image"
-msgstr "第3の段階でバイナリイメージの生成を行います"
+msgid ""
+"executes the third build stage, obtaining installer components (optional)"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:66
-#, no-wrap
-msgid "B<lb_source>(1)"
-msgstr "B<lb_source>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary>(1)"
+msgid "B<lb binary>(1)"
+msgstr "B<lb_binary>(1)"
 
 #. type: Plain text
 #: en/live-build.7:68
-msgid "create the optional fourth stage by generating a source image"
-msgstr "オプションの第4の段階でソースイメージの生成を行います"
+#, fuzzy
+#| msgid "create the third stage by generating a binary image"
+msgid "executes the fourth build stage, generating a binary image"
+msgstr "第3の段階でバイナリイメージの生成を行います"
 
 #. type: IP
 #: en/live-build.7:68
-#, no-wrap
-msgid "B<lb_clean>(1)"
-msgstr "B<lb_clean>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source>(1)"
+msgid "B<lb source>(1)"
+msgstr "B<lb_source>(1)"
 
 #. type: Plain text
 #: en/live-build.7:70
-msgid "clean up system build directories"
+#, fuzzy
+#| msgid "create the optional fourth stage by generating a source image"
+msgid "executes the fifth build stage, generating a source image (optional)"
+msgstr "オプションの第4の段階でソースイメージの生成を行います"
+
+#. type: IP
+#: en/live-build.7:70
+#, fuzzy, no-wrap
+#| msgid "B<lb_clean>(1)"
+msgid "B<lb clean>(1)"
+msgstr "B<lb_clean>(1)"
+
+#. type: Plain text
+#: en/live-build.7:72
+#, fuzzy
+#| msgid "clean up system build directories"
+msgid "cleans up system build directories"
 msgstr "システムのビルド用ディレクトリを掃除します"
 
 #. type: SS
-#: en/live-build.7:70
+#: en/live-build.7:72
 #, no-wrap
 msgid "Ancillary Commands"
 msgstr "副次的なコマンド"
 
 #. type: IP
-#: en/live-build.7:71
+#: en/live-build.7:73
 #, no-wrap
 msgid "B<lb>(1)"
 msgstr "B<lb>(1)"
 
 #. type: Plain text
-#: en/live-build.7:73
-msgid "generic live-build wrapper"
-msgstr "live-build の包括的なラッパー"
-
-#. type: IP
-#: en/live-build.7:73
-#, no-wrap
-msgid "B<lb_build>(1)"
-msgstr "B<lb_build>(1)"
-
-#. type: Plain text
 #: en/live-build.7:75
-msgid "alias for all stages"
-msgstr "全段階のラッパーです"
+#, fuzzy
+#| msgid "generic live-build wrapper"
+msgid "generic live-build script execution wrapper"
+msgstr "live-build の包括的なラッパー"
 
 #. type: IP
 #: en/live-build.7:75
-#, no-wrap
-msgid "B<lb_local>(1)"
-msgstr "B<lb_local>(1)"
-
-#. type: Plain text
-#: en/live-build.7:77
-msgid "helper for using a local live-build"
-msgstr "ローカルの live-build を利用する支援コマンド"
-
-#. type: IP
-#: en/live-build.7:77
-#, no-wrap
-msgid "B<lb_testroot>(1)"
-msgstr "B<lb_testroot>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_build>(1)"
+msgid "B<lb build>(1)"
+msgstr "B<lb_build>(1)"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:80
-msgid "ensure that a system is built as root"
-msgstr "システムが root により構成されていることを確認します"
+#: en/live-build.7:78
+#, fuzzy
+#| msgid "alias for all stages"
+msgid "alias for all build stages"
+msgstr "全段階のラッパーです"
 
 #. type: SH
-#: en/live-build.7:81
-#, no-wrap
-msgid "LOW-LEVEL COMMANDS (PLUMBING)"
+#: en/live-build.7:79
+#, fuzzy, no-wrap
+#| msgid "LOW-LEVEL COMMANDS (PLUMBING)"
+msgid "LOW-LEVEL COMMANDS (PLUMBING) - BUILD STAGE COMPONENTS"
 msgstr "低レベルコマンド (PLUMBING)"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:84
+#: en/live-build.7:82
 msgid ""
 "The actual work of live-build is implemented in the low-level commands, "
 "called plumbing. They are not supposed to be used by end users, they should "
@@ -541,7 +566,7 @@ msgstr ""
 "はこの低レベルコマンドが対象となるかもしれません。"
 
 #. type: Plain text
-#: en/live-build.7:86
+#: en/live-build.7:84
 msgid ""
 "Note that the interface (set of options and the semantics) to these low-"
 "level commands are meant to be a lot more stable than Porcelain level "
@@ -554,628 +579,856 @@ msgstr ""
 "ユーザの使い勝手改善のために変更される対象となります。"
 
 #. type: SS
-#: en/live-build.7:86
-#, no-wrap
-msgid "Bootstrap commands"
+#: en/live-build.7:84
+#, fuzzy, no-wrap
+#| msgid "Bootstrap commands"
+msgid "Bootstrap stage specific commands"
 msgstr "パッケージ収集用のコマンド"
 
 #. type: IP
+#: en/live-build.7:85
+#, fuzzy, no-wrap
+#| msgid "B<lb_bootstrap_cache>(1)"
+msgid "B<lb bootstrap_archives>(1)"
+msgstr "B<lb_bootstrap_cache>(1)"
+
+#. type: Plain text
 #: en/live-build.7:87
-#, no-wrap
-msgid "B<lb_bootstrap_cache>(1)"
+msgid "applies apt archive configuration"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:87
+#, fuzzy, no-wrap
+#| msgid "B<lb_bootstrap_cache>(1)"
+msgid "B<lb bootstrap_cache>(1)"
 msgstr "B<lb_bootstrap_cache>(1)"
 
 #. type: Plain text
 #: en/live-build.7:89
-msgid "cache bootstrap stage"
-msgstr "パッケージ収集段階をキャッシュします"
+msgid ""
+"in save mode, saves to cache a copy of the generated bootstrap directory, "
+"and in restore mode, restores from cache a previously generated copy"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:89
-#, no-wrap
-msgid "B<lb_bootstrap_debootstrap>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_bootstrap_debootstrap>(1)"
+msgid "B<lb bootstrap_debootstrap>(1)"
 msgstr "B<lb_bootstrap_debootstrap>(1)"
 
 #. type: Plain text
 #: en/live-build.7:91
-msgid "bootstrap a Debian system with debootstrap(8)"
+#, fuzzy
+#| msgid "bootstrap a Debian system with debootstrap(8)"
+msgid "creates (bootstrap) a basic Debian root filesystem using debootstrap(8)"
 msgstr "debootstrap(8) により Debian システムのパッケージ収集を行います"
 
 #. type: SS
 #: en/live-build.7:91
-#, no-wrap
-msgid "Chroot commands"
+#, fuzzy, no-wrap
+#| msgid "Chroot commands"
+msgid "Chroot stage specific commands"
 msgstr "chroot コマンド"
 
-#. type: IP
-#: en/live-build.7:92
-#, no-wrap
-msgid "B<lb_chroot_apt>(1)"
-msgstr "B<lb_chroot_apt>(1)"
-
 #. type: Plain text
 #: en/live-build.7:94
-msgid "manage /etc/apt/apt.conf"
-msgstr "/etc/apt/apt.conf の管理"
+msgid ""
+"Note: The following chroot_ prefixed commands are used in building the live "
+"OS filesystem. Another set of similarly prefixed files are listed separately "
+"(see further down)."
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:94
-#, no-wrap
-msgid "B<lb_chroot_cache>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_cache>(1)"
+msgid "B<lb chroot_cache>(1)"
 msgstr "B<lb_chroot_cache>(1)"
 
 #. type: Plain text
 #: en/live-build.7:96
-msgid "cache chroot stage"
-msgstr "chroot 段階をキャッシュします"
+msgid ""
+"in save mode, saves to cache a copy of the chroot directory, and in restore "
+"mode, restores from cache a previously generated copy"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:96
-#, no-wrap
-msgid "B<lb_chroot_debianchroot>(1)"
-msgstr "B<lb_chroot_debianchroot>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_cache>(1)"
+msgid "B<lb chroot_firmware>(1)"
+msgstr "B<lb_chroot_cache>(1)"
 
 #. type: Plain text
 #: en/live-build.7:98
-msgid "manage /etc/debian_chroot"
-msgstr "/etc/debian_chroot の管理"
+msgid ""
+"compiles a list of firmware packages to be installed in the live OS root "
+"filesystem"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:98
-#, no-wrap
-msgid "B<lb_chroot_devpts>(1)"
-msgstr "B<lb_chroot_devpts>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_hacks>(1)"
+msgid "B<lb chroot_hacks>(1)"
+msgstr "B<lb_chroot_hacks>(1)"
 
 #. type: Plain text
 #: en/live-build.7:100
-msgid "mount /dev/pts"
-msgstr "/dev/pts をマウントします。"
+msgid ""
+"executes local hacks against the live OS root filesystem, if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:100
-#, no-wrap
-msgid "B<lb_chroot_dpkg>(1)"
-msgstr "B<lb_chroot_dpkg>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_hooks>(1)"
+msgid "B<lb chroot_hooks>(1)"
+msgstr "B<lb_chroot_hooks>(1)"
 
 #. type: Plain text
 #: en/live-build.7:102
-msgid "manage /sbin/dpkg"
-msgstr "/sbin/dpkg の管理"
+msgid ""
+"executes local hooks against the live OS root filesystem, if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:102
-#, no-wrap
-msgid "B<lb_chroot_hacks>(1)"
-msgstr "B<lb_chroot_hacks>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_local-includes>(1)"
+msgid "B<lb chroot_includes>(1)"
+msgstr "B<lb_chroot_local-includes>(1)"
 
 #. type: Plain text
 #: en/live-build.7:104
-msgid "execute hacks in chroot"
-msgstr "hacks (応急的な操作を行うスクリプト) を chroot で実行します"
+msgid ""
+"copies a set of local files from the config directory into the live OS root "
+"filesystem, if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:104
-#, no-wrap
-msgid "B<lb_chroot_hostname>(1)"
-msgstr "B<lb_chroot_hostname>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_install-packages>(1)"
+msgid "B<lb chroot_install-packages>(1)"
+msgstr "B<lb_chroot_install-packages>(1)"
 
 #. type: Plain text
 #: en/live-build.7:106
-msgid "manage /bin/hostname"
-msgstr "/bin/hostname の管理"
+msgid ""
+"installs into the live OS root filesystem any packages listed in local "
+"package lists"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:106
-#, no-wrap
-msgid "B<lb_chroot_hosts>(1)"
-msgstr "B<lb_chroot_hosts>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_interactive>(1)"
+msgid "B<lb chroot_interactive>(1)"
+msgstr "B<lb_chroot_interactive>(1)"
 
 #. type: Plain text
 #: en/live-build.7:108
-msgid "manage /etc/hosts"
-msgstr "/etc/hosts の管理"
+msgid ""
+"pauses the build process and starts an interactive shell from the live OS "
+"root filesystem, providing an oportunity for manual modifications or "
+"testing; note that this is (currently) usually executed with several chroot "
+"prep modifications applied (see description of these further down)"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:108
-#, no-wrap
-msgid "B<lb_chroot_install-packages>(1)"
-msgstr "B<lb_chroot_install-packages>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_linux-image>(1)"
+msgid "B<lb chroot_linux-image>(1)"
+msgstr "B<lb_chroot_linux-image>(1)"
 
 #. type: Plain text
 #: en/live-build.7:110
-msgid "install queued packages into chroot"
-msgstr "キューにあるパッケージを chroot にインストールします"
+msgid ""
+"compiles a list of kernel images to be installed in the live OS root "
+"filesystem"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:110
-#, no-wrap
-msgid "B<lb_chroot_interactive>(1)"
-msgstr "B<lb_chroot_interactive>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_packages>(1)"
+msgid "B<lb chroot_live-packages>(1)"
+msgstr "B<lb_chroot_packages>(1)"
 
 #. type: Plain text
 #: en/live-build.7:112
-msgid "make build interactive"
-msgstr "対話的にビルドします"
+msgid ""
+"installs a set of live system specific packages to the live OS root "
+"filesystem"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:112
-#, no-wrap
-msgid "B<lb_chroot_linux-image>(1)"
-msgstr "B<lb_chroot_linux-image>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_packagelists>(1)"
+msgid "B<lb chroot_package-lists>(1)"
+msgstr "B<lb_chroot_packagelists>(1)"
 
 #. type: Plain text
 #: en/live-build.7:114
-msgid "manage /etc/kernel-img.conf"
-msgstr "/etc/kernel-img.conf の管理"
+msgid ""
+"compiles a list of packages provided in the user\\' local config to be "
+"installed in the live OS root filesystem"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:114
-#, no-wrap
-msgid "B<lb_chroot_hooks>(1)"
-msgstr "B<lb_chroot_hooks>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_local-preseed>(1)"
+msgid "B<lb chroot_preseed>(1)"
+msgstr "B<lb_chroot_local-preseed>(1)"
 
 #. type: Plain text
 #: en/live-build.7:116
-msgid "execute local hooks in chroot"
-msgstr "ローカルフックを chroot で実行します"
+msgid ""
+"installs pre-configured answers to certain install prompts into the live OS "
+"root filesystem"
+msgstr ""
 
-#. type: IP
+#. type: SS
 #: en/live-build.7:116
 #, no-wrap
-msgid "B<lb_chroot_local-includes>(1)"
-msgstr "B<lb_chroot_local-includes>(1)"
-
-#. type: Plain text
-#: en/live-build.7:118
-msgid "copy local files into chroot"
-msgstr "ローカルファイルを chroot にコピーします"
+msgid "Installer stage specific commands"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:118
-#, no-wrap
-msgid "B<lb_chroot_packages>(1)"
-msgstr "B<lb_chroot_packages>(1)"
+#: en/live-build.7:117
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_debian-installer>(1)"
+msgid "B<lb installer_debian-installer>(1)"
+msgstr "B<lb_binary_debian-installer>(1)"
 
 #. type: Plain text
-#: en/live-build.7:120
-msgid "queue install of packages into chroot"
-msgstr "chroot にインストールするパッケージをキューに追加します"
+#: en/live-build.7:119
+msgid "obtains and sets up Debian installer(d-i) components"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:120
-#, no-wrap
-msgid "B<lb_chroot_local-patches>(1)"
-msgstr "B<lb_chroot_local-patches>(1)"
+#: en/live-build.7:119
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_local-preseed>(1)"
+msgid "B<lb installer_preseed>(1)"
+msgstr "B<lb_chroot_local-preseed>(1)"
 
 #. type: Plain text
-#: en/live-build.7:122
-msgid "apply local patches against chroot"
-msgstr "ローカルのパッチを chroot に適用させます"
+#: en/live-build.7:121
+msgid "installs pre-configured answers to certain install prompts"
+msgstr ""
+
+#. type: SS
+#: en/live-build.7:121
+#, fuzzy, no-wrap
+#| msgid "Binary commands"
+msgid "Binary stage specific commands"
+msgstr "バイナリコマンド"
 
 #. type: IP
 #: en/live-build.7:122
-#, no-wrap
-msgid "B<lb_chroot_local-preseed>(1)"
-msgstr "B<lb_chroot_local-preseed>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_checksums>(1)"
+msgid "B<lb binary_checksums>(1)"
+msgstr "B<lb_binary_checksums>(1)"
 
 #. type: Plain text
 #: en/live-build.7:124
-msgid "use debconf local preseeding file"
-msgstr "ローカルにある debconf の preseed 用ファイルを利用します"
+#, fuzzy
+#| msgid "create source checksums (md5, sha1, and/or sha256)"
+msgid "creates checksums (md5, sha1, and/or sha256) for live image content"
+msgstr "ソースのチェックサム (md5、sha1、sha256 のどれか) を作成します"
 
 #. type: IP
 #: en/live-build.7:124
-#, no-wrap
-msgid "B<lb_chroot_packagelists>(1)"
-msgstr "B<lb_chroot_packagelists>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_chroot>(1)"
+msgid "B<lb binary_chroot>(1)"
+msgstr "B<lb_binary_chroot>(1)"
 
 #. type: Plain text
 #: en/live-build.7:126
-msgid "queue install of package lists into chroot"
-msgstr "chroot にインストールするパッケージ一覧をキューに追加します"
+msgid ""
+"duplicates the chroot directory, to place a copy of what whould be the "
+"completed live OS root filesystem to one side, allowing the original to "
+"continue to be used in executing certain parts of the remainder of the build "
+"process"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:126
-#, no-wrap
-msgid "B<lb_chroot_proc>(1)"
-msgstr "B<lb_chroot_proc>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_disk>(1)"
+msgid "B<lb binary_disk>(1)"
+msgstr "B<lb_binary_disk>(1)"
 
 #. type: Plain text
 #: en/live-build.7:128
-msgid "mount /proc"
-msgstr "/proc をマウントします。"
+msgid "creates disk information files to be added to live image"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:128
-#, no-wrap
-msgid "B<lb_chroot_resolv>(1)"
-msgstr "B<lb_chroot_resolv>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_grub>(1)"
+msgid "B<lb binary_grub>(1)"
+msgstr "B<lb_binary_grub>(1)"
 
 #. type: Plain text
 #: en/live-build.7:130
-msgid "manage /etc/resolv.conf"
-msgstr "/etc/resolv.conf の管理"
+msgid "installs grub into live image to provide image boot capability"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:130
-#, no-wrap
-msgid "B<lb_chroot_selinuxfs>(1)"
-msgstr "B<lb_chroot_selinuxfs>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_grub2>(1)"
+msgid "B<lb binary_grub2>(1)"
+msgstr "B<lb_binary_grub2>(1)"
 
 #. type: Plain text
 #: en/live-build.7:132
-msgid "mount /selinux"
-msgstr "/selinux をマウントします。"
+msgid "installs grub2 into live image to provide image boot capability"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:132
-#, no-wrap
-msgid "B<lb_chroot_archives>(1)"
-msgstr "B<lb_chroot_archives>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_hdd>(1)"
+msgid "B<lb binary_hdd>(1)"
+msgstr "B<lb_binary_hdd>(1)"
 
 #. type: Plain text
 #: en/live-build.7:134
-msgid "manage /etc/apt/sources.list"
-msgstr "/etc/apt/sources.list の管理"
+msgid "compiles the final live image into an hdd image file"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:134
-#, no-wrap
-msgid "B<lb_chroot_sysfs>(1)"
-msgstr "B<lb_chroot_sysfs>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_rootfs>(1)"
+msgid "B<lb binary_hooks>(1)"
+msgstr "B<lb_binary_rootfs>(1)"
 
 #. type: Plain text
 #: en/live-build.7:136
-msgid "mount /sys"
-msgstr "/sys をマウントします。"
+msgid "executes local hooks against the live image, if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:136
-#, no-wrap
-msgid "B<lb_chroot_sysv-rc>(1)"
-msgstr "B<lb_chroot_sysv-rc>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_includes>(1)"
+msgid "B<lb binary_includes>(1)"
+msgstr "B<lb_binary_includes>(1)"
 
 #. type: Plain text
 #: en/live-build.7:138
-msgid "manage /usr/sbin/policy-rc.d"
-msgstr "/usr/sbin/policy-rc.d の管理"
+msgid ""
+"copies a set of local files from the config directory into the live image, "
+"if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:138
-#, no-wrap
-msgid "B<lb_chroot_task-lists>(1)"
-msgstr "B<lb_chroot_task-lists>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_iso>(1)"
+msgid "B<lb binary_iso>(1)"
+msgstr "B<lb_binary_iso>(1)"
 
 #. type: Plain text
 #: en/live-build.7:140
-msgid "install task lists into chroot"
-msgstr "タスク一覧を chroot にインストールします"
-
-#. type: SS
-#: en/live-build.7:140
-#, no-wrap
-msgid "Binary commands"
-msgstr "バイナリコマンド"
+msgid "compiles the final live image into an iso file"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:141
-#, no-wrap
-msgid "B<lb_binary_chroot>(1)"
-msgstr "B<lb_binary_chroot>(1)"
+#: en/live-build.7:140
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_linux-image>(1)"
+msgid "B<lb binary_linux-image>(1)"
+msgstr "B<lb_binary_linux-image>(1)"
 
 #. type: Plain text
-#: en/live-build.7:143
-msgid "copy chroot into chroot"
-msgstr "chroot を chroot にコピーします"
+#: en/live-build.7:142
+#, fuzzy
+#| msgid "install linux-image into binary"
+msgid "copies the linux-image into the live image"
+msgstr "linux-image をバイナリにインストールします"
 
 #. type: IP
-#: en/live-build.7:143
-#, no-wrap
-msgid "B<lb_binary_debian-installer>(1)"
-msgstr "B<lb_binary_debian-installer>(1)"
+#: en/live-build.7:142
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_local-includes>(1)"
+msgid "B<lb binary_loadlin>(1)"
+msgstr "B<lb_binary_local-includes>(1)"
 
 #. type: Plain text
-#: en/live-build.7:145
-msgid "install debian-installer into binary"
-msgstr "debian-installer をバイナリにインストールします"
+#: en/live-build.7:144
+msgid "bundles a copy of loadlin into the live image"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:145
-#, no-wrap
-msgid "B<lb_binary_disk>(1)"
-msgstr "B<lb_binary_disk>(1)"
+#: en/live-build.7:144
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_manifest>(1)"
+msgid "B<lb binary_manifest>(1)"
+msgstr "B<lb_binary_manifest>(1)"
 
 #. type: Plain text
-#: en/live-build.7:147
-msgid "install disk information into binary"
-msgstr "ディスク情報をバイナリにインストールします"
+#: en/live-build.7:146
+msgid ""
+"creates manifest of packages installed into live OS filesystem, and list of "
+"packages to be excluded by a persistence mechanism installing the live OS to "
+"disk"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:147
-#, no-wrap
-msgid "B<lb_binary_grub>(1)"
-msgstr "B<lb_binary_grub>(1)"
+#: en/live-build.7:146
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_memtest>(1)"
+msgid "B<lb binary_memtest>(1)"
+msgstr "B<lb_binary_memtest>(1)"
 
 #. type: Plain text
-#: en/live-build.7:149
-msgid "installs grub into binary"
-msgstr "grub をバイナリにインストールします"
+#: en/live-build.7:148
+msgid "bundles a copy of memtest into the live image"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:149
-#, no-wrap
-msgid "B<lb_binary_grub2>(1)"
-msgstr "B<lb_binary_grub2>(1)"
+#: en/live-build.7:148
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_net>(1)"
+msgid "B<lb binary_netboot>(1)"
+msgstr "B<lb_binary_net>(1)"
 
 #. type: Plain text
-#: en/live-build.7:151
-msgid "installs grub2 into binary"
-msgstr "grub2 をバイナリにインストールします"
+#: en/live-build.7:150
+msgid "compiles the final live image into a netboot tar archive"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:151
-#, no-wrap
-msgid "B<lb_binary_includes>(1)"
-msgstr "B<lb_binary_includes>(1)"
+#: en/live-build.7:150
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_local-packagelists>(1)"
+msgid "B<lb binary_package-lists>(1)"
+msgstr "B<lb_binary_local-packagelists>(1)"
 
 #. type: Plain text
-#: en/live-build.7:153 en/live-build.7:161
-msgid "copy files into binary"
-msgstr "ファイルをバイナリにコピーします"
+#: en/live-build.7:152
+msgid ""
+"processes local lists of packages to obtain and bundle into image (from "
+"which they could later be installed if not already)"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:153
-#, no-wrap
-msgid "B<lb_binary_iso>(1)"
-msgstr "B<lb_binary_iso>(1)"
+#: en/live-build.7:152
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_rootfs>(1)"
+msgid "B<lb binary_rootfs>(1)"
+msgstr "B<lb_binary_rootfs>(1)"
 
 #. type: Plain text
-#: en/live-build.7:155
-msgid "build iso binary image"
-msgstr "ISOバイナリイメージをビルドします"
+#: en/live-build.7:154
+msgid ""
+"wraps up the completed live OS root filesystem into a virtual file system "
+"image"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:155
-#, no-wrap
-msgid "B<lb_binary_linux-image>(1)"
-msgstr "B<lb_binary_linux-image>(1)"
+#: en/live-build.7:154
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_syslinux>(1)"
+msgid "B<lb binary_syslinux>(1)"
+msgstr "B<lb_binary_syslinux>(1)"
 
 #. type: Plain text
-#: en/live-build.7:157
-msgid "install linux-image into binary"
-msgstr "linux-image をバイナリにインストールします"
+#: en/live-build.7:156
+msgid "installs syslinux into live image to provide image boot capability"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:157
-#, no-wrap
-msgid "B<lb_binary_local-hooks>(1)"
-msgstr "B<lb_binary_local-hooks>(1)"
+#: en/live-build.7:156
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_tar>(1)"
+msgid "B<lb binary_tar>(1)"
+msgstr "B<lb_binary_tar>(1)"
 
 #. type: Plain text
-#: en/live-build.7:159
-msgid "execute local hooks in binary"
-msgstr "ローカルフックをバイナリで実行します"
+#: en/live-build.7:158
+msgid "compiles the final live image into a tar archive"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:159
-#, no-wrap
-msgid "B<lb_binary_local-includes>(1)"
-msgstr "B<lb_binary_local-includes>(1)"
+#: en/live-build.7:158
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_win32-loader>(1)"
+msgid "B<lb binary_win32-loader>(1)"
+msgstr "B<lb_binary_win32-loader>(1)"
+
+#. type: Plain text
+#: en/live-build.7:160
+msgid ""
+"bundles a copy of win32-loader into the live image and creates an autorun."
+"inf file"
+msgstr ""
 
 #. type: IP
-#: en/live-build.7:161
-#, no-wrap
-msgid "B<lb_binary_local-packagelists>(1)"
-msgstr "B<lb_binary_local-packagelists>(1)"
+#: en/live-build.7:160
+#, fuzzy, no-wrap
+#| msgid "B<lb_binary_iso>(1)"
+msgid "B<lb binary_zsync>(1)"
+msgstr "B<lb_binary_iso>(1)"
 
 #. type: Plain text
-#: en/live-build.7:163
-msgid "install local package lists into binary"
-msgstr "ローカルパッケージ一覧をバイナリにインストールします"
+#: en/live-build.7:162
+msgid "builds zsync control files"
+msgstr ""
+
+#. type: SS
+#: en/live-build.7:162
+#, fuzzy, no-wrap
+#| msgid "Source commands"
+msgid "Source stage specific commands"
+msgstr "ソースコマンド"
 
 #. type: IP
 #: en/live-build.7:163
-#, no-wrap
-msgid "B<lb_binary_manifest>(1)"
-msgstr "B<lb_binary_manifest>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_checksums>(1)"
+msgid "B<lb source_checksums>(1)"
+msgstr "B<lb_source_checksums>(1)"
 
 #. type: Plain text
 #: en/live-build.7:165
-msgid "create manifest"
-msgstr "名簿ファイルを作成します"
+#, fuzzy
+#| msgid "create source checksums (md5, sha1, and/or sha256)"
+msgid "creates checksums (md5, sha1, and/or sha256) for source image content"
+msgstr "ソースのチェックサム (md5、sha1、sha256 のどれか) を作成します"
 
 #. type: IP
 #: en/live-build.7:165
-#, no-wrap
-msgid "B<lb_binary_checksums>(1)"
-msgstr "B<lb_binary_checksums>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_debian>(1)"
+msgid "B<lb source_debian>(1)"
+msgstr "B<lb_source_debian>(1)"
 
 #. type: Plain text
 #: en/live-build.7:167
-msgid "create binary checksums (md5, sha1, and/or sha256)"
-msgstr "バイナリのチェックサム (md5、sha1、sha256 のどれか) を作成します"
+msgid "downloads source packages for bundling into source image"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:167
-#, no-wrap
-msgid "B<lb_binary_memtest>(1)"
-msgstr "B<lb_binary_memtest>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_disk>(1)"
+msgid "B<lb source_disk>(1)"
+msgstr "B<lb_source_disk>(1)"
 
 #. type: Plain text
 #: en/live-build.7:169
-msgid "installs a memtest into binary"
-msgstr "memtest をバイナリにインストールします"
+#, fuzzy
+#| msgid "install disk information into source"
+msgid "creates disk information files to be added to source image"
+msgstr "ディスク情報をソースにインストールします"
 
 #. type: IP
 #: en/live-build.7:169
-#, no-wrap
-msgid "B<lb_binary_net>(1)"
-msgstr "B<lb_binary_net>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_hdd>(1)"
+msgid "B<lb source_hdd>(1)"
+msgstr "B<lb_source_hdd>(1)"
 
 #. type: Plain text
 #: en/live-build.7:171
-msgid "build netboot binary image"
-msgstr "ネットワークブート用バイナリイメージをビルドします"
+msgid "compiles the final source image into an hdd image file"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:171
-#, no-wrap
-msgid "B<lb_binary_rootfs>(1)"
-msgstr "B<lb_binary_rootfs>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_hdd>(1)"
+msgid "B<lb source_hooks>(1)"
+msgstr "B<lb_source_hdd>(1)"
 
 #. type: Plain text
 #: en/live-build.7:173
-msgid "build rootfs image"
-msgstr "rootfs イメージをビルドします"
+msgid "executes local hooks against the source image, if any are provided"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:173
-#, no-wrap
-msgid "B<lb_binary_syslinux>(1)"
-msgstr "B<lb_binary_syslinux>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_iso>(1)"
+msgid "B<lb source_iso>(1)"
+msgstr "B<lb_source_iso>(1)"
 
 #. type: Plain text
 #: en/live-build.7:175
-msgid "installs syslinux into binary"
-msgstr "syslinux をバイナリにインストールします"
+msgid "compiles the final source image into an iso file"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:175
-#, no-wrap
-msgid "B<lb_binary_tar>(1)"
-msgstr "B<lb_binary_tar>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_iso>(1)"
+msgid "B<lb source_live>(1)"
+msgstr "B<lb_source_iso>(1)"
 
 #. type: Plain text
 #: en/live-build.7:177
-msgid "build harddisk binary image"
-msgstr "ハードディスクバイナリイメージをビルドします"
+#, fuzzy
+#| msgid "copy debian-live config into source"
+msgid "copies live-build config into source"
+msgstr "debian-live の設定をソースにコピーします。"
 
 #. type: IP
 #: en/live-build.7:177
-#, no-wrap
-msgid "B<lb_binary_hdd>(1)"
-msgstr "B<lb_binary_hdd>(1)"
-
-#. type: Plain text
-#: en/live-build.7:179
-msgid "build binary hdd image"
-msgstr "バイナリhddイメージをビルドします"
-
-#. type: IP
-#: en/live-build.7:179
-#, no-wrap
-msgid "B<lb_binary_win32-loader>(1)"
-msgstr "B<lb_binary_win32-loader>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_source_tar>(1)"
+msgid "B<lb source_tar>(1)"
+msgstr "B<lb_source_tar>(1)"
 
+#.  FIXME
 #. type: Plain text
-#: en/live-build.7:181
-msgid "installs win32-loader into binary"
-msgstr "win32-loader をバイナリにインストールします"
+#: en/live-build.7:180
+msgid "compiles the final source image into a tar archive"
+msgstr ""
 
-#. type: SS
+#. type: SH
 #: en/live-build.7:181
-#, no-wrap
-msgid "Source commands"
-msgstr "ソースコマンド"
-
-#. type: IP
-#: en/live-build.7:182
-#, no-wrap
-msgid "B<lb_source_debian>(1)"
-msgstr "B<lb_source_debian>(1)"
+#, fuzzy, no-wrap
+#| msgid "LOW-LEVEL COMMANDS (PLUMBING)"
+msgid "LOW-LEVEL COMMANDS (PLUMBING) - CHROOT PREP COMPONENTS"
+msgstr "低レベルコマンド (PLUMBING)"
 
+#.  FIXME
 #. type: Plain text
 #: en/live-build.7:184
-msgid "download sources"
-msgstr "ソースをダウンロードします"
-
-#. type: IP
-#: en/live-build.7:184
-#, no-wrap
-msgid "B<lb_source_debian-live>(1)"
-msgstr "B<lb_source_debian-live>(1)"
+msgid ""
+"The notes above under the section regarding build-stage specific low-level "
+"plumbing commands also apply here."
+msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:186
-msgid "copy debian-live config into source"
-msgstr "debian-live の設定をソースにコピーします。"
+msgid ""
+"The following chroot_ prefixed commands are used throughout the various "
+"primary stages of the build process to apply and remove modifications to a "
+"chroot root filesystem. Generally these are used to apply modification that "
+"setup the chroot for use (execution of programs within it) during the build "
+"process, and later to remove those modification, unmounting things that were "
+"mounted, and making the chroot suitable for use as the root filesystem of "
+"the live OS to be bundled into the live image."
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:186
-#, no-wrap
-msgid "B<lb_source_disk>(1)"
-msgstr "B<lb_source_disk>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_apt>(1)"
+msgid "B<lb chroot_apt>(1)"
+msgstr "B<lb_chroot_apt>(1)"
 
 #. type: Plain text
 #: en/live-build.7:188
-msgid "install disk information into source"
-msgstr "ディスク情報をソースにインストールします"
+msgid ""
+"manages apt configuration; in apply mode it applies configuration for use "
+"during build process, and in remove mode removes that configuration"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:188
-#, no-wrap
-msgid "B<lb_source_iso>(1)"
-msgstr "B<lb_source_iso>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_archives>(1)"
+msgid "B<lb chroot_archives>(1)"
+msgstr "B<lb_chroot_archives>(1)"
 
 #. type: Plain text
 #: en/live-build.7:190
-msgid "build iso source image"
-msgstr "ISOソースイメージをビルドします"
+msgid ""
+"manages apt archive source lists; in apply mode it applies source list "
+"configurations suitable for use of the chroot in the build process, and in "
+"remove mode replaces that with a configuration suitable for the final live OS"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:190
-#, no-wrap
-msgid "B<lb_source_checksums>(1)"
-msgstr "B<lb_source_checksums>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_debianchroot>(1)"
+msgid "B<lb chroot_debianchroot>(1)"
+msgstr "B<lb_chroot_debianchroot>(1)"
 
 #. type: Plain text
 #: en/live-build.7:192
-msgid "create source checksums (md5, sha1, and/or sha256)"
-msgstr "ソースのチェックサム (md5、sha1、sha256 のどれか) を作成します"
+#, fuzzy
+#| msgid "manage /etc/debian_chroot"
+msgid "manages a /etc/debian_chroot file"
+msgstr "/etc/debian_chroot の管理"
 
 #. type: IP
 #: en/live-build.7:192
-#, no-wrap
-msgid "B<lb_source_net>(1)"
-msgstr "B<lb_source_net>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_devpts>(1)"
+msgid "B<lb chroot_devpts>(1)"
+msgstr "B<lb_chroot_devpts>(1)"
 
 #. type: Plain text
 #: en/live-build.7:194
-msgid "build source net image"
-msgstr ""
+#, fuzzy
+#| msgid "mount /dev/pts"
+msgid "manages mounting of /dev/pts"
+msgstr "/dev/pts をマウントします。"
 
 #. type: IP
 #: en/live-build.7:194
-#, no-wrap
-msgid "B<lb_source_tar>(1)"
-msgstr "B<lb_source_tar>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_dpkg>(1)"
+msgid "B<lb chroot_dpkg>(1)"
+msgstr "B<lb_chroot_dpkg>(1)"
 
 #. type: Plain text
 #: en/live-build.7:196
-msgid "build source tarball"
-msgstr "ソースの tar アーカイブをビルドします"
+msgid ""
+"manages dpkg; in apply mode disabling things like the start-stop-daemon, and "
+"in remove mode enabling them again"
+msgstr ""
 
 #. type: IP
 #: en/live-build.7:196
-#, no-wrap
-msgid "B<lb_source_hdd>(1)"
-msgstr "B<lb_source_hdd>(1)"
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_hostname>(1)"
+msgid "B<lb chroot_hostname>(1)"
+msgstr "B<lb_chroot_hostname>(1)"
+
+#. type: Plain text
+#: en/live-build.7:198
+#, fuzzy
+#| msgid "use custom configuration file."
+msgid "manages the hostname configuration"
+msgstr "独自の設定ファイルを使います。"
+
+#. type: IP
+#: en/live-build.7:198
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_hosts>(1)"
+msgid "B<lb chroot_hosts>(1)"
+msgstr "B<lb_chroot_hosts>(1)"
+
+#. type: Plain text
+#: en/live-build.7:200
+#, fuzzy
+#| msgid "manage /etc/hosts"
+msgid "manages the /etc/hosts file"
+msgstr "/etc/hosts の管理"
+
+#. type: IP
+#: en/live-build.7:200
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_proc>(1)"
+msgid "B<lb chroot_proc>(1)"
+msgstr "B<lb_chroot_proc>(1)"
+
+#. type: Plain text
+#: en/live-build.7:202
+#, fuzzy
+#| msgid "mount /proc"
+msgid "manages mounting of /proc"
+msgstr "/proc をマウントします。"
+
+#. type: IP
+#: en/live-build.7:202
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_resolv>(1)"
+msgid "B<lb chroot_resolv>(1)"
+msgstr "B<lb_chroot_resolv>(1)"
+
+#. type: Plain text
+#: en/live-build.7:204
+#, fuzzy
+#| msgid "manage /etc/resolv.conf"
+msgid "manages configuration of the /etc/resolv.conf file"
+msgstr "/etc/resolv.conf の管理"
+
+#. type: IP
+#: en/live-build.7:204
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_selinuxfs>(1)"
+msgid "B<lb chroot_selinuxfs>(1)"
+msgstr "B<lb_chroot_selinuxfs>(1)"
+
+#. type: Plain text
+#: en/live-build.7:206
+msgid "manages mounting of /sys/fs/selinux"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:206
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_sysfs>(1)"
+msgid "B<lb chroot_sysfs>(1)"
+msgstr "B<lb_chroot_sysfs>(1)"
+
+#. type: Plain text
+#: en/live-build.7:208
+msgid "manages mounting of /sys"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:208
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_sysv-rc>(1)"
+msgid "B<lb chroot_sysv-rc>(1)"
+msgstr "B<lb_chroot_sysv-rc>(1)"
+
+#. type: Plain text
+#: en/live-build.7:210
+#, fuzzy
+#| msgid "manage /usr/sbin/policy-rc.d"
+msgid "manages the /usr/sbin/policy-rc.d file"
+msgstr "/usr/sbin/policy-rc.d の管理"
+
+#. type: IP
+#: en/live-build.7:210
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_sysfs>(1)"
+msgid "B<lb chroot_tmpfs>(1)"
+msgstr "B<lb_chroot_sysfs>(1)"
+
+#. type: Plain text
+#: en/live-build.7:212
+msgid "manages configuration of dpkg to use a tmpfs filesystem"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:212
+#, fuzzy, no-wrap
+#| msgid "B<lb_chroot_apt>(1)"
+msgid "B<lb chroot_upstart>(1)"
+msgstr "B<lb_chroot_apt>(1)"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:199
-msgid "build source hdd image"
-msgstr "ソースhddイメージをビルドします"
+#: en/live-build.7:215
+msgid ""
+"manages use of upstart /sbin/initctl program; in apply mode blocking "
+"execution through a dpkg diversion, and in remove mode enabling execution "
+"again"
+msgstr ""
 
 #. type: SH
-#: en/live-build.7:200
+#: en/live-build.7:216
 #, no-wrap
 msgid "CONFIG FILES"
 msgstr "設定ファイル"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:203
+#: en/live-build.7:219
 msgid ""
 "Many live-build commands make use of files in the I<config/> directory to "
 "control what they do. Besides the common I<config/common>, which is used by "
@@ -1193,9 +1446,17 @@ msgstr ""
 "にわずかに複雑な方法を採っているものがあります。"
 
 #. type: Plain text
-#: en/live-build.7:205
+#: en/live-build.7:221
+#, fuzzy
+#| msgid ""
+#| "For example, lb_bootstrap_debootstrap uses files named config/bootstrap "
+#| "and config/bootstrap_debootstrap to read the options it will use. See the "
+#| "man pages of individual commands for details about the names and formats "
+#| "of the files they use. Generally, these files contain variables with "
+#| "values assigned, one variable per line. Some programs in live-build use "
+#| "pairs of values or slightly more complicated variable assignments."
 msgid ""
-"For example, lb_bootstrap_debootstrap uses files named config/bootstrap and "
+"For example, lb bootstrap_debootstrap uses files named config/bootstrap and "
 "config/bootstrap_debootstrap to read the options it will use. See the man "
 "pages of individual commands for details about the names and formats of the "
 "files they use. Generally, these files contain variables with values "
@@ -1210,7 +1471,7 @@ msgstr ""
 "にわずかに複雑な方法を採っているものがあります。"
 
 #. type: Plain text
-#: en/live-build.7:207
+#: en/live-build.7:223
 msgid ""
 "Note that live-build will respect environment variables which are present in "
 "the context of the shell it is running. If variables can be read from config "
@@ -1226,7 +1487,7 @@ msgstr ""
 "自動的にデフォルト値をセットします。"
 
 #. type: Plain text
-#: en/live-build.7:209
+#: en/live-build.7:225
 msgid ""
 "In some rare cases, you may want to have different versions of these files "
 "for different architectures or distributions. If files named config/stage."
@@ -1247,7 +1508,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:212
+#: en/live-build.7:228
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "program. That means they have to follow the normal shell syntax. You can "
@@ -1259,13 +1520,13 @@ msgstr ""
 "す。"
 
 #. type: IP
-#: en/live-build.7:214
+#: en/live-build.7:230
 #, no-wrap
 msgid "B</etc/live/build.conf>"
 msgstr "B</etc/live/build.conf>"
 
 #. type: IP
-#: en/live-build.7:215
+#: en/live-build.7:231
 #, no-wrap
 msgid "B</etc/live/build/*>"
 msgstr "B</etc/live/build/*>"
diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot
index 9083aea7d..5b3263309 100644
--- a/manpages/pot/lb.1.pot
+++ b/manpages/pot/lb.1.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"Project-Id-Version: live-build 1:20170807kali1\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,7 +81,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -96,7 +96,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -112,8 +112,8 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -127,55 +127,54 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -185,16 +184,16 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot
index fb57f9a17..a34ffb5af 100644
--- a/manpages/pot/lb_binary.1.pot
+++ b/manpages/pot/lb_binary.1.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"Project-Id-Version: live-build 1:20170807kali1\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,8 +82,8 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -97,55 +97,54 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -155,23 +154,23 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
 
 #. type: Plain text
 #: en/lb_binary.1:5
-msgid "B<lb binary> - Complete the binary stage"
+msgid "B<lb_binary> - Complete the binary stage"
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot
index 976e07de0..aa7e5d1e5 100644
--- a/manpages/pot/lb_bootstrap.1.pot
+++ b/manpages/pot/lb_bootstrap.1.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"Project-Id-Version: live-build 1:20170807kali1\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,8 +82,8 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -97,55 +97,54 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -155,23 +154,23 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
 
 #. type: Plain text
 #: en/lb_bootstrap.1:5
-msgid "B<lb bootstrap> - Complete the bootstrap stage"
+msgid "B<lb_bootstrap> - Complete the bootstrap stage"
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot
index 6c427802c..33cb1af7f 100644
--- a/manpages/pot/lb_build.1.pot
+++ b/manpages/pot/lb_build.1.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"Project-Id-Version: live-build 1:20170807kali1\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,63 +82,62 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -148,23 +147,23 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
 
 #. type: Plain text
 #: en/lb_build.1:5
-msgid "B<lb build> - Complete the bootstrap, chroot, binary, and source stages"
+msgid "B<lb_build> - Complete the bootstrap, chroot, binary, and source stages"
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot
index b6c2a5e66..4ae7f47e8 100644
--- a/manpages/pot/lb_chroot.1.pot
+++ b/manpages/pot/lb_chroot.1.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"Project-Id-Version: live-build 1:20170807kali1\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,8 +82,8 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -97,55 +97,54 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -155,23 +154,23 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
 
 #. type: Plain text
 #: en/lb_chroot.1:5
-msgid "B<lb chroot> - Complete the chroot stage"
+msgid "B<lb_chroot> - Complete the chroot stage"
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot
index 031a73ba0..2669bf617 100644
--- a/manpages/pot/lb_clean.1.pot
+++ b/manpages/pot/lb_clean.1.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"Project-Id-Version: live-build 1:20170807kali1\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,63 +82,62 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -148,23 +147,23 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
 
 #. type: Plain text
 #: en/lb_clean.1:5
-msgid "B<lb clean> - Clean build directory"
+msgid "B<lb_clean> - Clean build directory"
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 69bcce068..289273548 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"Project-Id-Version: live-build 1:20170807kali1\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,63 +82,62 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -148,23 +147,23 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:5
-msgid "B<lb config> - Create config directory"
+msgid "B<lb_config> - Create config directory"
 msgstr ""
 
 #. type: Plain text
@@ -255,460 +254,475 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:43
-msgid "  [B<--bootloader> grub|grub2|syslinux]"
+msgid "  [B<--bootappend-live-failsafe> I<PARAMETER>|I<\"PARAMETERS\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:45
-msgid "  [B<--cache> true|false]"
+msgid "  [B<--bootloaders> grub-legacy|grub-pc|syslinux|grub-efi]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:47
-msgid "  [B<--cache-indices> true|false]"
+msgid "  [B<--cache> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:49
-msgid "  [B<--cache-packages> true|false]"
+msgid "  [B<--cache-indices> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:51
-msgid "  [B<--cache-stages> I<STAGE>|I<\"STAGES\">]"
+msgid "  [B<--cache-packages> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:53
-msgid "  [B<--checksums> md5|sha1|sha256|none]"
+msgid "  [B<--cache-stages> I<STAGE>|I<\"STAGES\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:55
-msgid "  [B<--compression> bzip2|gzip|lzip|none]"
+msgid "  [B<--checksums> md5|sha1|sha256|none]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:57
-msgid "  [B<--config> I<GIT_URL::GIT_ID>]"
+msgid "  [B<--compression> bzip2|gzip|lzip|none]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:59
-msgid "  [B<--build-with-chroot> true|false]"
+msgid "  [B<--config> I<GIT_URL::GIT_ID>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:61
-msgid "  [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]"
+msgid "  [B<--build-with-chroot> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:63
-msgid "  [B<--clean>]"
+msgid "  [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:65
-msgid "  [-c|B<--conffile> I<FILE>]"
+msgid "  [B<--clean>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:67
-msgid "  [B<--debconf-frontend> dialog|editor|noninteractive|readline]"
+msgid "  [-c|B<--conffile> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:69
-msgid "  [B<--debconf-priority> low|medium|high|critical]"
+msgid "  [B<--debconf-frontend> dialog|editor|noninteractive|readline]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:71
+msgid "  [B<--debconf-priority> low|medium|high|critical]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:73
 msgid ""
 "  [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:73
+#: en/lb_config.1:75
 msgid "  [B<--debian-installer-distribution> daily|I<CODENAME>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:75
+#: en/lb_config.1:77
 msgid "  [B<--debian-installer-preseedfile> I<FILE>|I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:77
+#: en/lb_config.1:79
 msgid "  [B<--debian-installer-gui> true|false]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:79
+#: en/lb_config.1:81
+msgid "  [B<--debootstrap-options> I<OPTIONS>]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:83
+msgid "  [B<--debootstrap-script> I<SCRIPT>]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:85
 msgid "  [B<--debug>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:81
+#: en/lb_config.1:87
 msgid "  [-d|B<--distribution> I<CODENAME>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:83
+#: en/lb_config.1:89
 msgid "  [B<--parent-distribution> I<CODENAME>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:85
+#: en/lb_config.1:91
 msgid "  [B<--parent-debian-installer-distribution> I<CODENAME>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:87
+#: en/lb_config.1:93
 msgid "  [B<--dump>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:89
+#: en/lb_config.1:95
 msgid "  [B<--fdisk> fdisk|fdisk.dist]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:91
+#: en/lb_config.1:97
 msgid "  [B<--firmware-binary true|false>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:93
+#: en/lb_config.1:99
 msgid "  [B<--firmware-chroot true|false>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:95
+#: en/lb_config.1:101
 msgid "  [B<--force>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:97
+#: en/lb_config.1:103
 msgid "  [B<--grub-splash> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:99
+#: en/lb_config.1:105
 msgid "  [B<--gzip-options> I<OPTION>|\"I<OPTIONS>\"]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:101
+#: en/lb_config.1:107
 msgid "  [B<--hooks> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:103
+#: en/lb_config.1:109
 msgid "  [B<--ignore-system-defaults>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:105
+#: en/lb_config.1:111
 msgid "  [B<--initramfs> auto|none|live-boot|casper]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:107
+#: en/lb_config.1:113
 msgid "  [B<--initramfs-compression> bzip2|gzip|lzma]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:109
+#: en/lb_config.1:115
 msgid "  [B<--initsystem> sysvinit|runit|systemd|upstart|none]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:111
+#: en/lb_config.1:117
 msgid "  [B<--interactive> shell]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:113
+#: en/lb_config.1:119
 msgid "  [B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\"]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:115
+#: en/lb_config.1:121
 msgid "  [B<--iso-application> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:117
+#: en/lb_config.1:123
 msgid "  [B<--iso-preparer> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:119
+#: en/lb_config.1:125
 msgid "  [B<--iso-publisher> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:121
+#: en/lb_config.1:127
 msgid "  [B<--iso-volume> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:123
+#: en/lb_config.1:129
 msgid "  [B<--jffs2-eraseblock> I<SIZE>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:125
+#: en/lb_config.1:131
 msgid "  [B<--keyring-packages> I<PACKAGE|\"PACKAGES\">]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:127
+#: en/lb_config.1:133
 msgid "  [-k|B<--linux-flavours> I<FLAVOUR>|I<\"FLAVOURS\">]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:129
+#: en/lb_config.1:135
 msgid "  [B<--linux-packages> I<\"PACKAGES\">]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:131
+#: en/lb_config.1:137
 msgid "  [B<--losetup> losetup|losetup.orig]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:133
+#: en/lb_config.1:139
 msgid "  [B<--memtest> memtest86+|memtest86|none]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:135
+#: en/lb_config.1:141
 msgid "  [-m|B<--parent-mirror-bootstrap> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:137
+#: en/lb_config.1:143
 msgid "  [B<--parent-mirror-chroot> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:139
+#: en/lb_config.1:145
 msgid "  [B<--parent-mirror-chroot-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:141
+#: en/lb_config.1:147
 msgid "  [B<--parent-mirror-chroot-updates> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:143
+#: en/lb_config.1:149
 msgid "  [B<--parent-mirror-chroot-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:145
+#: en/lb_config.1:151
 msgid "  [B<--parent-mirror-binary> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:147
+#: en/lb_config.1:153
 msgid "  [B<--parent-mirror-binary-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:149
+#: en/lb_config.1:155
 msgid "  [B<--parent-mirror-binary-updates> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:151
+#: en/lb_config.1:157
 msgid "  [B<--parent-mirror-binary-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:153
+#: en/lb_config.1:159
 msgid "  [B<--parent-mirror-debian-installer> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:155
+#: en/lb_config.1:161
 msgid "  [B<--mirror-bootstrap> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:157
+#: en/lb_config.1:163
 msgid "  [B<--mirror-chroot> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:159
+#: en/lb_config.1:165
 msgid "  [B<--mirror-chroot-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:161
+#: en/lb_config.1:167
 msgid "  [B<--mirror-chroot-updates> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:163
+#: en/lb_config.1:169
 msgid "  [B<--mirror-chroot-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:165
+#: en/lb_config.1:171
 msgid "  [B<--mirror-binary> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:167
+#: en/lb_config.1:173
 msgid "  [B<--mirror-binary-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:169
+#: en/lb_config.1:175
 msgid "  [B<--mirror-binary-updates> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:171
+#: en/lb_config.1:177
 msgid "  [B<--mirror-binary-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:173
+#: en/lb_config.1:179
 msgid "  [B<--mirror-debian-installer> I<URL>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:175
+#: en/lb_config.1:181
 msgid "  [B<--mode> debian|progress-linux|ubuntu]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:177
+#: en/lb_config.1:183
 msgid "  [B<--system> live|normal]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:179
+#: en/lb_config.1:185
 msgid "  [B<--net-root-filesystem> nfs|cfs]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:181
+#: en/lb_config.1:187
 msgid "  [B<--net-root-mountoptions> I<OPTIONS>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:183
+#: en/lb_config.1:189
 msgid "  [B<--net-root-path> I<PATH>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:185
+#: en/lb_config.1:191
 msgid "  [B<--net-root-server> I<IP>|I<HOSTNAME>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:187
+#: en/lb_config.1:193
 msgid "  [B<--net-cow-filesystem> nfs|cfs]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:189
+#: en/lb_config.1:195
 msgid "  [B<--net-cow-mountoptions> I<OPTIONS>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:191
+#: en/lb_config.1:197
 msgid "  [B<--net-cow-path> I<PATH>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:193
+#: en/lb_config.1:199
 msgid "  [B<--net-cow-server> I<IP>|I<HOSTNAME>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:195
+#: en/lb_config.1:201
 msgid "  [B<--net-tarball> true|false]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:197
+#: en/lb_config.1:203
 msgid "  [B<--quiet>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:199
+#: en/lb_config.1:205
 msgid "  [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:201
+#: en/lb_config.1:207
 msgid ""
 "  [B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|I<\"PARENT_ARCHIVE_AREAS"
 "\">]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:203
+#: en/lb_config.1:209
 msgid "  [B<--security> true|false]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:205
+#: en/lb_config.1:211
 msgid "  [B<--source> true|false]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:207
+#: en/lb_config.1:213
 msgid "  [-s|B<--source-images> iso|netboot|tar|hdd]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:209
+#: en/lb_config.1:215
 msgid "  [B<--tasksel> apt|aptitude|tasksel]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:211
+#: en/lb_config.1:217
 msgid "  [B<--templates> I<PATH>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:213
+#: en/lb_config.1:219
 msgid "  [B<--hdd-size >I<MB>]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:215
+#: en/lb_config.1:221
 msgid "  [B<--updates> true|false]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:217
+#: en/lb_config.1:223
 msgid "  [B<--backports> true|false]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:219
+#: en/lb_config.1:225
 msgid "  [B<--verbose>]"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:222
+#: en/lb_config.1:228
 msgid "  [B<--win32-loader true|false]>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:225
+#: en/lb_config.1:231
 msgid ""
 "B<lb config> is a high-level command (porcelain) of I<live-build>(7), the "
 "live systems tool suite."
@@ -716,7 +730,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:228
+#: en/lb_config.1:234
 msgid ""
 "B<lb config> populates the configuration directory for live-build. By "
 "default, this directory is named 'config' and is created in the current "
@@ -725,7 +739,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:231
+#: en/lb_config.1:237
 msgid ""
 "Note: Currently B<lb config> tries to be smart and sets defaults for some "
 "options depending on the setting of other options (e.g. which linux packages "
@@ -741,7 +755,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:234
+#: en/lb_config.1:240
 msgid ""
 "In addition to its specific options B<lb config> understands all generic "
 "live-build options. See I<live-build>(7) for a complete list of all generic "
@@ -750,26 +764,26 @@ msgstr ""
 
 #.  FIXME
 #. type: IP
-#: en/lb_config.1:236
+#: en/lb_config.1:242
 #, no-wrap
 msgid "B<--apt> apt|aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:238
+#: en/lb_config.1:244
 msgid ""
 "defines if apt-get or aptitude is used to install packages when building the "
 "image. The default is apt."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:238
+#: en/lb_config.1:244
 #, no-wrap
 msgid "B<--apt-ftp-proxy> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:240
+#: en/lb_config.1:246
 msgid ""
 "sets the ftp proxy to be used by apt. By default, this is empty. Note that "
 "this variable is only for the proxy that gets used by apt internally within "
@@ -777,13 +791,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:240
+#: en/lb_config.1:246
 #, no-wrap
 msgid "B<--apt-http-proxy> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:242
+#: en/lb_config.1:248
 msgid ""
 "sets the http proxy to be used by apt. By default, this is empty. Note that "
 "this variable is only for the proxy that gets used by apt internally within "
@@ -791,26 +805,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:242
+#: en/lb_config.1:248
 #, no-wrap
 msgid "B<--apt-indices> true|false|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:244
+#: en/lb_config.1:250
 msgid ""
 "defines if the resulting images should have apt indices or not and defaults "
 "to true. If set to none, no indices are included at all."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:244
+#: en/lb_config.1:250
 #, no-wrap
 msgid "B<--apt-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:246
+#: en/lb_config.1:252
 msgid ""
 "defines the default options that will be appended to every apt call that is "
 "made inside chroot during the building of the image. By default, this is set "
@@ -818,13 +832,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:246
+#: en/lb_config.1:252
 #, no-wrap
 msgid "B<--aptitude-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:248
+#: en/lb_config.1:254
 msgid ""
 "defines the default options that will be appended to every aptitude call "
 "that is made inside chroot during building of the image. By default, this is "
@@ -832,13 +846,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:248
+#: en/lb_config.1:254
 #, no-wrap
 msgid "B<--apt-pipeline> I<DEPTH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:250
+#: en/lb_config.1:256
 msgid ""
 "sets the depth of the apt/aptitude pipeline. In cases where the remote "
 "server is not RFC conforming or buggy (such as Squid 2.0.2) this option can "
@@ -850,51 +864,51 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:250
+#: en/lb_config.1:256
 #, no-wrap
 msgid "B<--apt-recommends> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:252
+#: en/lb_config.1:258
 msgid ""
 "defines if apt should install recommended packages automatically. By "
 "default, this is true."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:252
+#: en/lb_config.1:258
 #, no-wrap
 msgid "B<--apt-secure> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:254
+#: en/lb_config.1:260
 msgid ""
 "defines if apt should check repository signatures. This is true by default."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:254
+#: en/lb_config.1:260
 #, no-wrap
 msgid "B<--apt-source-archives> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:256
+#: en/lb_config.1:262
 msgid ""
 "defines if deb-src entries should be included in the resulting live image or "
 "not, defaults to true."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:256
+#: en/lb_config.1:262
 #, no-wrap
 msgid "-a|B<--architectures> I<ARCHITECTURE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:258
+#: en/lb_config.1:264
 msgid ""
 "defines the architecture of the to be build image. By default, this is set "
 "to the host architecture. Note that you cannot crossbuild for another "
@@ -905,13 +919,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:258
+#: en/lb_config.1:264
 #, no-wrap
 msgid "-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:260
+#: en/lb_config.1:266
 msgid ""
 "defines the image type to build. By default, for images using syslinux this "
 "is set to iso-hybrid to build CD/DVD images that may also be used like hdd "
@@ -919,43 +933,43 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:260
+#: en/lb_config.1:266
 #, no-wrap
 msgid "B<--binary-filesystem> fat16|fat32|ext2|ext3|ext4"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:262
+#: en/lb_config.1:268
 msgid ""
 "defines the filesystem to be used in the image type. This only has an effect "
-"if the selected binary image type does allow to choose a filesystem. For "
-"example, when selection iso the resulting CD/DVD has always the filesystem "
-"ISO9660. When building hdd images for usb sticks, this is active. Note that "
-"it defaults to fat16 on all architectures except sparc where it defaults to "
+"if the selected binary image type lets you choose a filesystem. For example, "
+"when selection iso the resulting CD/DVD has always the filesystem ISO9660. "
+"When building hdd images for usb sticks, this is active. Note that it "
+"defaults to fat16 on all architectures except sparc where it defaults to "
 "ext4. Also note that if you choose fat16 and your resulting binary image "
 "gets bigger than 2GB, the binary filesystem automatically gets switched to "
 "fat32."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:262
+#: en/lb_config.1:268
 #, no-wrap
 msgid "B<--bootappend-install> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:264
+#: en/lb_config.1:270
 msgid "sets boot parameters specific to debian-installer, if included."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:264
+#: en/lb_config.1:270
 #, no-wrap
 msgid "B<--bootappend-live> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:266
+#: en/lb_config.1:272
 msgid ""
 "sets boot parameters specific to debian-live. A complete list of boot "
 "parameters can be found in the I<live-boot>(7) and I<live-config>(7) manual "
@@ -963,59 +977,73 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:266
+#: en/lb_config.1:272
 #, no-wrap
-msgid "B<--bootloader> grub|grub2|syslinux"
+msgid "B<--bootappend-live-failsafe> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:268
+#: en/lb_config.1:274
+msgid ""
+"sets boot parameters specific to debian-live failsafe boot entries. A "
+"complete list of boot parameters can be found in the I<live-boot>(7) and "
+"I<live-config>(7) manual pages."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:274
+#, no-wrap
+msgid "B<--bootloaders> grub-legacy|grub-pc|syslinux|grub-efi"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:276
 msgid ""
 "defines which bootloader is being used in the generated image. This has only "
-"an effect if the selected binary image type does allow to choose the "
-"bootloader. For example, if you build a iso, always syslinux (or more "
-"precise, isolinux) is being used. Also note that some combinations of binary "
-"images types and bootloaders may be possible but live-build does not support "
-"them yet. B<lb config> will fail to create such a not yet supported "
-"configuration and give a explanation about it. For hdd images on amd64 and "
-"i386, the default is syslinux."
+"an effect if the selected binary image type lets you choose the bootloader. "
+"For example, if you build a iso, always syslinux (or more precise, isolinux) "
+"is being used. Also note that some combinations of binary images types and "
+"bootloaders may be possible but live-build does not support them yet. B<lb "
+"config> will fail to create such a not yet supported configuration and give "
+"a explanation about it. For hdd images on amd64 and i386, the default is "
+"syslinux."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:268
+#: en/lb_config.1:276
 #, no-wrap
 msgid "B<--cache> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:270
+#: en/lb_config.1:278
 msgid ""
 "defines globally if any cache should be used at all. Different caches can be "
 "controlled through the their own options."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:270
+#: en/lb_config.1:278
 #, no-wrap
 msgid "B<--cache-indices> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:272
+#: en/lb_config.1:280
 msgid ""
 "defines if downloaded package indices and lists should be cached which is "
-"false by default. Enabling it would allow to rebuild an image completely "
-"offline, however, you would not get updates anymore then."
+"false by default. Enabling it lets you rebuild an image completely offline, "
+"however, you would not get updates anymore then."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:272
+#: en/lb_config.1:280
 #, no-wrap
 msgid "B<--cache-packages> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:274
+#: en/lb_config.1:282
 msgid ""
 "defines if downloaded packages files should be cached which is true by "
 "default. Disabling it does save space consumption in your build directory, "
@@ -1026,13 +1054,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:274
+#: en/lb_config.1:282
 #, no-wrap
 msgid "B<--cache-stages> true|false|I<STAGE>|\"I<STAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:276
+#: en/lb_config.1:284
 msgid ""
 "sets which stages should be cached. By default set to bootstrap. As an "
 "exception to the normal stage names, also rootfs can be used here which does "
@@ -1042,13 +1070,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:276
+#: en/lb_config.1:284
 #, no-wrap
 msgid "B<--checksums> md5|sha1|sha256|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:278
+#: en/lb_config.1:286
 msgid ""
 "defines if the binary image should contain a file called md5sums.txt, "
 "sha1sums.txt and/or sha256sums.txt. These lists all files on the image "
@@ -1060,39 +1088,39 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:278
+#: en/lb_config.1:286
 #, no-wrap
 msgid "B<--compression> bzip2|gzip|lzip|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:280
+#: en/lb_config.1:288
 msgid ""
 "defines the compression program to be used to compress tarballs. Defaults to "
 "gzip."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:280
+#: en/lb_config.1:288
 #, no-wrap
 msgid "B<--config> I<GIT_URL>::I<GIT_ID>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:282
+#: en/lb_config.1:290
 msgid ""
-"allows to bootstrap a config tree from a git repositories, optionally "
-"appended by a Git Id (branch, commit, tag, etc.)."
+"bootstrap the config tree from a git repository, optionally appended by a "
+"Git Id (branch, commit, tag, etc.)."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:282
+#: en/lb_config.1:290
 #, no-wrap
 msgid "B<--build-with-chroot> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:284
+#: en/lb_config.1:292
 msgid ""
 "defines whether live-build should use the tools from within the chroot to "
 "build the binary image or not by using and including the host system's "
@@ -1107,13 +1135,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:284
+#: en/lb_config.1:292
 #, no-wrap
 msgid "B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:286
+#: en/lb_config.1:294
 msgid ""
 "defines which filesystem type should be used for the root filesystem image. "
 "If you use none, then no filesystem image is created and the root filesystem "
@@ -1124,39 +1152,39 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:286
+#: en/lb_config.1:294
 #, no-wrap
 msgid "B<--clean>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:288
+#: en/lb_config.1:296
 msgid ""
 "minimizes config directory by automatically removing unused and thus empty "
 "subdirectories."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:288
+#: en/lb_config.1:296
 #, no-wrap
 msgid "-c|B<--conffile> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:290
+#: en/lb_config.1:298
 msgid ""
 "using a user specified alternative configuration file in addition to the "
 "normally used one in the config directory."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:290
+#: en/lb_config.1:298
 #, no-wrap
 msgid "B<--debconf-frontend> dialog|editor|noninteractive|readline"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:292
+#: en/lb_config.1:300
 msgid ""
 "defines what value the debconf frontend should be set to inside the chroot. "
 "Note that setting it to anything but noninteractive, which is the default, "
@@ -1164,13 +1192,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:292
+#: en/lb_config.1:300
 #, no-wrap
 msgid "B<--debconf-priority> low|medium|high|critical"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:294
+#: en/lb_config.1:302
 msgid ""
 "defines what value the debconf priority should be set to inside the chroot. "
 "By default, it is set to critical, which means that almost no questions are "
@@ -1179,13 +1207,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:294
+#: en/lb_config.1:302
 #, no-wrap
 msgid "B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:296
+#: en/lb_config.1:304
 msgid ""
 "defines which type, if any, of the debian-installer should be included in "
 "the resulting binary image. By default, no installer is included. All "
@@ -1197,13 +1225,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:296
+#: en/lb_config.1:304
 #, no-wrap
 msgid "B<--debian-installer-distribution> daily|I<CODENAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:298
+#: en/lb_config.1:306
 msgid ""
 "defines the distribution where the debian-installer files should be taken "
 "out from. Normally, this should be set to the same distribution as the live "
@@ -1212,13 +1240,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:298
+#: en/lb_config.1:306
 #, no-wrap
 msgid "B<--debian-installer-preseedfile> I<FILE>|I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:300
+#: en/lb_config.1:308
 msgid ""
 "sets the filename or URL for an optionally used and included preseeding file "
 "for debian-installer. If config/binary_debian-installer/preseed.cfg exists, "
@@ -1226,13 +1254,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:300
+#: en/lb_config.1:308
 #, no-wrap
 msgid "B<--debian-installer-gui> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:302
+#: en/lb_config.1:310
 msgid ""
 "defines if the debian-installer graphical GTK interface should be true or "
 "not. In Debian mode and for most versions of Ubuntu, this option is true, "
@@ -1240,88 +1268,113 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:302 en/live-build.7:36
+#: en/lb_config.1:310
+#, no-wrap
+msgid "B<--debootstrap-options> I<OPTIONS>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:312
+msgid ""
+"passes the given options to debootstrap when setting up the base system."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:312
+#, no-wrap
+msgid "B<--debootstrap-script> I<SCRIPT>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:314
+msgid ""
+"tells debootstrap to use an alternate bootstrap script (last parameter to "
+"debootstrap)."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:314 en/live-build.7:36
 #, no-wrap
 msgid "B<--debug>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:304
+#: en/lb_config.1:316
 msgid "turn on debugging informational messages."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:304
+#: en/lb_config.1:316
 #, no-wrap
 msgid "-d|B<--distribution> I<CODENAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:306
+#: en/lb_config.1:318
 msgid "defines the distribution of the resulting live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:306
+#: en/lb_config.1:318
 #, no-wrap
 msgid "-d|B<--parent-distribution> I<CODENAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:308
+#: en/lb_config.1:320
 msgid ""
 "defines the parent distribution for derivatives of the resulting live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:308
+#: en/lb_config.1:320
 #, no-wrap
 msgid "-d|B<--parent-debian-installer-distribution> I<CODENAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:310
+#: en/lb_config.1:322
 msgid ""
 "defines the parent debian-installer distribution for derivatives of the "
 "resulting live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:310
+#: en/lb_config.1:322
 #, no-wrap
 msgid "B<--dump>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:312
+#: en/lb_config.1:324
 msgid ""
 "prepares a report of the currently present live system configuration and the "
 "version of live-build used. This is useful to provide if you submit bug "
-"reports, we do get all informations required for us to locate and replicate "
+"reports, we do get all information required for us to locate and replicate "
 "an error."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:312
+#: en/lb_config.1:324
 #, no-wrap
 msgid "B<--fdisk> fdisk|fdisk.dist"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:314
+#: en/lb_config.1:326
 msgid ""
 "sets the filename of the fdisk binary from the host system that should be "
 "used. This is autodetected and does generally not need any customization."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:314 en/live-build.7:38
+#: en/lb_config.1:326 en/live-build.7:38
 #, no-wrap
 msgid "B<--force>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:316
+#: en/lb_config.1:328
 msgid ""
 "forces re-execution of already run stages. Use only if you know what you are "
 "doing. It is generally safer to use B<lb clean> to clean up before re-"
@@ -1329,26 +1382,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:316
+#: en/lb_config.1:328
 #, no-wrap
 msgid "B<--grub-splash> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:318
+#: en/lb_config.1:330
 msgid ""
 "defines the name of an optional to be included splash screen graphic for the "
 "grub bootloader."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:318
+#: en/lb_config.1:330
 #, no-wrap
 msgid "B<--gzip-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:320
+#: en/lb_config.1:332
 msgid ""
 "defines the default options that will be appended to (almost) every gzip "
 "call during the building of the image. By default, this is set to --best to "
@@ -1357,13 +1410,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:320
+#: en/lb_config.1:332
 #, no-wrap
 msgid "B<--hooks> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:322
+#: en/lb_config.1:334
 msgid ""
 "defines which hooks available in /usr/share/live/build/examples/hooks should "
 "be activated. Normally, there are no hooks executed. Make sure you know and "
@@ -1371,13 +1424,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:322
+#: en/lb_config.1:334
 #, no-wrap
 msgid "B<--ignore-system-defaults>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:324
+#: en/lb_config.1:336
 msgid ""
 "B<lb config> by default reads system defaults from I</etc/live/build.conf> "
 "and I</etc/live/build/*> when generating a new live system config directory. "
@@ -1386,13 +1439,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:324
+#: en/lb_config.1:336
 #, no-wrap
 msgid "B<--initramfs> auto|none|live-boot|casper"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:326
+#: en/lb_config.1:338
 msgid ""
 "sets the name of package that contains the live system specific initramfs "
 "modification. By default, auto is used, which means that at build time of "
@@ -1403,26 +1456,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:326
+#: en/lb_config.1:338
 #, no-wrap
 msgid "B<--initramfs-compression> bzip2|gzip|lzma]"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:328
+#: en/lb_config.1:340
 msgid ""
 "defines the compression program to be used to compress the initramfs. "
 "Defaults to gzip."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:328
+#: en/lb_config.1:340
 #, no-wrap
 msgid "B<--interactive> shell"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:330
+#: en/lb_config.1:342
 msgid ""
 "defines if after the chroot stage and before the beginning of the binary "
 "stage, a interactive shell login should be spawned in the chroot in order to "
@@ -1436,24 +1489,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:330
+#: en/lb_config.1:342
 #, no-wrap
 msgid "B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:332
+#: en/lb_config.1:344
 msgid "defines options to pass to isohybrid."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:332
+#: en/lb_config.1:344
 #, no-wrap
 msgid "B<--iso-application> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:334
+#: en/lb_config.1:346
 msgid ""
 "sets the APPLICATION field in the header of a resulting CD/DVD image and "
 "defaults to \"Debian Live\" in debian mode, and \"Ubuntu Live\" in ubuntu "
@@ -1461,13 +1514,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:334
+#: en/lb_config.1:346
 #, no-wrap
 msgid "B<--iso-preparer> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:336
+#: en/lb_config.1:348
 msgid ""
 "sets the PREPARER field in the header of a resulting CD/DVD image. By "
 "default this is set to \"live-build I<VERSION>; http://packages.qa.debian."
@@ -1476,13 +1529,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:336
+#: en/lb_config.1:348
 #, no-wrap
 msgid "B<--iso-publisher> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:338
+#: en/lb_config.1:350
 msgid ""
 "sets the PUBLISHED field in the header of a resulting CD/DVD image. By "
 "default, this is set to 'Live Systems project; http:/live-systems.org/; "
@@ -1491,13 +1544,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:338
+#: en/lb_config.1:350
 #, no-wrap
 msgid "B<--iso-volume> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:340
+#: en/lb_config.1:352
 msgid ""
 "sets the VOLUME field in the header of a resulting CD/DVD and defaults to "
 "'(I<MODE>) (I<DISTRIBUTION>) (I<DATE>)' whereas MODE is expanded to the name "
@@ -1506,13 +1559,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:340
+#: en/lb_config.1:352
 #, no-wrap
 msgid "B<--jffs2-eraseblock> I<SIZE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:342
+#: en/lb_config.1:354
 msgid ""
 "sets the eraseblock size for a JFFS2 (Second Journaling Flash File System) "
 "filesystem. The default is 64 KiB. If you use an erase block size different "
@@ -1522,72 +1575,72 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:342
+#: en/lb_config.1:354
 #, no-wrap
 msgid "B<--keyring-packages> I<PACKAGE|\"PACKAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:344
+#: en/lb_config.1:356
 msgid ""
 "sets the keyring package or additional keyring packages. By default this is "
 "set to debian-archive-keyring."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:344
+#: en/lb_config.1:356
 #, no-wrap
 msgid "-k|B<--linux-flavours> I<FLAVOUR>|\"I<FLAVOURS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:346
+#: en/lb_config.1:358
 msgid ""
 "sets the kernel flavours to be installed. Note that in case you specify more "
 "than that the first will be configured the default kernel that gets booted."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:346
+#: en/lb_config.1:358
 #, no-wrap
 msgid "B<--linux-packages> \"I<PACKAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:348
+#: en/lb_config.1:360
 msgid ""
 "sets the internal name of the kernel packages naming scheme. If you use "
 "debian kernel packages, you will not have to adjust it. If you decide to use "
 "custom kernel packages that do not follow the debian naming scheme, remember "
 "to set this option to the stub of the packages only (for debian this is "
 "linux-image-2.6), so that I<STUB>-I<FLAVOUR> results in a valid package name "
-"(for debian e.g. linux-image-686-pae). Preferably you use the meta package name, "
-"if any, for the stub, so that your configuration is ABI independent. Also "
-"don't forget that you have to include stubs of the binary modules packages "
-"for unionfs or aufs, and squashfs if you built them out-of-tree."
+"(for debian e.g. linux-image-686-pae). Preferably you use the meta package "
+"name, if any, for the stub, so that your configuration is ABI independent. "
+"Also don't forget that you have to include stubs of the binary modules "
+"packages for unionfs or aufs, and squashfs if you built them out-of-tree."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:348
+#: en/lb_config.1:360
 #, no-wrap
 msgid "B<--losetup> losetup|losetup.orig"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:350
+#: en/lb_config.1:362
 msgid ""
 "sets the filename of the losetup binary from the host system that should be "
 "used. This is autodetected and does generally not need any customization."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:350
+#: en/lb_config.1:362
 #, no-wrap
 msgid "B<--memtest> memtest86+|memtest86|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:352
+#: en/lb_config.1:364
 msgid ""
 "defines if memtest, memtest86+ or no memory tester at all should be included "
 "as secondary bootloader configuration. This is only available on amd64 and "
@@ -1595,13 +1648,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:352
+#: en/lb_config.1:364
 #, no-wrap
 msgid "-m|B<--parent-mirror-bootstrap> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:354
+#: en/lb_config.1:366
 msgid ""
 "sets the location of the debian package mirror that should be used to "
 "bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may "
@@ -1609,13 +1662,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:354
+#: en/lb_config.1:366
 #, no-wrap
 msgid "B<--parent-mirror-chroot> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:356
+#: en/lb_config.1:368
 msgid ""
 "sets the location of the debian package mirror that will be used to fetch "
 "the packages in order to build the live system. By default, this is set to "
@@ -1623,13 +1676,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:356
+#: en/lb_config.1:368
 #, no-wrap
 msgid "B<--parent-mirror-chroot-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:358
+#: en/lb_config.1:370
 msgid ""
 "sets the location of the debian security package mirror that will be used to "
 "fetch the packages in order to build the live system. By default, this "
@@ -1637,13 +1690,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:358
+#: en/lb_config.1:370
 #, no-wrap
 msgid "B<--parent-mirror-chroot-updates> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:360
+#: en/lb_config.1:372
 msgid ""
 "sets the location of the debian updates package mirror that will be used to "
 "fetch packages in order to build the live system. By default, this is set to "
@@ -1651,13 +1704,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:360
+#: en/lb_config.1:372
 #, no-wrap
 msgid "B<--parent-mirror-chroot-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:362
+#: en/lb_config.1:374
 msgid ""
 "sets the location of the debian backports package mirror that will be used "
 "to fetch packages in order to build the live system. By default, this points "
@@ -1665,13 +1718,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:362
+#: en/lb_config.1:374
 #, no-wrap
 msgid "B<--parent-mirror-binary> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:364
+#: en/lb_config.1:376
 msgid ""
 "sets the location of the debian package mirror that should end up configured "
 "in the final image and which is the one a user would see and use. This has "
@@ -1681,13 +1734,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:364
+#: en/lb_config.1:376
 #, no-wrap
 msgid "B<--parent-mirror-binary-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:366
+#: en/lb_config.1:378
 msgid ""
 "sets the location of the debian security package mirror that should end up "
 "configured in the final image. By default, 'http://security.debian.org/' is "
@@ -1695,13 +1748,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:366
+#: en/lb_config.1:378
 #, no-wrap
 msgid "B<--parent-mirror-binary-updates> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:368
+#: en/lb_config.1:380
 msgid ""
 "sets the location of the debian updates package mirror that should end up "
 "configured in the final image. By default, the value of --parent-mirror-"
@@ -1709,13 +1762,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:368
+#: en/lb_config.1:380
 #, no-wrap
 msgid "B<--parent-mirror-binary-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:370
+#: en/lb_config.1:382
 msgid ""
 "sets the location of the debian backports package mirror that should end up "
 "configured in the final image. By default, 'http://backports.debian.org/"
@@ -1723,13 +1776,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:370
+#: en/lb_config.1:382
 #, no-wrap
 msgid "B<--parent-mirror-debian-installer> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:372
+#: en/lb_config.1:384
 msgid ""
 "sets the location of the mirror that will be used to fetch the debian "
 "installer images. By default, this points to the same mirror used to build "
@@ -1737,13 +1790,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:372
+#: en/lb_config.1:384
 #, no-wrap
 msgid "B<--mirror-bootstrap> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:374
+#: en/lb_config.1:386
 msgid ""
 "sets the location of the debian package mirror that should be used to "
 "bootstrap the derivative from. This defaults to http://ftp.de.debian.org/"
@@ -1751,13 +1804,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:374
+#: en/lb_config.1:386
 #, no-wrap
 msgid "B<--mirror-chroot> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:376
+#: en/lb_config.1:388
 msgid ""
 "sets the location of the debian package mirror that will be used to fetch "
 "the packages of the derivative in order to build the live system. By "
@@ -1765,13 +1818,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:376
+#: en/lb_config.1:388
 #, no-wrap
 msgid "B<--mirror-chroot-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:378
+#: en/lb_config.1:390
 msgid ""
 "sets the location of the debian security package mirror that will be used to "
 "fetch the packages of the derivative in order to build the live system. By "
@@ -1779,13 +1832,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:378
+#: en/lb_config.1:390
 #, no-wrap
 msgid "B<--mirror-chroot-updates> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:380
+#: en/lb_config.1:392
 msgid ""
 "sets the location of the debian updates package mirror that will be used to "
 "fetch packages of the derivative in order to build the live system. By "
@@ -1793,13 +1846,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:380
+#: en/lb_config.1:392
 #, no-wrap
 msgid "B<--mirror-chroot-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:382
+#: en/lb_config.1:394
 msgid ""
 "sets the location of the debian backports package mirror that will be used "
 "to fetch packages of the derivative in order to build the live system. By "
@@ -1807,13 +1860,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:382
+#: en/lb_config.1:394
 #, no-wrap
 msgid "B<--mirror-binary> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:384
+#: en/lb_config.1:396
 msgid ""
 "sets the location of the derivative package mirror that should end up "
 "configured in the final image and which is the one a user would see and use. "
@@ -1823,52 +1876,52 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:384
+#: en/lb_config.1:396
 #, no-wrap
 msgid "B<--mirror-binary-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:386
+#: en/lb_config.1:398
 msgid ""
 "sets the location of the derivatives security package mirror that should end "
 "up configured in the final image."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:386
+#: en/lb_config.1:398
 #, no-wrap
 msgid "B<--mirror-binary-updates> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:388
+#: en/lb_config.1:400
 msgid ""
 "sets the location of the derivatives updates package mirror that should end "
 "up configured in the final image."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:388
+#: en/lb_config.1:400
 #, no-wrap
 msgid "B<--mirror-binary-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:390
+#: en/lb_config.1:402
 msgid ""
 "sets the location of the derivatives backports package mirror that should "
 "end up configured in the final image."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:390
+#: en/lb_config.1:402
 #, no-wrap
 msgid "B<--mirror-debian-installer> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:392
+#: en/lb_config.1:404
 msgid ""
 "sets the location of the mirror that will be used to fetch the debian "
 "installer images of the derivative. By default, this points to the same "
@@ -1876,65 +1929,65 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:392
+#: en/lb_config.1:404
 #, no-wrap
 msgid "B<--mode> debian|progress|ubuntu"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:394
+#: en/lb_config.1:406
 msgid ""
 "defines a global mode to load project specific defaults. By default this is "
 "set to debian."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:394
+#: en/lb_config.1:406
 #, no-wrap
 msgid "B<--system> live|normal"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:396
+#: en/lb_config.1:408
 msgid ""
 "defines if the resulting system image should a live system or a normal, non-"
 "live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:396
+#: en/lb_config.1:408
 #, no-wrap
 msgid "B<--net-root-filesystem> nfs|cfs"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:398
+#: en/lb_config.1:410
 msgid ""
 "defines the filesystem that will be configured in the bootloader "
 "configuration for your netboot image. This defaults to nfs."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:398
+#: en/lb_config.1:410
 #, no-wrap
 msgid "B<--net-root-mountoptions> I<OPTIONS>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:400
+#: en/lb_config.1:412
 msgid ""
 "sets additional options for mounting the root filesystem in netboot images "
 "and is by default empty."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:400
+#: en/lb_config.1:412
 #, no-wrap
 msgid "B<--net-root-path> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:402
+#: en/lb_config.1:414
 msgid ""
 "sets the file path that will be configured in the bootloader configuration "
 "for your netboot image. This defaults to /srv/debian-live in debian mode, "
@@ -1942,13 +1995,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:402
+#: en/lb_config.1:414
 #, no-wrap
 msgid "B<--net-root-server> I<IP>|I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:404
+#: en/lb_config.1:416
 msgid ""
 "sets the IP or hostname that will be configured in the bootloader "
 "configuration for the root filesystem of your netboot image. This defaults "
@@ -1956,38 +2009,38 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:404
+#: en/lb_config.1:416
 #, no-wrap
 msgid "B<--net-cow-filesystem> nfs|cfs"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:406
+#: en/lb_config.1:418
 msgid ""
 "defines the filesystem type for the copy-on-write layer and defaults to nfs."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:406
+#: en/lb_config.1:418
 #, no-wrap
 msgid "B<--net-cow-mountoptions> I<OPTIONS>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:408
+#: en/lb_config.1:420
 msgid ""
 "sets additional options for mounting the copy-on-write layer in netboot "
 "images and is by default empty."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:408
+#: en/lb_config.1:420
 #, no-wrap
 msgid "B<--net-cow-path> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:410
+#: en/lb_config.1:422
 msgid ""
 "defines the path to client writable filesystem. Anywhere that "
 "I<client_mac_address> is specified in the path live-boot will substitute the "
@@ -1995,28 +2048,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:413
+#: en/lb_config.1:425
 msgid "Example:"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:415
+#: en/lb_config.1:427
 msgid "/export/hosts/client_mac_address"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:417
+#: en/lb_config.1:429
 msgid "/export/hosts/00-16-D3-33-92-E8"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:417
+#: en/lb_config.1:429
 #, no-wrap
 msgid "B<--net-cow-server> I<IP>|I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:419
+#: en/lb_config.1:431
 msgid ""
 "sets the IP or hostname that will be configured in the bootloader "
 "configuration for the copy-on-write filesystem of your netboot image and is "
@@ -2024,13 +2077,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:419
+#: en/lb_config.1:431
 #, no-wrap
 msgid "B<--net-tarball> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:421
+#: en/lb_config.1:433
 msgid ""
 "defines if a compressed tarball should be created. Disabling this options "
 "leads to no tarball at all, the plain binary directory is considered the "
@@ -2038,24 +2091,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:421 en/live-build.7:40
+#: en/lb_config.1:433 en/live-build.7:40
 #, no-wrap
 msgid "B<--quiet>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:423
+#: en/lb_config.1:435
 msgid "reduces the verbosity of messages output by B<lb build>."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:423
+#: en/lb_config.1:435
 #, no-wrap
 msgid "B<--archive-areas> I<ARCHIVE_AREA>|\"I<ARCHIVE_AREAS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:425
+#: en/lb_config.1:437
 msgid ""
 "defines which package archive areas of a debian packages archive should be "
 "used for configured debian package mirrors. By default, this is set to main. "
@@ -2065,37 +2118,37 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:425
+#: en/lb_config.1:437
 #, no-wrap
 msgid "B<--parent-archive-areas> I<PARENT_ARCHIVE_AREA>|\"I<PARENT_ARCHIVE_AREAS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:427
+#: en/lb_config.1:439
 msgid "defines the archive areas for derivatives of the resulting live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:427
+#: en/lb_config.1:439
 #, no-wrap
 msgid "B<--security> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:429
+#: en/lb_config.1:441
 msgid ""
 "defines if the security repositories specified in the security mirror "
 "options should be used or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:429
+#: en/lb_config.1:441
 #, no-wrap
 msgid "B<--source> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:431
+#: en/lb_config.1:443
 msgid ""
 "defines if a corresponding source image to the binary image should be build. "
 "By default this is false because most people do not require this and would "
@@ -2105,24 +2158,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:431
+#: en/lb_config.1:443
 #, no-wrap
 msgid "-s|B<--source-images> iso|netboot|tar|hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:433
+#: en/lb_config.1:445
 msgid "defines the image type for the source image. Default is tar."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:433
+#: en/lb_config.1:445
 #, no-wrap
 msgid "B<--firmware-binary> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:435
+#: en/lb_config.1:447
 msgid ""
 "defines if firmware packages should be automatically included into the "
 "binary pool for debian-installer. Note that only firmware packages available "
@@ -2133,13 +2186,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:435
+#: en/lb_config.1:447
 #, no-wrap
 msgid "B<--firmware-chroot> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:437
+#: en/lb_config.1:449
 msgid ""
 "defines if firmware packages should be automatically included into the live "
 "image. Note that only firmware packages available within the configured "
@@ -2149,65 +2202,65 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:437
+#: en/lb_config.1:449
 #, no-wrap
 msgid "B<--swap-file-path> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:439
+#: en/lb_config.1:451
 msgid ""
 "defines the path to a swap file to create in the binary image. Default is "
 "not to create a swap file."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:439
+#: en/lb_config.1:451
 #, no-wrap
 msgid "B<--swap-file-size> I<MB>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:441
+#: en/lb_config.1:453
 msgid ""
 "defines what size in megabytes the swap file should be, if one is to be "
 "created. Default is 512MB."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:441
+#: en/lb_config.1:453
 #, no-wrap
 msgid "B<--tasksel> apt|aptitude|tasksel"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:443
+#: en/lb_config.1:455
 msgid ""
 "selects which program is used to install tasks. By default, this is set to "
 "tasksel."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:443
+#: en/lb_config.1:455
 #, no-wrap
 msgid "B<--templates> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:445
+#: en/lb_config.1:457
 msgid ""
 "sets the path to the templates that live-build is going to use, e.g. for "
 "bootloaders. By default, this is set to /usr/share/live/build/templates/."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:445
+#: en/lb_config.1:457
 #, no-wrap
 msgid "B<--hdd-size> MB"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:447
+#: en/lb_config.1:459
 msgid ""
 "defines what size the hdd image should be. Note that although the default is "
 "set to 10000 (= 10GB), it will not need 10GB space on your harddisk as the "
@@ -2215,63 +2268,63 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:447
+#: en/lb_config.1:459
 #, no-wrap
 msgid "B<--updates> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:449
+#: en/lb_config.1:461
 msgid ""
 "defines if debian updates package archives should be included in the image "
 "or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:449
+#: en/lb_config.1:461
 #, no-wrap
 msgid "B<--backports> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:451
+#: en/lb_config.1:463
 msgid ""
 "defines if debian backports package archives should be included in the image "
 "or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:451 en/live-build.7:42
+#: en/lb_config.1:463 en/live-build.7:42
 #, no-wrap
 msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:453
+#: en/lb_config.1:465
 msgid "increases the verbosity of messages output by B<lb build>."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:453
+#: en/lb_config.1:465
 #, no-wrap
 msgid "B<--win32-loader true|false>"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:456
+#: en/lb_config.1:468
 msgid "defines if win32-loader should be included in the binary image or not."
 msgstr ""
 
 #. type: SH
-#: en/lb_config.1:457
+#: en/lb_config.1:469
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:460
+#: en/lb_config.1:472
 msgid ""
 "Currently, command line switches can also be specified through the "
 "corresponding environment variable. However, this generally should not be "
@@ -2285,20 +2338,20 @@ msgstr ""
 
 #.  FIXME
 #. type: IP
-#: en/lb_config.1:464
+#: en/lb_config.1:476
 #, no-wrap
 msgid "B<auto/config>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:465
+#: en/lb_config.1:477
 #, no-wrap
 msgid "B</etc/live/build.conf, /etc/live/build/*>"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:468
+#: en/lb_config.1:480
 msgid ""
 "An optional, global configuration file for B<lb config> variables. It is "
 "useful to specify a few system wide defaults, like "
@@ -2307,11 +2360,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:473 en/live-build.7:219
+#: en/lb_config.1:485 en/live-build.7:235
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:475 en/live-build.7:221
+#: en/lb_config.1:487 en/live-build.7:237
 msgid "I<live-config>(7)"
 msgstr ""
diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot
index c82885177..78e34757b 100644
--- a/manpages/pot/lb_source.1.pot
+++ b/manpages/pot/lb_source.1.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"Project-Id-Version: live-build 1:20170807kali1\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,8 +82,8 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -97,55 +97,54 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -155,23 +154,23 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
 
 #. type: Plain text
 #: en/lb_source.1:5
-msgid "B<lb source> - Complete the source stage"
+msgid "B<lb_source> - Complete the source stage"
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 99096d61a..26d2c6330 100644
--- a/manpages/pot/live-build.7.pot
+++ b/manpages/pot/live-build.7.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 5.0~a11-1\n"
-"POT-Creation-Date: 2015-10-21 02:21+0200\n"
+"Project-Id-Version: live-build 1:20170807kali1\n"
+"POT-Creation-Date: 2017-08-29 14:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
 #: en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
 #: en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,57 +82,56 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17
-#: en/live-build.7:213
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
+#: en/live-build.7:229
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20
-#: en/live-build.7:217
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
+#: en/live-build.7:233
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24
-#: en/live-build.7:223
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
+#: en/live-build.7:239
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25
-#: en/live-build.7:224
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
+#: en/live-build.7:240
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27
-#: en/live-build.7:226
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
+#: en/live-build.7:242
 msgid ""
 "More information about live-build and the Live Systems project can be found "
-"on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
-"at E<lt>I<http://live-systems.org/manual/>E<gt>."
+"on the homepage at E<lt>I<https://debian-live.alioth.debian.org/>E<gt>."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28
-#: en/live-build.7:227
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
+#: en/live-build.7:243
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30
-#: en/live-build.7:229
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
+#: en/live-build.7:245
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -142,51 +141,51 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31
-#: en/live-build.7:230
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
+#: en/live-build.7:246
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32
-#: en/live-build.7:231
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
+#: en/live-build.7:247
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:302 en/live-build.7:36
+#: en/lb_config.1:314 en/live-build.7:36
 #, no-wrap
 msgid "B<--debug>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:314 en/live-build.7:38
+#: en/lb_config.1:326 en/live-build.7:38
 #, no-wrap
 msgid "B<--force>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:421 en/live-build.7:40
+#: en/lb_config.1:433 en/live-build.7:40
 #, no-wrap
 msgid "B<--quiet>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:451 en/live-build.7:42
+#: en/lb_config.1:463 en/live-build.7:42
 #, no-wrap
 msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:473 en/live-build.7:219
+#: en/lb_config.1:485 en/live-build.7:235
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:475 en/live-build.7:221
+#: en/lb_config.1:487 en/live-build.7:237
 msgid "I<live-config>(7)"
 msgstr ""
 
@@ -224,8 +223,8 @@ msgstr ""
 #: en/live-build.7:19
 msgid ""
 "More documentation about how to use live-build is available in the "
-"individual manpages for each helper and in the manual at E<lt>I<http://live-"
-"systems.org/manual/>E<gt>."
+"individual manpages for each helper and in the manual at E<lt>I<https://"
+"debian-live.alioth.debian.org/manual/>E<gt>."
 msgstr ""
 
 #.  FIXME
@@ -376,129 +375,121 @@ msgstr ""
 #. type: IP
 #: en/live-build.7:58
 #, no-wrap
-msgid "B<lb_config>(1)"
+msgid "B<lb config>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:60
-msgid "create configuration for live-build"
+msgid "creates configuration for live-build"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:60
 #, no-wrap
-msgid "B<lb_bootstrap>(1)"
+msgid "B<lb bootstrap>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:62
-msgid "create the first stage by bootstrapping a basic debian system"
+msgid ""
+"executes the first build stage, creating (bootstraping) a basic Debian root "
+"filesystem"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:62
 #, no-wrap
-msgid "B<lb_chroot>(1)"
+msgid "B<lb chroot>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:64
-msgid "create the second stage by customizing the chroot"
+msgid "executes the second build stage, building the live OS filesystem"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:64
 #, no-wrap
-msgid "B<lb_binary>(1)"
+msgid "B<lb installer>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:66
-msgid "create the third stage by generating a binary image"
+msgid ""
+"executes the third build stage, obtaining installer components (optional)"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:66
 #, no-wrap
-msgid "B<lb_source>(1)"
+msgid "B<lb binary>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:68
-msgid "create the optional fourth stage by generating a source image"
+msgid "executes the fourth build stage, generating a binary image"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:68
 #, no-wrap
-msgid "B<lb_clean>(1)"
+msgid "B<lb source>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:70
-msgid "clean up system build directories"
+msgid "executes the fifth build stage, generating a source image (optional)"
 msgstr ""
 
-#. type: SS
+#. type: IP
 #: en/live-build.7:70
 #, no-wrap
-msgid "Ancillary Commands"
+msgid "B<lb clean>(1)"
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:71
-#, no-wrap
-msgid "B<lb>(1)"
+#. type: Plain text
+#: en/live-build.7:72
+msgid "cleans up system build directories"
 msgstr ""
 
-#. type: Plain text
-#: en/live-build.7:73
-msgid "generic live-build wrapper"
+#. type: SS
+#: en/live-build.7:72
+#, no-wrap
+msgid "Ancillary Commands"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:73
 #, no-wrap
-msgid "B<lb_build>(1)"
+msgid "B<lb>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:75
-msgid "alias for all stages"
+msgid "generic live-build script execution wrapper"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:75
 #, no-wrap
-msgid "B<lb_local>(1)"
-msgstr ""
-
-#. type: Plain text
-#: en/live-build.7:77
-msgid "helper for using a local live-build"
-msgstr ""
-
-#. type: IP
-#: en/live-build.7:77
-#, no-wrap
-msgid "B<lb_testroot>(1)"
+msgid "B<lb build>(1)"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:80
-msgid "ensure that a system is built as root"
+#: en/live-build.7:78
+msgid "alias for all build stages"
 msgstr ""
 
 #. type: SH
-#: en/live-build.7:81
+#: en/live-build.7:79
 #, no-wrap
-msgid "LOW-LEVEL COMMANDS (PLUMBING)"
+msgid "LOW-LEVEL COMMANDS (PLUMBING) - BUILD STAGE COMPONENTS"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:84
+#: en/live-build.7:82
 msgid ""
 "The actual work of live-build is implemented in the low-level commands, "
 "called plumbing. They are not supposed to be used by end users, they should "
@@ -509,7 +500,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:86
+#: en/live-build.7:84
 msgid ""
 "Note that the interface (set of options and the semantics) to these low-"
 "level commands are meant to be a lot more stable than Porcelain level "
@@ -518,628 +509,767 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: en/live-build.7:86
+#: en/live-build.7:84
+#, no-wrap
+msgid "Bootstrap stage specific commands"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:85
 #, no-wrap
-msgid "Bootstrap commands"
+msgid "B<lb bootstrap_archives>(1)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-build.7:87
+msgid "applies apt archive configuration"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:87
 #, no-wrap
-msgid "B<lb_bootstrap_cache>(1)"
+msgid "B<lb bootstrap_cache>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:89
-msgid "cache bootstrap stage"
+msgid ""
+"in save mode, saves to cache a copy of the generated bootstrap directory, "
+"and in restore mode, restores from cache a previously generated copy"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:89
 #, no-wrap
-msgid "B<lb_bootstrap_debootstrap>(1)"
+msgid "B<lb bootstrap_debootstrap>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:91
-msgid "bootstrap a Debian system with debootstrap(8)"
+msgid "creates (bootstrap) a basic Debian root filesystem using debootstrap(8)"
 msgstr ""
 
 #. type: SS
 #: en/live-build.7:91
 #, no-wrap
-msgid "Chroot commands"
-msgstr ""
-
-#. type: IP
-#: en/live-build.7:92
-#, no-wrap
-msgid "B<lb_chroot_apt>(1)"
+msgid "Chroot stage specific commands"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:94
-msgid "manage /etc/apt/apt.conf"
+msgid ""
+"Note: The following chroot_ prefixed commands are used in building the live "
+"OS filesystem. Another set of similarly prefixed files are listed separately "
+"(see further down)."
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:94
 #, no-wrap
-msgid "B<lb_chroot_cache>(1)"
+msgid "B<lb chroot_cache>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:96
-msgid "cache chroot stage"
+msgid ""
+"in save mode, saves to cache a copy of the chroot directory, and in restore "
+"mode, restores from cache a previously generated copy"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:96
 #, no-wrap
-msgid "B<lb_chroot_debianchroot>(1)"
+msgid "B<lb chroot_firmware>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:98
-msgid "manage /etc/debian_chroot"
+msgid ""
+"compiles a list of firmware packages to be installed in the live OS root "
+"filesystem"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:98
 #, no-wrap
-msgid "B<lb_chroot_devpts>(1)"
+msgid "B<lb chroot_hacks>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:100
-msgid "mount /dev/pts"
+msgid ""
+"executes local hacks against the live OS root filesystem, if any are provided"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:100
 #, no-wrap
-msgid "B<lb_chroot_dpkg>(1)"
+msgid "B<lb chroot_hooks>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:102
-msgid "manage /sbin/dpkg"
+msgid ""
+"executes local hooks against the live OS root filesystem, if any are provided"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:102
 #, no-wrap
-msgid "B<lb_chroot_hacks>(1)"
+msgid "B<lb chroot_includes>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:104
-msgid "execute hacks in chroot"
+msgid ""
+"copies a set of local files from the config directory into the live OS root "
+"filesystem, if any are provided"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:104
 #, no-wrap
-msgid "B<lb_chroot_hostname>(1)"
+msgid "B<lb chroot_install-packages>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:106
-msgid "manage /bin/hostname"
+msgid ""
+"installs into the live OS root filesystem any packages listed in local "
+"package lists"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:106
 #, no-wrap
-msgid "B<lb_chroot_hosts>(1)"
+msgid "B<lb chroot_interactive>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:108
-msgid "manage /etc/hosts"
+msgid ""
+"pauses the build process and starts an interactive shell from the live OS "
+"root filesystem, providing an oportunity for manual modifications or "
+"testing; note that this is (currently) usually executed with several chroot "
+"prep modifications applied (see description of these further down)"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:108
 #, no-wrap
-msgid "B<lb_chroot_install-packages>(1)"
+msgid "B<lb chroot_linux-image>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:110
-msgid "install queued packages into chroot"
+msgid ""
+"compiles a list of kernel images to be installed in the live OS root "
+"filesystem"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:110
 #, no-wrap
-msgid "B<lb_chroot_interactive>(1)"
+msgid "B<lb chroot_live-packages>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:112
-msgid "make build interactive"
+msgid ""
+"installs a set of live system specific packages to the live OS root "
+"filesystem"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:112
 #, no-wrap
-msgid "B<lb_chroot_linux-image>(1)"
+msgid "B<lb chroot_package-lists>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:114
-msgid "manage /etc/kernel-img.conf"
+msgid ""
+"compiles a list of packages provided in the user\\' local config to be "
+"installed in the live OS root filesystem"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:114
 #, no-wrap
-msgid "B<lb_chroot_hooks>(1)"
+msgid "B<lb chroot_preseed>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:116
-msgid "execute local hooks in chroot"
+msgid ""
+"installs pre-configured answers to certain install prompts into the live OS "
+"root filesystem"
 msgstr ""
 
-#. type: IP
+#. type: SS
 #: en/live-build.7:116
 #, no-wrap
-msgid "B<lb_chroot_local-includes>(1)"
-msgstr ""
-
-#. type: Plain text
-#: en/live-build.7:118
-msgid "copy local files into chroot"
+msgid "Installer stage specific commands"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:118
+#: en/live-build.7:117
 #, no-wrap
-msgid "B<lb_chroot_packages>(1)"
+msgid "B<lb installer_debian-installer>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:120
-msgid "queue install of packages into chroot"
+#: en/live-build.7:119
+msgid "obtains and sets up Debian installer(d-i) components"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:120
+#: en/live-build.7:119
 #, no-wrap
-msgid "B<lb_chroot_local-patches>(1)"
+msgid "B<lb installer_preseed>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:122
-msgid "apply local patches against chroot"
+#: en/live-build.7:121
+msgid "installs pre-configured answers to certain install prompts"
+msgstr ""
+
+#. type: SS
+#: en/live-build.7:121
+#, no-wrap
+msgid "Binary stage specific commands"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:122
 #, no-wrap
-msgid "B<lb_chroot_local-preseed>(1)"
+msgid "B<lb binary_checksums>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:124
-msgid "use debconf local preseeding file"
+msgid "creates checksums (md5, sha1, and/or sha256) for live image content"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:124
 #, no-wrap
-msgid "B<lb_chroot_packagelists>(1)"
+msgid "B<lb binary_chroot>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:126
-msgid "queue install of package lists into chroot"
+msgid ""
+"duplicates the chroot directory, to place a copy of what whould be the "
+"completed live OS root filesystem to one side, allowing the original to "
+"continue to be used in executing certain parts of the remainder of the build "
+"process"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:126
 #, no-wrap
-msgid "B<lb_chroot_proc>(1)"
+msgid "B<lb binary_disk>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:128
-msgid "mount /proc"
+msgid "creates disk information files to be added to live image"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:128
 #, no-wrap
-msgid "B<lb_chroot_resolv>(1)"
+msgid "B<lb binary_grub>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:130
-msgid "manage /etc/resolv.conf"
+msgid "installs grub into live image to provide image boot capability"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:130
 #, no-wrap
-msgid "B<lb_chroot_selinuxfs>(1)"
+msgid "B<lb binary_grub2>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:132
-msgid "mount /selinux"
+msgid "installs grub2 into live image to provide image boot capability"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:132
 #, no-wrap
-msgid "B<lb_chroot_archives>(1)"
+msgid "B<lb binary_hdd>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:134
-msgid "manage /etc/apt/sources.list"
+msgid "compiles the final live image into an hdd image file"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:134
 #, no-wrap
-msgid "B<lb_chroot_sysfs>(1)"
+msgid "B<lb binary_hooks>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:136
-msgid "mount /sys"
+msgid "executes local hooks against the live image, if any are provided"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:136
 #, no-wrap
-msgid "B<lb_chroot_sysv-rc>(1)"
+msgid "B<lb binary_includes>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:138
-msgid "manage /usr/sbin/policy-rc.d"
+msgid ""
+"copies a set of local files from the config directory into the live image, "
+"if any are provided"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:138
 #, no-wrap
-msgid "B<lb_chroot_task-lists>(1)"
+msgid "B<lb binary_iso>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:140
-msgid "install task lists into chroot"
+msgid "compiles the final live image into an iso file"
 msgstr ""
 
-#. type: SS
+#. type: IP
 #: en/live-build.7:140
 #, no-wrap
-msgid "Binary commands"
+msgid "B<lb binary_linux-image>(1)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-build.7:142
+msgid "copies the linux-image into the live image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:141
+#: en/live-build.7:142
 #, no-wrap
-msgid "B<lb_binary_chroot>(1)"
+msgid "B<lb binary_loadlin>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:143
-msgid "copy chroot into chroot"
+#: en/live-build.7:144
+msgid "bundles a copy of loadlin into the live image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:143
+#: en/live-build.7:144
 #, no-wrap
-msgid "B<lb_binary_debian-installer>(1)"
+msgid "B<lb binary_manifest>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:145
-msgid "install debian-installer into binary"
+#: en/live-build.7:146
+msgid ""
+"creates manifest of packages installed into live OS filesystem, and list of "
+"packages to be excluded by a persistence mechanism installing the live OS to "
+"disk"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:145
+#: en/live-build.7:146
 #, no-wrap
-msgid "B<lb_binary_disk>(1)"
+msgid "B<lb binary_memtest>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:147
-msgid "install disk information into binary"
+#: en/live-build.7:148
+msgid "bundles a copy of memtest into the live image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:147
+#: en/live-build.7:148
 #, no-wrap
-msgid "B<lb_binary_grub>(1)"
+msgid "B<lb binary_netboot>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:149
-msgid "installs grub into binary"
+#: en/live-build.7:150
+msgid "compiles the final live image into a netboot tar archive"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:149
+#: en/live-build.7:150
 #, no-wrap
-msgid "B<lb_binary_grub2>(1)"
+msgid "B<lb binary_package-lists>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:151
-msgid "installs grub2 into binary"
+#: en/live-build.7:152
+msgid ""
+"processes local lists of packages to obtain and bundle into image (from "
+"which they could later be installed if not already)"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:151
+#: en/live-build.7:152
 #, no-wrap
-msgid "B<lb_binary_includes>(1)"
+msgid "B<lb binary_rootfs>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:153 en/live-build.7:161
-msgid "copy files into binary"
+#: en/live-build.7:154
+msgid ""
+"wraps up the completed live OS root filesystem into a virtual file system "
+"image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:153
+#: en/live-build.7:154
 #, no-wrap
-msgid "B<lb_binary_iso>(1)"
+msgid "B<lb binary_syslinux>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:155
-msgid "build iso binary image"
+#: en/live-build.7:156
+msgid "installs syslinux into live image to provide image boot capability"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:155
+#: en/live-build.7:156
 #, no-wrap
-msgid "B<lb_binary_linux-image>(1)"
+msgid "B<lb binary_tar>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:157
-msgid "install linux-image into binary"
+#: en/live-build.7:158
+msgid "compiles the final live image into a tar archive"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:157
+#: en/live-build.7:158
 #, no-wrap
-msgid "B<lb_binary_local-hooks>(1)"
+msgid "B<lb binary_win32-loader>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:159
-msgid "execute local hooks in binary"
+#: en/live-build.7:160
+msgid ""
+"bundles a copy of win32-loader into the live image and creates an autorun."
+"inf file"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:159
+#: en/live-build.7:160
 #, no-wrap
-msgid "B<lb_binary_local-includes>(1)"
+msgid "B<lb binary_zsync>(1)"
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:161
-#, no-wrap
-msgid "B<lb_binary_local-packagelists>(1)"
+#. type: Plain text
+#: en/live-build.7:162
+msgid "builds zsync control files"
 msgstr ""
 
-#. type: Plain text
-#: en/live-build.7:163
-msgid "install local package lists into binary"
+#. type: SS
+#: en/live-build.7:162
+#, no-wrap
+msgid "Source stage specific commands"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:163
 #, no-wrap
-msgid "B<lb_binary_manifest>(1)"
+msgid "B<lb source_checksums>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:165
-msgid "create manifest"
+msgid "creates checksums (md5, sha1, and/or sha256) for source image content"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:165
 #, no-wrap
-msgid "B<lb_binary_checksums>(1)"
+msgid "B<lb source_debian>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:167
-msgid "create binary checksums (md5, sha1, and/or sha256)"
+msgid "downloads source packages for bundling into source image"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:167
 #, no-wrap
-msgid "B<lb_binary_memtest>(1)"
+msgid "B<lb source_disk>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:169
-msgid "installs a memtest into binary"
+msgid "creates disk information files to be added to source image"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:169
 #, no-wrap
-msgid "B<lb_binary_net>(1)"
+msgid "B<lb source_hdd>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:171
-msgid "build netboot binary image"
+msgid "compiles the final source image into an hdd image file"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:171
 #, no-wrap
-msgid "B<lb_binary_rootfs>(1)"
+msgid "B<lb source_hooks>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:173
-msgid "build rootfs image"
+msgid "executes local hooks against the source image, if any are provided"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:173
 #, no-wrap
-msgid "B<lb_binary_syslinux>(1)"
+msgid "B<lb source_iso>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:175
-msgid "installs syslinux into binary"
+msgid "compiles the final source image into an iso file"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:175
 #, no-wrap
-msgid "B<lb_binary_tar>(1)"
+msgid "B<lb source_live>(1)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-build.7:177
-msgid "build harddisk binary image"
+msgid "copies live-build config into source"
 msgstr ""
 
 #. type: IP
 #: en/live-build.7:177
 #, no-wrap
-msgid "B<lb_binary_hdd>(1)"
+msgid "B<lb source_tar>(1)"
 msgstr ""
 
+#.  FIXME
 #. type: Plain text
-#: en/live-build.7:179
-msgid "build binary hdd image"
+#: en/live-build.7:180
+msgid "compiles the final source image into a tar archive"
+msgstr ""
+
+#. type: SH
+#: en/live-build.7:181
+#, no-wrap
+msgid "LOW-LEVEL COMMANDS (PLUMBING) - CHROOT PREP COMPONENTS"
+msgstr ""
+
+#.  FIXME
+#. type: Plain text
+#: en/live-build.7:184
+msgid ""
+"The notes above under the section regarding build-stage specific low-level "
+"plumbing commands also apply here."
+msgstr ""
+
+#. type: Plain text
+#: en/live-build.7:186
+msgid ""
+"The following chroot_ prefixed commands are used throughout the various "
+"primary stages of the build process to apply and remove modifications to a "
+"chroot root filesystem. Generally these are used to apply modification that "
+"setup the chroot for use (execution of programs within it) during the build "
+"process, and later to remove those modification, unmounting things that were "
+"mounted, and making the chroot suitable for use as the root filesystem of "
+"the live OS to be bundled into the live image."
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:179
+#: en/live-build.7:186
 #, no-wrap
-msgid "B<lb_binary_win32-loader>(1)"
+msgid "B<lb chroot_apt>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:181
-msgid "installs win32-loader into binary"
+#: en/live-build.7:188
+msgid ""
+"manages apt configuration; in apply mode it applies configuration for use "
+"during build process, and in remove mode removes that configuration"
 msgstr ""
 
-#. type: SS
-#: en/live-build.7:181
+#. type: IP
+#: en/live-build.7:188
 #, no-wrap
-msgid "Source commands"
+msgid "B<lb chroot_archives>(1)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-build.7:190
+msgid ""
+"manages apt archive source lists; in apply mode it applies source list "
+"configurations suitable for use of the chroot in the build process, and in "
+"remove mode replaces that with a configuration suitable for the final live OS"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:182
+#: en/live-build.7:190
 #, no-wrap
-msgid "B<lb_source_debian>(1)"
+msgid "B<lb chroot_debianchroot>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:184
-msgid "download sources"
+#: en/live-build.7:192
+msgid "manages a /etc/debian_chroot file"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:184
+#: en/live-build.7:192
 #, no-wrap
-msgid "B<lb_source_debian-live>(1)"
+msgid "B<lb chroot_devpts>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:186
-msgid "copy debian-live config into source"
+#: en/live-build.7:194
+msgid "manages mounting of /dev/pts"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:186
+#: en/live-build.7:194
 #, no-wrap
-msgid "B<lb_source_disk>(1)"
+msgid "B<lb chroot_dpkg>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:188
-msgid "install disk information into source"
+#: en/live-build.7:196
+msgid ""
+"manages dpkg; in apply mode disabling things like the start-stop-daemon, and "
+"in remove mode enabling them again"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:188
+#: en/live-build.7:196
 #, no-wrap
-msgid "B<lb_source_iso>(1)"
+msgid "B<lb chroot_hostname>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:190
-msgid "build iso source image"
+#: en/live-build.7:198
+msgid "manages the hostname configuration"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:190
+#: en/live-build.7:198
 #, no-wrap
-msgid "B<lb_source_checksums>(1)"
+msgid "B<lb chroot_hosts>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:192
-msgid "create source checksums (md5, sha1, and/or sha256)"
+#: en/live-build.7:200
+msgid "manages the /etc/hosts file"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:192
+#: en/live-build.7:200
 #, no-wrap
-msgid "B<lb_source_net>(1)"
+msgid "B<lb chroot_proc>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:194
-msgid "build source net image"
+#: en/live-build.7:202
+msgid "manages mounting of /proc"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:194
+#: en/live-build.7:202
 #, no-wrap
-msgid "B<lb_source_tar>(1)"
+msgid "B<lb chroot_resolv>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:196
-msgid "build source tarball"
+#: en/live-build.7:204
+msgid "manages configuration of the /etc/resolv.conf file"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:196
+#: en/live-build.7:204
+#, no-wrap
+msgid "B<lb chroot_selinuxfs>(1)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-build.7:206
+msgid "manages mounting of /sys/fs/selinux"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:206
 #, no-wrap
-msgid "B<lb_source_hdd>(1)"
+msgid "B<lb chroot_sysfs>(1)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-build.7:208
+msgid "manages mounting of /sys"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:208
+#, no-wrap
+msgid "B<lb chroot_sysv-rc>(1)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-build.7:210
+msgid "manages the /usr/sbin/policy-rc.d file"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:210
+#, no-wrap
+msgid "B<lb chroot_tmpfs>(1)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-build.7:212
+msgid "manages configuration of dpkg to use a tmpfs filesystem"
+msgstr ""
+
+#. type: IP
+#: en/live-build.7:212
+#, no-wrap
+msgid "B<lb chroot_upstart>(1)"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:199
-msgid "build source hdd image"
+#: en/live-build.7:215
+msgid ""
+"manages use of upstart /sbin/initctl program; in apply mode blocking "
+"execution through a dpkg diversion, and in remove mode enabling execution "
+"again"
 msgstr ""
 
 #. type: SH
-#: en/live-build.7:200
+#: en/live-build.7:216
 #, no-wrap
 msgid "CONFIG FILES"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:203
+#: en/live-build.7:219
 msgid ""
 "Many live-build commands make use of files in the I<config/> directory to "
 "control what they do. Besides the common I<config/common>, which is used by "
@@ -1151,9 +1281,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:205
+#: en/live-build.7:221
 msgid ""
-"For example, lb_bootstrap_debootstrap uses files named config/bootstrap and "
+"For example, lb bootstrap_debootstrap uses files named config/bootstrap and "
 "config/bootstrap_debootstrap to read the options it will use. See the man "
 "pages of individual commands for details about the names and formats of the "
 "files they use. Generally, these files contain variables with values "
@@ -1162,7 +1292,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:207
+#: en/live-build.7:223
 msgid ""
 "Note that live-build will respect environment variables which are present in "
 "the context of the shell it is running. If variables can be read from config "
@@ -1173,7 +1303,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:209
+#: en/live-build.7:225
 msgid ""
 "In some rare cases, you may want to have different versions of these files "
 "for different architectures or distributions. If files named config/stage."
@@ -1186,7 +1316,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:212
+#: en/live-build.7:228
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "program. That means they have to follow the normal shell syntax. You can "
@@ -1194,13 +1324,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:214
+#: en/live-build.7:230
 #, no-wrap
 msgid "B</etc/live/build.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:215
+#: en/live-build.7:231
 #, no-wrap
 msgid "B</etc/live/build/*>"
 msgstr ""